To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 467
- compare with another revision
- download diff
- download tarball
- view history from revision 467
- Committer: Teddy Hogeborn
- Date: 2011-02-27 17:33:28 UTC
- mfrom: (237.5.2 mandos-release)
- Revision ID: teddy@fukt.bsnet.se-20110227173328-iobho8fi50761460
Merge fix for password-prompt/plymouth conflict from Björn.
- files removed:
- debian/source/local-options
- files modified:
- DBUS-API
added
removed
mandos
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
34
from __future__ import (division, absolute_import, print_function,
36
36
37
37
import SocketServer as socketserver
38
38
import socket
39
import argparse
39
import optparse
40
40
import datetime
41
41
import errno
42
42
import gnutls.crypto
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
import types
66
65
67
66
import dbus
68
67
import dbus.service
83
82
SO_BINDTODEVICE = None
84
83
85
84
86
version = "1.4.0"
85
version = "1.2.3"
87
86
88
87
#logger = logging.getLogger('mandos')
89
88
logger = logging.Logger('mandos')
152
151
self.group = None # our entry group
153
152
self.server = None
154
153
self.bus = bus
155
self.entry_group_state_changed_match = None
156
154
def rename(self):
157
155
"""Derived from the Avahi example code"""
158
156
if self.rename_count >= self.max_renames:
160
158
" after %i retries, exiting.",
161
159
self.rename_count)
162
160
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server
164
.GetAlternativeServiceName(self.name))
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
165
162
logger.info("Changing Zeroconf service name to %r ...",
166
163
self.name)
167
164
syslogger.setFormatter(logging.Formatter
171
168
self.remove()
172
169
try:
173
170
self.add()
174
except dbus.exceptions.DBusException as error:
171
except dbus.exceptions.DBusException, error:
175
172
logger.critical("DBusException: %s", error)
176
173
self.cleanup()
177
174
os._exit(1)
178
175
self.rename_count += 1
179
176
def remove(self):
180
177
"""Derived from the Avahi example code"""
181
if self.entry_group_state_changed_match is not None:
182
self.entry_group_state_changed_match.remove()
183
self.entry_group_state_changed_match = None
184
178
if self.group is not None:
185
179
self.group.Reset()
186
180
def add(self):
187
181
"""Derived from the Avahi example code"""
188
self.remove()
189
182
if self.group is None:
190
183
self.group = dbus.Interface(
191
184
self.bus.get_object(avahi.DBUS_NAME,
192
185
self.server.EntryGroupNew()),
193
186
avahi.DBUS_INTERFACE_ENTRY_GROUP)
194
self.entry_group_state_changed_match = (
195
self.group.connect_to_signal(
196
'StateChanged', self .entry_group_state_changed))
187
self.group.connect_to_signal('StateChanged',
188
self
189
.entry_group_state_changed)
197
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
198
191
self.name, self.type)
199
192
self.group.AddService(
222
215
def cleanup(self):
223
216
"""Derived from the Avahi example code"""
224
217
if self.group is not None:
225
try:
226
self.group.Free()
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
229
pass
218
self.group.Free()
230
219
self.group = None
231
self.remove()
232
def server_state_changed(self, state, error=None):
220
def server_state_changed(self, state):
233
221
"""Derived from the Avahi example code"""
234
222
logger.debug("Avahi server state change: %i", state)
235
bad_states = { avahi.SERVER_INVALID:
236
"Zeroconf server invalid",
237
avahi.SERVER_REGISTERING: None,
238
avahi.SERVER_COLLISION:
239
"Zeroconf server name collision",
240
avahi.SERVER_FAILURE:
241
"Zeroconf server failure" }
242
if state in bad_states:
243
if bad_states[state] is not None:
244
if error is None:
245
logger.error(bad_states[state])
246
else:
247
logger.error(bad_states[state] + ": %r", error)
248
self.cleanup()
223
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
225
self.remove()
249
226
elif state == avahi.SERVER_RUNNING:
250
227
self.add()
251
else:
252
if error is None:
253
logger.debug("Unknown state: %r", state)
254
else:
255
logger.debug("Unknown state: %r: %r", state, error)
256
228
def activate(self):
257
229
"""Derived from the Avahi example code"""
258
230
if self.server is None:
259
231
self.server = dbus.Interface(
260
232
self.bus.get_object(avahi.DBUS_NAME,
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
233
avahi.DBUS_PATH_SERVER),
263
234
avahi.DBUS_INTERFACE_SERVER)
264
235
self.server.connect_to_signal("StateChanged",
265
236
self.server_state_changed)
266
237
self.server_state_changed(self.server.GetState())
267
238
268
239
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
274
275
240
class Client(object):
276
241
"""A representation of a client host served by this server.
277
242
305
270
secret: bytestring; sent verbatim (over TLS) to client
306
271
timeout: datetime.timedelta(); How long from last_checked_ok
307
272
until this client is disabled
308
extended_timeout: extra long timeout when password has been sent
309
273
runtime_expansions: Allowed attributes for runtime expansion.
310
expires: datetime.datetime(); time (UTC) when a client will be
311
disabled, or None
312
274
"""
313
275
314
276
runtime_expansions = ("approval_delay", "approval_duration",
316
278
"host", "interval", "last_checked_ok",
317
279
"last_enabled", "name", "timeout")
318
280
281
@staticmethod
282
def _timedelta_to_milliseconds(td):
283
"Convert a datetime.timedelta() to milliseconds"
284
return ((td.days * 24 * 60 * 60 * 1000)
285
+ (td.seconds * 1000)
286
+ (td.microseconds // 1000))
287
319
288
def timeout_milliseconds(self):
320
289
"Return the 'timeout' attribute in milliseconds"
321
return _timedelta_to_milliseconds(self.timeout)
322
323
def extended_timeout_milliseconds(self):
324
"Return the 'extended_timeout' attribute in milliseconds"
325
return _timedelta_to_milliseconds(self.extended_timeout)
290
return self._timedelta_to_milliseconds(self.timeout)
326
291
327
292
def interval_milliseconds(self):
328
293
"Return the 'interval' attribute in milliseconds"
329
return _timedelta_to_milliseconds(self.interval)
330
294
return self._timedelta_to_milliseconds(self.interval)
295
331
296
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
297
return self._timedelta_to_milliseconds(self.approval_delay)
333
298
334
299
def __init__(self, name = None, disable_hook=None, config=None):
335
300
"""Note: the 'checker' key in 'config' sets the
362
327
self.last_enabled = None
363
328
self.last_checked_ok = None
364
329
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
367
330
self.interval = string_to_delta(config["interval"])
368
331
self.disable_hook = disable_hook
369
332
self.checker = None
370
333
self.checker_initiator_tag = None
371
334
self.disable_initiator_tag = None
372
self.expires = None
373
335
self.checker_callback_tag = None
374
336
self.checker_command = config["checker"]
375
337
self.current_checker_command = None
382
344
config["approval_delay"])
383
345
self.approval_duration = string_to_delta(
384
346
config["approval_duration"])
385
self.changedstate = (multiprocessing_manager
386
.Condition(multiprocessing_manager
387
.Lock()))
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
388
348
389
349
def send_changedstate(self):
390
350
self.changedstate.acquire()
391
351
self.changedstate.notify_all()
392
352
self.changedstate.release()
393
353
394
354
def enable(self):
395
355
"""Start this client's checker and timeout hooks"""
396
356
if getattr(self, "enabled", False):
397
357
# Already enabled
398
358
return
399
359
self.send_changedstate()
360
self.last_enabled = datetime.datetime.utcnow()
400
361
# Schedule a new checker to be started an 'interval' from now,
401
362
# and every interval from then on.
402
363
self.checker_initiator_tag = (gobject.timeout_add
403
364
(self.interval_milliseconds(),
404
365
self.start_checker))
405
366
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
407
367
self.disable_initiator_tag = (gobject.timeout_add
408
368
(self.timeout_milliseconds(),
409
369
self.disable))
410
370
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
412
371
# Also start a new checker *right now*.
413
372
self.start_checker()
414
373
423
382
if getattr(self, "disable_initiator_tag", False):
424
383
gobject.source_remove(self.disable_initiator_tag)
425
384
self.disable_initiator_tag = None
426
self.expires = None
427
385
if getattr(self, "checker_initiator_tag", False):
428
386
gobject.source_remove(self.checker_initiator_tag)
429
387
self.checker_initiator_tag = None
455
413
logger.warning("Checker for %(name)s crashed?",
456
414
vars(self))
457
415
458
def checked_ok(self, timeout=None):
416
def checked_ok(self):
459
417
"""Bump up the timeout for this client.
460
418
461
419
This should only be called when the client has been seen,
462
420
alive and well.
463
421
"""
464
if timeout is None:
465
timeout = self.timeout
466
422
self.last_checked_ok = datetime.datetime.utcnow()
467
423
gobject.source_remove(self.disable_initiator_tag)
468
424
self.disable_initiator_tag = (gobject.timeout_add
469
(_timedelta_to_milliseconds
470
(timeout), self.disable))
471
self.expires = datetime.datetime.utcnow() + timeout
425
(self.timeout_milliseconds(),
426
self.disable))
472
427
473
428
def need_approval(self):
474
429
self.last_approval_request = datetime.datetime.utcnow()
490
445
# If a checker exists, make sure it is not a zombie
491
446
try:
492
447
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
493
except (AttributeError, OSError) as error:
448
except (AttributeError, OSError), error:
494
449
if (isinstance(error, OSError)
495
450
and error.errno != errno.ECHILD):
496
451
raise error
514
469
'replace')))
515
470
for attr in
516
471
self.runtime_expansions)
517
472
518
473
try:
519
474
command = self.checker_command % escaped_attrs
520
except TypeError as error:
475
except TypeError, error:
521
476
logger.error('Could not format string "%s":'
522
477
' %s', self.checker_command, error)
523
478
return True # Try again later
542
497
if pid:
543
498
gobject.source_remove(self.checker_callback_tag)
544
499
self.checker_callback(pid, status, command)
545
except OSError as error:
500
except OSError, error:
546
501
logger.error("Failed to start subprocess: %s",
547
502
error)
548
503
# Re-run this periodically if run by gobject.timeout_add
561
516
#time.sleep(0.5)
562
517
#if self.checker.poll() is None:
563
518
# os.kill(self.checker.pid, signal.SIGKILL)
564
except OSError as error:
519
except OSError, error:
565
520
if error.errno != errno.ESRCH: # No such process
566
521
raise
567
522
self.checker = None
568
523
569
570
524
def dbus_service_property(dbus_interface, signature="v",
571
525
access="readwrite", byte_arrays=False):
572
526
"""Decorators for marking methods of a DBusObjectWithProperties to
618
572
619
573
class DBusObjectWithProperties(dbus.service.Object):
620
574
"""A D-Bus object with properties.
621
575
622
576
Classes inheriting from this can use the dbus_service_property
623
577
decorator to expose methods as D-Bus properties. It exposes the
624
578
standard Get(), Set(), and GetAll() methods on the D-Bus.
631
585
def _get_all_dbus_properties(self):
632
586
"""Returns a generator of (name, attribute) pairs
633
587
"""
634
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
635
for cls in self.__class__.__mro__
588
return ((prop._dbus_name, prop)
636
589
for name, prop in
637
inspect.getmembers(cls, self._is_dbus_property))
590
inspect.getmembers(self, self._is_dbus_property))
638
591
639
592
def _get_dbus_property(self, interface_name, property_name):
640
593
"""Returns a bound method if one exists which is a D-Bus
641
594
property with the specified name and interface.
642
595
"""
643
for cls in self.__class__.__mro__:
644
for name, value in (inspect.getmembers
645
(cls, self._is_dbus_property)):
646
if (value._dbus_name == property_name
647
and value._dbus_interface == interface_name):
648
return value.__get__(self)
649
596
for name in (property_name,
597
property_name + "_dbus_property"):
598
prop = getattr(self, name, None)
599
if (prop is None
600
or not self._is_dbus_property(prop)
601
or prop._dbus_name != property_name
602
or (interface_name and prop._dbus_interface
603
and interface_name != prop._dbus_interface)):
604
continue
605
return prop
650
606
# No such property
651
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
608
+ interface_name + "."
686
642
def GetAll(self, interface_name):
687
643
"""Standard D-Bus property GetAll() method, see D-Bus
688
644
standard.
689
645
690
646
Note: Will not include properties with access="write".
691
647
"""
692
648
all = {}
748
704
xmlstring = document.toxml("utf-8")
749
705
document.unlink()
750
706
except (AttributeError, xml.dom.DOMException,
751
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
752
708
logger.error("Failed to override Introspection method",
753
709
error)
754
710
return xmlstring
755
711
756
712
757
def datetime_to_dbus (dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
759
if dt is None:
760
return dbus.String("", variant_level = variant_level)
761
return dbus.String(dt.isoformat(),
762
variant_level=variant_level)
763
764
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
765
.__metaclass__):
766
"""Applied to an empty subclass of a D-Bus object, this metaclass
767
will add additional D-Bus attributes matching a certain pattern.
768
"""
769
def __new__(mcs, name, bases, attr):
770
# Go through all the base classes which could have D-Bus
771
# methods, signals, or properties in them
772
for base in (b for b in bases
773
if issubclass(b, dbus.service.Object)):
774
# Go though all attributes of the base class
775
for attrname, attribute in inspect.getmembers(base):
776
# Ignore non-D-Bus attributes, and D-Bus attributes
777
# with the wrong interface name
778
if (not hasattr(attribute, "_dbus_interface")
779
or not attribute._dbus_interface
780
.startswith("se.recompile.Mandos")):
781
continue
782
# Create an alternate D-Bus interface name based on
783
# the current name
784
alt_interface = (attribute._dbus_interface
785
.replace("se.recompile.Mandos",
786
"se.bsnet.fukt.Mandos"))
787
# Is this a D-Bus signal?
788
if getattr(attribute, "_dbus_is_signal", False):
789
# Extract the original non-method function by
790
# black magic
791
nonmethod_func = (dict(
792
zip(attribute.func_code.co_freevars,
793
attribute.__closure__))["func"]
794
.cell_contents)
795
# Create a new, but exactly alike, function
796
# object, and decorate it to be a new D-Bus signal
797
# with the alternate D-Bus interface name
798
new_function = (dbus.service.signal
799
(alt_interface,
800
attribute._dbus_signature)
801
(types.FunctionType(
802
nonmethod_func.func_code,
803
nonmethod_func.func_globals,
804
nonmethod_func.func_name,
805
nonmethod_func.func_defaults,
806
nonmethod_func.func_closure)))
807
# Define a creator of a function to call both the
808
# old and new functions, so both the old and new
809
# signals gets sent when the function is called
810
def fixscope(func1, func2):
811
"""This function is a scope container to pass
812
func1 and func2 to the "call_both" function
813
outside of its arguments"""
814
def call_both(*args, **kwargs):
815
"""This function will emit two D-Bus
816
signals by calling func1 and func2"""
817
func1(*args, **kwargs)
818
func2(*args, **kwargs)
819
return call_both
820
# Create the "call_both" function and add it to
821
# the class
822
attr[attrname] = fixscope(attribute,
823
new_function)
824
# Is this a D-Bus method?
825
elif getattr(attribute, "_dbus_is_method", False):
826
# Create a new, but exactly alike, function
827
# object. Decorate it to be a new D-Bus method
828
# with the alternate D-Bus interface name. Add it
829
# to the class.
830
attr[attrname] = (dbus.service.method
831
(alt_interface,
832
attribute._dbus_in_signature,
833
attribute._dbus_out_signature)
834
(types.FunctionType
835
(attribute.func_code,
836
attribute.func_globals,
837
attribute.func_name,
838
attribute.func_defaults,
839
attribute.func_closure)))
840
# Is this a D-Bus property?
841
elif getattr(attribute, "_dbus_is_property", False):
842
# Create a new, but exactly alike, function
843
# object, and decorate it to be a new D-Bus
844
# property with the alternate D-Bus interface
845
# name. Add it to the class.
846
attr[attrname] = (dbus_service_property
847
(alt_interface,
848
attribute._dbus_signature,
849
attribute._dbus_access,
850
attribute
851
._dbus_get_args_options
852
["byte_arrays"])
853
(types.FunctionType
854
(attribute.func_code,
855
attribute.func_globals,
856
attribute.func_name,
857
attribute.func_defaults,
858
attribute.func_closure)))
859
return type.__new__(mcs, name, bases, attr)
860
861
713
class ClientDBus(Client, DBusObjectWithProperties):
862
714
"""A Client class using D-Bus
863
715
885
737
DBusObjectWithProperties.__init__(self, self.bus,
886
738
self.dbus_object_path)
887
739
888
def notifychangeproperty(transform_func,
889
dbus_name, type_func=lambda x: x,
890
variant_level=1):
891
""" Modify a variable so that it's a property which announces
892
its changes to DBus.
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
745
bval = bool(value)
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
750
dbus_bool)
893
751
894
transform_fun: Function that takes a value and transforms it
895
to a D-Bus type.
896
dbus_name: D-Bus name of the variable
897
type_func: Function that transform the value before sending it
898
to the D-Bus. Default: no transform
899
variant_level: D-Bus variant level. Default: 1
900
"""
901
attrname = "_{0}".format(dbus_name)
902
def setter(self, value):
903
if hasattr(self, "dbus_object_path"):
904
if (not hasattr(self, attrname) or
905
type_func(getattr(self, attrname, None))
906
!= type_func(value)):
907
dbus_value = transform_func(type_func(value),
908
variant_level)
909
self.PropertyChanged(dbus.String(dbus_name),
910
dbus_value)
911
setattr(self, attrname, value)
912
913
return property(lambda self: getattr(self, attrname), setter)
914
915
916
expires = notifychangeproperty(datetime_to_dbus, "Expires")
917
approvals_pending = notifychangeproperty(dbus.Boolean,
918
"ApprovalPending",
919
type_func = bool)
920
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
921
last_enabled = notifychangeproperty(datetime_to_dbus,
922
"LastEnabled")
923
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
924
type_func = lambda checker:
925
checker is not None)
926
last_checked_ok = notifychangeproperty(datetime_to_dbus,
927
"LastCheckedOK")
928
last_approval_request = notifychangeproperty(
929
datetime_to_dbus, "LastApprovalRequest")
930
approved_by_default = notifychangeproperty(dbus.Boolean,
931
"ApprovedByDefault")
932
approval_delay = notifychangeproperty(dbus.UInt16,
933
"ApprovalDelay",
934
type_func =
935
_timedelta_to_milliseconds)
936
approval_duration = notifychangeproperty(
937
dbus.UInt16, "ApprovalDuration",
938
type_func = _timedelta_to_milliseconds)
939
host = notifychangeproperty(dbus.String, "Host")
940
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
941
type_func =
942
_timedelta_to_milliseconds)
943
extended_timeout = notifychangeproperty(
944
dbus.UInt16, "ExtendedTimeout",
945
type_func = _timedelta_to_milliseconds)
946
interval = notifychangeproperty(dbus.UInt16,
947
"Interval",
948
type_func =
949
_timedelta_to_milliseconds)
950
checker_command = notifychangeproperty(dbus.String, "Checker")
951
952
del notifychangeproperty
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
755
756
@staticmethod
757
def _datetime_to_dbus(dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
759
return dbus.String(dt.isoformat(),
760
variant_level=variant_level)
761
762
def enable(self):
763
oldstate = getattr(self, "enabled", False)
764
r = Client.enable(self)
765
if oldstate != self.enabled:
766
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
768
dbus.Boolean(True, variant_level=1))
769
self.PropertyChanged(
770
dbus.String("LastEnabled"),
771
self._datetime_to_dbus(self.last_enabled,
772
variant_level=1))
773
return r
774
775
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
777
r = Client.disable(self, quiet=quiet)
778
if not quiet and oldstate != self.enabled:
779
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
781
dbus.Boolean(False, variant_level=1))
782
return r
953
783
954
784
def __del__(self, *args, **kwargs):
955
785
try:
964
794
*args, **kwargs):
965
795
self.checker_callback_tag = None
966
796
self.checker = None
797
# Emit D-Bus signal
798
self.PropertyChanged(dbus.String("CheckerRunning"),
799
dbus.Boolean(False, variant_level=1))
967
800
if os.WIFEXITED(condition):
968
801
exitstatus = os.WEXITSTATUS(condition)
969
802
# Emit D-Bus signal
979
812
return Client.checker_callback(self, pid, condition, command,
980
813
*args, **kwargs)
981
814
815
def checked_ok(self, *args, **kwargs):
816
r = Client.checked_ok(self, *args, **kwargs)
817
# Emit D-Bus signal
818
self.PropertyChanged(
819
dbus.String("LastCheckedOK"),
820
(self._datetime_to_dbus(self.last_checked_ok,
821
variant_level=1)))
822
return r
823
824
def need_approval(self, *args, **kwargs):
825
r = Client.need_approval(self, *args, **kwargs)
826
# Emit D-Bus signal
827
self.PropertyChanged(
828
dbus.String("LastApprovalRequest"),
829
(self._datetime_to_dbus(self.last_approval_request,
830
variant_level=1)))
831
return r
832
982
833
def start_checker(self, *args, **kwargs):
983
834
old_checker = self.checker
984
835
if self.checker is not None:
991
842
and old_checker_pid != self.checker.pid):
992
843
# Emit D-Bus signal
993
844
self.CheckerStarted(self.current_checker_command)
845
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
847
dbus.Boolean(True, variant_level=1))
994
848
return r
995
849
850
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
852
r = Client.stop_checker(self, *args, **kwargs)
853
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
856
dbus.Boolean(False, variant_level=1))
857
return r
858
996
859
def _reset_approved(self):
997
860
self._approved = None
998
861
return False
1000
863
def approve(self, value=True):
1001
864
self.send_changedstate()
1002
865
self._approved = value
1003
gobject.timeout_add(_timedelta_to_milliseconds
866
gobject.timeout_add(self._timedelta_to_milliseconds
1004
867
(self.approval_duration),
1005
868
self._reset_approved)
1006
869
1007
870
1008
871
## D-Bus methods, signals & properties
1009
_interface = "se.recompile.Mandos.Client"
872
_interface = "se.bsnet.fukt.Mandos.Client"
1010
873
1011
874
## Signals
1012
875
1059
922
# CheckedOK - method
1060
923
@dbus.service.method(_interface)
1061
924
def CheckedOK(self):
1062
self.checked_ok()
925
return self.checked_ok()
1063
926
1064
927
# Enable - method
1065
928
@dbus.service.method(_interface)
1098
961
if value is None: # get
1099
962
return dbus.Boolean(self.approved_by_default)
1100
963
self.approved_by_default = bool(value)
964
# Emit D-Bus signal
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
dbus.Boolean(value, variant_level=1))
1101
967
1102
968
# ApprovalDelay - property
1103
969
@dbus_service_property(_interface, signature="t",
1106
972
if value is None: # get
1107
973
return dbus.UInt64(self.approval_delay_milliseconds())
1108
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
# Emit D-Bus signal
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
1109
978
1110
979
# ApprovalDuration - property
1111
980
@dbus_service_property(_interface, signature="t",
1112
981
access="readwrite")
1113
982
def ApprovalDuration_dbus_property(self, value=None):
1114
983
if value is None: # get
1115
return dbus.UInt64(_timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1116
985
self.approval_duration))
1117
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
# Emit D-Bus signal
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
1118
990
1119
991
# Name - property
1120
992
@dbus_service_property(_interface, signature="s", access="read")
1133
1005
if value is None: # get
1134
1006
return dbus.String(self.host)
1135
1007
self.host = value
1008
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
1010
dbus.String(value, variant_level=1))
1136
1011
1137
1012
# Created - property
1138
1013
@dbus_service_property(_interface, signature="s", access="read")
1139
1014
def Created_dbus_property(self):
1140
return dbus.String(datetime_to_dbus(self.created))
1015
return dbus.String(self._datetime_to_dbus(self.created))
1141
1016
1142
1017
# LastEnabled - property
1143
1018
@dbus_service_property(_interface, signature="s", access="read")
1144
1019
def LastEnabled_dbus_property(self):
1145
return datetime_to_dbus(self.last_enabled)
1020
if self.last_enabled is None:
1021
return dbus.String("")
1022
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1146
1023
1147
1024
# Enabled - property
1148
1025
@dbus_service_property(_interface, signature="b",
1162
1039
if value is not None:
1163
1040
self.checked_ok()
1164
1041
return
1165
return datetime_to_dbus(self.last_checked_ok)
1166
1167
# Expires - property
1168
@dbus_service_property(_interface, signature="s", access="read")
1169
def Expires_dbus_property(self):
1170
return datetime_to_dbus(self.expires)
1042
if self.last_checked_ok is None:
1043
return dbus.String("")
1044
return dbus.String(self._datetime_to_dbus(self
1045
.last_checked_ok))
1171
1046
1172
1047
# LastApprovalRequest - property
1173
1048
@dbus_service_property(_interface, signature="s", access="read")
1174
1049
def LastApprovalRequest_dbus_property(self):
1175
return datetime_to_dbus(self.last_approval_request)
1050
if self.last_approval_request is None:
1051
return dbus.String("")
1052
return dbus.String(self.
1053
_datetime_to_dbus(self
1054
.last_approval_request))
1176
1055
1177
1056
# Timeout - property
1178
1057
@dbus_service_property(_interface, signature="t",
1181
1060
if value is None: # get
1182
1061
return dbus.UInt64(self.timeout_milliseconds())
1183
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
1065
dbus.UInt64(value, variant_level=1))
1184
1066
if getattr(self, "disable_initiator_tag", None) is None:
1185
1067
return
1186
1068
# Reschedule timeout
1187
1069
gobject.source_remove(self.disable_initiator_tag)
1188
1070
self.disable_initiator_tag = None
1189
self.expires = None
1190
1071
time_to_die = (self.
1191
1072
_timedelta_to_milliseconds((self
1192
1073
.last_checked_ok
1197
1078
# The timeout has passed
1198
1079
self.disable()
1199
1080
else:
1200
self.expires = (datetime.datetime.utcnow()
1201
+ datetime.timedelta(milliseconds =
1202
time_to_die))
1203
1081
self.disable_initiator_tag = (gobject.timeout_add
1204
1082
(time_to_die, self.disable))
1205
1083
1206
# ExtendedTimeout - property
1207
@dbus_service_property(_interface, signature="t",
1208
access="readwrite")
1209
def ExtendedTimeout_dbus_property(self, value=None):
1210
if value is None: # get
1211
return dbus.UInt64(self.extended_timeout_milliseconds())
1212
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1213
1214
1084
# Interval - property
1215
1085
@dbus_service_property(_interface, signature="t",
1216
1086
access="readwrite")
1218
1088
if value is None: # get
1219
1089
return dbus.UInt64(self.interval_milliseconds())
1220
1090
self.interval = datetime.timedelta(0, 0, 0, value)
1091
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1093
dbus.UInt64(value, variant_level=1))
1221
1094
if getattr(self, "checker_initiator_tag", None) is None:
1222
1095
return
1223
1096
# Reschedule checker run
1225
1098
self.checker_initiator_tag = (gobject.timeout_add
1226
1099
(value, self.start_checker))
1227
1100
self.start_checker() # Start one now, too
1228
1101
1229
1102
# Checker - property
1230
1103
@dbus_service_property(_interface, signature="s",
1231
1104
access="readwrite")
1233
1106
if value is None: # get
1234
1107
return dbus.String(self.checker_command)
1235
1108
self.checker_command = value
1109
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1111
dbus.String(self.checker_command,
1112
variant_level=1))
1236
1113
1237
1114
# CheckerRunning - property
1238
1115
@dbus_service_property(_interface, signature="b",
1265
1142
self._pipe.send(('init', fpr, address))
1266
1143
if not self._pipe.recv():
1267
1144
raise KeyError()
1268
1145
1269
1146
def __getattribute__(self, name):
1270
1147
if(name == '_pipe'):
1271
1148
return super(ProxyClient, self).__getattribute__(name)
1278
1155
self._pipe.send(('funcall', name, args, kwargs))
1279
1156
return self._pipe.recv()[1]
1280
1157
return func
1281
1158
1282
1159
def __setattr__(self, name, value):
1283
1160
if(name == '_pipe'):
1284
1161
return super(ProxyClient, self).__setattr__(name, value)
1285
1162
self._pipe.send(('setattr', name, value))
1286
1163
1287
class ClientDBusTransitional(ClientDBus):
1288
__metaclass__ = AlternateDBusNamesMetaclass
1289
1164
1290
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
1291
1166
"""A class to handle client connections.
1299
1174
unicode(self.client_address))
1300
1175
logger.debug("Pipe FD: %d",
1301
1176
self.server.child_pipe.fileno())
1302
1177
1303
1178
session = (gnutls.connection
1304
1179
.ClientSession(self.request,
1305
1180
gnutls.connection
1306
1181
.X509Credentials()))
1307
1182
1308
1183
# Note: gnutls.connection.X509Credentials is really a
1309
1184
# generic GnuTLS certificate credentials object so long as
1310
1185
# no X.509 keys are added to it. Therefore, we can use it
1311
1186
# here despite using OpenPGP certificates.
1312
1187
1313
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1314
1189
# "+AES-256-CBC", "+SHA1",
1315
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1321
1196
(gnutls.library.functions
1322
1197
.gnutls_priority_set_direct(session._c_object,
1323
1198
priority, None))
1324
1199
1325
1200
# Start communication using the Mandos protocol
1326
1201
# Get protocol number
1327
1202
line = self.request.makefile().readline()
1329
1204
try:
1330
1205
if int(line.strip().split()[0]) > 1:
1331
1206
raise RuntimeError
1332
except (ValueError, IndexError, RuntimeError) as error:
1207
except (ValueError, IndexError, RuntimeError), error:
1333
1208
logger.error("Unknown protocol version: %s", error)
1334
1209
return
1335
1210
1336
1211
# Start GnuTLS connection
1337
1212
try:
1338
1213
session.handshake()
1339
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1340
1215
logger.warning("Handshake failed: %s", error)
1341
1216
# Do not run session.bye() here: the session is not
1342
1217
# established. Just abandon the request.
1343
1218
return
1344
1219
logger.debug("Handshake succeeded")
1345
1220
1346
1221
approval_required = False
1347
1222
try:
1348
1223
try:
1349
1224
fpr = self.fingerprint(self.peer_certificate
1350
1225
(session))
1351
except (TypeError,
1352
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1353
1227
logger.warning("Bad certificate: %s", error)
1354
1228
return
1355
1229
logger.debug("Fingerprint: %s", fpr)
1356
1230
1357
1231
try:
1358
1232
client = ProxyClient(child_pipe, fpr,
1359
1233
self.client_address)
1367
1241
1368
1242
while True:
1369
1243
if not client.enabled:
1370
logger.info("Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1371
1245
client.name)
1372
1246
if self.server.use_dbus:
1373
1247
# Emit D-Bus signal
1374
client.Rejected("Disabled")
1248
client.Rejected("Disabled")
1375
1249
return
1376
1250
1377
1251
if client._approved or not client.approval_delay:
1394
1268
return
1395
1269
1396
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1397
1272
time = datetime.datetime.now()
1398
1273
client.changedstate.acquire()
1399
(client.changedstate.wait
1400
(float(client._timedelta_to_milliseconds(delay)
1401
/ 1000)))
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1402
1275
client.changedstate.release()
1403
1276
time2 = datetime.datetime.now()
1404
1277
if (time2 - time) >= delay:
1419
1292
while sent_size < len(client.secret):
1420
1293
try:
1421
1294
sent = session.send(client.secret[sent_size:])
1422
except gnutls.errors.GNUTLSError as error:
1295
except (gnutls.errors.GNUTLSError), error:
1423
1296
logger.warning("gnutls send failed")
1424
1297
return
1425
1298
logger.debug("Sent: %d, remaining: %d",
1426
1299
sent, len(client.secret)
1427
1300
- (sent_size + sent))
1428
1301
sent_size += sent
1429
1302
1430
1303
logger.info("Sending secret to %s", client.name)
1431
# bump the timeout using extended_timeout
1432
client.checked_ok(client.extended_timeout)
1304
# bump the timeout as if seen
1305
client.checked_ok()
1433
1306
if self.server.use_dbus:
1434
1307
# Emit D-Bus signal
1435
1308
client.GotSecret()
1439
1312
client.approvals_pending -= 1
1440
1313
try:
1441
1314
session.bye()
1442
except gnutls.errors.GNUTLSError as error:
1315
except (gnutls.errors.GNUTLSError), error:
1443
1316
logger.warning("GnuTLS bye failed")
1444
1317
1445
1318
@staticmethod
1514
1387
except:
1515
1388
self.handle_error(request, address)
1516
1389
self.close_request(request)
1517
1390
1518
1391
def process_request(self, request, address):
1519
1392
"""Start a new process to process the request."""
1520
proc = multiprocessing.Process(target = self.sub_process_main,
1521
args = (request,
1522
address))
1523
proc.start()
1524
return proc
1525
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1526
1395
1527
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1528
1397
""" adds a pipe to the MixIn """
1532
1401
This function creates a new pipe in self.pipe
1533
1402
"""
1534
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1535
1536
proc = MultiprocessingMixIn.process_request(self, request,
1537
client_address)
1404
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1538
1407
self.child_pipe.close()
1539
self.add_pipe(parent_pipe, proc)
1540
1541
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1409
1410
def add_pipe(self, parent_pipe):
1542
1411
"""Dummy function; override as necessary"""
1543
1412
raise NotImplementedError
1544
1413
1545
1546
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1547
1415
socketserver.TCPServer, object):
1548
1416
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1574
1442
SO_BINDTODEVICE,
1575
1443
str(self.interface
1576
1444
+ '\0'))
1577
except socket.error as error:
1445
except socket.error, error:
1578
1446
if error[0] == errno.EPERM:
1579
1447
logger.error("No permission to"
1580
1448
" bind to interface %s",
1632
1500
def server_activate(self):
1633
1501
if self.enabled:
1634
1502
return socketserver.TCPServer.server_activate(self)
1635
1636
1503
def enable(self):
1637
1504
self.enabled = True
1638
1639
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
1640
1506
# Call "handle_ipc" for both data and EOF events
1641
1507
gobject.io_add_watch(parent_pipe.fileno(),
1642
1508
gobject.IO_IN | gobject.IO_HUP,
1643
1509
functools.partial(self.handle_ipc,
1644
parent_pipe =
1645
parent_pipe,
1646
proc = proc))
1647
1510
parent_pipe = parent_pipe))
1511
1648
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1649
proc = None, client_object=None):
1513
client_object=None):
1650
1514
condition_names = {
1651
1515
gobject.IO_IN: "IN", # There is data to read.
1652
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1661
1525
for cond, name in
1662
1526
condition_names.iteritems()
1663
1527
if cond & condition)
1664
# error, or the other end of multiprocessing.Pipe has closed
1528
# error or the other end of multiprocessing.Pipe has closed
1665
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1666
# Wait for other process to exit
1667
proc.join()
1668
1530
return False
1669
1531
1670
1532
# Read a request from the child
1680
1542
client = c
1681
1543
break
1682
1544
else:
1683
logger.info("Client not found for fingerprint: %s, ad"
1684
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1685
1547
if self.use_dbus:
1686
1548
# Emit D-Bus signal
1687
mandos_dbus_service.ClientNotFound(fpr,
1688
address[0])
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1689
1550
parent_pipe.send(False)
1690
1551
return False
1691
1552
1692
1553
gobject.io_add_watch(parent_pipe.fileno(),
1693
1554
gobject.IO_IN | gobject.IO_HUP,
1694
1555
functools.partial(self.handle_ipc,
1695
parent_pipe =
1696
parent_pipe,
1697
proc = proc,
1698
client_object =
1699
client))
1556
parent_pipe = parent_pipe,
1557
client_object = client))
1700
1558
parent_pipe.send(True)
1701
# remove the old hook in favor of the new above hook on
1702
# same fileno
1559
# remove the old hook in favor of the new above hook on same fileno
1703
1560
return False
1704
1561
if command == 'funcall':
1705
1562
funcname = request[1]
1706
1563
args = request[2]
1707
1564
kwargs = request[3]
1708
1565
1709
parent_pipe.send(('data', getattr(client_object,
1710
funcname)(*args,
1711
**kwargs)))
1712
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
1713
1568
if command == 'getattr':
1714
1569
attrname = request[1]
1715
1570
if callable(client_object.__getattribute__(attrname)):
1716
1571
parent_pipe.send(('function',))
1717
1572
else:
1718
parent_pipe.send(('data', client_object
1719
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1720
1574
1721
1575
if command == 'setattr':
1722
1576
attrname = request[1]
1723
1577
value = request[2]
1724
1578
setattr(client_object, attrname, value)
1725
1579
1726
1580
return True
1727
1581
1728
1582
1759
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1760
1614
else:
1761
1615
raise ValueError("Unknown suffix %r" % suffix)
1762
except (ValueError, IndexError) as e:
1616
except (ValueError, IndexError), e:
1763
1617
raise ValueError(*(e.args))
1764
1618
timevalue += delta
1765
1619
return timevalue
1819
1673
##################################################################
1820
1674
# Parsing of options, both command line and config file
1821
1675
1822
parser = argparse.ArgumentParser()
1823
parser.add_argument("-v", "--version", action="version",
1824
version = "%%(prog)s %s" % version,
1825
help="show version number and exit")
1826
parser.add_argument("-i", "--interface", metavar="IF",
1827
help="Bind to interface IF")
1828
parser.add_argument("-a", "--address",
1829
help="Address to listen for requests on")
1830
parser.add_argument("-p", "--port", type=int,
1831
help="Port number to receive requests on")
1832
parser.add_argument("--check", action="store_true",
1833
help="Run self-test")
1834
parser.add_argument("--debug", action="store_true",
1835
help="Debug mode; run in foreground and log"
1836
" to terminal")
1837
parser.add_argument("--debuglevel", metavar="LEVEL",
1838
help="Debug level for stdout output")
1839
parser.add_argument("--priority", help="GnuTLS"
1840
" priority string (see GnuTLS documentation)")
1841
parser.add_argument("--servicename",
1842
metavar="NAME", help="Zeroconf service name")
1843
parser.add_argument("--configdir",
1844
default="/etc/mandos", metavar="DIR",
1845
help="Directory to search for configuration"
1846
" files")
1847
parser.add_argument("--no-dbus", action="store_false",
1848
dest="use_dbus", help="Do not provide D-Bus"
1849
" system bus interface")
1850
parser.add_argument("--no-ipv6", action="store_false",
1851
dest="use_ipv6", help="Do not use IPv6")
1852
options = parser.parse_args()
1676
parser = optparse.OptionParser(version = "%%prog %s" % version)
1677
parser.add_option("-i", "--interface", type="string",
1678
metavar="IF", help="Bind to interface IF")
1679
parser.add_option("-a", "--address", type="string",
1680
help="Address to listen for requests on")
1681
parser.add_option("-p", "--port", type="int",
1682
help="Port number to receive requests on")
1683
parser.add_option("--check", action="store_true",
1684
help="Run self-test")
1685
parser.add_option("--debug", action="store_true",
1686
help="Debug mode; run in foreground and log to"
1687
" terminal")
1688
parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
help="Debug level for stdout output")
1690
parser.add_option("--priority", type="string", help="GnuTLS"
1691
" priority string (see GnuTLS documentation)")
1692
parser.add_option("--servicename", type="string",
1693
metavar="NAME", help="Zeroconf service name")
1694
parser.add_option("--configdir", type="string",
1695
default="/etc/mandos", metavar="DIR",
1696
help="Directory to search for configuration"
1697
" files")
1698
parser.add_option("--no-dbus", action="store_false",
1699
dest="use_dbus", help="Do not provide D-Bus"
1700
" system bus interface")
1701
parser.add_option("--no-ipv6", action="store_false",
1702
dest="use_ipv6", help="Do not use IPv6")
1703
options = parser.parse_args()[0]
1853
1704
1854
1705
if options.check:
1855
1706
import doctest
1907
1758
debuglevel = server_settings["debuglevel"]
1908
1759
use_dbus = server_settings["use_dbus"]
1909
1760
use_ipv6 = server_settings["use_ipv6"]
1910
1761
1911
1762
if server_settings["servicename"] != "Mandos":
1912
1763
syslogger.setFormatter(logging.Formatter
1913
1764
('Mandos (%s) [%%(process)d]:'
1915
1766
% server_settings["servicename"]))
1916
1767
1917
1768
# Parse config file with clients
1918
client_defaults = { "timeout": "5m",
1919
"extended_timeout": "15m",
1920
"interval": "2m",
1769
client_defaults = { "timeout": "1h",
1770
"interval": "5m",
1921
1771
"checker": "fping -q -- %%(host)s",
1922
1772
"host": "",
1923
1773
"approval_delay": "0s",
1963
1813
try:
1964
1814
os.setgid(gid)
1965
1815
os.setuid(uid)
1966
except OSError as error:
1816
except OSError, error:
1967
1817
if error[0] != errno.EPERM:
1968
1818
raise error
1969
1819
1974
1824
level = getattr(logging, debuglevel.upper())
1975
1825
syslogger.setLevel(level)
1976
1826
console.setLevel(level)
1977
1827
1978
1828
if debug:
1979
1829
# Enable all possible GnuTLS debugging
1980
1830
2011
1861
# End of Avahi example code
2012
1862
if use_dbus:
2013
1863
try:
2014
bus_name = dbus.service.BusName("se.recompile.Mandos",
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2015
1865
bus, do_not_queue=True)
2016
old_bus_name = (dbus.service.BusName
2017
("se.bsnet.fukt.Mandos", bus,
2018
do_not_queue=True))
2019
except dbus.exceptions.NameExistsException as e:
1866
except dbus.exceptions.NameExistsException, e:
2020
1867
logger.error(unicode(e) + ", disabling D-Bus")
2021
1868
use_dbus = False
2022
1869
server_settings["use_dbus"] = False
2034
1881
2035
1882
client_class = Client
2036
1883
if use_dbus:
2037
client_class = functools.partial(ClientDBusTransitional,
2038
bus = bus)
1884
client_class = functools.partial(ClientDBus, bus = bus)
2039
1885
def client_config_items(config, section):
2040
1886
special_settings = {
2041
1887
"approved_by_default":
2071
1917
del pidfilename
2072
1918
2073
1919
signal.signal(signal.SIGINT, signal.SIG_IGN)
2074
1920
2075
1921
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2076
1922
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2077
1923
2080
1926
"""A D-Bus proxy object"""
2081
1927
def __init__(self):
2082
1928
dbus.service.Object.__init__(self, bus, "/")
2083
_interface = "se.recompile.Mandos"
1929
_interface = "se.bsnet.fukt.Mandos"
2084
1930
2085
1931
@dbus.service.signal(_interface, signature="o")
2086
1932
def ClientAdded(self, objpath):
2128
1974
2129
1975
del _interface
2130
1976
2131
class MandosDBusServiceTransitional(MandosDBusService):
2132
__metaclass__ = AlternateDBusNamesMetaclass
2133
mandos_dbus_service = MandosDBusServiceTransitional()
1977
mandos_dbus_service = MandosDBusService()
2134
1978
2135
1979
def cleanup():
2136
1980
"Cleanup function; run on exit"
2137
1981
service.cleanup()
2138
1982
2139
multiprocessing.active_children()
2140
1983
while tcp_server.clients:
2141
1984
client = tcp_server.clients.pop()
2142
1985
if use_dbus:
2146
1989
client.disable(quiet=True)
2147
1990
if use_dbus:
2148
1991
# Emit D-Bus signal
2149
mandos_dbus_service.ClientRemoved(client
2150
.dbus_object_path,
1992
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2151
1993
client.name)
2152
1994
2153
1995
atexit.register(cleanup)
2177
2019
# From the Avahi example code
2178
2020
try:
2179
2021
service.activate()
2180
except dbus.exceptions.DBusException as error:
2022
except dbus.exceptions.DBusException, error:
2181
2023
logger.critical("DBusException: %s", error)
2182
2024
cleanup()
2183
2025
sys.exit(1)
2190
2032
2191
2033
logger.debug("Starting main loop")
2192
2034
main_loop.run()
2193
except AvahiError as error:
2035
except AvahiError, error:
2194
2036
logger.critical("AvahiError: %s", error)
2195
2037
cleanup()
2196
2038
sys.exit(1)
2202
2044
# Must run before the D-Bus bus name gets deregistered
2203
2045
cleanup()
2204
2046
2205
2206
2047
if __name__ == '__main__':
2207
2048
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0