81
82
SO_BINDTODEVICE = None
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
88
89
syslogger = (logging.handlers.SysLogHandler
89
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
address = "/dev/log"))
91
address = str("/dev/log")))
91
92
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
('Mandos [%(process)d]: %(levelname)s:'
94
95
logger.addHandler(syslogger)
96
97
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
101
logger.addHandler(console)
102
103
class AvahiError(Exception):
150
151
self.group = None # our entry group
151
152
self.server = None
154
self.entry_group_state_changed_match = None
153
155
def rename(self):
154
156
"""Derived from the Avahi example code"""
155
157
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
158
160
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
161
raise AvahiServiceError("Too many renames")
160
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
logger.info("Changing Zeroconf service name to %r ...",
163
165
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
176
self.rename_count += 1
175
177
def remove(self):
176
178
"""Derived from the Avahi example code"""
177
179
if self.group is not None:
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
186
if self.entry_group_state_changed_match is not None:
187
self.entry_group_state_changed_match.remove()
188
self.entry_group_state_changed_match = None
180
190
"""Derived from the Avahi example code"""
181
if self.group is None:
182
self.group = dbus.Interface(
183
self.bus.get_object(avahi.DBUS_NAME,
184
self.server.EntryGroupNew()),
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
self.entry_group_state_changed_match = (
198
self.group.connect_to_signal(
199
'StateChanged', self .entry_group_state_changed))
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
201
self.name, self.type)
191
202
self.group.AddService(
199
210
self.group.Commit()
200
211
def entry_group_state_changed(self, state, error):
201
212
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
213
logger.debug("Avahi entry group state change: %i", state)
204
215
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
216
logger.debug("Zeroconf service established.")
206
217
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
218
logger.info("Zeroconf service name collision.")
209
220
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
221
logger.critical("Avahi: Error in group state changed %s",
212
raise AvahiGroupError(u"State changed: %s"
223
raise AvahiGroupError("State changed: %s"
213
224
% unicode(error))
214
225
def cleanup(self):
215
226
"""Derived from the Avahi example code"""
216
if self.group is not None:
219
def server_state_changed(self, state):
228
def server_state_changed(self, state, error=None):
220
229
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
230
logger.debug("Avahi server state change: %i", state)
231
bad_states = { avahi.SERVER_INVALID:
232
"Zeroconf server invalid",
233
avahi.SERVER_REGISTERING: None,
234
avahi.SERVER_COLLISION:
235
"Zeroconf server name collision",
236
avahi.SERVER_FAILURE:
237
"Zeroconf server failure" }
238
if state in bad_states:
239
if bad_states[state]:
240
logger.error(bad_states[state])
225
242
elif state == avahi.SERVER_RUNNING:
245
logger.debug("Unknown state: %r", state)
227
246
def activate(self):
228
247
"""Derived from the Avahi example code"""
229
248
if self.server is None:
230
249
self.server = dbus.Interface(
231
250
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
251
avahi.DBUS_PATH_SERVER,
252
follow_name_owner_changes=True),
233
253
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
254
self.server.connect_to_signal("StateChanged",
235
255
self.server_state_changed)
236
256
self.server_state_changed(self.server.GetState())
255
275
created: datetime.datetime(); (UTC) object creation
256
276
current_checker_command: string; current running checker_command
257
277
disable_hook: If set, called by disable() as disable_hook(self)
258
disable_initiator_tag: - '' -
278
disable_initiator_tag: a gobject event source tag, or None
260
280
fingerprint: string (40 or 32 hexadecimal digits); used to
261
281
uniquely identify the client
262
282
host: string; available for use by the checker command
263
283
interval: datetime.timedelta(); How often to start a new checker
284
last_approval_request: datetime.datetime(); (UTC) or None
264
285
last_checked_ok: datetime.datetime(); (UTC) or None
265
286
last_enabled: datetime.datetime(); (UTC)
266
287
name: string; from the config file, used in log messages and
271
292
runtime_expansions: Allowed attributes for runtime expansion.
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")
295
runtime_expansions = ("approval_delay", "approval_duration",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
298
"last_enabled", "name", "timeout")
280
301
def _timedelta_to_milliseconds(td):
302
323
if config is None:
304
logger.debug(u"Creating client %r", self.name)
325
logger.debug("Creating client %r", self.name)
305
326
# Uppercase and remove spaces from fingerprint for later
306
327
# comparison purposes with return value from the fingerprint()
308
self.fingerprint = (config[u"fingerprint"].upper()
310
logger.debug(u" Fingerprint: %s", self.fingerprint)
311
if u"secret" in config:
312
self.secret = config[u"secret"].decode(u"base64")
313
elif u"secfile" in config:
329
self.fingerprint = (config["fingerprint"].upper()
331
logger.debug(" Fingerprint: %s", self.fingerprint)
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
314
335
with open(os.path.expanduser(os.path.expandvars
315
(config[u"secfile"])),
336
(config["secfile"])),
316
337
"rb") as secfile:
317
338
self.secret = secfile.read()
319
raise TypeError(u"No secret or secfile for client %s"
340
raise TypeError("No secret or secfile for client %s"
321
self.host = config.get(u"host", u"")
342
self.host = config.get("host", "")
322
343
self.created = datetime.datetime.utcnow()
323
344
self.enabled = False
345
self.last_approval_request = None
324
346
self.last_enabled = None
325
347
self.last_checked_ok = None
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
328
350
self.disable_hook = disable_hook
329
351
self.checker = None
330
352
self.checker_initiator_tag = None
331
353
self.disable_initiator_tag = None
332
354
self.checker_callback_tag = None
333
self.checker_command = config[u"checker"]
355
self.checker_command = config["checker"]
334
356
self.current_checker_command = None
335
357
self.last_connect = None
336
358
self._approved = None
337
self.approved_by_default = config.get(u"approved_by_default",
359
self.approved_by_default = config.get("approved_by_default",
339
361
self.approvals_pending = 0
340
362
self.approval_delay = string_to_delta(
341
config[u"approval_delay"])
363
config["approval_delay"])
342
364
self.approval_duration = string_to_delta(
343
config[u"approval_duration"])
365
config["approval_duration"])
344
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
346
368
def send_changedstate(self):
376
398
self.send_changedstate()
378
logger.info(u"Disabling client %s", self.name)
379
if getattr(self, u"disable_initiator_tag", False):
400
logger.info("Disabling client %s", self.name)
401
if getattr(self, "disable_initiator_tag", False):
380
402
gobject.source_remove(self.disable_initiator_tag)
381
403
self.disable_initiator_tag = None
382
if getattr(self, u"checker_initiator_tag", False):
404
if getattr(self, "checker_initiator_tag", False):
383
405
gobject.source_remove(self.checker_initiator_tag)
384
406
self.checker_initiator_tag = None
385
407
self.stop_checker()
439
464
# If a checker exists, make sure it is not a zombie
441
466
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
442
except (AttributeError, OSError), error:
467
except (AttributeError, OSError) as error:
443
468
if (isinstance(error, OSError)
444
469
and error.errno != errno.ECHILD):
448
logger.warning(u"Checker was a zombie")
473
logger.warning("Checker was a zombie")
449
474
gobject.source_remove(self.checker_callback_tag)
450
475
self.checker_callback(pid, status,
451
476
self.current_checker_command)
458
483
# Escape attributes for the shell
459
484
escaped_attrs = dict(
461
re.escape(unicode(str(getattr(self, attr, u"")),
486
re.escape(unicode(str(getattr(self, attr, "")),
465
490
self.runtime_expansions)
468
493
command = self.checker_command % escaped_attrs
469
except TypeError, error:
470
logger.error(u'Could not format string "%s":'
471
u' %s', self.checker_command, error)
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
472
497
return True # Try again later
473
498
self.current_checker_command = command
475
logger.info(u"Starting checker %r for %s",
500
logger.info("Starting checker %r for %s",
476
501
command, self.name)
477
502
# We don't need to redirect stdout and stderr, since
478
503
# in normal mode, that is already done by daemon(),
502
527
if self.checker_callback_tag:
503
528
gobject.source_remove(self.checker_callback_tag)
504
529
self.checker_callback_tag = None
505
if getattr(self, u"checker", None) is None:
530
if getattr(self, "checker", None) is None:
507
logger.debug(u"Stopping checker for %(name)s", vars(self))
532
logger.debug("Stopping checker for %(name)s", vars(self))
509
534
os.kill(self.checker.pid, signal.SIGTERM)
511
536
#if self.checker.poll() is None:
512
537
# os.kill(self.checker.pid, signal.SIGKILL)
513
except OSError, error:
538
except OSError as error:
514
539
if error.errno != errno.ESRCH: # No such process
516
541
self.checker = None
518
def dbus_service_property(dbus_interface, signature=u"v",
519
access=u"readwrite", byte_arrays=False):
543
def dbus_service_property(dbus_interface, signature="v",
544
access="readwrite", byte_arrays=False):
520
545
"""Decorators for marking methods of a DBusObjectWithProperties to
521
546
become properties on the D-Bus.
530
555
# Encoding deeply encoded byte arrays is not supported yet by the
531
556
# "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)
557
if byte_arrays and signature != "ay":
558
raise ValueError("Byte arrays not supported for non-'ay'"
559
" signature %r" % signature)
535
560
def decorator(func):
536
561
func._dbus_is_property = True
537
562
func._dbus_interface = dbus_interface
538
563
func._dbus_signature = signature
539
564
func._dbus_access = access
540
565
func._dbus_name = func.__name__
541
if func._dbus_name.endswith(u"_dbus_property"):
566
if func._dbus_name.endswith("_dbus_property"):
542
567
func._dbus_name = func._dbus_name[:-14]
543
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
568
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
600
625
# No such property
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
607
632
def Get(self, interface_name, property_name):
608
633
"""Standard D-Bus property Get() method, see D-Bus standard.
610
635
prop = self._get_dbus_property(interface_name, property_name)
611
if prop._dbus_access == u"write":
636
if prop._dbus_access == "write":
612
637
raise DBusPropertyAccessException(property_name)
614
if not hasattr(value, u"variant_level"):
639
if not hasattr(value, "variant_level"):
616
641
return type(value)(value, variant_level=value.variant_level+1)
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
643
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
619
644
def Set(self, interface_name, property_name, value):
620
645
"""Standard D-Bus property Set() method, see D-Bus standard.
622
647
prop = self._get_dbus_property(interface_name, property_name)
623
if prop._dbus_access == u"read":
648
if prop._dbus_access == "read":
624
649
raise DBusPropertyAccessException(property_name)
625
if prop._dbus_get_args_options[u"byte_arrays"]:
650
if prop._dbus_get_args_options["byte_arrays"]:
626
651
# The byte_arrays option is not supported yet on
627
652
# signatures other than "ay".
628
if prop._dbus_signature != u"ay":
653
if prop._dbus_signature != "ay":
630
655
value = dbus.ByteArray(''.join(unichr(byte)
631
656
for byte in value))
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
659
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
out_signature="a{sv}")
636
661
def GetAll(self, interface_name):
637
662
"""Standard D-Bus property GetAll() method, see D-Bus
646
671
# Interface non-empty but did not match
648
673
# Ignore write-only properties
649
if prop._dbus_access == u"write":
674
if prop._dbus_access == "write":
652
if not hasattr(value, u"variant_level"):
677
if not hasattr(value, "variant_level"):
653
678
all[name] = value
655
680
all[name] = type(value)(value, variant_level=
656
681
value.variant_level+1)
657
return dbus.Dictionary(all, signature=u"sv")
682
return dbus.Dictionary(all, signature="sv")
659
684
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
661
686
path_keyword='object_path',
662
687
connection_keyword='connection')
663
688
def Introspect(self, object_path, connection):
669
694
document = xml.dom.minidom.parseString(xmlstring)
670
695
def make_tag(document, name, prop):
671
e = document.createElement(u"property")
672
e.setAttribute(u"name", name)
673
e.setAttribute(u"type", prop._dbus_signature)
674
e.setAttribute(u"access", prop._dbus_access)
696
e = document.createElement("property")
697
e.setAttribute("name", name)
698
e.setAttribute("type", prop._dbus_signature)
699
e.setAttribute("access", prop._dbus_access)
676
for if_tag in document.getElementsByTagName(u"interface"):
701
for if_tag in document.getElementsByTagName("interface"):
677
702
for tag in (make_tag(document, name, prop)
679
704
in self._get_all_dbus_properties()
680
705
if prop._dbus_interface
681
== if_tag.getAttribute(u"name")):
706
== if_tag.getAttribute("name")):
682
707
if_tag.appendChild(tag)
683
708
# Add the names to the return values for the
684
709
# "org.freedesktop.DBus.Properties" methods
685
if (if_tag.getAttribute(u"name")
686
== u"org.freedesktop.DBus.Properties"):
687
for cn in if_tag.getElementsByTagName(u"method"):
688
if cn.getAttribute(u"name") == u"Get":
689
for arg in cn.getElementsByTagName(u"arg"):
690
if (arg.getAttribute(u"direction")
692
arg.setAttribute(u"name", u"value")
693
elif cn.getAttribute(u"name") == u"GetAll":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"props")
698
xmlstring = document.toxml(u"utf-8")
710
if (if_tag.getAttribute("name")
711
== "org.freedesktop.DBus.Properties"):
712
for cn in if_tag.getElementsByTagName("method"):
713
if cn.getAttribute("name") == "Get":
714
for arg in cn.getElementsByTagName("arg"):
715
if (arg.getAttribute("direction")
717
arg.setAttribute("name", "value")
718
elif cn.getAttribute("name") == "GetAll":
719
for arg in cn.getElementsByTagName("arg"):
720
if (arg.getAttribute("direction")
722
arg.setAttribute("name", "props")
723
xmlstring = document.toxml("utf-8")
699
724
document.unlink()
700
725
except (AttributeError, xml.dom.DOMException,
701
xml.parsers.expat.ExpatError), error:
702
logger.error(u"Failed to override Introspection method",
726
xml.parsers.expat.ExpatError) as error:
727
logger.error("Failed to override Introspection method",
752
779
variant_level=variant_level)
754
781
def enable(self):
755
oldstate = getattr(self, u"enabled", False)
782
oldstate = getattr(self, "enabled", False)
756
783
r = Client.enable(self)
757
784
if oldstate != self.enabled:
758
785
# Emit D-Bus signals
759
self.PropertyChanged(dbus.String(u"Enabled"),
786
self.PropertyChanged(dbus.String("Enabled"),
760
787
dbus.Boolean(True, variant_level=1))
761
788
self.PropertyChanged(
762
dbus.String(u"LastEnabled"),
789
dbus.String("LastEnabled"),
763
790
self._datetime_to_dbus(self.last_enabled,
764
791
variant_level=1))
767
794
def disable(self, quiet = False):
768
oldstate = getattr(self, u"enabled", False)
795
oldstate = getattr(self, "enabled", False)
769
796
r = Client.disable(self, quiet=quiet)
770
797
if not quiet and oldstate != self.enabled:
771
798
# Emit D-Bus signal
772
self.PropertyChanged(dbus.String(u"Enabled"),
799
self.PropertyChanged(dbus.String("Enabled"),
773
800
dbus.Boolean(False, variant_level=1))
807
834
def checked_ok(self, *args, **kwargs):
808
r = Client.checked_ok(self, *args, **kwargs)
835
Client.checked_ok(self, *args, **kwargs)
809
836
# Emit D-Bus signal
810
837
self.PropertyChanged(
811
dbus.String(u"LastCheckedOK"),
838
dbus.String("LastCheckedOK"),
812
839
(self._datetime_to_dbus(self.last_checked_ok,
813
840
variant_level=1)))
842
def need_approval(self, *args, **kwargs):
843
r = Client.need_approval(self, *args, **kwargs)
845
self.PropertyChanged(
846
dbus.String("LastApprovalRequest"),
847
(self._datetime_to_dbus(self.last_approval_request,
816
851
def start_checker(self, *args, **kwargs):
826
861
# Emit D-Bus signal
827
862
self.CheckerStarted(self.current_checker_command)
828
863
self.PropertyChanged(
829
dbus.String(u"CheckerRunning"),
864
dbus.String("CheckerRunning"),
830
865
dbus.Boolean(True, variant_level=1))
833
868
def stop_checker(self, *args, **kwargs):
834
old_checker = getattr(self, u"checker", None)
869
old_checker = getattr(self, "checker", None)
835
870
r = Client.stop_checker(self, *args, **kwargs)
836
871
if (old_checker is not None
837
and getattr(self, u"checker", None) is None):
838
self.PropertyChanged(dbus.String(u"CheckerRunning"),
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
839
874
dbus.Boolean(False, variant_level=1))
854
889
## D-Bus methods, signals & properties
855
_interface = u"se.bsnet.fukt.Mandos.Client"
890
_interface = "se.bsnet.fukt.Mandos.Client"
859
894
# CheckerCompleted - signal
860
@dbus.service.signal(_interface, signature=u"nxs")
895
@dbus.service.signal(_interface, signature="nxs")
861
896
def CheckerCompleted(self, exitcode, waitstatus, command):
865
900
# CheckerStarted - signal
866
@dbus.service.signal(_interface, signature=u"s")
901
@dbus.service.signal(_interface, signature="s")
867
902
def CheckerStarted(self, command):
871
906
# PropertyChanged - signal
872
@dbus.service.signal(_interface, signature=u"sv")
907
@dbus.service.signal(_interface, signature="sv")
873
908
def PropertyChanged(self, property, value):
886
921
# Rejected - signal
887
@dbus.service.signal(_interface, signature=u"s")
922
@dbus.service.signal(_interface, signature="s")
888
923
def Rejected(self, reason):
892
927
# NeedApproval - signal
893
@dbus.service.signal(_interface, signature=u"tb")
928
@dbus.service.signal(_interface, signature="tb")
894
929
def NeedApproval(self, timeout, default):
931
return self.need_approval()
900
935
# Approve - method
901
@dbus.service.method(_interface, in_signature=u"b")
936
@dbus.service.method(_interface, in_signature="b")
902
937
def Approve(self, value):
903
938
self.approve(value)
905
940
# CheckedOK - method
906
941
@dbus.service.method(_interface)
907
942
def CheckedOK(self):
908
return self.checked_ok()
910
945
# Enable - method
911
946
@dbus.service.method(_interface)
935
970
# ApprovalPending - property
936
@dbus_service_property(_interface, signature=u"b", access=u"read")
971
@dbus_service_property(_interface, signature="b", access="read")
937
972
def ApprovalPending_dbus_property(self):
938
973
return dbus.Boolean(bool(self.approvals_pending))
940
975
# ApprovedByDefault - property
941
@dbus_service_property(_interface, signature=u"b",
976
@dbus_service_property(_interface, signature="b",
943
978
def ApprovedByDefault_dbus_property(self, value=None):
944
979
if value is None: # get
945
980
return dbus.Boolean(self.approved_by_default)
946
981
self.approved_by_default = bool(value)
947
982
# Emit D-Bus signal
948
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
983
self.PropertyChanged(dbus.String("ApprovedByDefault"),
949
984
dbus.Boolean(value, variant_level=1))
951
986
# ApprovalDelay - property
952
@dbus_service_property(_interface, signature=u"t",
987
@dbus_service_property(_interface, signature="t",
954
989
def ApprovalDelay_dbus_property(self, value=None):
955
990
if value is None: # get
956
991
return dbus.UInt64(self.approval_delay_milliseconds())
957
992
self.approval_delay = datetime.timedelta(0, 0, 0, value)
958
993
# Emit D-Bus signal
959
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
994
self.PropertyChanged(dbus.String("ApprovalDelay"),
960
995
dbus.UInt64(value, variant_level=1))
962
997
# ApprovalDuration - property
963
@dbus_service_property(_interface, signature=u"t",
998
@dbus_service_property(_interface, signature="t",
965
1000
def ApprovalDuration_dbus_property(self, value=None):
966
1001
if value is None: # get
967
1002
return dbus.UInt64(self._timedelta_to_milliseconds(
968
1003
self.approval_duration))
969
1004
self.approval_duration = datetime.timedelta(0, 0, 0, value)
970
1005
# Emit D-Bus signal
971
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
1006
self.PropertyChanged(dbus.String("ApprovalDuration"),
972
1007
dbus.UInt64(value, variant_level=1))
974
1009
# Name - property
975
@dbus_service_property(_interface, signature=u"s", access=u"read")
1010
@dbus_service_property(_interface, signature="s", access="read")
976
1011
def Name_dbus_property(self):
977
1012
return dbus.String(self.name)
979
1014
# Fingerprint - property
980
@dbus_service_property(_interface, signature=u"s", access=u"read")
1015
@dbus_service_property(_interface, signature="s", access="read")
981
1016
def Fingerprint_dbus_property(self):
982
1017
return dbus.String(self.fingerprint)
984
1019
# Host - property
985
@dbus_service_property(_interface, signature=u"s",
1020
@dbus_service_property(_interface, signature="s",
987
1022
def Host_dbus_property(self, value=None):
988
1023
if value is None: # get
989
1024
return dbus.String(self.host)
990
1025
self.host = value
991
1026
# Emit D-Bus signal
992
self.PropertyChanged(dbus.String(u"Host"),
1027
self.PropertyChanged(dbus.String("Host"),
993
1028
dbus.String(value, variant_level=1))
995
1030
# Created - property
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1031
@dbus_service_property(_interface, signature="s", access="read")
997
1032
def Created_dbus_property(self):
998
1033
return dbus.String(self._datetime_to_dbus(self.created))
1000
1035
# LastEnabled - property
1001
@dbus_service_property(_interface, signature=u"s", access=u"read")
1036
@dbus_service_property(_interface, signature="s", access="read")
1002
1037
def LastEnabled_dbus_property(self):
1003
1038
if self.last_enabled is None:
1004
return dbus.String(u"")
1039
return dbus.String("")
1005
1040
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1007
1042
# Enabled - property
1008
@dbus_service_property(_interface, signature=u"b",
1009
access=u"readwrite")
1043
@dbus_service_property(_interface, signature="b",
1010
1045
def Enabled_dbus_property(self, value=None):
1011
1046
if value is None: # get
1012
1047
return dbus.Boolean(self.enabled)
1018
1053
# LastCheckedOK - property
1019
@dbus_service_property(_interface, signature=u"s",
1020
access=u"readwrite")
1054
@dbus_service_property(_interface, signature="s",
1021
1056
def LastCheckedOK_dbus_property(self, value=None):
1022
1057
if value is not None:
1023
1058
self.checked_ok()
1025
1060
if self.last_checked_ok is None:
1026
return dbus.String(u"")
1061
return dbus.String("")
1027
1062
return dbus.String(self._datetime_to_dbus(self
1028
1063
.last_checked_ok))
1065
# LastApprovalRequest - property
1066
@dbus_service_property(_interface, signature="s", access="read")
1067
def LastApprovalRequest_dbus_property(self):
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1030
1074
# Timeout - property
1031
@dbus_service_property(_interface, signature=u"t",
1032
access=u"readwrite")
1075
@dbus_service_property(_interface, signature="t",
1033
1077
def Timeout_dbus_property(self, value=None):
1034
1078
if value is None: # get
1035
1079
return dbus.UInt64(self.timeout_milliseconds())
1036
1080
self.timeout = datetime.timedelta(0, 0, 0, value)
1037
1081
# Emit D-Bus signal
1038
self.PropertyChanged(dbus.String(u"Timeout"),
1082
self.PropertyChanged(dbus.String("Timeout"),
1039
1083
dbus.UInt64(value, variant_level=1))
1040
if getattr(self, u"disable_initiator_tag", None) is None:
1084
if getattr(self, "disable_initiator_tag", None) is None:
1042
1086
# Reschedule timeout
1043
1087
gobject.source_remove(self.disable_initiator_tag)
1056
1100
(time_to_die, self.disable))
1058
1102
# Interval - property
1059
@dbus_service_property(_interface, signature=u"t",
1060
access=u"readwrite")
1103
@dbus_service_property(_interface, signature="t",
1061
1105
def Interval_dbus_property(self, value=None):
1062
1106
if value is None: # get
1063
1107
return dbus.UInt64(self.interval_milliseconds())
1064
1108
self.interval = datetime.timedelta(0, 0, 0, value)
1065
1109
# Emit D-Bus signal
1066
self.PropertyChanged(dbus.String(u"Interval"),
1110
self.PropertyChanged(dbus.String("Interval"),
1067
1111
dbus.UInt64(value, variant_level=1))
1068
if getattr(self, u"checker_initiator_tag", None) is None:
1112
if getattr(self, "checker_initiator_tag", None) is None:
1070
1114
# Reschedule checker run
1071
1115
gobject.source_remove(self.checker_initiator_tag)
1074
1118
self.start_checker() # Start one now, too
1076
1120
# Checker - property
1077
@dbus_service_property(_interface, signature=u"s",
1078
access=u"readwrite")
1121
@dbus_service_property(_interface, signature="s",
1079
1123
def Checker_dbus_property(self, value=None):
1080
1124
if value is None: # get
1081
1125
return dbus.String(self.checker_command)
1082
1126
self.checker_command = value
1083
1127
# Emit D-Bus signal
1084
self.PropertyChanged(dbus.String(u"Checker"),
1128
self.PropertyChanged(dbus.String("Checker"),
1085
1129
dbus.String(self.checker_command,
1086
1130
variant_level=1))
1088
1132
# CheckerRunning - property
1089
@dbus_service_property(_interface, signature=u"b",
1090
access=u"readwrite")
1133
@dbus_service_property(_interface, signature="b",
1091
1135
def CheckerRunning_dbus_property(self, value=None):
1092
1136
if value is None: # get
1093
1137
return dbus.Boolean(self.checker is not None)
1159
1203
# no X.509 keys are added to it. Therefore, we can use it
1160
1204
# here despite using OpenPGP certificates.
1162
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1163
# u"+AES-256-CBC", u"+SHA1",
1164
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1206
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
# "+AES-256-CBC", "+SHA1",
1208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1166
1210
# Use a fallback default, since this MUST be set.
1167
1211
priority = self.server.gnutls_priority
1168
1212
if priority is None:
1169
priority = u"NORMAL"
1170
1214
(gnutls.library.functions
1171
1215
.gnutls_priority_set_direct(session._c_object,
1172
1216
priority, None))
1174
1218
# Start communication using the Mandos protocol
1175
1219
# Get protocol number
1176
1220
line = self.request.makefile().readline()
1177
logger.debug(u"Protocol version: %r", line)
1221
logger.debug("Protocol version: %r", line)
1179
1223
if int(line.strip().split()[0]) > 1:
1180
1224
raise RuntimeError
1181
except (ValueError, IndexError, RuntimeError), error:
1182
logger.error(u"Unknown protocol version: %s", error)
1225
except (ValueError, IndexError, RuntimeError) as error:
1226
logger.error("Unknown protocol version: %s", error)
1185
1229
# Start GnuTLS connection
1187
1231
session.handshake()
1188
except gnutls.errors.GNUTLSError, error:
1189
logger.warning(u"Handshake failed: %s", error)
1232
except gnutls.errors.GNUTLSError as error:
1233
logger.warning("Handshake failed: %s", error)
1190
1234
# Do not run session.bye() here: the session is not
1191
1235
# established. Just abandon the request.
1193
logger.debug(u"Handshake succeeded")
1237
logger.debug("Handshake succeeded")
1195
1239
approval_required = False
1198
1242
fpr = self.fingerprint(self.peer_certificate
1200
except (TypeError, gnutls.errors.GNUTLSError), error:
1201
logger.warning(u"Bad certificate: %s", error)
1245
gnutls.errors.GNUTLSError) as error:
1246
logger.warning("Bad certificate: %s", error)
1203
logger.debug(u"Fingerprint: %s", fpr)
1248
logger.debug("Fingerprint: %s", fpr)
1206
1251
client = ProxyClient(child_pipe, fpr,
1407
1452
bind to an address or port if they were not specified."""
1408
1453
if self.interface is not None:
1409
1454
if SO_BINDTODEVICE is None:
1410
logger.error(u"SO_BINDTODEVICE does not exist;"
1411
u" cannot bind to interface %s",
1455
logger.error("SO_BINDTODEVICE does not exist;"
1456
" cannot bind to interface %s",
1412
1457
self.interface)
1415
1460
self.socket.setsockopt(socket.SOL_SOCKET,
1416
1461
SO_BINDTODEVICE,
1417
1462
str(self.interface
1419
except socket.error, error:
1464
except socket.error as error:
1420
1465
if error[0] == errno.EPERM:
1421
logger.error(u"No permission to"
1422
u" bind to interface %s",
1466
logger.error("No permission to"
1467
" bind to interface %s",
1423
1468
self.interface)
1424
1469
elif error[0] == errno.ENOPROTOOPT:
1425
logger.error(u"SO_BINDTODEVICE not available;"
1426
u" cannot bind to interface %s",
1470
logger.error("SO_BINDTODEVICE not available;"
1471
" cannot bind to interface %s",
1427
1472
self.interface)
1486
1531
def handle_ipc(self, source, condition, parent_pipe=None,
1487
1532
client_object=None):
1488
1533
condition_names = {
1489
gobject.IO_IN: u"IN", # There is data to read.
1490
gobject.IO_OUT: u"OUT", # Data can be written (without
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1492
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1493
gobject.IO_ERR: u"ERR", # Error condition.
1494
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1495
1540
# broken, usually for pipes and
1557
1602
def string_to_delta(interval):
1558
1603
"""Parse a string and return a datetime.timedelta
1560
>>> string_to_delta(u'7d')
1605
>>> string_to_delta('7d')
1561
1606
datetime.timedelta(7)
1562
>>> string_to_delta(u'60s')
1607
>>> string_to_delta('60s')
1563
1608
datetime.timedelta(0, 60)
1564
>>> string_to_delta(u'60m')
1609
>>> string_to_delta('60m')
1565
1610
datetime.timedelta(0, 3600)
1566
>>> string_to_delta(u'24h')
1611
>>> string_to_delta('24h')
1567
1612
datetime.timedelta(1)
1568
>>> string_to_delta(u'1w')
1613
>>> string_to_delta('1w')
1569
1614
datetime.timedelta(7)
1570
>>> string_to_delta(u'5m 30s')
1615
>>> string_to_delta('5m 30s')
1571
1616
datetime.timedelta(0, 330)
1573
1618
timevalue = datetime.timedelta(0)
1576
1621
suffix = unicode(s[-1])
1577
1622
value = int(s[:-1])
1579
1624
delta = datetime.timedelta(value)
1580
elif suffix == u"s":
1581
1626
delta = datetime.timedelta(0, value)
1582
elif suffix == u"m":
1583
1628
delta = datetime.timedelta(0, 0, 0, 0, value)
1584
elif suffix == u"h":
1585
1630
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1586
elif suffix == u"w":
1587
1632
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1589
raise ValueError(u"Unknown suffix %r" % suffix)
1590
except (ValueError, IndexError), e:
1591
raise ValueError(e.message)
1634
raise ValueError("Unknown suffix %r" % suffix)
1635
except (ValueError, IndexError) as e:
1636
raise ValueError(*(e.args))
1592
1637
timevalue += delta
1593
1638
return timevalue
1600
1645
global if_nametoindex
1602
1647
if_nametoindex = (ctypes.cdll.LoadLibrary
1603
(ctypes.util.find_library(u"c"))
1648
(ctypes.util.find_library("c"))
1604
1649
.if_nametoindex)
1605
1650
except (OSError, AttributeError):
1606
logger.warning(u"Doing if_nametoindex the hard way")
1651
logger.warning("Doing if_nametoindex the hard way")
1607
1652
def if_nametoindex(interface):
1608
1653
"Get an interface index the hard way, i.e. using fcntl()"
1609
1654
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1610
1655
with contextlib.closing(socket.socket()) as s:
1611
1656
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1612
struct.pack(str(u"16s16x"),
1657
struct.pack(str("16s16x"),
1614
interface_index = struct.unpack(str(u"I"),
1659
interface_index = struct.unpack(str("I"),
1615
1660
ifreq[16:20])[0]
1616
1661
return interface_index
1617
1662
return if_nametoindex(interface)
1647
1692
##################################################################
1648
1693
# Parsing of options, both command line and config file
1650
parser = optparse.OptionParser(version = "%%prog %s" % version)
1651
parser.add_option("-i", u"--interface", type=u"string",
1652
metavar="IF", help=u"Bind to interface IF")
1653
parser.add_option("-a", u"--address", type=u"string",
1654
help=u"Address to listen for requests on")
1655
parser.add_option("-p", u"--port", type=u"int",
1656
help=u"Port number to receive requests on")
1657
parser.add_option("--check", action=u"store_true",
1658
help=u"Run self-test")
1659
parser.add_option("--debug", action=u"store_true",
1660
help=u"Debug mode; run in foreground and log to"
1662
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1663
help=u"Debug level for stdout output")
1664
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1665
u" priority string (see GnuTLS documentation)")
1666
parser.add_option("--servicename", type=u"string",
1667
metavar=u"NAME", help=u"Zeroconf service name")
1668
parser.add_option("--configdir", type=u"string",
1669
default=u"/etc/mandos", metavar=u"DIR",
1670
help=u"Directory to search for configuration"
1672
parser.add_option("--no-dbus", action=u"store_false",
1673
dest=u"use_dbus", help=u"Do not provide D-Bus"
1674
u" system bus interface")
1675
parser.add_option("--no-ipv6", action=u"store_false",
1676
dest=u"use_ipv6", help=u"Do not use IPv6")
1677
options = parser.parse_args()[0]
1695
parser = argparse.ArgumentParser()
1696
parser.add_argument("-v", "--version", action="version",
1697
version = "%%(prog)s %s" % version,
1698
help="show version number and exit")
1699
parser.add_argument("-i", "--interface", metavar="IF",
1700
help="Bind to interface IF")
1701
parser.add_argument("-a", "--address",
1702
help="Address to listen for requests on")
1703
parser.add_argument("-p", "--port", type=int,
1704
help="Port number to receive requests on")
1705
parser.add_argument("--check", action="store_true",
1706
help="Run self-test")
1707
parser.add_argument("--debug", action="store_true",
1708
help="Debug mode; run in foreground and log"
1710
parser.add_argument("--debuglevel", metavar="LEVEL",
1711
help="Debug level for stdout output")
1712
parser.add_argument("--priority", help="GnuTLS"
1713
" priority string (see GnuTLS documentation)")
1714
parser.add_argument("--servicename",
1715
metavar="NAME", help="Zeroconf service name")
1716
parser.add_argument("--configdir",
1717
default="/etc/mandos", metavar="DIR",
1718
help="Directory to search for configuration"
1720
parser.add_argument("--no-dbus", action="store_false",
1721
dest="use_dbus", help="Do not provide D-Bus"
1722
" system bus interface")
1723
parser.add_argument("--no-ipv6", action="store_false",
1724
dest="use_ipv6", help="Do not use IPv6")
1725
options = parser.parse_args()
1679
1727
if options.check:
1684
1732
# Default values for config file for server-global settings
1685
server_defaults = { u"interface": u"",
1690
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1691
u"servicename": u"Mandos",
1692
u"use_dbus": u"True",
1693
u"use_ipv6": u"True",
1733
server_defaults = { "interface": "",
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
"servicename": "Mandos",
1697
1745
# Parse config file for server-global settings
1698
1746
server_config = configparser.SafeConfigParser(server_defaults)
1699
1747
del server_defaults
1700
1748
server_config.read(os.path.join(options.configdir,
1702
1750
# Convert the SafeConfigParser object to a dict
1703
1751
server_settings = server_config.defaults()
1704
1752
# Use the appropriate methods on the non-string config options
1705
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1706
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
for option in ("debug", "use_dbus", "use_ipv6"):
1754
server_settings[option] = server_config.getboolean("DEFAULT",
1708
1756
if server_settings["port"]:
1709
server_settings["port"] = server_config.getint(u"DEFAULT",
1757
server_settings["port"] = server_config.getint("DEFAULT",
1711
1759
del server_config
1713
1761
# Override the settings from the config file with command line
1714
1762
# options, if set.
1715
for option in (u"interface", u"address", u"port", u"debug",
1716
u"priority", u"servicename", u"configdir",
1717
u"use_dbus", u"use_ipv6", u"debuglevel"):
1763
for option in ("interface", "address", "port", "debug",
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
1718
1766
value = getattr(options, option)
1719
1767
if value is not None:
1720
1768
server_settings[option] = value
1728
1776
##################################################################
1730
1778
# For convenience
1731
debug = server_settings[u"debug"]
1732
debuglevel = server_settings[u"debuglevel"]
1733
use_dbus = server_settings[u"use_dbus"]
1734
use_ipv6 = server_settings[u"use_ipv6"]
1779
debug = server_settings["debug"]
1780
debuglevel = server_settings["debuglevel"]
1781
use_dbus = server_settings["use_dbus"]
1782
use_ipv6 = server_settings["use_ipv6"]
1736
if server_settings[u"servicename"] != u"Mandos":
1784
if server_settings["servicename"] != "Mandos":
1737
1785
syslogger.setFormatter(logging.Formatter
1738
(u'Mandos (%s) [%%(process)d]:'
1739
u' %%(levelname)s: %%(message)s'
1740
% server_settings[u"servicename"]))
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
1742
1790
# Parse config file with clients
1743
client_defaults = { u"timeout": u"1h",
1745
u"checker": u"fping -q -- %%(host)s",
1747
u"approval_delay": u"0s",
1748
u"approval_duration": u"1s",
1791
client_defaults = { "timeout": "1h",
1793
"checker": "fping -q -- %%(host)s",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1750
1798
client_config = configparser.SafeConfigParser(client_defaults)
1751
client_config.read(os.path.join(server_settings[u"configdir"],
1799
client_config.read(os.path.join(server_settings["configdir"],
1754
1802
global mandos_dbus_service
1755
1803
mandos_dbus_service = None
1757
tcp_server = MandosServer((server_settings[u"address"],
1758
server_settings[u"port"]),
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1760
interface=(server_settings[u"interface"]
1808
interface=(server_settings["interface"]
1762
1810
use_ipv6=use_ipv6,
1763
1811
gnutls_priority=
1764
server_settings[u"priority"],
1812
server_settings["priority"],
1765
1813
use_dbus=use_dbus)
1766
pidfilename = u"/var/run/mandos.pid"
1768
pidfile = open(pidfilename, u"w")
1770
logger.error(u"Could not open file %r", pidfilename)
1815
pidfilename = "/var/run/mandos.pid"
1817
pidfile = open(pidfilename, "w")
1819
logger.error("Could not open file %r", pidfilename)
1773
uid = pwd.getpwnam(u"_mandos").pw_uid
1774
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
1775
1824
except KeyError:
1777
uid = pwd.getpwnam(u"mandos").pw_uid
1778
gid = pwd.getpwnam(u"mandos").pw_gid
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
1779
1828
except KeyError:
1781
uid = pwd.getpwnam(u"nobody").pw_uid
1782
gid = pwd.getpwnam(u"nobody").pw_gid
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
1783
1832
except KeyError:
1789
except OSError, error:
1838
except OSError as error:
1790
1839
if error[0] != errno.EPERM:
1830
1883
# End of Avahi example code
1833
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1834
1887
bus, do_not_queue=True)
1835
except dbus.exceptions.NameExistsException, e:
1836
logger.error(unicode(e) + u", disabling D-Bus")
1888
except dbus.exceptions.NameExistsException as e:
1889
logger.error(unicode(e) + ", disabling D-Bus")
1837
1890
use_dbus = False
1838
server_settings[u"use_dbus"] = False
1891
server_settings["use_dbus"] = False
1839
1892
tcp_server.use_dbus = False
1840
1893
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1841
service = AvahiService(name = server_settings[u"servicename"],
1842
servicetype = u"_mandos._tcp",
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1843
1896
protocol = protocol, bus = bus)
1844
1897
if server_settings["interface"]:
1845
1898
service.interface = (if_nametoindex
1846
(str(server_settings[u"interface"])))
1849
# Close all input and output, do double fork, etc.
1899
(str(server_settings["interface"])))
1852
1901
global multiprocessing_manager
1853
1902
multiprocessing_manager = multiprocessing.Manager()
1873
1922
client_config, section)))
1874
1923
for section in client_config.sections()))
1875
1924
if not tcp_server.clients:
1876
logger.warning(u"No clients defined")
1925
logger.warning("No clients defined")
1881
pidfile.write(str(pid) + "\n")
1884
logger.error(u"Could not write to file %r with PID %d",
1887
# "pidfile" was never created
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1934
logger.error("Could not write to file %r with PID %d",
1937
# "pidfile" was never created
1892
1941
signal.signal(signal.SIGINT, signal.SIG_IGN)
1893
1943
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1894
1944
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1897
1947
class MandosDBusService(dbus.service.Object):
1898
1948
"""A D-Bus proxy object"""
1899
1949
def __init__(self):
1900
dbus.service.Object.__init__(self, bus, u"/")
1901
_interface = u"se.bsnet.fukt.Mandos"
1950
dbus.service.Object.__init__(self, bus, "/")
1951
_interface = "se.bsnet.fukt.Mandos"
1903
@dbus.service.signal(_interface, signature=u"o")
1953
@dbus.service.signal(_interface, signature="o")
1904
1954
def ClientAdded(self, objpath):
1908
@dbus.service.signal(_interface, signature=u"ss")
1958
@dbus.service.signal(_interface, signature="ss")
1909
1959
def ClientNotFound(self, fingerprint, address):
1913
@dbus.service.signal(_interface, signature=u"os")
1963
@dbus.service.signal(_interface, signature="os")
1914
1964
def ClientRemoved(self, objpath, name):
1918
@dbus.service.method(_interface, out_signature=u"ao")
1968
@dbus.service.method(_interface, out_signature="ao")
1919
1969
def GetAllClients(self):
1921
1971
return dbus.Array(c.dbus_object_path
1922
1972
for c in tcp_server.clients)
1924
1974
@dbus.service.method(_interface,
1925
out_signature=u"a{oa{sv}}")
1975
out_signature="a{oa{sv}}")
1926
1976
def GetAllClientsWithProperties(self):
1928
1978
return dbus.Dictionary(
1929
((c.dbus_object_path, c.GetAll(u""))
1979
((c.dbus_object_path, c.GetAll(""))
1930
1980
for c in tcp_server.clients),
1931
signature=u"oa{sv}")
1933
@dbus.service.method(_interface, in_signature=u"o")
1983
@dbus.service.method(_interface, in_signature="o")
1934
1984
def RemoveClient(self, object_path):
1936
1986
for c in tcp_server.clients:
2002
2052
(tcp_server.handle_request
2003
2053
(*args[2:], **kwargs) or True))
2005
logger.debug(u"Starting main loop")
2055
logger.debug("Starting main loop")
2006
2056
main_loop.run()
2007
except AvahiError, error:
2008
logger.critical(u"AvahiError: %s", error)
2057
except AvahiError as error:
2058
logger.critical("AvahiError: %s", error)
2011
2061
except KeyboardInterrupt:
2014
logger.debug(u"Server received KeyboardInterrupt")
2015
logger.debug(u"Server exiting")
2063
print("", file=sys.stderr)
2064
logger.debug("Server received KeyboardInterrupt")
2065
logger.debug("Server exiting")
2016
2066
# Must run before the D-Bus bus name gets deregistered