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 355
- compare with another revision
- download diff
- download tarball
- view history from revision 355
- Committer: Teddy Hogeborn
- Date: 2009-08-30 03:10:29 UTC
- Revision ID: teddy@fukt.bsnet.se-20090830031029-cj8po3rc4g1cux1d
* mandos: White-space fixes only.
* mandos-ctl: - '' -
* plugin-runner.c: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/password-prompt.c: - '' -
* mandos-ctl: - '' -
* plugin-runner.c: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/password-prompt.c: - '' -
- files removed:
- dbus-mandos.conf
- files modified:
- Makefile
added
removed
mandos
55
55
import logging
56
56
import logging.handlers
57
57
import pwd
58
import contextlib
58
from contextlib import closing
59
59
import struct
60
60
import fcntl
61
61
import functools
62
import cPickle as pickle
63
import multiprocessing
64
62
65
63
import dbus
66
64
import dbus.service
69
67
from dbus.mainloop.glib import DBusGMainLoop
70
68
import ctypes
71
69
import ctypes.util
72
import xml.dom.minidom
73
import inspect
74
70
75
71
try:
76
72
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
77
SO_BINDTODEVICE = None
82
78
83
79
84
version = "1.0.14"
80
version = "1.0.11"
85
81
86
#logger = logging.getLogger(u'mandos')
87
82
logger = logging.Logger(u'mandos')
88
83
syslogger = (logging.handlers.SysLogHandler
89
84
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
179
174
self.server.EntryGroupNew()),
180
175
avahi.DBUS_INTERFACE_ENTRY_GROUP)
181
176
self.group.connect_to_signal('StateChanged',
182
self
183
.entry_group_state_changed)
177
self.entry_group_state_changed)
184
178
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
185
179
self.name, self.type)
186
180
self.group.AddService(
245
239
enabled: bool()
246
240
last_checked_ok: datetime.datetime(); (UTC) or None
247
241
timeout: datetime.timedelta(); How long from last_checked_ok
248
until this client is disabled
242
until this client is invalid
249
243
interval: datetime.timedelta(); How often to start a new checker
250
244
disable_hook: If set, called by disable() as disable_hook(self)
251
245
checker: subprocess.Popen(); a running checker process used
252
246
to see if the client lives.
253
247
'None' if no process is running.
254
248
checker_initiator_tag: a gobject event source tag, or None
255
disable_initiator_tag: - '' -
249
disable_initiator_tag: - '' -
256
250
checker_callback_tag: - '' -
257
251
checker_command: string; External command which is run to check if
258
252
client lives. %() expansions are done at
259
253
runtime with vars(self) as dict, so that for
260
254
instance %(name)s can be used in the command.
261
255
current_checker_command: string; current running checker_command
262
approved_delay: datetime.timedelta(); Time to wait for approval
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approved_duration: datetime.timedelta(); Duration of one approval
265
256
"""
266
257
267
258
@staticmethod
268
def _timedelta_to_milliseconds(td):
269
"Convert a datetime.timedelta() to milliseconds"
270
return ((td.days * 24 * 60 * 60 * 1000)
271
+ (td.seconds * 1000)
272
+ (td.microseconds // 1000))
259
def _datetime_to_milliseconds(dt):
260
"Convert a datetime.datetime() to milliseconds"
261
return ((dt.days * 24 * 60 * 60 * 1000)
262
+ (dt.seconds * 1000)
263
+ (dt.microseconds // 1000))
273
264
274
265
def timeout_milliseconds(self):
275
266
"Return the 'timeout' attribute in milliseconds"
276
return self._timedelta_to_milliseconds(self.timeout)
267
return self._datetime_to_milliseconds(self.timeout)
277
268
278
269
def interval_milliseconds(self):
279
270
"Return the 'interval' attribute in milliseconds"
280
return self._timedelta_to_milliseconds(self.interval)
281
282
def approved_delay_milliseconds(self):
283
return self._timedelta_to_milliseconds(self.approved_delay)
271
return self._datetime_to_milliseconds(self.interval)
284
272
285
273
def __init__(self, name = None, disable_hook=None, config=None):
286
274
"""Note: the 'checker' key in 'config' sets the
299
287
if u"secret" in config:
300
288
self.secret = config[u"secret"].decode(u"base64")
301
289
elif u"secfile" in config:
302
with open(os.path.expanduser(os.path.expandvars
303
(config[u"secfile"])),
304
"rb") as secfile:
290
with closing(open(os.path.expanduser
291
(os.path.expandvars
292
(config[u"secfile"])))) as secfile:
305
293
self.secret = secfile.read()
306
294
else:
307
#XXX Need to allow secret on demand!
308
295
raise TypeError(u"No secret or secfile for client %s"
309
296
% self.name)
310
297
self.host = config.get(u"host", u"")
322
309
self.checker_command = config[u"checker"]
323
310
self.current_checker_command = None
324
311
self.last_connect = None
325
self._approved = None
326
self.approved_by_default = config.get(u"approved_by_default",
327
True)
328
self.approvals_pending = 0
329
self.approved_delay = string_to_delta(
330
config[u"approved_delay"])
331
self.approved_duration = string_to_delta(
332
config[u"approved_duration"])
333
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
334
312
335
def send_changedstate(self):
336
self.changedstate.acquire()
337
self.changedstate.notify_all()
338
self.changedstate.release()
339
340
313
def enable(self):
341
314
"""Start this client's checker and timeout hooks"""
342
315
if getattr(self, u"enabled", False):
343
316
# Already enabled
344
317
return
345
self.send_changedstate()
346
318
self.last_enabled = datetime.datetime.utcnow()
347
319
# Schedule a new checker to be started an 'interval' from now,
348
320
# and every interval from then on.
349
321
self.checker_initiator_tag = (gobject.timeout_add
350
322
(self.interval_milliseconds(),
351
323
self.start_checker))
324
# Also start a new checker *right now*.
325
self.start_checker()
352
326
# Schedule a disable() when 'timeout' has passed
353
327
self.disable_initiator_tag = (gobject.timeout_add
354
328
(self.timeout_milliseconds(),
355
329
self.disable))
356
330
self.enabled = True
357
# Also start a new checker *right now*.
358
self.start_checker()
359
331
360
def disable(self, quiet=True):
332
def disable(self):
361
333
"""Disable this client."""
362
334
if not getattr(self, "enabled", False):
363
335
return False
364
if not quiet:
365
self.send_changedstate()
366
if not quiet:
367
logger.info(u"Disabling client %s", self.name)
336
logger.info(u"Disabling client %s", self.name)
368
337
if getattr(self, u"disable_initiator_tag", False):
369
338
gobject.source_remove(self.disable_initiator_tag)
370
339
self.disable_initiator_tag = None
422
391
# client would inevitably timeout, since no checker would get
423
392
# a chance to run to completion. If we instead leave running
424
393
# checkers alone, the checker would have to take more time
425
# than 'timeout' for the client to be disabled, which is as it
426
# should be.
394
# than 'timeout' for the client to be declared invalid, which
395
# is as it should be.
427
396
428
397
# If a checker exists, make sure it is not a zombie
429
try:
398
if self.checker is not None:
430
399
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
431
except (AttributeError, OSError), error:
432
if (isinstance(error, OSError)
433
and error.errno != errno.ECHILD):
434
raise error
435
else:
436
400
if pid:
437
401
logger.warning(u"Checker was a zombie")
438
402
gobject.source_remove(self.checker_callback_tag)
494
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
495
459
try:
496
460
os.kill(self.checker.pid, signal.SIGTERM)
497
#time.sleep(0.5)
461
#os.sleep(0.5)
498
462
#if self.checker.poll() is None:
499
463
# os.kill(self.checker.pid, signal.SIGKILL)
500
464
except OSError, error:
501
465
if error.errno != errno.ESRCH: # No such process
502
466
raise
503
467
self.checker = None
504
505
def dbus_service_property(dbus_interface, signature=u"v",
506
access=u"readwrite", byte_arrays=False):
507
"""Decorators for marking methods of a DBusObjectWithProperties to
508
become properties on the D-Bus.
509
510
The decorated method will be called with no arguments by "Get"
511
and with one argument by "Set".
512
513
The parameters, where they are supported, are the same as
514
dbus.service.method, except there is only "signature", since the
515
type from Get() and the type sent to Set() is the same.
516
"""
517
# Encoding deeply encoded byte arrays is not supported yet by the
518
# "Set" method, so we fail early here:
519
if byte_arrays and signature != u"ay":
520
raise ValueError(u"Byte arrays not supported for non-'ay'"
521
u" signature %r" % signature)
522
def decorator(func):
523
func._dbus_is_property = True
524
func._dbus_interface = dbus_interface
525
func._dbus_signature = signature
526
func._dbus_access = access
527
func._dbus_name = func.__name__
528
if func._dbus_name.endswith(u"_dbus_property"):
529
func._dbus_name = func._dbus_name[:-14]
530
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
531
return func
532
return decorator
533
534
535
class DBusPropertyException(dbus.exceptions.DBusException):
536
"""A base class for D-Bus property-related exceptions
537
"""
538
def __unicode__(self):
539
return unicode(str(self))
540
541
542
class DBusPropertyAccessException(DBusPropertyException):
543
"""A property's access permissions disallows an operation.
544
"""
545
pass
546
547
548
class DBusPropertyNotFound(DBusPropertyException):
549
"""An attempt was made to access a non-existing property.
550
"""
551
pass
552
553
554
class DBusObjectWithProperties(dbus.service.Object):
555
"""A D-Bus object with properties.
556
557
Classes inheriting from this can use the dbus_service_property
558
decorator to expose methods as D-Bus properties. It exposes the
559
standard Get(), Set(), and GetAll() methods on the D-Bus.
560
"""
561
562
@staticmethod
563
def _is_dbus_property(obj):
564
return getattr(obj, u"_dbus_is_property", False)
565
566
def _get_all_dbus_properties(self):
567
"""Returns a generator of (name, attribute) pairs
568
"""
569
return ((prop._dbus_name, prop)
570
for name, prop in
571
inspect.getmembers(self, self._is_dbus_property))
572
573
def _get_dbus_property(self, interface_name, property_name):
574
"""Returns a bound method if one exists which is a D-Bus
575
property with the specified name and interface.
576
"""
577
for name in (property_name,
578
property_name + u"_dbus_property"):
579
prop = getattr(self, name, None)
580
if (prop is None
581
or not self._is_dbus_property(prop)
582
or prop._dbus_name != property_name
583
or (interface_name and prop._dbus_interface
584
and interface_name != prop._dbus_interface)):
585
continue
586
return prop
587
# No such property
588
raise DBusPropertyNotFound(self.dbus_object_path + u":"
589
+ interface_name + u"."
590
+ property_name)
591
592
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
593
out_signature=u"v")
594
def Get(self, interface_name, property_name):
595
"""Standard D-Bus property Get() method, see D-Bus standard.
596
"""
597
prop = self._get_dbus_property(interface_name, property_name)
598
if prop._dbus_access == u"write":
599
raise DBusPropertyAccessException(property_name)
600
value = prop()
601
if not hasattr(value, u"variant_level"):
602
return value
603
return type(value)(value, variant_level=value.variant_level+1)
604
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
606
def Set(self, interface_name, property_name, value):
607
"""Standard D-Bus property Set() method, see D-Bus standard.
608
"""
609
prop = self._get_dbus_property(interface_name, property_name)
610
if prop._dbus_access == u"read":
611
raise DBusPropertyAccessException(property_name)
612
if prop._dbus_get_args_options[u"byte_arrays"]:
613
# The byte_arrays option is not supported yet on
614
# signatures other than "ay".
615
if prop._dbus_signature != u"ay":
616
raise ValueError
617
value = dbus.ByteArray(''.join(unichr(byte)
618
for byte in value))
619
prop(value)
620
621
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
622
out_signature=u"a{sv}")
623
def GetAll(self, interface_name):
624
"""Standard D-Bus property GetAll() method, see D-Bus
625
standard.
626
627
Note: Will not include properties with access="write".
628
"""
629
all = {}
630
for name, prop in self._get_all_dbus_properties():
631
if (interface_name
632
and interface_name != prop._dbus_interface):
633
# Interface non-empty but did not match
634
continue
635
# Ignore write-only properties
636
if prop._dbus_access == u"write":
637
continue
638
value = prop()
639
if not hasattr(value, u"variant_level"):
640
all[name] = value
641
continue
642
all[name] = type(value)(value, variant_level=
643
value.variant_level+1)
644
return dbus.Dictionary(all, signature=u"sv")
645
646
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
647
out_signature=u"s",
648
path_keyword='object_path',
649
connection_keyword='connection')
650
def Introspect(self, object_path, connection):
651
"""Standard D-Bus method, overloaded to insert property tags.
652
"""
653
xmlstring = dbus.service.Object.Introspect(self, object_path,
654
connection)
655
try:
656
document = xml.dom.minidom.parseString(xmlstring)
657
def make_tag(document, name, prop):
658
e = document.createElement(u"property")
659
e.setAttribute(u"name", name)
660
e.setAttribute(u"type", prop._dbus_signature)
661
e.setAttribute(u"access", prop._dbus_access)
662
return e
663
for if_tag in document.getElementsByTagName(u"interface"):
664
for tag in (make_tag(document, name, prop)
665
for name, prop
666
in self._get_all_dbus_properties()
667
if prop._dbus_interface
668
== if_tag.getAttribute(u"name")):
669
if_tag.appendChild(tag)
670
# Add the names to the return values for the
671
# "org.freedesktop.DBus.Properties" methods
672
if (if_tag.getAttribute(u"name")
673
== u"org.freedesktop.DBus.Properties"):
674
for cn in if_tag.getElementsByTagName(u"method"):
675
if cn.getAttribute(u"name") == u"Get":
676
for arg in cn.getElementsByTagName(u"arg"):
677
if (arg.getAttribute(u"direction")
678
== u"out"):
679
arg.setAttribute(u"name", u"value")
680
elif cn.getAttribute(u"name") == u"GetAll":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
683
== u"out"):
684
arg.setAttribute(u"name", u"props")
685
xmlstring = document.toxml(u"utf-8")
686
document.unlink()
687
except (AttributeError, xml.dom.DOMException,
688
xml.parsers.expat.ExpatError), error:
689
logger.error(u"Failed to override Introspection method",
690
error)
691
return xmlstring
692
693
694
class ClientDBus(Client, DBusObjectWithProperties):
468
469
def still_valid(self):
470
"""Has the timeout not yet passed for this client?"""
471
if not getattr(self, u"enabled", False):
472
return False
473
now = datetime.datetime.utcnow()
474
if self.last_checked_ok is None:
475
return now < (self.created + self.timeout)
476
else:
477
return now < (self.last_checked_ok + self.timeout)
478
479
480
class ClientDBus(Client, dbus.service.Object):
695
481
"""A Client class using D-Bus
696
482
697
483
Attributes:
701
487
# dbus.service.Object doesn't use super(), so we can't either.
702
488
703
489
def __init__(self, bus = None, *args, **kwargs):
704
self._approvals_pending = 0
705
490
self.bus = bus
706
491
Client.__init__(self, *args, **kwargs)
707
492
# Only now, when this client is initialized, can it show up on
709
494
self.dbus_object_path = (dbus.ObjectPath
710
495
(u"/clients/"
711
496
+ self.name.replace(u".", u"_")))
712
DBusObjectWithProperties.__init__(self, self.bus,
713
self.dbus_object_path)
714
715
#Could possible return a bool(self._approvals_pending),
716
#but this could mess up approvals_pending += 1 XXX
717
def _get_approvals_pending(self):
718
return self._approvals_pending
719
def _set_approvals_pending(self, value):
720
old_value = self._approvals_pending
721
self._approvals_pending = value
722
bval = bool(value)
723
if (hasattr(self, "dbus_object_path")
724
and bval is not bool(old_value)):
725
dbus_bool = dbus.Boolean(bval, variant_level=1)
726
self.PropertyChanged(dbus.String(u"approved_pending"),
727
dbus_bool)
728
729
approvals_pending = property(_get_approvals_pending,
730
_set_approvals_pending)
731
del _get_approvals_pending, _set_approvals_pending
497
dbus.service.Object.__init__(self, self.bus,
498
self.dbus_object_path)
732
499
733
500
@staticmethod
734
501
def _datetime_to_dbus(dt, variant_level=0):
749
516
variant_level=1))
750
517
return r
751
518
752
def disable(self, quiet = False):
519
def disable(self, signal = True):
753
520
oldstate = getattr(self, u"enabled", False)
754
r = Client.disable(self, quiet=quiet)
755
if not quiet and oldstate != self.enabled:
521
r = Client.disable(self)
522
if signal and oldstate != self.enabled:
756
523
# Emit D-Bus signal
757
524
self.PropertyChanged(dbus.String(u"enabled"),
758
525
dbus.Boolean(False, variant_level=1))
763
530
self.remove_from_connection()
764
531
except LookupError:
765
532
pass
766
if hasattr(DBusObjectWithProperties, u"__del__"):
767
DBusObjectWithProperties.__del__(self, *args, **kwargs)
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
768
535
Client.__del__(self, *args, **kwargs)
769
536
770
537
def checker_callback(self, pid, condition, command,
823
590
self.PropertyChanged(dbus.String(u"checker_running"),
824
591
dbus.Boolean(False, variant_level=1))
825
592
return r
826
827
def _reset_approved(self):
828
self._approved = None
829
return False
830
831
def approve(self, value=True):
832
self.send_changedstate()
833
self._approved = value
834
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
835
self._reset_approved)
836
837
838
## D-Bus methods, signals & properties
593
594
## D-Bus methods & signals
839
595
_interface = u"se.bsnet.fukt.Mandos.Client"
840
596
841
## Signals
597
# CheckedOK - method
598
@dbus.service.method(_interface)
599
def CheckedOK(self):
600
return self.checked_ok()
842
601
843
602
# CheckerCompleted - signal
844
603
@dbus.service.signal(_interface, signature=u"nxs")
852
611
"D-Bus signal"
853
612
pass
854
613
614
# GetAllProperties - method
615
@dbus.service.method(_interface, out_signature=u"a{sv}")
616
def GetAllProperties(self):
617
"D-Bus method"
618
return dbus.Dictionary({
619
dbus.String(u"name"):
620
dbus.String(self.name, variant_level=1),
621
dbus.String(u"fingerprint"):
622
dbus.String(self.fingerprint, variant_level=1),
623
dbus.String(u"host"):
624
dbus.String(self.host, variant_level=1),
625
dbus.String(u"created"):
626
self._datetime_to_dbus(self.created,
627
variant_level=1),
628
dbus.String(u"last_enabled"):
629
(self._datetime_to_dbus(self.last_enabled,
630
variant_level=1)
631
if self.last_enabled is not None
632
else dbus.Boolean(False, variant_level=1)),
633
dbus.String(u"enabled"):
634
dbus.Boolean(self.enabled, variant_level=1),
635
dbus.String(u"last_checked_ok"):
636
(self._datetime_to_dbus(self.last_checked_ok,
637
variant_level=1)
638
if self.last_checked_ok is not None
639
else dbus.Boolean (False, variant_level=1)),
640
dbus.String(u"timeout"):
641
dbus.UInt64(self.timeout_milliseconds(),
642
variant_level=1),
643
dbus.String(u"interval"):
644
dbus.UInt64(self.interval_milliseconds(),
645
variant_level=1),
646
dbus.String(u"checker"):
647
dbus.String(self.checker_command,
648
variant_level=1),
649
dbus.String(u"checker_running"):
650
dbus.Boolean(self.checker is not None,
651
variant_level=1),
652
dbus.String(u"object_path"):
653
dbus.ObjectPath(self.dbus_object_path,
654
variant_level=1)
655
}, signature=u"sv")
656
657
# IsStillValid - method
658
@dbus.service.method(_interface, out_signature=u"b")
659
def IsStillValid(self):
660
return self.still_valid()
661
855
662
# PropertyChanged - signal
856
663
@dbus.service.signal(_interface, signature=u"sv")
857
664
def PropertyChanged(self, property, value):
858
665
"D-Bus signal"
859
666
pass
860
667
861
# GotSecret - signal
862
# XXXTEDDY Is sent after succesfull transfer of secret from mandos-server to mandos-client
668
# ReceivedSecret - signal
863
669
@dbus.service.signal(_interface)
864
def GotSecret(self):
670
def ReceivedSecret(self):
865
671
"D-Bus signal"
866
672
pass
867
673
868
674
# Rejected - signal
869
@dbus.service.signal(_interface, signature=u"s")
870
def Rejected(self, reason):
871
"D-Bus signal"
872
pass
873
874
# NeedApproval - signal
875
@dbus.service.signal(_interface, signature=u"db")
876
def NeedApproval(self, timeout, default):
877
"D-Bus signal"
878
pass
879
880
## Methods
881
882
# Approve - method
883
@dbus.service.method(_interface, in_signature=u"b")
884
def Approve(self, value):
885
self.approve(value)
886
887
# CheckedOK - method
888
@dbus.service.method(_interface)
889
def CheckedOK(self):
890
return self.checked_ok()
675
@dbus.service.signal(_interface)
676
def Rejected(self):
677
"D-Bus signal"
678
pass
679
680
# SetChecker - method
681
@dbus.service.method(_interface, in_signature=u"s")
682
def SetChecker(self, checker):
683
"D-Bus setter method"
684
self.checker_command = checker
685
# Emit D-Bus signal
686
self.PropertyChanged(dbus.String(u"checker"),
687
dbus.String(self.checker_command,
688
variant_level=1))
689
690
# SetHost - method
691
@dbus.service.method(_interface, in_signature=u"s")
692
def SetHost(self, host):
693
"D-Bus setter method"
694
self.host = host
695
# Emit D-Bus signal
696
self.PropertyChanged(dbus.String(u"host"),
697
dbus.String(self.host, variant_level=1))
698
699
# SetInterval - method
700
@dbus.service.method(_interface, in_signature=u"t")
701
def SetInterval(self, milliseconds):
702
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
# Emit D-Bus signal
704
self.PropertyChanged(dbus.String(u"interval"),
705
(dbus.UInt64(self.interval_milliseconds(),
706
variant_level=1)))
707
708
# SetSecret - method
709
@dbus.service.method(_interface, in_signature=u"ay",
710
byte_arrays=True)
711
def SetSecret(self, secret):
712
"D-Bus setter method"
713
self.secret = str(secret)
714
715
# SetTimeout - method
716
@dbus.service.method(_interface, in_signature=u"t")
717
def SetTimeout(self, milliseconds):
718
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
# Emit D-Bus signal
720
self.PropertyChanged(dbus.String(u"timeout"),
721
(dbus.UInt64(self.timeout_milliseconds(),
722
variant_level=1)))
891
723
892
724
# Enable - method
893
725
@dbus.service.method(_interface)
912
744
def StopChecker(self):
913
745
self.stop_checker()
914
746
915
## Properties
916
917
# approved_pending - property
918
@dbus_service_property(_interface, signature=u"b", access=u"read")
919
def approved_pending_dbus_property(self):
920
return dbus.Boolean(bool(self.approvals_pending))
921
922
# approved_by_default - property
923
@dbus_service_property(_interface, signature=u"b",
924
access=u"readwrite")
925
def approved_by_default_dbus_property(self):
926
return dbus.Boolean(self.approved_by_default)
927
928
# approved_delay - property
929
@dbus_service_property(_interface, signature=u"t",
930
access=u"readwrite")
931
def approved_delay_dbus_property(self):
932
return dbus.UInt64(self.approved_delay_milliseconds())
933
934
# approved_duration - property
935
@dbus_service_property(_interface, signature=u"t",
936
access=u"readwrite")
937
def approved_duration_dbus_property(self):
938
return dbus.UInt64(self._timedelta_to_milliseconds(
939
self.approved_duration))
940
941
# name - property
942
@dbus_service_property(_interface, signature=u"s", access=u"read")
943
def name_dbus_property(self):
944
return dbus.String(self.name)
945
946
# fingerprint - property
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def fingerprint_dbus_property(self):
949
return dbus.String(self.fingerprint)
950
951
# host - property
952
@dbus_service_property(_interface, signature=u"s",
953
access=u"readwrite")
954
def host_dbus_property(self, value=None):
955
if value is None: # get
956
return dbus.String(self.host)
957
self.host = value
958
# Emit D-Bus signal
959
self.PropertyChanged(dbus.String(u"host"),
960
dbus.String(value, variant_level=1))
961
962
# created - property
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
964
def created_dbus_property(self):
965
return dbus.String(self._datetime_to_dbus(self.created))
966
967
# last_enabled - property
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def last_enabled_dbus_property(self):
970
if self.last_enabled is None:
971
return dbus.String(u"")
972
return dbus.String(self._datetime_to_dbus(self.last_enabled))
973
974
# enabled - property
975
@dbus_service_property(_interface, signature=u"b",
976
access=u"readwrite")
977
def enabled_dbus_property(self, value=None):
978
if value is None: # get
979
return dbus.Boolean(self.enabled)
980
if value:
981
self.enable()
982
else:
983
self.disable()
984
985
# last_checked_ok - property
986
@dbus_service_property(_interface, signature=u"s",
987
access=u"readwrite")
988
def last_checked_ok_dbus_property(self, value=None):
989
if value is not None:
990
self.checked_ok()
991
return
992
if self.last_checked_ok is None:
993
return dbus.String(u"")
994
return dbus.String(self._datetime_to_dbus(self
995
.last_checked_ok))
996
997
# timeout - property
998
@dbus_service_property(_interface, signature=u"t",
999
access=u"readwrite")
1000
def timeout_dbus_property(self, value=None):
1001
if value is None: # get
1002
return dbus.UInt64(self.timeout_milliseconds())
1003
self.timeout = datetime.timedelta(0, 0, 0, value)
1004
# Emit D-Bus signal
1005
self.PropertyChanged(dbus.String(u"timeout"),
1006
dbus.UInt64(value, variant_level=1))
1007
if getattr(self, u"disable_initiator_tag", None) is None:
1008
return
1009
# Reschedule timeout
1010
gobject.source_remove(self.disable_initiator_tag)
1011
self.disable_initiator_tag = None
1012
time_to_die = (self.
1013
_timedelta_to_milliseconds((self
1014
.last_checked_ok
1015
+ self.timeout)
1016
- datetime.datetime
1017
.utcnow()))
1018
if time_to_die <= 0:
1019
# The timeout has passed
1020
self.disable()
1021
else:
1022
self.disable_initiator_tag = (gobject.timeout_add
1023
(time_to_die, self.disable))
1024
1025
# interval - property
1026
@dbus_service_property(_interface, signature=u"t",
1027
access=u"readwrite")
1028
def interval_dbus_property(self, value=None):
1029
if value is None: # get
1030
return dbus.UInt64(self.interval_milliseconds())
1031
self.interval = datetime.timedelta(0, 0, 0, value)
1032
# Emit D-Bus signal
1033
self.PropertyChanged(dbus.String(u"interval"),
1034
dbus.UInt64(value, variant_level=1))
1035
if getattr(self, u"checker_initiator_tag", None) is None:
1036
return
1037
# Reschedule checker run
1038
gobject.source_remove(self.checker_initiator_tag)
1039
self.checker_initiator_tag = (gobject.timeout_add
1040
(value, self.start_checker))
1041
self.start_checker() # Start one now, too
1042
1043
# checker - property
1044
@dbus_service_property(_interface, signature=u"s",
1045
access=u"readwrite")
1046
def checker_dbus_property(self, value=None):
1047
if value is None: # get
1048
return dbus.String(self.checker_command)
1049
self.checker_command = value
1050
# Emit D-Bus signal
1051
self.PropertyChanged(dbus.String(u"checker"),
1052
dbus.String(self.checker_command,
1053
variant_level=1))
1054
1055
# checker_running - property
1056
@dbus_service_property(_interface, signature=u"b",
1057
access=u"readwrite")
1058
def checker_running_dbus_property(self, value=None):
1059
if value is None: # get
1060
return dbus.Boolean(self.checker is not None)
1061
if value:
1062
self.start_checker()
1063
else:
1064
self.stop_checker()
1065
1066
# object_path - property
1067
@dbus_service_property(_interface, signature=u"o", access=u"read")
1068
def object_path_dbus_property(self):
1069
return self.dbus_object_path # is already a dbus.ObjectPath
1070
1071
# secret = property
1072
@dbus_service_property(_interface, signature=u"ay",
1073
access=u"write", byte_arrays=True)
1074
def secret_dbus_property(self, value):
1075
self.secret = str(value)
1076
1077
747
del _interface
1078
748
1079
749
1080
class ProxyClient(object):
1081
def __init__(self, child_pipe, fpr, address):
1082
self._pipe = child_pipe
1083
self._pipe.send(('init', fpr, address))
1084
if not self._pipe.recv():
1085
raise KeyError()
1086
1087
def __getattribute__(self, name):
1088
if(name == '_pipe'):
1089
return super(ProxyClient, self).__getattribute__(name)
1090
self._pipe.send(('getattr', name))
1091
data = self._pipe.recv()
1092
if data[0] == 'data':
1093
return data[1]
1094
if data[0] == 'function':
1095
def func(*args, **kwargs):
1096
self._pipe.send(('funcall', name, args, kwargs))
1097
return self._pipe.recv()[1]
1098
return func
1099
1100
def __setattr__(self, name, value):
1101
if(name == '_pipe'):
1102
return super(ProxyClient, self).__setattr__(name, value)
1103
self._pipe.send(('setattr', name, value))
1104
1105
1106
750
class ClientHandler(socketserver.BaseRequestHandler, object):
1107
751
"""A class to handle client connections.
1108
752
1110
754
Note: This will run in its own forked process."""
1111
755
1112
756
def handle(self):
1113
with contextlib.closing(self.server.child_pipe) as child_pipe:
1114
logger.info(u"TCP connection from: %s",
1115
unicode(self.client_address))
1116
logger.debug(u"Pipe FD: %d",
1117
self.server.child_pipe.fileno())
1118
757
logger.info(u"TCP connection from: %s",
758
unicode(self.client_address))
759
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
# Open IPC pipe to parent process
761
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1119
762
session = (gnutls.connection
1120
763
.ClientSession(self.request,
1121
764
gnutls.connection
1122
765
.X509Credentials()))
1123
766
767
line = self.request.makefile().readline()
768
logger.debug(u"Protocol version: %r", line)
769
try:
770
if int(line.strip().split()[0]) > 1:
771
raise RuntimeError
772
except (ValueError, IndexError, RuntimeError), error:
773
logger.error(u"Unknown protocol version: %s", error)
774
return
775
1124
776
# Note: gnutls.connection.X509Credentials is really a
1125
777
# generic GnuTLS certificate credentials object so long as
1126
778
# no X.509 keys are added to it. Therefore, we can use it
1127
779
# here despite using OpenPGP certificates.
1128
780
1129
781
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1130
782
# u"+AES-256-CBC", u"+SHA1",
1131
783
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1137
789
(gnutls.library.functions
1138
790
.gnutls_priority_set_direct(session._c_object,
1139
791
priority, None))
1140
1141
# Start communication using the Mandos protocol
1142
# Get protocol number
1143
line = self.request.makefile().readline()
1144
logger.debug(u"Protocol version: %r", line)
1145
try:
1146
if int(line.strip().split()[0]) > 1:
1147
raise RuntimeError
1148
except (ValueError, IndexError, RuntimeError), error:
1149
logger.error(u"Unknown protocol version: %s", error)
1150
return
1151
1152
# Start GnuTLS connection
792
1153
793
try:
1154
794
session.handshake()
1155
795
except gnutls.errors.GNUTLSError, error:
1158
798
# established. Just abandon the request.
1159
799
return
1160
800
logger.debug(u"Handshake succeeded")
1161
1162
approval_required = False
1163
801
try:
1164
try:
1165
fpr = self.fingerprint(self.peer_certificate
1166
(session))
1167
except (TypeError, gnutls.errors.GNUTLSError), error:
1168
logger.warning(u"Bad certificate: %s", error)
1169
return
1170
logger.debug(u"Fingerprint: %s", fpr)
1171
1172
try:
1173
client = ProxyClient(child_pipe, fpr,
1174
self.client_address)
1175
except KeyError:
1176
return
1177
1178
if client.approved_delay:
1179
delay = client.approved_delay
1180
client.approvals_pending += 1
1181
approval_required = True
1182
1183
while True:
1184
if not client.enabled:
1185
logger.warning(u"Client %s is disabled",
1186
client.name)
1187
if self.server.use_dbus:
1188
# Emit D-Bus signal
1189
client.Rejected("Disabled")
1190
return
1191
1192
if client._approved or not client.approved_delay:
1193
#We are approved or approval is disabled
1194
break
1195
elif client._approved is None:
1196
logger.info(u"Client %s need approval",
1197
client.name)
1198
if self.server.use_dbus:
1199
# Emit D-Bus signal
1200
client.NeedApproval(
1201
client.approved_delay_milliseconds(),
1202
client.approved_by_default)
1203
else:
1204
logger.warning(u"Client %s was not approved",
1205
client.name)
1206
if self.server.use_dbus:
1207
# Emit D-Bus signal
1208
client.Rejected("Disapproved")
1209
return
1210
1211
#wait until timeout or approved
1212
#x = float(client._timedelta_to_milliseconds(delay))
1213
time = datetime.datetime.now()
1214
client.changedstate.acquire()
1215
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1216
client.changedstate.release()
1217
time2 = datetime.datetime.now()
1218
if (time2 - time) >= delay:
1219
if not client.approved_by_default:
1220
logger.warning("Client %s timed out while"
1221
" waiting for approval",
1222
client.name)
1223
if self.server.use_dbus:
1224
# Emit D-Bus signal
1225
client.Rejected("Time out")
1226
return
1227
else:
1228
break
1229
else:
1230
delay -= time2 - time
1231
1232
sent_size = 0
1233
while sent_size < len(client.secret):
1234
# XXX handle session exception
1235
sent = session.send(client.secret[sent_size:])
1236
logger.debug(u"Sent: %d, remaining: %d",
1237
sent, len(client.secret)
1238
- (sent_size + sent))
1239
sent_size += sent
1240
1241
logger.info(u"Sending secret to %s", client.name)
1242
# bump the timeout as if seen
1243
client.checked_ok()
1244
if self.server.use_dbus:
1245
# Emit D-Bus signal
1246
client.GotSecret()
802
fpr = self.fingerprint(self.peer_certificate(session))
803
except (TypeError, gnutls.errors.GNUTLSError), error:
804
logger.warning(u"Bad certificate: %s", error)
805
session.bye()
806
return
807
logger.debug(u"Fingerprint: %s", fpr)
1247
808
1248
finally:
1249
if approval_required:
1250
client.approvals_pending -= 1
1251
session.bye()
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
811
client = c
812
break
813
else:
814
ipc.write(u"NOTFOUND %s %s\n"
815
% (fpr, unicode(self.client_address)))
816
session.bye()
817
return
818
# Have to check if client.still_valid(), since it is
819
# possible that the client timed out while establishing
820
# the GnuTLS session.
821
if not client.still_valid():
822
ipc.write(u"INVALID %s\n" % client.name)
823
session.bye()
824
return
825
ipc.write(u"SENDING %s\n" % client.name)
826
sent_size = 0
827
while sent_size < len(client.secret):
828
sent = session.send(client.secret[sent_size:])
829
logger.debug(u"Sent: %d, remaining: %d",
830
sent, len(client.secret)
831
- (sent_size + sent))
832
sent_size += sent
833
session.bye()
1252
834
1253
835
@staticmethod
1254
836
def peer_certificate(session):
1314
896
return hex_fpr
1315
897
1316
898
1317
class MultiprocessingMixIn(object):
1318
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1319
def sub_process_main(self, request, address):
1320
try:
1321
self.finish_request(request, address)
1322
except:
1323
self.handle_error(request, address)
1324
self.close_request(request)
1325
1326
def process_request(self, request, address):
1327
"""Start a new process to process the request."""
1328
multiprocessing.Process(target = self.sub_process_main,
1329
args = (request, address)).start()
1330
1331
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1332
""" adds a pipe to the MixIn """
899
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
900
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1333
901
def process_request(self, request, client_address):
1334
902
"""Overrides and wraps the original process_request().
1335
903
1336
904
This function creates a new pipe in self.pipe
1337
905
"""
1338
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1339
1340
super(MultiprocessingMixInWithPipe,
906
self.pipe = os.pipe()
907
super(ForkingMixInWithPipe,
1341
908
self).process_request(request, client_address)
1342
self.child_pipe.close()
1343
self.add_pipe(parent_pipe)
1344
1345
def add_pipe(self, parent_pipe):
909
os.close(self.pipe[1]) # close write end
910
self.add_pipe(self.pipe[0])
911
def add_pipe(self, pipe):
1346
912
"""Dummy function; override as necessary"""
1347
pass
1348
1349
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
913
os.close(pipe)
914
915
916
class IPv6_TCPServer(ForkingMixInWithPipe,
1350
917
socketserver.TCPServer, object):
1351
918
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1352
919
1416
983
clients: set of Client objects
1417
984
gnutls_priority GnuTLS priority string
1418
985
use_dbus: Boolean; to emit D-Bus signals or not
986
clients: set of Client objects
987
gnutls_priority GnuTLS priority string
988
use_dbus: Boolean; to emit D-Bus signals or not
1419
989
1420
990
Assumes a gobject.MainLoop event loop.
1421
991
"""
1437
1007
return socketserver.TCPServer.server_activate(self)
1438
1008
def enable(self):
1439
1009
self.enabled = True
1440
def add_pipe(self, parent_pipe):
1010
def add_pipe(self, pipe):
1441
1011
# Call "handle_ipc" for both data and EOF events
1442
gobject.io_add_watch(parent_pipe.fileno(),
1443
gobject.IO_IN | gobject.IO_HUP,
1444
functools.partial(self.handle_ipc,
1445
parent_pipe = parent_pipe))
1446
1447
def handle_ipc(self, source, condition, parent_pipe=None,
1448
client_object=None):
1012
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1013
self.handle_ipc)
1014
def handle_ipc(self, source, condition, file_objects={}):
1449
1015
condition_names = {
1450
1016
gobject.IO_IN: u"IN", # There is data to read.
1451
1017
gobject.IO_OUT: u"OUT", # Data can be written (without
1462
1028
if cond & condition)
1463
1029
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1464
1030
conditions_string)
1465
1466
# XXXTEDDY error or the other end of multiprocessing.Pipe has closed
1467
if condition & gobject.IO_HUP or condition & gobject.IO_ERR:
1468
return False
1469
1470
# Read a request from the child
1471
request = parent_pipe.recv()
1472
logger.debug(u"IPC request: %s", repr(request))
1473
command = request[0]
1474
1475
if command == 'init':
1476
fpr = request[1]
1477
address = request[2]
1478
1479
for c in self.clients:
1480
if c.fingerprint == fpr:
1481
client = c
1482
break
1483
else:
1484
logger.warning(u"Client not found for fingerprint: %s, ad"
1485
u"dress: %s", fpr, address)
1486
if self.use_dbus:
1487
# Emit D-Bus signal
1488
mandos_dbus_service.ClientNotFound(fpr, address)
1489
parent_pipe.send(False)
1490
return False
1491
1492
gobject.io_add_watch(parent_pipe.fileno(),
1493
gobject.IO_IN | gobject.IO_HUP,
1494
functools.partial(self.handle_ipc,
1495
parent_pipe = parent_pipe,
1496
client_object = client))
1497
parent_pipe.send(True)
1498
# remove the old hook in favor of the new above hook on same fileno
1499
return False
1500
if command == 'funcall':
1501
funcname = request[1]
1502
args = request[2]
1503
kwargs = request[3]
1504
1505
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1506
1507
if command == 'getattr':
1508
attrname = request[1]
1509
if callable(client_object.__getattribute__(attrname)):
1510
parent_pipe.send(('function',))
1511
else:
1512
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1513
1514
if command == 'setattr':
1515
attrname = request[1]
1516
value = request[2]
1517
setattr(client_object, attrname, value)
1518
1031
1032
# Turn the pipe file descriptor into a Python file object
1033
if source not in file_objects:
1034
file_objects[source] = os.fdopen(source, u"r", 1)
1035
1036
# Read a line from the file object
1037
cmdline = file_objects[source].readline()
1038
if not cmdline: # Empty line means end of file
1039
# close the IPC pipe
1040
file_objects[source].close()
1041
del file_objects[source]
1042
1043
# Stop calling this function
1044
return False
1045
1046
logger.debug(u"IPC command: %r", cmdline)
1047
1048
# Parse and act on command
1049
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1050
1051
if cmd == u"NOTFOUND":
1052
logger.warning(u"Client not found for fingerprint: %s",
1053
args)
1054
if self.use_dbus:
1055
# Emit D-Bus signal
1056
mandos_dbus_service.ClientNotFound(args)
1057
elif cmd == u"INVALID":
1058
for client in self.clients:
1059
if client.name == args:
1060
logger.warning(u"Client %s is invalid", args)
1061
if self.use_dbus:
1062
# Emit D-Bus signal
1063
client.Rejected()
1064
break
1065
else:
1066
logger.error(u"Unknown client %s is invalid", args)
1067
elif cmd == u"SENDING":
1068
for client in self.clients:
1069
if client.name == args:
1070
logger.info(u"Sending secret to %s", client.name)
1071
client.checked_ok()
1072
if self.use_dbus:
1073
# Emit D-Bus signal
1074
client.ReceivedSecret()
1075
break
1076
else:
1077
logger.error(u"Sending secret to unknown client %s",
1078
args)
1079
else:
1080
logger.error(u"Unknown IPC command: %r", cmdline)
1081
1082
# Keep calling this function
1519
1083
return True
1520
1084
1521
1085
1551
1115
elif suffix == u"w":
1552
1116
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1553
1117
else:
1554
raise ValueError(u"Unknown suffix %r" % suffix)
1555
except (ValueError, IndexError), e:
1556
raise ValueError(e.message)
1118
raise ValueError
1119
except (ValueError, IndexError):
1120
raise ValueError
1557
1121
timevalue += delta
1558
1122
return timevalue
1559
1123
1572
1136
def if_nametoindex(interface):
1573
1137
"Get an interface index the hard way, i.e. using fcntl()"
1574
1138
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1575
with contextlib.closing(socket.socket()) as s:
1139
with closing(socket.socket()) as s:
1576
1140
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1577
1141
struct.pack(str(u"16s16x"),
1578
1142
interface))
1598
1162
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1599
1163
if not stat.S_ISCHR(os.fstat(null).st_mode):
1600
1164
raise OSError(errno.ENODEV,
1601
u"%s not a character device"
1602
% os.path.devnull)
1165
u"/dev/null not a character device")
1603
1166
os.dup2(null, sys.stdin.fileno())
1604
1167
os.dup2(null, sys.stdout.fileno())
1605
1168
os.dup2(null, sys.stderr.fileno())
1609
1172
1610
1173
def main():
1611
1174
1612
##################################################################
1175
######################################################################
1613
1176
# Parsing of options, both command line and config file
1614
1177
1615
1178
parser = optparse.OptionParser(version = "%%prog %s" % version)
1709
1272
u"interval": u"5m",
1710
1273
u"checker": u"fping -q -- %%(host)s",
1711
1274
u"host": u"",
1712
u"approved_delay": u"0s",
1713
u"approved_duration": u"1s",
1714
1275
}
1715
1276
client_config = configparser.SafeConfigParser(client_defaults)
1716
1277
client_config.read(os.path.join(server_settings[u"configdir"],
1774
1335
bus = dbus.SystemBus()
1775
1336
# End of Avahi example code
1776
1337
if use_dbus:
1777
try:
1778
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1779
bus, do_not_queue=True)
1780
except dbus.exceptions.NameExistsException, e:
1781
logger.error(unicode(e) + u", disabling D-Bus")
1782
use_dbus = False
1783
server_settings[u"use_dbus"] = False
1784
tcp_server.use_dbus = False
1338
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1785
1339
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1786
1340
service = AvahiService(name = server_settings[u"servicename"],
1787
1341
servicetype = u"_mandos._tcp",
1789
1343
if server_settings["interface"]:
1790
1344
service.interface = (if_nametoindex
1791
1345
(str(server_settings[u"interface"])))
1792
1793
global multiprocessing_manager
1794
multiprocessing_manager = multiprocessing.Manager()
1795
1346
1796
1347
client_class = Client
1797
1348
if use_dbus:
1798
1349
client_class = functools.partial(ClientDBus, bus = bus)
1799
def client_config_items(config, section):
1800
special_settings = {
1801
"approved_by_default":
1802
lambda: config.getboolean(section,
1803
"approved_by_default"),
1804
}
1805
for name, value in config.items(section):
1806
try:
1807
yield (name, special_settings[name]())
1808
except KeyError:
1809
yield (name, value)
1810
1811
1350
tcp_server.clients.update(set(
1812
1351
client_class(name = section,
1813
config= dict(client_config_items(
1814
client_config, section)))
1352
config= dict(client_config.items(section)))
1815
1353
for section in client_config.sections()))
1816
1354
if not tcp_server.clients:
1817
1355
logger.warning(u"No clients defined")
1829
1367
daemon()
1830
1368
1831
1369
try:
1832
with pidfile:
1370
with closing(pidfile):
1833
1371
pid = os.getpid()
1834
1372
pidfile.write(str(pid) + "\n")
1835
1373
del pidfile
1841
1379
pass
1842
1380
del pidfilename
1843
1381
1382
def cleanup():
1383
"Cleanup function; run on exit"
1384
service.cleanup()
1385
1386
while tcp_server.clients:
1387
client = tcp_server.clients.pop()
1388
client.disable_hook = None
1389
client.disable()
1390
1391
atexit.register(cleanup)
1392
1844
1393
if not debug:
1845
1394
signal.signal(signal.SIGINT, signal.SIG_IGN)
1846
1395
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1853
1402
dbus.service.Object.__init__(self, bus, u"/")
1854
1403
_interface = u"se.bsnet.fukt.Mandos"
1855
1404
1856
@dbus.service.signal(_interface, signature=u"o")
1857
def ClientAdded(self, objpath):
1405
@dbus.service.signal(_interface, signature=u"oa{sv}")
1406
def ClientAdded(self, objpath, properties):
1858
1407
"D-Bus signal"
1859
1408
pass
1860
1409
1861
@dbus.service.signal(_interface, signature=u"ss")
1862
def ClientNotFound(self, fingerprint, address):
1410
@dbus.service.signal(_interface, signature=u"s")
1411
def ClientNotFound(self, fingerprint):
1863
1412
"D-Bus signal"
1864
1413
pass
1865
1414
1879
1428
def GetAllClientsWithProperties(self):
1880
1429
"D-Bus method"
1881
1430
return dbus.Dictionary(
1882
((c.dbus_object_path, c.GetAll(u""))
1431
((c.dbus_object_path, c.GetAllProperties())
1883
1432
for c in tcp_server.clients),
1884
1433
signature=u"oa{sv}")
1885
1434
1891
1440
tcp_server.clients.remove(c)
1892
1441
c.remove_from_connection()
1893
1442
# Don't signal anything except ClientRemoved
1894
c.disable(quiet=True)
1443
c.disable(signal=False)
1895
1444
# Emit D-Bus signal
1896
1445
self.ClientRemoved(object_path, c.name)
1897
1446
return
1898
raise KeyError(object_path)
1447
raise KeyError
1899
1448
1900
1449
del _interface
1901
1450
1902
1451
mandos_dbus_service = MandosDBusService()
1903
1452
1904
def cleanup():
1905
"Cleanup function; run on exit"
1906
service.cleanup()
1907
1908
while tcp_server.clients:
1909
client = tcp_server.clients.pop()
1910
if use_dbus:
1911
client.remove_from_connection()
1912
client.disable_hook = None
1913
# Don't signal anything except ClientRemoved
1914
client.disable(quiet=True)
1915
if use_dbus:
1916
# Emit D-Bus signal
1917
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1918
client.name)
1919
1920
atexit.register(cleanup)
1921
1922
1453
for client in tcp_server.clients:
1923
1454
if use_dbus:
1924
1455
# Emit D-Bus signal
1925
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1456
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1457
client.GetAllProperties())
1926
1458
client.enable()
1927
1459
1928
1460
tcp_server.enable()
1946
1478
service.activate()
1947
1479
except dbus.exceptions.DBusException, error:
1948
1480
logger.critical(u"DBusException: %s", error)
1949
cleanup()
1950
1481
sys.exit(1)
1951
1482
# End of Avahi example code
1952
1483
1959
1490
main_loop.run()
1960
1491
except AvahiError, error:
1961
1492
logger.critical(u"AvahiError: %s", error)
1962
cleanup()
1963
1493
sys.exit(1)
1964
1494
except KeyboardInterrupt:
1965
1495
if debug:
1966
1496
print >> sys.stderr
1967
1497
logger.debug(u"Server received KeyboardInterrupt")
1968
1498
logger.debug(u"Server exiting")
1969
# Must run before the D-Bus bus name gets deregistered
1970
cleanup()
1971
1499
1972
1500
if __name__ == '__main__':
1973
1501
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0