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 389
- compare with another revision
- download diff
- download tarball
- view history from revision 389
- Committer: Teddy Hogeborn
- Date: 2009-10-18 08:47:40 UTC
- Revision ID: teddy@fukt.bsnet.se-20091018084740-fa1qgm22lg125r10
* plugins.d/splashy.c: Use exit codes from <sysexits.h>.
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
81
79
SO_BINDTODEVICE = None
82
80
83
81
84
version = "1.0.14"
82
version = "1.0.12"
85
83
86
#logger = logging.getLogger(u'mandos')
87
84
logger = logging.Logger(u'mandos')
88
85
syslogger = (logging.handlers.SysLogHandler
89
86
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
157
154
u" after %i retries, exiting.",
158
155
self.rename_count)
159
156
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
157
self.name = self.server.GetAlternativeServiceName(self.name)
161
158
logger.info(u"Changing Zeroconf service name to %r ...",
162
self.name)
159
unicode(self.name))
163
160
syslogger.setFormatter(logging.Formatter
164
161
(u'Mandos (%s) [%%(process)d]:'
165
162
u' %%(levelname)s: %%(message)s'
166
163
% self.name))
167
164
self.remove()
168
try:
169
self.add()
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
172
self.cleanup()
173
os._exit(1)
165
self.add()
174
166
self.rename_count += 1
175
167
def remove(self):
176
168
"""Derived from the Avahi example code"""
199
191
self.group.Commit()
200
192
def entry_group_state_changed(self, state, error):
201
193
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
194
logger.debug(u"Avahi state change: %i", state)
203
195
204
196
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
197
logger.debug(u"Zeroconf service established.")
218
210
self.group = None
219
211
def server_state_changed(self, state):
220
212
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
213
if state == avahi.SERVER_COLLISION:
223
214
logger.error(u"Zeroconf server name collision")
224
215
self.remove()
240
231
"""A representation of a client host served by this server.
241
232
242
233
Attributes:
243
_approved: bool(); 'None' if not yet approved/disapproved
244
approval_delay: datetime.timedelta(); Time to wait for approval
245
approval_duration: datetime.timedelta(); Duration of one approval
234
name: string; from the config file, used in log messages and
235
D-Bus identifiers
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
242
enabled: bool()
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
246
248
checker: subprocess.Popen(); a running checker process used
247
249
to see if the client lives.
248
250
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
249
253
checker_callback_tag: - '' -
250
checker_command: string; External command which is run to check
251
if client lives. %() expansions are done at
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
252
256
runtime with vars(self) as dict, so that for
253
257
instance %(name)s can be used in the command.
254
checker_initiator_tag: a gobject event source tag, or None
255
created: datetime.datetime(); (UTC) object creation
256
258
current_checker_command: string; current running checker_command
257
disable_hook: If set, called by disable() as disable_hook(self)
258
disable_initiator_tag: - '' -
259
enabled: bool()
260
fingerprint: string (40 or 32 hexadecimal digits); used to
261
uniquely identify the client
262
host: string; available for use by the checker command
263
interval: datetime.timedelta(); How often to start a new checker
264
last_checked_ok: datetime.datetime(); (UTC) or None
265
last_enabled: datetime.datetime(); (UTC)
266
name: string; from the config file, used in log messages and
267
D-Bus identifiers
268
secret: bytestring; sent verbatim (over TLS) to client
269
timeout: datetime.timedelta(); How long from last_checked_ok
270
until this client is disabled
271
runtime_expansions: Allowed attributes for runtime expansion.
272
259
"""
273
260
274
runtime_expansions = (u"approval_delay", u"approval_duration",
275
u"created", u"enabled", u"fingerprint",
276
u"host", u"interval", u"last_checked_ok",
277
u"last_enabled", u"name", u"timeout")
278
279
261
@staticmethod
280
262
def _timedelta_to_milliseconds(td):
281
263
"Convert a datetime.timedelta() to milliseconds"
290
272
def interval_milliseconds(self):
291
273
"Return the 'interval' attribute in milliseconds"
292
274
return self._timedelta_to_milliseconds(self.interval)
293
294
def approval_delay_milliseconds(self):
295
return self._timedelta_to_milliseconds(self.approval_delay)
296
275
297
276
def __init__(self, name = None, disable_hook=None, config=None):
298
277
"""Note: the 'checker' key in 'config' sets the
311
290
if u"secret" in config:
312
291
self.secret = config[u"secret"].decode(u"base64")
313
292
elif u"secfile" in config:
314
with open(os.path.expanduser(os.path.expandvars
315
(config[u"secfile"])),
316
"rb") as secfile:
293
with closing(open(os.path.expanduser
294
(os.path.expandvars
295
(config[u"secfile"])),
296
"rb")) as secfile:
317
297
self.secret = secfile.read()
318
298
else:
319
299
raise TypeError(u"No secret or secfile for client %s"
333
313
self.checker_command = config[u"checker"]
334
314
self.current_checker_command = None
335
315
self.last_connect = None
336
self._approved = None
337
self.approved_by_default = config.get(u"approved_by_default",
338
True)
339
self.approvals_pending = 0
340
self.approval_delay = string_to_delta(
341
config[u"approval_delay"])
342
self.approval_duration = string_to_delta(
343
config[u"approval_duration"])
344
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
345
316
346
def send_changedstate(self):
347
self.changedstate.acquire()
348
self.changedstate.notify_all()
349
self.changedstate.release()
350
351
317
def enable(self):
352
318
"""Start this client's checker and timeout hooks"""
353
319
if getattr(self, u"enabled", False):
354
320
# Already enabled
355
321
return
356
self.send_changedstate()
357
322
self.last_enabled = datetime.datetime.utcnow()
358
323
# Schedule a new checker to be started an 'interval' from now,
359
324
# and every interval from then on.
360
325
self.checker_initiator_tag = (gobject.timeout_add
361
326
(self.interval_milliseconds(),
362
327
self.start_checker))
328
# Also start a new checker *right now*.
329
self.start_checker()
363
330
# Schedule a disable() when 'timeout' has passed
364
331
self.disable_initiator_tag = (gobject.timeout_add
365
332
(self.timeout_milliseconds(),
366
333
self.disable))
367
334
self.enabled = True
368
# Also start a new checker *right now*.
369
self.start_checker()
370
335
371
def disable(self, quiet=True):
336
def disable(self):
372
337
"""Disable this client."""
373
338
if not getattr(self, "enabled", False):
374
339
return False
375
if not quiet:
376
self.send_changedstate()
377
if not quiet:
378
logger.info(u"Disabling client %s", self.name)
340
logger.info(u"Disabling client %s", self.name)
379
341
if getattr(self, u"disable_initiator_tag", False):
380
342
gobject.source_remove(self.disable_initiator_tag)
381
343
self.disable_initiator_tag = None
433
395
# client would inevitably timeout, since no checker would get
434
396
# a chance to run to completion. If we instead leave running
435
397
# checkers alone, the checker would have to take more time
436
# than 'timeout' for the client to be disabled, which is as it
437
# should be.
398
# than 'timeout' for the client to be declared invalid, which
399
# is as it should be.
438
400
439
401
# If a checker exists, make sure it is not a zombie
440
402
try:
456
418
command = self.checker_command % self.host
457
419
except TypeError:
458
420
# Escape attributes for the shell
459
escaped_attrs = dict(
460
(attr,
461
re.escape(unicode(str(getattr(self, attr, u"")),
462
errors=
463
u'replace')))
464
for attr in
465
self.runtime_expansions)
466
421
escaped_attrs = dict((key,
422
re.escape(unicode(str(val),
423
errors=
424
u'replace')))
425
for key, val in
426
vars(self).iteritems())
467
427
try:
468
428
command = self.checker_command % escaped_attrs
469
429
except TypeError, error:
507
467
logger.debug(u"Stopping checker for %(name)s", vars(self))
508
468
try:
509
469
os.kill(self.checker.pid, signal.SIGTERM)
510
#time.sleep(0.5)
470
#os.sleep(0.5)
511
471
#if self.checker.poll() is None:
512
472
# os.kill(self.checker.pid, signal.SIGKILL)
513
473
except OSError, error:
514
474
if error.errno != errno.ESRCH: # No such process
515
475
raise
516
476
self.checker = None
477
478
def still_valid(self):
479
"""Has the timeout not yet passed for this client?"""
480
if not getattr(self, u"enabled", False):
481
return False
482
now = datetime.datetime.utcnow()
483
if self.last_checked_ok is None:
484
return now < (self.created + self.timeout)
485
else:
486
return now < (self.last_checked_ok + self.timeout)
487
517
488
518
489
def dbus_service_property(dbus_interface, signature=u"v",
519
490
access=u"readwrite", byte_arrays=False):
527
498
dbus.service.method, except there is only "signature", since the
528
499
type from Get() and the type sent to Set() is the same.
529
500
"""
530
# Encoding deeply encoded byte arrays is not supported yet by the
531
# "Set" method, so we fail early here:
532
if byte_arrays and signature != u"ay":
533
raise ValueError(u"Byte arrays not supported for non-'ay'"
534
u" signature %r" % signature)
535
501
def decorator(func):
536
502
func._dbus_is_property = True
537
503
func._dbus_interface = dbus_interface
623
589
if prop._dbus_access == u"read":
624
590
raise DBusPropertyAccessException(property_name)
625
591
if prop._dbus_get_args_options[u"byte_arrays"]:
626
# The byte_arrays option is not supported yet on
627
# signatures other than "ay".
628
if prop._dbus_signature != u"ay":
629
raise ValueError
630
592
value = dbus.ByteArray(''.join(unichr(byte)
631
593
for byte in value))
632
594
prop(value)
711
673
dbus_object_path: dbus.ObjectPath
712
674
bus: dbus.SystemBus()
713
675
"""
714
715
runtime_expansions = (Client.runtime_expansions
716
+ (u"dbus_object_path",))
717
718
676
# dbus.service.Object doesn't use super(), so we can't either.
719
677
720
678
def __init__(self, bus = None, *args, **kwargs):
721
self._approvals_pending = 0
722
679
self.bus = bus
723
680
Client.__init__(self, *args, **kwargs)
724
681
# Only now, when this client is initialized, can it show up on
725
682
# the D-Bus
726
client_object_name = unicode(self.name).translate(
727
{ord(u"."): ord(u"_"),
728
ord(u"-"): ord(u"_")})
729
683
self.dbus_object_path = (dbus.ObjectPath
730
(u"/clients/" + client_object_name))
684
(u"/clients/"
685
+ self.name.replace(u".", u"_")))
731
686
DBusObjectWithProperties.__init__(self, self.bus,
732
687
self.dbus_object_path)
733
734
def _get_approvals_pending(self):
735
return self._approvals_pending
736
def _set_approvals_pending(self, value):
737
old_value = self._approvals_pending
738
self._approvals_pending = value
739
bval = bool(value)
740
if (hasattr(self, "dbus_object_path")
741
and bval is not bool(old_value)):
742
dbus_bool = dbus.Boolean(bval, variant_level=1)
743
self.PropertyChanged(dbus.String(u"ApprovalPending"),
744
dbus_bool)
745
746
approvals_pending = property(_get_approvals_pending,
747
_set_approvals_pending)
748
del _get_approvals_pending, _set_approvals_pending
749
688
750
689
@staticmethod
751
690
def _datetime_to_dbus(dt, variant_level=0):
758
697
r = Client.enable(self)
759
698
if oldstate != self.enabled:
760
699
# Emit D-Bus signals
761
self.PropertyChanged(dbus.String(u"Enabled"),
700
self.PropertyChanged(dbus.String(u"enabled"),
762
701
dbus.Boolean(True, variant_level=1))
763
702
self.PropertyChanged(
764
dbus.String(u"LastEnabled"),
703
dbus.String(u"last_enabled"),
765
704
self._datetime_to_dbus(self.last_enabled,
766
705
variant_level=1))
767
706
return r
768
707
769
def disable(self, quiet = False):
708
def disable(self, signal = True):
770
709
oldstate = getattr(self, u"enabled", False)
771
r = Client.disable(self, quiet=quiet)
772
if not quiet and oldstate != self.enabled:
710
r = Client.disable(self)
711
if signal and oldstate != self.enabled:
773
712
# Emit D-Bus signal
774
self.PropertyChanged(dbus.String(u"Enabled"),
713
self.PropertyChanged(dbus.String(u"enabled"),
775
714
dbus.Boolean(False, variant_level=1))
776
715
return r
777
716
789
728
self.checker_callback_tag = None
790
729
self.checker = None
791
730
# Emit D-Bus signal
792
self.PropertyChanged(dbus.String(u"CheckerRunning"),
731
self.PropertyChanged(dbus.String(u"checker_running"),
793
732
dbus.Boolean(False, variant_level=1))
794
733
if os.WIFEXITED(condition):
795
734
exitstatus = os.WEXITSTATUS(condition)
810
749
r = Client.checked_ok(self, *args, **kwargs)
811
750
# Emit D-Bus signal
812
751
self.PropertyChanged(
813
dbus.String(u"LastCheckedOK"),
752
dbus.String(u"last_checked_ok"),
814
753
(self._datetime_to_dbus(self.last_checked_ok,
815
754
variant_level=1)))
816
755
return r
828
767
# Emit D-Bus signal
829
768
self.CheckerStarted(self.current_checker_command)
830
769
self.PropertyChanged(
831
dbus.String(u"CheckerRunning"),
770
dbus.String(u"checker_running"),
832
771
dbus.Boolean(True, variant_level=1))
833
772
return r
834
773
837
776
r = Client.stop_checker(self, *args, **kwargs)
838
777
if (old_checker is not None
839
778
and getattr(self, u"checker", None) is None):
840
self.PropertyChanged(dbus.String(u"CheckerRunning"),
779
self.PropertyChanged(dbus.String(u"checker_running"),
841
780
dbus.Boolean(False, variant_level=1))
842
781
return r
843
844
def _reset_approved(self):
845
self._approved = None
846
return False
847
848
def approve(self, value=True):
849
self.send_changedstate()
850
self._approved = value
851
gobject.timeout_add(self._timedelta_to_milliseconds
852
(self.approval_duration),
853
self._reset_approved)
854
855
856
## D-Bus methods, signals & properties
782
783
## D-Bus methods & signals
857
784
_interface = u"se.bsnet.fukt.Mandos.Client"
858
785
859
## Signals
786
# CheckedOK - method
787
@dbus.service.method(_interface)
788
def CheckedOK(self):
789
return self.checked_ok()
860
790
861
791
# CheckerCompleted - signal
862
792
@dbus.service.signal(_interface, signature=u"nxs")
879
809
# GotSecret - signal
880
810
@dbus.service.signal(_interface)
881
811
def GotSecret(self):
882
"""D-Bus signal
883
Is sent after a successful transfer of secret from the Mandos
884
server to mandos-client
885
"""
812
"D-Bus signal"
886
813
pass
887
814
888
815
# Rejected - signal
889
@dbus.service.signal(_interface, signature=u"s")
890
def Rejected(self, reason):
891
"D-Bus signal"
892
pass
893
894
# NeedApproval - signal
895
@dbus.service.signal(_interface, signature=u"tb")
896
def NeedApproval(self, timeout, default):
897
"D-Bus signal"
898
pass
899
900
## Methods
901
902
# Approve - method
903
@dbus.service.method(_interface, in_signature=u"b")
904
def Approve(self, value):
905
self.approve(value)
906
907
# CheckedOK - method
908
@dbus.service.method(_interface)
909
def CheckedOK(self):
910
return self.checked_ok()
816
@dbus.service.signal(_interface)
817
def Rejected(self):
818
"D-Bus signal"
819
pass
911
820
912
821
# Enable - method
913
822
@dbus.service.method(_interface)
932
841
def StopChecker(self):
933
842
self.stop_checker()
934
843
935
## Properties
936
937
# ApprovalPending - property
938
@dbus_service_property(_interface, signature=u"b", access=u"read")
939
def ApprovalPending_dbus_property(self):
940
return dbus.Boolean(bool(self.approvals_pending))
941
942
# ApprovedByDefault - property
943
@dbus_service_property(_interface, signature=u"b",
944
access=u"readwrite")
945
def ApprovedByDefault_dbus_property(self, value=None):
946
if value is None: # get
947
return dbus.Boolean(self.approved_by_default)
948
self.approved_by_default = bool(value)
949
# Emit D-Bus signal
950
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
951
dbus.Boolean(value, variant_level=1))
952
953
# ApprovalDelay - property
954
@dbus_service_property(_interface, signature=u"t",
955
access=u"readwrite")
956
def ApprovalDelay_dbus_property(self, value=None):
957
if value is None: # get
958
return dbus.UInt64(self.approval_delay_milliseconds())
959
self.approval_delay = datetime.timedelta(0, 0, 0, value)
960
# Emit D-Bus signal
961
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
962
dbus.UInt64(value, variant_level=1))
963
964
# ApprovalDuration - property
965
@dbus_service_property(_interface, signature=u"t",
966
access=u"readwrite")
967
def ApprovalDuration_dbus_property(self, value=None):
968
if value is None: # get
969
return dbus.UInt64(self._timedelta_to_milliseconds(
970
self.approval_duration))
971
self.approval_duration = datetime.timedelta(0, 0, 0, value)
972
# Emit D-Bus signal
973
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
974
dbus.UInt64(value, variant_level=1))
975
976
# Name - property
844
# name - property
977
845
@dbus_service_property(_interface, signature=u"s", access=u"read")
978
def Name_dbus_property(self):
846
def name_dbus_property(self):
979
847
return dbus.String(self.name)
980
848
981
# Fingerprint - property
849
# fingerprint - property
982
850
@dbus_service_property(_interface, signature=u"s", access=u"read")
983
def Fingerprint_dbus_property(self):
851
def fingerprint_dbus_property(self):
984
852
return dbus.String(self.fingerprint)
985
853
986
# Host - property
854
# host - property
987
855
@dbus_service_property(_interface, signature=u"s",
988
856
access=u"readwrite")
989
def Host_dbus_property(self, value=None):
857
def host_dbus_property(self, value=None):
990
858
if value is None: # get
991
859
return dbus.String(self.host)
992
860
self.host = value
993
861
# Emit D-Bus signal
994
self.PropertyChanged(dbus.String(u"Host"),
862
self.PropertyChanged(dbus.String(u"host"),
995
863
dbus.String(value, variant_level=1))
996
864
997
# Created - property
865
# created - property
998
866
@dbus_service_property(_interface, signature=u"s", access=u"read")
999
def Created_dbus_property(self):
867
def created_dbus_property(self):
1000
868
return dbus.String(self._datetime_to_dbus(self.created))
1001
869
1002
# LastEnabled - property
870
# last_enabled - property
1003
871
@dbus_service_property(_interface, signature=u"s", access=u"read")
1004
def LastEnabled_dbus_property(self):
872
def last_enabled_dbus_property(self):
1005
873
if self.last_enabled is None:
1006
874
return dbus.String(u"")
1007
875
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1008
876
1009
# Enabled - property
877
# enabled - property
1010
878
@dbus_service_property(_interface, signature=u"b",
1011
879
access=u"readwrite")
1012
def Enabled_dbus_property(self, value=None):
880
def enabled_dbus_property(self, value=None):
1013
881
if value is None: # get
1014
882
return dbus.Boolean(self.enabled)
1015
883
if value:
1017
885
else:
1018
886
self.disable()
1019
887
1020
# LastCheckedOK - property
888
# last_checked_ok - property
1021
889
@dbus_service_property(_interface, signature=u"s",
1022
890
access=u"readwrite")
1023
def LastCheckedOK_dbus_property(self, value=None):
891
def last_checked_ok_dbus_property(self, value=None):
1024
892
if value is not None:
1025
893
self.checked_ok()
1026
894
return
1029
897
return dbus.String(self._datetime_to_dbus(self
1030
898
.last_checked_ok))
1031
899
1032
# Timeout - property
900
# timeout - property
1033
901
@dbus_service_property(_interface, signature=u"t",
1034
902
access=u"readwrite")
1035
def Timeout_dbus_property(self, value=None):
903
def timeout_dbus_property(self, value=None):
1036
904
if value is None: # get
1037
905
return dbus.UInt64(self.timeout_milliseconds())
1038
906
self.timeout = datetime.timedelta(0, 0, 0, value)
1039
907
# Emit D-Bus signal
1040
self.PropertyChanged(dbus.String(u"Timeout"),
908
self.PropertyChanged(dbus.String(u"timeout"),
1041
909
dbus.UInt64(value, variant_level=1))
1042
910
if getattr(self, u"disable_initiator_tag", None) is None:
1043
911
return
1057
925
self.disable_initiator_tag = (gobject.timeout_add
1058
926
(time_to_die, self.disable))
1059
927
1060
# Interval - property
928
# interval - property
1061
929
@dbus_service_property(_interface, signature=u"t",
1062
930
access=u"readwrite")
1063
def Interval_dbus_property(self, value=None):
931
def interval_dbus_property(self, value=None):
1064
932
if value is None: # get
1065
933
return dbus.UInt64(self.interval_milliseconds())
1066
934
self.interval = datetime.timedelta(0, 0, 0, value)
1067
935
# Emit D-Bus signal
1068
self.PropertyChanged(dbus.String(u"Interval"),
936
self.PropertyChanged(dbus.String(u"interval"),
1069
937
dbus.UInt64(value, variant_level=1))
1070
938
if getattr(self, u"checker_initiator_tag", None) is None:
1071
939
return
1075
943
(value, self.start_checker))
1076
944
self.start_checker() # Start one now, too
1077
945
1078
# Checker - property
946
# checker - property
1079
947
@dbus_service_property(_interface, signature=u"s",
1080
948
access=u"readwrite")
1081
def Checker_dbus_property(self, value=None):
949
def checker_dbus_property(self, value=None):
1082
950
if value is None: # get
1083
951
return dbus.String(self.checker_command)
1084
952
self.checker_command = value
1085
953
# Emit D-Bus signal
1086
self.PropertyChanged(dbus.String(u"Checker"),
954
self.PropertyChanged(dbus.String(u"checker"),
1087
955
dbus.String(self.checker_command,
1088
956
variant_level=1))
1089
957
1090
# CheckerRunning - property
958
# checker_running - property
1091
959
@dbus_service_property(_interface, signature=u"b",
1092
960
access=u"readwrite")
1093
def CheckerRunning_dbus_property(self, value=None):
961
def checker_running_dbus_property(self, value=None):
1094
962
if value is None: # get
1095
963
return dbus.Boolean(self.checker is not None)
1096
964
if value:
1098
966
else:
1099
967
self.stop_checker()
1100
968
1101
# ObjectPath - property
969
# object_path - property
1102
970
@dbus_service_property(_interface, signature=u"o", access=u"read")
1103
def ObjectPath_dbus_property(self):
971
def object_path_dbus_property(self):
1104
972
return self.dbus_object_path # is already a dbus.ObjectPath
1105
973
1106
# Secret = property
974
# secret = property
1107
975
@dbus_service_property(_interface, signature=u"ay",
1108
976
access=u"write", byte_arrays=True)
1109
def Secret_dbus_property(self, value):
977
def secret_dbus_property(self, value):
1110
978
self.secret = str(value)
1111
979
1112
980
del _interface
1113
981
1114
982
1115
class ProxyClient(object):
1116
def __init__(self, child_pipe, fpr, address):
1117
self._pipe = child_pipe
1118
self._pipe.send(('init', fpr, address))
1119
if not self._pipe.recv():
1120
raise KeyError()
1121
1122
def __getattribute__(self, name):
1123
if(name == '_pipe'):
1124
return super(ProxyClient, self).__getattribute__(name)
1125
self._pipe.send(('getattr', name))
1126
data = self._pipe.recv()
1127
if data[0] == 'data':
1128
return data[1]
1129
if data[0] == 'function':
1130
def func(*args, **kwargs):
1131
self._pipe.send(('funcall', name, args, kwargs))
1132
return self._pipe.recv()[1]
1133
return func
1134
1135
def __setattr__(self, name, value):
1136
if(name == '_pipe'):
1137
return super(ProxyClient, self).__setattr__(name, value)
1138
self._pipe.send(('setattr', name, value))
1139
1140
1141
983
class ClientHandler(socketserver.BaseRequestHandler, object):
1142
984
"""A class to handle client connections.
1143
985
1145
987
Note: This will run in its own forked process."""
1146
988
1147
989
def handle(self):
1148
with contextlib.closing(self.server.child_pipe) as child_pipe:
1149
logger.info(u"TCP connection from: %s",
1150
unicode(self.client_address))
1151
logger.debug(u"Pipe FD: %d",
1152
self.server.child_pipe.fileno())
1153
990
logger.info(u"TCP connection from: %s",
991
unicode(self.client_address))
992
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
993
# Open IPC pipe to parent process
994
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1154
995
session = (gnutls.connection
1155
996
.ClientSession(self.request,
1156
997
gnutls.connection
1157
998
.X509Credentials()))
1158
999
1000
line = self.request.makefile().readline()
1001
logger.debug(u"Protocol version: %r", line)
1002
try:
1003
if int(line.strip().split()[0]) > 1:
1004
raise RuntimeError
1005
except (ValueError, IndexError, RuntimeError), error:
1006
logger.error(u"Unknown protocol version: %s", error)
1007
return
1008
1159
1009
# Note: gnutls.connection.X509Credentials is really a
1160
1010
# generic GnuTLS certificate credentials object so long as
1161
1011
# no X.509 keys are added to it. Therefore, we can use it
1162
1012
# here despite using OpenPGP certificates.
1163
1013
1164
1014
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1165
1015
# u"+AES-256-CBC", u"+SHA1",
1166
1016
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1172
1022
(gnutls.library.functions
1173
1023
.gnutls_priority_set_direct(session._c_object,
1174
1024
priority, None))
1175
1176
# Start communication using the Mandos protocol
1177
# Get protocol number
1178
line = self.request.makefile().readline()
1179
logger.debug(u"Protocol version: %r", line)
1180
try:
1181
if int(line.strip().split()[0]) > 1:
1182
raise RuntimeError
1183
except (ValueError, IndexError, RuntimeError), error:
1184
logger.error(u"Unknown protocol version: %s", error)
1185
return
1186
1187
# Start GnuTLS connection
1025
1188
1026
try:
1189
1027
session.handshake()
1190
1028
except gnutls.errors.GNUTLSError, error:
1193
1031
# established. Just abandon the request.
1194
1032
return
1195
1033
logger.debug(u"Handshake succeeded")
1196
1197
approval_required = False
1198
1034
try:
1199
try:
1200
fpr = self.fingerprint(self.peer_certificate
1201
(session))
1202
except (TypeError, gnutls.errors.GNUTLSError), error:
1203
logger.warning(u"Bad certificate: %s", error)
1204
return
1205
logger.debug(u"Fingerprint: %s", fpr)
1206
1207
try:
1208
client = ProxyClient(child_pipe, fpr,
1209
self.client_address)
1210
except KeyError:
1211
return
1212
1213
if client.approval_delay:
1214
delay = client.approval_delay
1215
client.approvals_pending += 1
1216
approval_required = True
1217
1218
while True:
1219
if not client.enabled:
1220
logger.warning(u"Client %s is disabled",
1221
client.name)
1222
if self.server.use_dbus:
1223
# Emit D-Bus signal
1224
client.Rejected("Disabled")
1225
return
1226
1227
if client._approved or not client.approval_delay:
1228
#We are approved or approval is disabled
1229
break
1230
elif client._approved is None:
1231
logger.info(u"Client %s needs approval",
1232
client.name)
1233
if self.server.use_dbus:
1234
# Emit D-Bus signal
1235
client.NeedApproval(
1236
client.approval_delay_milliseconds(),
1237
client.approved_by_default)
1238
else:
1239
logger.warning(u"Client %s was not approved",
1240
client.name)
1241
if self.server.use_dbus:
1242
# Emit D-Bus signal
1243
client.Rejected("Denied")
1244
return
1245
1246
#wait until timeout or approved
1247
#x = float(client._timedelta_to_milliseconds(delay))
1248
time = datetime.datetime.now()
1249
client.changedstate.acquire()
1250
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1251
client.changedstate.release()
1252
time2 = datetime.datetime.now()
1253
if (time2 - time) >= delay:
1254
if not client.approved_by_default:
1255
logger.warning("Client %s timed out while"
1256
" waiting for approval",
1257
client.name)
1258
if self.server.use_dbus:
1259
# Emit D-Bus signal
1260
client.Rejected("Approval timed out")
1261
return
1262
else:
1263
break
1264
else:
1265
delay -= time2 - time
1266
1267
sent_size = 0
1268
while sent_size < len(client.secret):
1269
try:
1270
sent = session.send(client.secret[sent_size:])
1271
except (gnutls.errors.GNUTLSError), error:
1272
logger.warning("gnutls send failed")
1273
return
1274
logger.debug(u"Sent: %d, remaining: %d",
1275
sent, len(client.secret)
1276
- (sent_size + sent))
1277
sent_size += sent
1278
1279
logger.info(u"Sending secret to %s", client.name)
1280
# bump the timeout as if seen
1281
client.checked_ok()
1282
if self.server.use_dbus:
1283
# Emit D-Bus signal
1284
client.GotSecret()
1035
fpr = self.fingerprint(self.peer_certificate(session))
1036
except (TypeError, gnutls.errors.GNUTLSError), error:
1037
logger.warning(u"Bad certificate: %s", error)
1038
session.bye()
1039
return
1040
logger.debug(u"Fingerprint: %s", fpr)
1285
1041
1286
finally:
1287
if approval_required:
1288
client.approvals_pending -= 1
1289
try:
1290
session.bye()
1291
except (gnutls.errors.GNUTLSError), error:
1292
logger.warning("GnuTLS bye failed")
1042
for c in self.server.clients:
1043
if c.fingerprint == fpr:
1044
client = c
1045
break
1046
else:
1047
ipc.write(u"NOTFOUND %s %s\n"
1048
% (fpr, unicode(self.client_address)))
1049
session.bye()
1050
return
1051
# Have to check if client.still_valid(), since it is
1052
# possible that the client timed out while establishing
1053
# the GnuTLS session.
1054
if not client.still_valid():
1055
ipc.write(u"INVALID %s\n" % client.name)
1056
session.bye()
1057
return
1058
ipc.write(u"SENDING %s\n" % client.name)
1059
sent_size = 0
1060
while sent_size < len(client.secret):
1061
sent = session.send(client.secret[sent_size:])
1062
logger.debug(u"Sent: %d, remaining: %d",
1063
sent, len(client.secret)
1064
- (sent_size + sent))
1065
sent_size += sent
1066
session.bye()
1293
1067
1294
1068
@staticmethod
1295
1069
def peer_certificate(session):
1355
1129
return hex_fpr
1356
1130
1357
1131
1358
class MultiprocessingMixIn(object):
1359
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1360
def sub_process_main(self, request, address):
1361
try:
1362
self.finish_request(request, address)
1363
except:
1364
self.handle_error(request, address)
1365
self.close_request(request)
1366
1367
def process_request(self, request, address):
1368
"""Start a new process to process the request."""
1369
multiprocessing.Process(target = self.sub_process_main,
1370
args = (request, address)).start()
1371
1372
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1373
""" adds a pipe to the MixIn """
1132
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1374
1134
def process_request(self, request, client_address):
1375
1135
"""Overrides and wraps the original process_request().
1376
1136
1377
1137
This function creates a new pipe in self.pipe
1378
1138
"""
1379
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1380
1381
super(MultiprocessingMixInWithPipe,
1139
self.pipe = os.pipe()
1140
super(ForkingMixInWithPipe,
1382
1141
self).process_request(request, client_address)
1383
self.child_pipe.close()
1384
self.add_pipe(parent_pipe)
1385
1386
def add_pipe(self, parent_pipe):
1142
os.close(self.pipe[1]) # close write end
1143
self.add_pipe(self.pipe[0])
1144
def add_pipe(self, pipe):
1387
1145
"""Dummy function; override as necessary"""
1388
pass
1389
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1146
os.close(pipe)
1147
1148
1149
class IPv6_TCPServer(ForkingMixInWithPipe,
1391
1150
socketserver.TCPServer, object):
1392
1151
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1393
1152
1478
1237
return socketserver.TCPServer.server_activate(self)
1479
1238
def enable(self):
1480
1239
self.enabled = True
1481
def add_pipe(self, parent_pipe):
1240
def add_pipe(self, pipe):
1482
1241
# Call "handle_ipc" for both data and EOF events
1483
gobject.io_add_watch(parent_pipe.fileno(),
1484
gobject.IO_IN | gobject.IO_HUP,
1485
functools.partial(self.handle_ipc,
1486
parent_pipe = parent_pipe))
1487
1488
def handle_ipc(self, source, condition, parent_pipe=None,
1489
client_object=None):
1242
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1243
self.handle_ipc)
1244
def handle_ipc(self, source, condition, file_objects={}):
1490
1245
condition_names = {
1491
1246
gobject.IO_IN: u"IN", # There is data to read.
1492
1247
gobject.IO_OUT: u"OUT", # Data can be written (without
1501
1256
for cond, name in
1502
1257
condition_names.iteritems()
1503
1258
if cond & condition)
1504
# error or the other end of multiprocessing.Pipe has closed
1505
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1506
return False
1507
1508
# Read a request from the child
1509
request = parent_pipe.recv()
1510
command = request[0]
1511
1512
if command == 'init':
1513
fpr = request[1]
1514
address = request[2]
1515
1516
for c in self.clients:
1517
if c.fingerprint == fpr:
1518
client = c
1519
break
1520
else:
1521
logger.warning(u"Client not found for fingerprint: %s, ad"
1522
u"dress: %s", fpr, address)
1523
if self.use_dbus:
1524
# Emit D-Bus signal
1525
mandos_dbus_service.ClientNotFound(fpr, address[0])
1526
parent_pipe.send(False)
1527
return False
1528
1529
gobject.io_add_watch(parent_pipe.fileno(),
1530
gobject.IO_IN | gobject.IO_HUP,
1531
functools.partial(self.handle_ipc,
1532
parent_pipe = parent_pipe,
1533
client_object = client))
1534
parent_pipe.send(True)
1535
# remove the old hook in favor of the new above hook on same fileno
1536
return False
1537
if command == 'funcall':
1538
funcname = request[1]
1539
args = request[2]
1540
kwargs = request[3]
1541
1542
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1543
1544
if command == 'getattr':
1545
attrname = request[1]
1546
if callable(client_object.__getattribute__(attrname)):
1547
parent_pipe.send(('function',))
1548
else:
1549
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1550
1551
if command == 'setattr':
1552
attrname = request[1]
1553
value = request[2]
1554
setattr(client_object, attrname, value)
1555
1259
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1260
conditions_string)
1261
1262
# Turn the pipe file descriptor into a Python file object
1263
if source not in file_objects:
1264
file_objects[source] = os.fdopen(source, u"r", 1)
1265
1266
# Read a line from the file object
1267
cmdline = file_objects[source].readline()
1268
if not cmdline: # Empty line means end of file
1269
# close the IPC pipe
1270
file_objects[source].close()
1271
del file_objects[source]
1272
1273
# Stop calling this function
1274
return False
1275
1276
logger.debug(u"IPC command: %r", cmdline)
1277
1278
# Parse and act on command
1279
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1280
1281
if cmd == u"NOTFOUND":
1282
logger.warning(u"Client not found for fingerprint: %s",
1283
args)
1284
if self.use_dbus:
1285
# Emit D-Bus signal
1286
mandos_dbus_service.ClientNotFound(args)
1287
elif cmd == u"INVALID":
1288
for client in self.clients:
1289
if client.name == args:
1290
logger.warning(u"Client %s is invalid", args)
1291
if self.use_dbus:
1292
# Emit D-Bus signal
1293
client.Rejected()
1294
break
1295
else:
1296
logger.error(u"Unknown client %s is invalid", args)
1297
elif cmd == u"SENDING":
1298
for client in self.clients:
1299
if client.name == args:
1300
logger.info(u"Sending secret to %s", client.name)
1301
client.checked_ok()
1302
if self.use_dbus:
1303
# Emit D-Bus signal
1304
client.GotSecret()
1305
break
1306
else:
1307
logger.error(u"Sending secret to unknown client %s",
1308
args)
1309
else:
1310
logger.error(u"Unknown IPC command: %r", cmdline)
1311
1312
# Keep calling this function
1556
1313
return True
1557
1314
1558
1315
1588
1345
elif suffix == u"w":
1589
1346
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1590
1347
else:
1591
raise ValueError(u"Unknown suffix %r" % suffix)
1592
except (ValueError, IndexError), e:
1593
raise ValueError(e.message)
1348
raise ValueError
1349
except (ValueError, IndexError):
1350
raise ValueError
1594
1351
timevalue += delta
1595
1352
return timevalue
1596
1353
1609
1366
def if_nametoindex(interface):
1610
1367
"Get an interface index the hard way, i.e. using fcntl()"
1611
1368
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1612
with contextlib.closing(socket.socket()) as s:
1369
with closing(socket.socket()) as s:
1613
1370
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1614
1371
struct.pack(str(u"16s16x"),
1615
1372
interface))
1661
1418
parser.add_option("--debug", action=u"store_true",
1662
1419
help=u"Debug mode; run in foreground and log to"
1663
1420
u" terminal")
1664
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1665
help=u"Debug level for stdout output")
1666
1421
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1667
1422
u" priority string (see GnuTLS documentation)")
1668
1423
parser.add_option("--servicename", type=u"string",
1693
1448
u"servicename": u"Mandos",
1694
1449
u"use_dbus": u"True",
1695
1450
u"use_ipv6": u"True",
1696
u"debuglevel": u"",
1697
1451
}
1698
1452
1699
1453
# Parse config file for server-global settings
1716
1470
# options, if set.
1717
1471
for option in (u"interface", u"address", u"port", u"debug",
1718
1472
u"priority", u"servicename", u"configdir",
1719
u"use_dbus", u"use_ipv6", u"debuglevel"):
1473
u"use_dbus", u"use_ipv6"):
1720
1474
value = getattr(options, option)
1721
1475
if value is not None:
1722
1476
server_settings[option] = value
1731
1485
1732
1486
# For convenience
1733
1487
debug = server_settings[u"debug"]
1734
debuglevel = server_settings[u"debuglevel"]
1735
1488
use_dbus = server_settings[u"use_dbus"]
1736
1489
use_ipv6 = server_settings[u"use_ipv6"]
1737
1490
1491
if not debug:
1492
syslogger.setLevel(logging.WARNING)
1493
console.setLevel(logging.WARNING)
1494
1738
1495
if server_settings[u"servicename"] != u"Mandos":
1739
1496
syslogger.setFormatter(logging.Formatter
1740
1497
(u'Mandos (%s) [%%(process)d]:'
1746
1503
u"interval": u"5m",
1747
1504
u"checker": u"fping -q -- %%(host)s",
1748
1505
u"host": u"",
1749
u"approval_delay": u"0s",
1750
u"approval_duration": u"1s",
1751
1506
}
1752
1507
client_config = configparser.SafeConfigParser(client_defaults)
1753
1508
client_config.read(os.path.join(server_settings[u"configdir"],
1759
1514
tcp_server = MandosServer((server_settings[u"address"],
1760
1515
server_settings[u"port"]),
1761
1516
ClientHandler,
1762
interface=(server_settings[u"interface"]
1763
or None),
1517
interface=server_settings[u"interface"],
1764
1518
use_ipv6=use_ipv6,
1765
1519
gnutls_priority=
1766
1520
server_settings[u"priority"],
1767
1521
use_dbus=use_dbus)
1768
if not debug:
1769
pidfilename = u"/var/run/mandos.pid"
1770
try:
1771
pidfile = open(pidfilename, u"w")
1772
except IOError:
1773
logger.error(u"Could not open file %r", pidfilename)
1522
pidfilename = u"/var/run/mandos.pid"
1523
try:
1524
pidfile = open(pidfilename, u"w")
1525
except IOError:
1526
logger.error(u"Could not open file %r", pidfilename)
1774
1527
1775
1528
try:
1776
1529
uid = pwd.getpwnam(u"_mandos").pw_uid
1793
1546
if error[0] != errno.EPERM:
1794
1547
raise error
1795
1548
1796
if not debug and not debuglevel:
1797
syslogger.setLevel(logging.WARNING)
1798
console.setLevel(logging.WARNING)
1799
if debuglevel:
1800
level = getattr(logging, debuglevel.upper())
1801
syslogger.setLevel(level)
1802
console.setLevel(level)
1803
1549
# Enable all possible GnuTLS debugging
1804
1550
if debug:
1805
# Enable all possible GnuTLS debugging
1806
1807
1551
# "Use a log level over 10 to enable all debugging options."
1808
1552
# - GnuTLS manual
1809
1553
gnutls.library.functions.gnutls_global_set_log_level(11)
1814
1558
1815
1559
(gnutls.library.functions
1816
1560
.gnutls_global_set_log_function(debug_gnutls))
1817
1818
# Redirect stdin so all checkers get /dev/null
1819
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1820
os.dup2(null, sys.stdin.fileno())
1821
if null > 2:
1822
os.close(null)
1823
else:
1824
# No console logging
1825
logger.removeHandler(console)
1826
1827
1561
1828
1562
global main_loop
1829
1563
# From the Avahi example code
1832
1566
bus = dbus.SystemBus()
1833
1567
# End of Avahi example code
1834
1568
if use_dbus:
1835
try:
1836
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1837
bus, do_not_queue=True)
1838
except dbus.exceptions.NameExistsException, e:
1839
logger.error(unicode(e) + u", disabling D-Bus")
1840
use_dbus = False
1841
server_settings[u"use_dbus"] = False
1842
tcp_server.use_dbus = False
1569
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1843
1570
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1844
1571
service = AvahiService(name = server_settings[u"servicename"],
1845
1572
servicetype = u"_mandos._tcp",
1847
1574
if server_settings["interface"]:
1848
1575
service.interface = (if_nametoindex
1849
1576
(str(server_settings[u"interface"])))
1850
1851
if not debug:
1852
# Close all input and output, do double fork, etc.
1853
daemon()
1854
1855
global multiprocessing_manager
1856
multiprocessing_manager = multiprocessing.Manager()
1857
1577
1858
1578
client_class = Client
1859
1579
if use_dbus:
1860
1580
client_class = functools.partial(ClientDBus, bus = bus)
1861
def client_config_items(config, section):
1862
special_settings = {
1863
"approved_by_default":
1864
lambda: config.getboolean(section,
1865
"approved_by_default"),
1866
}
1867
for name, value in config.items(section):
1868
try:
1869
yield (name, special_settings[name]())
1870
except KeyError:
1871
yield (name, value)
1872
1873
1581
tcp_server.clients.update(set(
1874
1582
client_class(name = section,
1875
config= dict(client_config_items(
1876
client_config, section)))
1583
config= dict(client_config.items(section)))
1877
1584
for section in client_config.sections()))
1878
1585
if not tcp_server.clients:
1879
1586
logger.warning(u"No clients defined")
1587
1588
if debug:
1589
# Redirect stdin so all checkers get /dev/null
1590
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1591
os.dup2(null, sys.stdin.fileno())
1592
if null > 2:
1593
os.close(null)
1594
else:
1595
# No console logging
1596
logger.removeHandler(console)
1597
# Close all input and output, do double fork, etc.
1598
daemon()
1599
1600
try:
1601
with closing(pidfile):
1602
pid = os.getpid()
1603
pidfile.write(str(pid) + "\n")
1604
del pidfile
1605
except IOError:
1606
logger.error(u"Could not write to file %r with PID %d",
1607
pidfilename, pid)
1608
except NameError:
1609
# "pidfile" was never created
1610
pass
1611
del pidfilename
1612
1613
def cleanup():
1614
"Cleanup function; run on exit"
1615
service.cleanup()
1880
1616
1617
while tcp_server.clients:
1618
client = tcp_server.clients.pop()
1619
client.disable_hook = None
1620
client.disable()
1621
1622
atexit.register(cleanup)
1623
1881
1624
if not debug:
1882
try:
1883
with pidfile:
1884
pid = os.getpid()
1885
pidfile.write(str(pid) + "\n")
1886
del pidfile
1887
except IOError:
1888
logger.error(u"Could not write to file %r with PID %d",
1889
pidfilename, pid)
1890
except NameError:
1891
# "pidfile" was never created
1892
pass
1893
del pidfilename
1894
1895
1625
signal.signal(signal.SIGINT, signal.SIG_IGN)
1896
1897
1626
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1898
1627
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1899
1628
1904
1633
dbus.service.Object.__init__(self, bus, u"/")
1905
1634
_interface = u"se.bsnet.fukt.Mandos"
1906
1635
1907
@dbus.service.signal(_interface, signature=u"o")
1908
def ClientAdded(self, objpath):
1636
@dbus.service.signal(_interface, signature=u"oa{sv}")
1637
def ClientAdded(self, objpath, properties):
1909
1638
"D-Bus signal"
1910
1639
pass
1911
1640
1912
@dbus.service.signal(_interface, signature=u"ss")
1913
def ClientNotFound(self, fingerprint, address):
1641
@dbus.service.signal(_interface, signature=u"s")
1642
def ClientNotFound(self, fingerprint):
1914
1643
"D-Bus signal"
1915
1644
pass
1916
1645
1942
1671
tcp_server.clients.remove(c)
1943
1672
c.remove_from_connection()
1944
1673
# Don't signal anything except ClientRemoved
1945
c.disable(quiet=True)
1674
c.disable(signal=False)
1946
1675
# Emit D-Bus signal
1947
1676
self.ClientRemoved(object_path, c.name)
1948
1677
return
1949
raise KeyError(object_path)
1678
raise KeyError
1950
1679
1951
1680
del _interface
1952
1681
1953
1682
mandos_dbus_service = MandosDBusService()
1954
1683
1955
def cleanup():
1956
"Cleanup function; run on exit"
1957
service.cleanup()
1958
1959
while tcp_server.clients:
1960
client = tcp_server.clients.pop()
1961
if use_dbus:
1962
client.remove_from_connection()
1963
client.disable_hook = None
1964
# Don't signal anything except ClientRemoved
1965
client.disable(quiet=True)
1966
if use_dbus:
1967
# Emit D-Bus signal
1968
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1969
client.name)
1970
1971
atexit.register(cleanup)
1972
1973
1684
for client in tcp_server.clients:
1974
1685
if use_dbus:
1975
1686
# Emit D-Bus signal
1976
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1687
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1688
client.GetAll(u""))
1977
1689
client.enable()
1978
1690
1979
1691
tcp_server.enable()
1997
1709
service.activate()
1998
1710
except dbus.exceptions.DBusException, error:
1999
1711
logger.critical(u"DBusException: %s", error)
2000
cleanup()
2001
1712
sys.exit(1)
2002
1713
# End of Avahi example code
2003
1714
2010
1721
main_loop.run()
2011
1722
except AvahiError, error:
2012
1723
logger.critical(u"AvahiError: %s", error)
2013
cleanup()
2014
1724
sys.exit(1)
2015
1725
except KeyboardInterrupt:
2016
1726
if debug:
2017
1727
print >> sys.stderr
2018
1728
logger.debug(u"Server received KeyboardInterrupt")
2019
1729
logger.debug(u"Server exiting")
2020
# Must run before the D-Bus bus name gets deregistered
2021
cleanup()
2022
1730
2023
1731
if __name__ == '__main__':
2024
1732
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0