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"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
177
182
if self.group is not None:
178
183
self.group.Reset()
180
185
"""Derived from the Avahi example code"""
181
187
if self.group is None:
182
188
self.group = dbus.Interface(
183
189
self.bus.get_object(avahi.DBUS_NAME,
184
190
self.server.EntryGroupNew()),
185
191
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.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
196
self.name, self.type)
191
197
self.group.AddService(
199
205
self.group.Commit()
200
206
def entry_group_state_changed(self, state, error):
201
207
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
204
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
206
212
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
209
215
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
212
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
213
219
% unicode(error))
214
220
def cleanup(self):
215
221
"""Derived from the Avahi example code"""
216
222
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
218
228
self.group = None
219
def server_state_changed(self, state):
230
def server_state_changed(self, state, error=None):
220
231
"""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")
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
243
logger.error(bad_states[state])
245
logger.error(bad_states[state] + ": %r", error)
225
247
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
227
254
def activate(self):
228
255
"""Derived from the Avahi example code"""
229
256
if self.server is None:
230
257
self.server = dbus.Interface(
231
258
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
233
261
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
235
263
self.server_state_changed)
236
264
self.server_state_changed(self.server.GetState())
255
283
created: datetime.datetime(); (UTC) object creation
256
284
current_checker_command: string; current running checker_command
257
285
disable_hook: If set, called by disable() as disable_hook(self)
258
disable_initiator_tag: - '' -
286
disable_initiator_tag: a gobject event source tag, or None
260
288
fingerprint: string (40 or 32 hexadecimal digits); used to
261
289
uniquely identify the client
262
290
host: string; available for use by the checker command
263
291
interval: datetime.timedelta(); How often to start a new checker
292
last_approval_request: datetime.datetime(); (UTC) or None
264
293
last_checked_ok: datetime.datetime(); (UTC) or None
265
294
last_enabled: datetime.datetime(); (UTC)
266
295
name: string; from the config file, used in log messages and
271
300
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")
303
runtime_expansions = ("approval_delay", "approval_duration",
304
"created", "enabled", "fingerprint",
305
"host", "interval", "last_checked_ok",
306
"last_enabled", "name", "timeout")
280
309
def _timedelta_to_milliseconds(td):
302
331
if config is None:
304
logger.debug(u"Creating client %r", self.name)
333
logger.debug("Creating client %r", self.name)
305
334
# Uppercase and remove spaces from fingerprint for later
306
335
# 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:
337
self.fingerprint = (config["fingerprint"].upper()
339
logger.debug(" Fingerprint: %s", self.fingerprint)
340
if "secret" in config:
341
self.secret = config["secret"].decode("base64")
342
elif "secfile" in config:
314
343
with open(os.path.expanduser(os.path.expandvars
315
(config[u"secfile"])),
344
(config["secfile"])),
316
345
"rb") as secfile:
317
346
self.secret = secfile.read()
319
raise TypeError(u"No secret or secfile for client %s"
348
raise TypeError("No secret or secfile for client %s"
321
self.host = config.get(u"host", u"")
350
self.host = config.get("host", "")
322
351
self.created = datetime.datetime.utcnow()
323
352
self.enabled = False
353
self.last_approval_request = None
324
354
self.last_enabled = None
325
355
self.last_checked_ok = None
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
356
self.timeout = string_to_delta(config["timeout"])
357
self.interval = string_to_delta(config["interval"])
328
358
self.disable_hook = disable_hook
329
359
self.checker = None
330
360
self.checker_initiator_tag = None
331
361
self.disable_initiator_tag = None
332
362
self.checker_callback_tag = None
333
self.checker_command = config[u"checker"]
363
self.checker_command = config["checker"]
334
364
self.current_checker_command = None
335
365
self.last_connect = None
336
366
self._approved = None
337
self.approved_by_default = config.get(u"approved_by_default",
367
self.approved_by_default = config.get("approved_by_default",
339
369
self.approvals_pending = 0
340
370
self.approval_delay = string_to_delta(
341
config[u"approval_delay"])
371
config["approval_delay"])
342
372
self.approval_duration = string_to_delta(
343
config[u"approval_duration"])
373
config["approval_duration"])
344
374
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
346
376
def send_changedstate(self):
376
406
self.send_changedstate()
378
logger.info(u"Disabling client %s", self.name)
379
if getattr(self, u"disable_initiator_tag", False):
408
logger.info("Disabling client %s", self.name)
409
if getattr(self, "disable_initiator_tag", False):
380
410
gobject.source_remove(self.disable_initiator_tag)
381
411
self.disable_initiator_tag = None
382
if getattr(self, u"checker_initiator_tag", False):
412
if getattr(self, "checker_initiator_tag", False):
383
413
gobject.source_remove(self.checker_initiator_tag)
384
414
self.checker_initiator_tag = None
385
415
self.stop_checker()
439
472
# If a checker exists, make sure it is not a zombie
441
474
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
442
except (AttributeError, OSError), error:
475
except (AttributeError, OSError) as error:
443
476
if (isinstance(error, OSError)
444
477
and error.errno != errno.ECHILD):
448
logger.warning(u"Checker was a zombie")
481
logger.warning("Checker was a zombie")
449
482
gobject.source_remove(self.checker_callback_tag)
450
483
self.checker_callback(pid, status,
451
484
self.current_checker_command)
458
491
# Escape attributes for the shell
459
492
escaped_attrs = dict(
461
re.escape(unicode(str(getattr(self, attr, u"")),
494
re.escape(unicode(str(getattr(self, attr, "")),
465
498
self.runtime_expansions)
468
501
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)
502
except TypeError as error:
503
logger.error('Could not format string "%s":'
504
' %s', self.checker_command, error)
472
505
return True # Try again later
473
506
self.current_checker_command = command
475
logger.info(u"Starting checker %r for %s",
508
logger.info("Starting checker %r for %s",
476
509
command, self.name)
477
510
# We don't need to redirect stdout and stderr, since
478
511
# in normal mode, that is already done by daemon(),
502
535
if self.checker_callback_tag:
503
536
gobject.source_remove(self.checker_callback_tag)
504
537
self.checker_callback_tag = None
505
if getattr(self, u"checker", None) is None:
538
if getattr(self, "checker", None) is None:
507
logger.debug(u"Stopping checker for %(name)s", vars(self))
540
logger.debug("Stopping checker for %(name)s", vars(self))
509
542
os.kill(self.checker.pid, signal.SIGTERM)
511
544
#if self.checker.poll() is None:
512
545
# os.kill(self.checker.pid, signal.SIGKILL)
513
except OSError, error:
546
except OSError as error:
514
547
if error.errno != errno.ESRCH: # No such process
516
549
self.checker = None
518
def dbus_service_property(dbus_interface, signature=u"v",
519
access=u"readwrite", byte_arrays=False):
551
def dbus_service_property(dbus_interface, signature="v",
552
access="readwrite", byte_arrays=False):
520
553
"""Decorators for marking methods of a DBusObjectWithProperties to
521
554
become properties on the D-Bus.
530
563
# Encoding deeply encoded byte arrays is not supported yet by the
531
564
# "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)
565
if byte_arrays and signature != "ay":
566
raise ValueError("Byte arrays not supported for non-'ay'"
567
" signature %r" % signature)
535
568
def decorator(func):
536
569
func._dbus_is_property = True
537
570
func._dbus_interface = dbus_interface
538
571
func._dbus_signature = signature
539
572
func._dbus_access = access
540
573
func._dbus_name = func.__name__
541
if func._dbus_name.endswith(u"_dbus_property"):
574
if func._dbus_name.endswith("_dbus_property"):
542
575
func._dbus_name = func._dbus_name[:-14]
543
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
576
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
600
633
# No such property
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
634
raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
+ interface_name + "."
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
638
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
607
640
def Get(self, interface_name, property_name):
608
641
"""Standard D-Bus property Get() method, see D-Bus standard.
610
643
prop = self._get_dbus_property(interface_name, property_name)
611
if prop._dbus_access == u"write":
644
if prop._dbus_access == "write":
612
645
raise DBusPropertyAccessException(property_name)
614
if not hasattr(value, u"variant_level"):
647
if not hasattr(value, "variant_level"):
616
649
return type(value)(value, variant_level=value.variant_level+1)
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
619
652
def Set(self, interface_name, property_name, value):
620
653
"""Standard D-Bus property Set() method, see D-Bus standard.
622
655
prop = self._get_dbus_property(interface_name, property_name)
623
if prop._dbus_access == u"read":
656
if prop._dbus_access == "read":
624
657
raise DBusPropertyAccessException(property_name)
625
if prop._dbus_get_args_options[u"byte_arrays"]:
658
if prop._dbus_get_args_options["byte_arrays"]:
626
659
# The byte_arrays option is not supported yet on
627
660
# signatures other than "ay".
628
if prop._dbus_signature != u"ay":
661
if prop._dbus_signature != "ay":
630
663
value = dbus.ByteArray(''.join(unichr(byte)
631
664
for byte in value))
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
667
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
668
out_signature="a{sv}")
636
669
def GetAll(self, interface_name):
637
670
"""Standard D-Bus property GetAll() method, see D-Bus
646
679
# Interface non-empty but did not match
648
681
# Ignore write-only properties
649
if prop._dbus_access == u"write":
682
if prop._dbus_access == "write":
652
if not hasattr(value, u"variant_level"):
685
if not hasattr(value, "variant_level"):
653
686
all[name] = value
655
688
all[name] = type(value)(value, variant_level=
656
689
value.variant_level+1)
657
return dbus.Dictionary(all, signature=u"sv")
690
return dbus.Dictionary(all, signature="sv")
659
692
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
661
694
path_keyword='object_path',
662
695
connection_keyword='connection')
663
696
def Introspect(self, object_path, connection):
669
702
document = xml.dom.minidom.parseString(xmlstring)
670
703
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)
704
e = document.createElement("property")
705
e.setAttribute("name", name)
706
e.setAttribute("type", prop._dbus_signature)
707
e.setAttribute("access", prop._dbus_access)
676
for if_tag in document.getElementsByTagName(u"interface"):
709
for if_tag in document.getElementsByTagName("interface"):
677
710
for tag in (make_tag(document, name, prop)
679
712
in self._get_all_dbus_properties()
680
713
if prop._dbus_interface
681
== if_tag.getAttribute(u"name")):
714
== if_tag.getAttribute("name")):
682
715
if_tag.appendChild(tag)
683
716
# Add the names to the return values for the
684
717
# "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")
718
if (if_tag.getAttribute("name")
719
== "org.freedesktop.DBus.Properties"):
720
for cn in if_tag.getElementsByTagName("method"):
721
if cn.getAttribute("name") == "Get":
722
for arg in cn.getElementsByTagName("arg"):
723
if (arg.getAttribute("direction")
725
arg.setAttribute("name", "value")
726
elif cn.getAttribute("name") == "GetAll":
727
for arg in cn.getElementsByTagName("arg"):
728
if (arg.getAttribute("direction")
730
arg.setAttribute("name", "props")
731
xmlstring = document.toxml("utf-8")
699
732
document.unlink()
700
733
except (AttributeError, xml.dom.DOMException,
701
xml.parsers.expat.ExpatError), error:
702
logger.error(u"Failed to override Introspection method",
734
xml.parsers.expat.ExpatError) as error:
735
logger.error("Failed to override Introspection method",
754
787
variant_level=variant_level)
756
789
def enable(self):
757
oldstate = getattr(self, u"enabled", False)
790
oldstate = getattr(self, "enabled", False)
758
791
r = Client.enable(self)
759
792
if oldstate != self.enabled:
760
793
# Emit D-Bus signals
761
self.PropertyChanged(dbus.String(u"Enabled"),
794
self.PropertyChanged(dbus.String("Enabled"),
762
795
dbus.Boolean(True, variant_level=1))
763
796
self.PropertyChanged(
764
dbus.String(u"LastEnabled"),
797
dbus.String("LastEnabled"),
765
798
self._datetime_to_dbus(self.last_enabled,
766
799
variant_level=1))
769
802
def disable(self, quiet = False):
770
oldstate = getattr(self, u"enabled", False)
803
oldstate = getattr(self, "enabled", False)
771
804
r = Client.disable(self, quiet=quiet)
772
805
if not quiet and oldstate != self.enabled:
773
806
# Emit D-Bus signal
774
self.PropertyChanged(dbus.String(u"Enabled"),
807
self.PropertyChanged(dbus.String("Enabled"),
775
808
dbus.Boolean(False, variant_level=1))
809
842
def checked_ok(self, *args, **kwargs):
810
r = Client.checked_ok(self, *args, **kwargs)
843
Client.checked_ok(self, *args, **kwargs)
811
844
# Emit D-Bus signal
812
845
self.PropertyChanged(
813
dbus.String(u"LastCheckedOK"),
846
dbus.String("LastCheckedOK"),
814
847
(self._datetime_to_dbus(self.last_checked_ok,
815
848
variant_level=1)))
850
def need_approval(self, *args, **kwargs):
851
r = Client.need_approval(self, *args, **kwargs)
853
self.PropertyChanged(
854
dbus.String("LastApprovalRequest"),
855
(self._datetime_to_dbus(self.last_approval_request,
818
859
def start_checker(self, *args, **kwargs):
828
869
# Emit D-Bus signal
829
870
self.CheckerStarted(self.current_checker_command)
830
871
self.PropertyChanged(
831
dbus.String(u"CheckerRunning"),
872
dbus.String("CheckerRunning"),
832
873
dbus.Boolean(True, variant_level=1))
835
876
def stop_checker(self, *args, **kwargs):
836
old_checker = getattr(self, u"checker", None)
877
old_checker = getattr(self, "checker", None)
837
878
r = Client.stop_checker(self, *args, **kwargs)
838
879
if (old_checker is not None
839
and getattr(self, u"checker", None) is None):
840
self.PropertyChanged(dbus.String(u"CheckerRunning"),
880
and getattr(self, "checker", None) is None):
881
self.PropertyChanged(dbus.String("CheckerRunning"),
841
882
dbus.Boolean(False, variant_level=1))
856
897
## D-Bus methods, signals & properties
857
_interface = u"se.bsnet.fukt.Mandos.Client"
898
_interface = "se.bsnet.fukt.Mandos.Client"
861
902
# CheckerCompleted - signal
862
@dbus.service.signal(_interface, signature=u"nxs")
903
@dbus.service.signal(_interface, signature="nxs")
863
904
def CheckerCompleted(self, exitcode, waitstatus, command):
867
908
# CheckerStarted - signal
868
@dbus.service.signal(_interface, signature=u"s")
909
@dbus.service.signal(_interface, signature="s")
869
910
def CheckerStarted(self, command):
873
914
# PropertyChanged - signal
874
@dbus.service.signal(_interface, signature=u"sv")
915
@dbus.service.signal(_interface, signature="sv")
875
916
def PropertyChanged(self, property, value):
888
929
# Rejected - signal
889
@dbus.service.signal(_interface, signature=u"s")
930
@dbus.service.signal(_interface, signature="s")
890
931
def Rejected(self, reason):
894
935
# NeedApproval - signal
895
@dbus.service.signal(_interface, signature=u"tb")
936
@dbus.service.signal(_interface, signature="tb")
896
937
def NeedApproval(self, timeout, default):
939
return self.need_approval()
902
943
# Approve - method
903
@dbus.service.method(_interface, in_signature=u"b")
944
@dbus.service.method(_interface, in_signature="b")
904
945
def Approve(self, value):
905
946
self.approve(value)
907
948
# CheckedOK - method
908
949
@dbus.service.method(_interface)
909
950
def CheckedOK(self):
910
return self.checked_ok()
912
953
# Enable - method
913
954
@dbus.service.method(_interface)
937
978
# ApprovalPending - property
938
@dbus_service_property(_interface, signature=u"b", access=u"read")
979
@dbus_service_property(_interface, signature="b", access="read")
939
980
def ApprovalPending_dbus_property(self):
940
981
return dbus.Boolean(bool(self.approvals_pending))
942
983
# ApprovedByDefault - property
943
@dbus_service_property(_interface, signature=u"b",
984
@dbus_service_property(_interface, signature="b",
945
986
def ApprovedByDefault_dbus_property(self, value=None):
946
987
if value is None: # get
947
988
return dbus.Boolean(self.approved_by_default)
948
989
self.approved_by_default = bool(value)
949
990
# Emit D-Bus signal
950
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
991
self.PropertyChanged(dbus.String("ApprovedByDefault"),
951
992
dbus.Boolean(value, variant_level=1))
953
994
# ApprovalDelay - property
954
@dbus_service_property(_interface, signature=u"t",
995
@dbus_service_property(_interface, signature="t",
956
997
def ApprovalDelay_dbus_property(self, value=None):
957
998
if value is None: # get
958
999
return dbus.UInt64(self.approval_delay_milliseconds())
959
1000
self.approval_delay = datetime.timedelta(0, 0, 0, value)
960
1001
# Emit D-Bus signal
961
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
1002
self.PropertyChanged(dbus.String("ApprovalDelay"),
962
1003
dbus.UInt64(value, variant_level=1))
964
1005
# ApprovalDuration - property
965
@dbus_service_property(_interface, signature=u"t",
1006
@dbus_service_property(_interface, signature="t",
967
1008
def ApprovalDuration_dbus_property(self, value=None):
968
1009
if value is None: # get
969
1010
return dbus.UInt64(self._timedelta_to_milliseconds(
970
1011
self.approval_duration))
971
1012
self.approval_duration = datetime.timedelta(0, 0, 0, value)
972
1013
# Emit D-Bus signal
973
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
1014
self.PropertyChanged(dbus.String("ApprovalDuration"),
974
1015
dbus.UInt64(value, variant_level=1))
976
1017
# Name - property
977
@dbus_service_property(_interface, signature=u"s", access=u"read")
1018
@dbus_service_property(_interface, signature="s", access="read")
978
1019
def Name_dbus_property(self):
979
1020
return dbus.String(self.name)
981
1022
# Fingerprint - property
982
@dbus_service_property(_interface, signature=u"s", access=u"read")
1023
@dbus_service_property(_interface, signature="s", access="read")
983
1024
def Fingerprint_dbus_property(self):
984
1025
return dbus.String(self.fingerprint)
986
1027
# Host - property
987
@dbus_service_property(_interface, signature=u"s",
1028
@dbus_service_property(_interface, signature="s",
989
1030
def Host_dbus_property(self, value=None):
990
1031
if value is None: # get
991
1032
return dbus.String(self.host)
992
1033
self.host = value
993
1034
# Emit D-Bus signal
994
self.PropertyChanged(dbus.String(u"Host"),
1035
self.PropertyChanged(dbus.String("Host"),
995
1036
dbus.String(value, variant_level=1))
997
1038
# Created - property
998
@dbus_service_property(_interface, signature=u"s", access=u"read")
1039
@dbus_service_property(_interface, signature="s", access="read")
999
1040
def Created_dbus_property(self):
1000
1041
return dbus.String(self._datetime_to_dbus(self.created))
1002
1043
# LastEnabled - property
1003
@dbus_service_property(_interface, signature=u"s", access=u"read")
1044
@dbus_service_property(_interface, signature="s", access="read")
1004
1045
def LastEnabled_dbus_property(self):
1005
1046
if self.last_enabled is None:
1006
return dbus.String(u"")
1047
return dbus.String("")
1007
1048
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1009
1050
# Enabled - property
1010
@dbus_service_property(_interface, signature=u"b",
1011
access=u"readwrite")
1051
@dbus_service_property(_interface, signature="b",
1012
1053
def Enabled_dbus_property(self, value=None):
1013
1054
if value is None: # get
1014
1055
return dbus.Boolean(self.enabled)
1020
1061
# LastCheckedOK - property
1021
@dbus_service_property(_interface, signature=u"s",
1022
access=u"readwrite")
1062
@dbus_service_property(_interface, signature="s",
1023
1064
def LastCheckedOK_dbus_property(self, value=None):
1024
1065
if value is not None:
1025
1066
self.checked_ok()
1027
1068
if self.last_checked_ok is None:
1028
return dbus.String(u"")
1069
return dbus.String("")
1029
1070
return dbus.String(self._datetime_to_dbus(self
1030
1071
.last_checked_ok))
1073
# LastApprovalRequest - property
1074
@dbus_service_property(_interface, signature="s", access="read")
1075
def LastApprovalRequest_dbus_property(self):
1076
if self.last_approval_request is None:
1077
return dbus.String("")
1078
return dbus.String(self.
1079
_datetime_to_dbus(self
1080
.last_approval_request))
1032
1082
# Timeout - property
1033
@dbus_service_property(_interface, signature=u"t",
1034
access=u"readwrite")
1083
@dbus_service_property(_interface, signature="t",
1035
1085
def Timeout_dbus_property(self, value=None):
1036
1086
if value is None: # get
1037
1087
return dbus.UInt64(self.timeout_milliseconds())
1038
1088
self.timeout = datetime.timedelta(0, 0, 0, value)
1039
1089
# Emit D-Bus signal
1040
self.PropertyChanged(dbus.String(u"Timeout"),
1090
self.PropertyChanged(dbus.String("Timeout"),
1041
1091
dbus.UInt64(value, variant_level=1))
1042
if getattr(self, u"disable_initiator_tag", None) is None:
1092
if getattr(self, "disable_initiator_tag", None) is None:
1044
1094
# Reschedule timeout
1045
1095
gobject.source_remove(self.disable_initiator_tag)
1058
1108
(time_to_die, self.disable))
1060
1110
# Interval - property
1061
@dbus_service_property(_interface, signature=u"t",
1062
access=u"readwrite")
1111
@dbus_service_property(_interface, signature="t",
1063
1113
def Interval_dbus_property(self, value=None):
1064
1114
if value is None: # get
1065
1115
return dbus.UInt64(self.interval_milliseconds())
1066
1116
self.interval = datetime.timedelta(0, 0, 0, value)
1067
1117
# Emit D-Bus signal
1068
self.PropertyChanged(dbus.String(u"Interval"),
1118
self.PropertyChanged(dbus.String("Interval"),
1069
1119
dbus.UInt64(value, variant_level=1))
1070
if getattr(self, u"checker_initiator_tag", None) is None:
1120
if getattr(self, "checker_initiator_tag", None) is None:
1072
1122
# Reschedule checker run
1073
1123
gobject.source_remove(self.checker_initiator_tag)
1076
1126
self.start_checker() # Start one now, too
1078
1128
# Checker - property
1079
@dbus_service_property(_interface, signature=u"s",
1080
access=u"readwrite")
1129
@dbus_service_property(_interface, signature="s",
1081
1131
def Checker_dbus_property(self, value=None):
1082
1132
if value is None: # get
1083
1133
return dbus.String(self.checker_command)
1084
1134
self.checker_command = value
1085
1135
# Emit D-Bus signal
1086
self.PropertyChanged(dbus.String(u"Checker"),
1136
self.PropertyChanged(dbus.String("Checker"),
1087
1137
dbus.String(self.checker_command,
1088
1138
variant_level=1))
1090
1140
# CheckerRunning - property
1091
@dbus_service_property(_interface, signature=u"b",
1092
access=u"readwrite")
1141
@dbus_service_property(_interface, signature="b",
1093
1143
def CheckerRunning_dbus_property(self, value=None):
1094
1144
if value is None: # get
1095
1145
return dbus.Boolean(self.checker is not None)
1161
1211
# no X.509 keys are added to it. Therefore, we can use it
1162
1212
# here despite using OpenPGP certificates.
1164
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1165
# u"+AES-256-CBC", u"+SHA1",
1166
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1214
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1215
# "+AES-256-CBC", "+SHA1",
1216
# "+COMP-NULL", "+CTYPE-OPENPGP",
1168
1218
# Use a fallback default, since this MUST be set.
1169
1219
priority = self.server.gnutls_priority
1170
1220
if priority is None:
1171
priority = u"NORMAL"
1172
1222
(gnutls.library.functions
1173
1223
.gnutls_priority_set_direct(session._c_object,
1174
1224
priority, None))
1176
1226
# Start communication using the Mandos protocol
1177
1227
# Get protocol number
1178
1228
line = self.request.makefile().readline()
1179
logger.debug(u"Protocol version: %r", line)
1229
logger.debug("Protocol version: %r", line)
1181
1231
if int(line.strip().split()[0]) > 1:
1182
1232
raise RuntimeError
1183
except (ValueError, IndexError, RuntimeError), error:
1184
logger.error(u"Unknown protocol version: %s", error)
1233
except (ValueError, IndexError, RuntimeError) as error:
1234
logger.error("Unknown protocol version: %s", error)
1187
1237
# Start GnuTLS connection
1189
1239
session.handshake()
1190
except gnutls.errors.GNUTLSError, error:
1191
logger.warning(u"Handshake failed: %s", error)
1240
except gnutls.errors.GNUTLSError as error:
1241
logger.warning("Handshake failed: %s", error)
1192
1242
# Do not run session.bye() here: the session is not
1193
1243
# established. Just abandon the request.
1195
logger.debug(u"Handshake succeeded")
1245
logger.debug("Handshake succeeded")
1197
1247
approval_required = False
1200
1250
fpr = self.fingerprint(self.peer_certificate
1202
except (TypeError, gnutls.errors.GNUTLSError), error:
1203
logger.warning(u"Bad certificate: %s", error)
1253
gnutls.errors.GNUTLSError) as error:
1254
logger.warning("Bad certificate: %s", error)
1205
logger.debug(u"Fingerprint: %s", fpr)
1256
logger.debug("Fingerprint: %s", fpr)
1208
1259
client = ProxyClient(child_pipe, fpr,
1409
1460
bind to an address or port if they were not specified."""
1410
1461
if self.interface is not None:
1411
1462
if SO_BINDTODEVICE is None:
1412
logger.error(u"SO_BINDTODEVICE does not exist;"
1413
u" cannot bind to interface %s",
1463
logger.error("SO_BINDTODEVICE does not exist;"
1464
" cannot bind to interface %s",
1414
1465
self.interface)
1417
1468
self.socket.setsockopt(socket.SOL_SOCKET,
1418
1469
SO_BINDTODEVICE,
1419
1470
str(self.interface
1421
except socket.error, error:
1472
except socket.error as error:
1422
1473
if error[0] == errno.EPERM:
1423
logger.error(u"No permission to"
1424
u" bind to interface %s",
1474
logger.error("No permission to"
1475
" bind to interface %s",
1425
1476
self.interface)
1426
1477
elif error[0] == errno.ENOPROTOOPT:
1427
logger.error(u"SO_BINDTODEVICE not available;"
1428
u" cannot bind to interface %s",
1478
logger.error("SO_BINDTODEVICE not available;"
1479
" cannot bind to interface %s",
1429
1480
self.interface)
1488
1539
def handle_ipc(self, source, condition, parent_pipe=None,
1489
1540
client_object=None):
1490
1541
condition_names = {
1491
gobject.IO_IN: u"IN", # There is data to read.
1492
gobject.IO_OUT: u"OUT", # Data can be written (without
1542
gobject.IO_IN: "IN", # There is data to read.
1543
gobject.IO_OUT: "OUT", # Data can be written (without
1494
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1495
gobject.IO_ERR: u"ERR", # Error condition.
1496
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1545
gobject.IO_PRI: "PRI", # There is urgent data to read.
1546
gobject.IO_ERR: "ERR", # Error condition.
1547
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1497
1548
# broken, usually for pipes and
1559
1610
def string_to_delta(interval):
1560
1611
"""Parse a string and return a datetime.timedelta
1562
>>> string_to_delta(u'7d')
1613
>>> string_to_delta('7d')
1563
1614
datetime.timedelta(7)
1564
>>> string_to_delta(u'60s')
1615
>>> string_to_delta('60s')
1565
1616
datetime.timedelta(0, 60)
1566
>>> string_to_delta(u'60m')
1617
>>> string_to_delta('60m')
1567
1618
datetime.timedelta(0, 3600)
1568
>>> string_to_delta(u'24h')
1619
>>> string_to_delta('24h')
1569
1620
datetime.timedelta(1)
1570
>>> string_to_delta(u'1w')
1621
>>> string_to_delta('1w')
1571
1622
datetime.timedelta(7)
1572
>>> string_to_delta(u'5m 30s')
1623
>>> string_to_delta('5m 30s')
1573
1624
datetime.timedelta(0, 330)
1575
1626
timevalue = datetime.timedelta(0)
1578
1629
suffix = unicode(s[-1])
1579
1630
value = int(s[:-1])
1581
1632
delta = datetime.timedelta(value)
1582
elif suffix == u"s":
1583
1634
delta = datetime.timedelta(0, value)
1584
elif suffix == u"m":
1585
1636
delta = datetime.timedelta(0, 0, 0, 0, value)
1586
elif suffix == u"h":
1587
1638
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1588
elif suffix == u"w":
1589
1640
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1591
raise ValueError(u"Unknown suffix %r" % suffix)
1592
except (ValueError, IndexError), e:
1593
raise ValueError(e.message)
1642
raise ValueError("Unknown suffix %r" % suffix)
1643
except (ValueError, IndexError) as e:
1644
raise ValueError(*(e.args))
1594
1645
timevalue += delta
1595
1646
return timevalue
1602
1653
global if_nametoindex
1604
1655
if_nametoindex = (ctypes.cdll.LoadLibrary
1605
(ctypes.util.find_library(u"c"))
1656
(ctypes.util.find_library("c"))
1606
1657
.if_nametoindex)
1607
1658
except (OSError, AttributeError):
1608
logger.warning(u"Doing if_nametoindex the hard way")
1659
logger.warning("Doing if_nametoindex the hard way")
1609
1660
def if_nametoindex(interface):
1610
1661
"Get an interface index the hard way, i.e. using fcntl()"
1611
1662
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1612
1663
with contextlib.closing(socket.socket()) as s:
1613
1664
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1614
struct.pack(str(u"16s16x"),
1665
struct.pack(str("16s16x"),
1616
interface_index = struct.unpack(str(u"I"),
1667
interface_index = struct.unpack(str("I"),
1617
1668
ifreq[16:20])[0]
1618
1669
return interface_index
1619
1670
return if_nametoindex(interface)
1649
1700
##################################################################
1650
1701
# Parsing of options, both command line and config file
1652
parser = optparse.OptionParser(version = "%%prog %s" % version)
1653
parser.add_option("-i", u"--interface", type=u"string",
1654
metavar="IF", help=u"Bind to interface IF")
1655
parser.add_option("-a", u"--address", type=u"string",
1656
help=u"Address to listen for requests on")
1657
parser.add_option("-p", u"--port", type=u"int",
1658
help=u"Port number to receive requests on")
1659
parser.add_option("--check", action=u"store_true",
1660
help=u"Run self-test")
1661
parser.add_option("--debug", action=u"store_true",
1662
help=u"Debug mode; run in foreground and log to"
1664
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1665
help=u"Debug level for stdout output")
1666
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1667
u" priority string (see GnuTLS documentation)")
1668
parser.add_option("--servicename", type=u"string",
1669
metavar=u"NAME", help=u"Zeroconf service name")
1670
parser.add_option("--configdir", type=u"string",
1671
default=u"/etc/mandos", metavar=u"DIR",
1672
help=u"Directory to search for configuration"
1674
parser.add_option("--no-dbus", action=u"store_false",
1675
dest=u"use_dbus", help=u"Do not provide D-Bus"
1676
u" system bus interface")
1677
parser.add_option("--no-ipv6", action=u"store_false",
1678
dest=u"use_ipv6", help=u"Do not use IPv6")
1679
options = parser.parse_args()[0]
1703
parser = argparse.ArgumentParser()
1704
parser.add_argument("-v", "--version", action="version",
1705
version = "%%(prog)s %s" % version,
1706
help="show version number and exit")
1707
parser.add_argument("-i", "--interface", metavar="IF",
1708
help="Bind to interface IF")
1709
parser.add_argument("-a", "--address",
1710
help="Address to listen for requests on")
1711
parser.add_argument("-p", "--port", type=int,
1712
help="Port number to receive requests on")
1713
parser.add_argument("--check", action="store_true",
1714
help="Run self-test")
1715
parser.add_argument("--debug", action="store_true",
1716
help="Debug mode; run in foreground and log"
1718
parser.add_argument("--debuglevel", metavar="LEVEL",
1719
help="Debug level for stdout output")
1720
parser.add_argument("--priority", help="GnuTLS"
1721
" priority string (see GnuTLS documentation)")
1722
parser.add_argument("--servicename",
1723
metavar="NAME", help="Zeroconf service name")
1724
parser.add_argument("--configdir",
1725
default="/etc/mandos", metavar="DIR",
1726
help="Directory to search for configuration"
1728
parser.add_argument("--no-dbus", action="store_false",
1729
dest="use_dbus", help="Do not provide D-Bus"
1730
" system bus interface")
1731
parser.add_argument("--no-ipv6", action="store_false",
1732
dest="use_ipv6", help="Do not use IPv6")
1733
options = parser.parse_args()
1681
1735
if options.check:
1686
1740
# Default values for config file for server-global settings
1687
server_defaults = { u"interface": u"",
1692
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1693
u"servicename": u"Mandos",
1694
u"use_dbus": u"True",
1695
u"use_ipv6": u"True",
1741
server_defaults = { "interface": "",
1746
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1747
"servicename": "Mandos",
1699
1753
# Parse config file for server-global settings
1700
1754
server_config = configparser.SafeConfigParser(server_defaults)
1701
1755
del server_defaults
1702
1756
server_config.read(os.path.join(options.configdir,
1704
1758
# Convert the SafeConfigParser object to a dict
1705
1759
server_settings = server_config.defaults()
1706
1760
# Use the appropriate methods on the non-string config options
1707
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1708
server_settings[option] = server_config.getboolean(u"DEFAULT",
1761
for option in ("debug", "use_dbus", "use_ipv6"):
1762
server_settings[option] = server_config.getboolean("DEFAULT",
1710
1764
if server_settings["port"]:
1711
server_settings["port"] = server_config.getint(u"DEFAULT",
1765
server_settings["port"] = server_config.getint("DEFAULT",
1713
1767
del server_config
1715
1769
# Override the settings from the config file with command line
1716
1770
# options, if set.
1717
for option in (u"interface", u"address", u"port", u"debug",
1718
u"priority", u"servicename", u"configdir",
1719
u"use_dbus", u"use_ipv6", u"debuglevel"):
1771
for option in ("interface", "address", "port", "debug",
1772
"priority", "servicename", "configdir",
1773
"use_dbus", "use_ipv6", "debuglevel"):
1720
1774
value = getattr(options, option)
1721
1775
if value is not None:
1722
1776
server_settings[option] = value
1730
1784
##################################################################
1732
1786
# For convenience
1733
debug = server_settings[u"debug"]
1734
debuglevel = server_settings[u"debuglevel"]
1735
use_dbus = server_settings[u"use_dbus"]
1736
use_ipv6 = server_settings[u"use_ipv6"]
1787
debug = server_settings["debug"]
1788
debuglevel = server_settings["debuglevel"]
1789
use_dbus = server_settings["use_dbus"]
1790
use_ipv6 = server_settings["use_ipv6"]
1738
if server_settings[u"servicename"] != u"Mandos":
1792
if server_settings["servicename"] != "Mandos":
1739
1793
syslogger.setFormatter(logging.Formatter
1740
(u'Mandos (%s) [%%(process)d]:'
1741
u' %%(levelname)s: %%(message)s'
1742
% server_settings[u"servicename"]))
1794
('Mandos (%s) [%%(process)d]:'
1795
' %%(levelname)s: %%(message)s'
1796
% server_settings["servicename"]))
1744
1798
# Parse config file with clients
1745
client_defaults = { u"timeout": u"1h",
1747
u"checker": u"fping -q -- %%(host)s",
1749
u"approval_delay": u"0s",
1750
u"approval_duration": u"1s",
1799
client_defaults = { "timeout": "1h",
1801
"checker": "fping -q -- %%(host)s",
1803
"approval_delay": "0s",
1804
"approval_duration": "1s",
1752
1806
client_config = configparser.SafeConfigParser(client_defaults)
1753
client_config.read(os.path.join(server_settings[u"configdir"],
1807
client_config.read(os.path.join(server_settings["configdir"],
1756
1810
global mandos_dbus_service
1757
1811
mandos_dbus_service = None
1759
tcp_server = MandosServer((server_settings[u"address"],
1760
server_settings[u"port"]),
1813
tcp_server = MandosServer((server_settings["address"],
1814
server_settings["port"]),
1762
interface=(server_settings[u"interface"]
1816
interface=(server_settings["interface"]
1764
1818
use_ipv6=use_ipv6,
1765
1819
gnutls_priority=
1766
server_settings[u"priority"],
1820
server_settings["priority"],
1767
1821
use_dbus=use_dbus)
1769
pidfilename = u"/var/run/mandos.pid"
1823
pidfilename = "/var/run/mandos.pid"
1771
pidfile = open(pidfilename, u"w")
1825
pidfile = open(pidfilename, "w")
1772
1826
except IOError:
1773
logger.error(u"Could not open file %r", pidfilename)
1827
logger.error("Could not open file %r", pidfilename)
1776
uid = pwd.getpwnam(u"_mandos").pw_uid
1777
gid = pwd.getpwnam(u"_mandos").pw_gid
1830
uid = pwd.getpwnam("_mandos").pw_uid
1831
gid = pwd.getpwnam("_mandos").pw_gid
1778
1832
except KeyError:
1780
uid = pwd.getpwnam(u"mandos").pw_uid
1781
gid = pwd.getpwnam(u"mandos").pw_gid
1834
uid = pwd.getpwnam("mandos").pw_uid
1835
gid = pwd.getpwnam("mandos").pw_gid
1782
1836
except KeyError:
1784
uid = pwd.getpwnam(u"nobody").pw_uid
1785
gid = pwd.getpwnam(u"nobody").pw_gid
1838
uid = pwd.getpwnam("nobody").pw_uid
1839
gid = pwd.getpwnam("nobody").pw_gid
1786
1840
except KeyError:
1792
except OSError, error:
1846
except OSError as error:
1793
1847
if error[0] != errno.EPERM:
1833
1891
# End of Avahi example code
1836
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1894
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1837
1895
bus, do_not_queue=True)
1838
except dbus.exceptions.NameExistsException, e:
1839
logger.error(unicode(e) + u", disabling D-Bus")
1896
except dbus.exceptions.NameExistsException as e:
1897
logger.error(unicode(e) + ", disabling D-Bus")
1840
1898
use_dbus = False
1841
server_settings[u"use_dbus"] = False
1899
server_settings["use_dbus"] = False
1842
1900
tcp_server.use_dbus = False
1843
1901
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1844
service = AvahiService(name = server_settings[u"servicename"],
1845
servicetype = u"_mandos._tcp",
1902
service = AvahiService(name = server_settings["servicename"],
1903
servicetype = "_mandos._tcp",
1846
1904
protocol = protocol, bus = bus)
1847
1905
if server_settings["interface"]:
1848
1906
service.interface = (if_nametoindex
1849
(str(server_settings[u"interface"])))
1852
# Close all input and output, do double fork, etc.
1907
(str(server_settings["interface"])))
1855
1909
global multiprocessing_manager
1856
1910
multiprocessing_manager = multiprocessing.Manager()
1901
1955
class MandosDBusService(dbus.service.Object):
1902
1956
"""A D-Bus proxy object"""
1903
1957
def __init__(self):
1904
dbus.service.Object.__init__(self, bus, u"/")
1905
_interface = u"se.bsnet.fukt.Mandos"
1958
dbus.service.Object.__init__(self, bus, "/")
1959
_interface = "se.bsnet.fukt.Mandos"
1907
@dbus.service.signal(_interface, signature=u"o")
1961
@dbus.service.signal(_interface, signature="o")
1908
1962
def ClientAdded(self, objpath):
1912
@dbus.service.signal(_interface, signature=u"ss")
1966
@dbus.service.signal(_interface, signature="ss")
1913
1967
def ClientNotFound(self, fingerprint, address):
1917
@dbus.service.signal(_interface, signature=u"os")
1971
@dbus.service.signal(_interface, signature="os")
1918
1972
def ClientRemoved(self, objpath, name):
1922
@dbus.service.method(_interface, out_signature=u"ao")
1976
@dbus.service.method(_interface, out_signature="ao")
1923
1977
def GetAllClients(self):
1925
1979
return dbus.Array(c.dbus_object_path
1926
1980
for c in tcp_server.clients)
1928
1982
@dbus.service.method(_interface,
1929
out_signature=u"a{oa{sv}}")
1983
out_signature="a{oa{sv}}")
1930
1984
def GetAllClientsWithProperties(self):
1932
1986
return dbus.Dictionary(
1933
((c.dbus_object_path, c.GetAll(u""))
1987
((c.dbus_object_path, c.GetAll(""))
1934
1988
for c in tcp_server.clients),
1935
signature=u"oa{sv}")
1937
@dbus.service.method(_interface, in_signature=u"o")
1991
@dbus.service.method(_interface, in_signature="o")
1938
1992
def RemoveClient(self, object_path):
1940
1994
for c in tcp_server.clients:
2006
2060
(tcp_server.handle_request
2007
2061
(*args[2:], **kwargs) or True))
2009
logger.debug(u"Starting main loop")
2063
logger.debug("Starting main loop")
2010
2064
main_loop.run()
2011
except AvahiError, error:
2012
logger.critical(u"AvahiError: %s", error)
2065
except AvahiError as error:
2066
logger.critical("AvahiError: %s", error)
2015
2069
except KeyboardInterrupt:
2018
logger.debug(u"Server received KeyboardInterrupt")
2019
logger.debug(u"Server exiting")
2071
print("", file=sys.stderr)
2072
logger.debug("Server received KeyboardInterrupt")
2073
logger.debug("Server exiting")
2020
2074
# Must run before the D-Bus bus name gets deregistered