151
150
self.group = None # our entry group
152
151
self.server = None
154
self.entry_group_state_changed_match = None
155
153
def rename(self):
156
154
"""Derived from the Avahi example code"""
157
155
if self.rename_count >= self.max_renames:
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
160
158
self.rename_count)
161
raise AvahiServiceError("Too many renames")
159
raise AvahiServiceError(u"Too many renames")
162
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
161
logger.info(u"Changing Zeroconf service name to %r ...",
165
163
syslogger.setFormatter(logging.Formatter
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
176
174
self.rename_count += 1
177
175
def remove(self):
178
176
"""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
182
177
if self.group is not None:
183
178
self.group.Reset()
185
180
"""Derived from the Avahi example code"""
187
181
if self.group is None:
188
182
self.group = dbus.Interface(
189
183
self.bus.get_object(avahi.DBUS_NAME,
190
184
self.server.EntryGroupNew()),
191
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
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' ...",
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
196
190
self.name, self.type)
197
191
self.group.AddService(
205
199
self.group.Commit()
206
200
def entry_group_state_changed(self, state, error):
207
201
"""Derived from the Avahi example code"""
208
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
210
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
211
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
212
206
elif state == avahi.ENTRY_GROUP_COLLISION:
213
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
215
209
elif state == avahi.ENTRY_GROUP_FAILURE:
216
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
218
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
219
213
% unicode(error))
220
214
def cleanup(self):
221
215
"""Derived from the Avahi example code"""
222
216
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
228
218
self.group = None
230
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
231
220
"""Derived from the Avahi example code"""
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)
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
247
225
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
254
227
def activate(self):
255
228
"""Derived from the Avahi example code"""
256
229
if self.server is None:
257
230
self.server = dbus.Interface(
258
231
self.bus.get_object(avahi.DBUS_NAME,
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
261
233
avahi.DBUS_INTERFACE_SERVER)
262
self.server.connect_to_signal("StateChanged",
234
self.server.connect_to_signal(u"StateChanged",
263
235
self.server_state_changed)
264
236
self.server_state_changed(self.server.GetState())
297
268
secret: bytestring; sent verbatim (over TLS) to client
298
269
timeout: datetime.timedelta(); How long from last_checked_ok
299
270
until this client is disabled
300
extended_timeout: extra long timeout when password has been sent
301
271
runtime_expansions: Allowed attributes for runtime expansion.
302
expires: datetime.datetime(); time (UTC) when a client will be
306
runtime_expansions = ("approval_delay", "approval_duration",
307
"created", "enabled", "fingerprint",
308
"host", "interval", "last_checked_ok",
309
"last_enabled", "name", "timeout")
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")
312
280
def _timedelta_to_milliseconds(td):
338
302
if config is None:
340
logger.debug("Creating client %r", self.name)
304
logger.debug(u"Creating client %r", self.name)
341
305
# Uppercase and remove spaces from fingerprint for later
342
306
# comparison purposes with return value from the fingerprint()
344
self.fingerprint = (config["fingerprint"].upper()
346
logger.debug(" Fingerprint: %s", self.fingerprint)
347
if "secret" in config:
348
self.secret = config["secret"].decode("base64")
349
elif "secfile" in config:
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:
350
314
with open(os.path.expanduser(os.path.expandvars
351
(config["secfile"])),
315
(config[u"secfile"])),
352
316
"rb") as secfile:
353
317
self.secret = secfile.read()
355
raise TypeError("No secret or secfile for client %s"
319
raise TypeError(u"No secret or secfile for client %s"
357
self.host = config.get("host", "")
321
self.host = config.get(u"host", u"")
358
322
self.created = datetime.datetime.utcnow()
359
323
self.enabled = False
360
self.last_approval_request = None
361
324
self.last_enabled = None
362
325
self.last_checked_ok = None
363
self.timeout = string_to_delta(config["timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
365
self.interval = string_to_delta(config["interval"])
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
366
328
self.disable_hook = disable_hook
367
329
self.checker = None
368
330
self.checker_initiator_tag = None
369
331
self.disable_initiator_tag = None
371
332
self.checker_callback_tag = None
372
self.checker_command = config["checker"]
333
self.checker_command = config[u"checker"]
373
334
self.current_checker_command = None
374
335
self.last_connect = None
375
336
self._approved = None
376
self.approved_by_default = config.get("approved_by_default",
337
self.approved_by_default = config.get(u"approved_by_default",
378
339
self.approvals_pending = 0
379
340
self.approval_delay = string_to_delta(
380
config["approval_delay"])
341
config[u"approval_delay"])
381
342
self.approval_duration = string_to_delta(
382
config["approval_duration"])
343
config[u"approval_duration"])
383
344
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
385
346
def send_changedstate(self):
441
400
if os.WIFEXITED(condition):
442
401
exitstatus = os.WEXITSTATUS(condition)
443
402
if exitstatus == 0:
444
logger.info("Checker for %(name)s succeeded",
403
logger.info(u"Checker for %(name)s succeeded",
446
405
self.checked_ok()
448
logger.info("Checker for %(name)s failed",
407
logger.info(u"Checker for %(name)s failed",
451
logger.warning("Checker for %(name)s crashed?",
410
logger.warning(u"Checker for %(name)s crashed?",
454
def checked_ok(self, timeout=None):
413
def checked_ok(self):
455
414
"""Bump up the timeout for this client.
457
416
This should only be called when the client has been seen,
461
timeout = self.timeout
462
419
self.last_checked_ok = datetime.datetime.utcnow()
463
420
gobject.source_remove(self.disable_initiator_tag)
464
self.expires = datetime.datetime.utcnow() + timeout
465
421
self.disable_initiator_tag = (gobject.timeout_add
466
(self._timedelta_to_milliseconds(timeout),
422
(self.timeout_milliseconds(),
469
def need_approval(self):
470
self.last_approval_request = datetime.datetime.utcnow()
472
425
def start_checker(self):
473
426
"""Start a new checker subprocess if one is not running.
505
458
# Escape attributes for the shell
506
459
escaped_attrs = dict(
508
re.escape(unicode(str(getattr(self, attr, "")),
461
re.escape(unicode(str(getattr(self, attr, u"")),
512
465
self.runtime_expansions)
515
468
command = self.checker_command % escaped_attrs
516
except TypeError as error:
517
logger.error('Could not format string "%s":'
518
' %s', self.checker_command, error)
469
except TypeError, error:
470
logger.error(u'Could not format string "%s":'
471
u' %s', self.checker_command, error)
519
472
return True # Try again later
520
473
self.current_checker_command = command
522
logger.info("Starting checker %r for %s",
475
logger.info(u"Starting checker %r for %s",
523
476
command, self.name)
524
477
# We don't need to redirect stdout and stderr, since
525
478
# in normal mode, that is already done by daemon(),
549
502
if self.checker_callback_tag:
550
503
gobject.source_remove(self.checker_callback_tag)
551
504
self.checker_callback_tag = None
552
if getattr(self, "checker", None) is None:
505
if getattr(self, u"checker", None) is None:
554
logger.debug("Stopping checker for %(name)s", vars(self))
507
logger.debug(u"Stopping checker for %(name)s", vars(self))
556
509
os.kill(self.checker.pid, signal.SIGTERM)
558
511
#if self.checker.poll() is None:
559
512
# os.kill(self.checker.pid, signal.SIGKILL)
560
except OSError as error:
513
except OSError, error:
561
514
if error.errno != errno.ESRCH: # No such process
563
516
self.checker = None
565
def dbus_service_property(dbus_interface, signature="v",
566
access="readwrite", byte_arrays=False):
518
def dbus_service_property(dbus_interface, signature=u"v",
519
access=u"readwrite", byte_arrays=False):
567
520
"""Decorators for marking methods of a DBusObjectWithProperties to
568
521
become properties on the D-Bus.
577
530
# Encoding deeply encoded byte arrays is not supported yet by the
578
531
# "Set" method, so we fail early here:
579
if byte_arrays and signature != "ay":
580
raise ValueError("Byte arrays not supported for non-'ay'"
581
" signature %r" % signature)
532
if byte_arrays and signature != u"ay":
533
raise ValueError(u"Byte arrays not supported for non-'ay'"
534
u" signature %r" % signature)
582
535
def decorator(func):
583
536
func._dbus_is_property = True
584
537
func._dbus_interface = dbus_interface
585
538
func._dbus_signature = signature
586
539
func._dbus_access = access
587
540
func._dbus_name = func.__name__
588
if func._dbus_name.endswith("_dbus_property"):
541
if func._dbus_name.endswith(u"_dbus_property"):
589
542
func._dbus_name = func._dbus_name[:-14]
590
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
543
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
647
600
# No such property
648
raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
+ interface_name + "."
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
652
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
654
607
def Get(self, interface_name, property_name):
655
608
"""Standard D-Bus property Get() method, see D-Bus standard.
657
610
prop = self._get_dbus_property(interface_name, property_name)
658
if prop._dbus_access == "write":
611
if prop._dbus_access == u"write":
659
612
raise DBusPropertyAccessException(property_name)
661
if not hasattr(value, "variant_level"):
614
if not hasattr(value, u"variant_level"):
663
616
return type(value)(value, variant_level=value.variant_level+1)
665
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
666
619
def Set(self, interface_name, property_name, value):
667
620
"""Standard D-Bus property Set() method, see D-Bus standard.
669
622
prop = self._get_dbus_property(interface_name, property_name)
670
if prop._dbus_access == "read":
623
if prop._dbus_access == u"read":
671
624
raise DBusPropertyAccessException(property_name)
672
if prop._dbus_get_args_options["byte_arrays"]:
625
if prop._dbus_get_args_options[u"byte_arrays"]:
673
626
# The byte_arrays option is not supported yet on
674
627
# signatures other than "ay".
675
if prop._dbus_signature != "ay":
628
if prop._dbus_signature != u"ay":
677
630
value = dbus.ByteArray(''.join(unichr(byte)
678
631
for byte in value))
681
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
out_signature="a{sv}")
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
683
636
def GetAll(self, interface_name):
684
637
"""Standard D-Bus property GetAll() method, see D-Bus
716
669
document = xml.dom.minidom.parseString(xmlstring)
717
670
def make_tag(document, name, prop):
718
e = document.createElement("property")
719
e.setAttribute("name", name)
720
e.setAttribute("type", prop._dbus_signature)
721
e.setAttribute("access", prop._dbus_access)
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)
723
for if_tag in document.getElementsByTagName("interface"):
676
for if_tag in document.getElementsByTagName(u"interface"):
724
677
for tag in (make_tag(document, name, prop)
726
679
in self._get_all_dbus_properties()
727
680
if prop._dbus_interface
728
== if_tag.getAttribute("name")):
681
== if_tag.getAttribute(u"name")):
729
682
if_tag.appendChild(tag)
730
683
# Add the names to the return values for the
731
684
# "org.freedesktop.DBus.Properties" methods
732
if (if_tag.getAttribute("name")
733
== "org.freedesktop.DBus.Properties"):
734
for cn in if_tag.getElementsByTagName("method"):
735
if cn.getAttribute("name") == "Get":
736
for arg in cn.getElementsByTagName("arg"):
737
if (arg.getAttribute("direction")
739
arg.setAttribute("name", "value")
740
elif cn.getAttribute("name") == "GetAll":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
744
arg.setAttribute("name", "props")
745
xmlstring = document.toxml("utf-8")
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")
746
699
document.unlink()
747
700
except (AttributeError, xml.dom.DOMException,
748
xml.parsers.expat.ExpatError) as error:
749
logger.error("Failed to override Introspection method",
701
xml.parsers.expat.ExpatError), error:
702
logger.error(u"Failed to override Introspection method",
770
723
Client.__init__(self, *args, **kwargs)
771
724
# Only now, when this client is initialized, can it show up on
773
client_object_name = unicode(self.name).translate(
776
726
self.dbus_object_path = (dbus.ObjectPath
777
("/clients/" + client_object_name))
728
+ self.name.replace(u".", u"_")))
778
729
DBusObjectWithProperties.__init__(self, self.bus,
779
730
self.dbus_object_path)
780
def _set_expires(self, value):
781
old_value = getattr(self, "_expires", None)
782
self._expires = value
783
if hasattr(self, "dbus_object_path") and old_value != value:
784
dbus_time = (self._datetime_to_dbus(self._expires,
786
self.PropertyChanged(dbus.String("Expires"),
788
expires = property(lambda self: self._expires, _set_expires)
791
732
def _get_approvals_pending(self):
792
733
return self._approvals_pending
808
749
def _datetime_to_dbus(dt, variant_level=0):
809
750
"""Convert a UTC datetime.datetime() to a D-Bus type."""
811
return dbus.String("", variant_level = variant_level)
812
751
return dbus.String(dt.isoformat(),
813
752
variant_level=variant_level)
815
754
def enable(self):
816
oldstate = getattr(self, "enabled", False)
755
oldstate = getattr(self, u"enabled", False)
817
756
r = Client.enable(self)
818
757
if oldstate != self.enabled:
819
758
# Emit D-Bus signals
820
self.PropertyChanged(dbus.String("Enabled"),
759
self.PropertyChanged(dbus.String(u"Enabled"),
821
760
dbus.Boolean(True, variant_level=1))
822
761
self.PropertyChanged(
823
dbus.String("LastEnabled"),
762
dbus.String(u"LastEnabled"),
824
763
self._datetime_to_dbus(self.last_enabled,
825
764
variant_level=1))
828
767
def disable(self, quiet = False):
829
oldstate = getattr(self, "enabled", False)
768
oldstate = getattr(self, u"enabled", False)
830
769
r = Client.disable(self, quiet=quiet)
831
770
if not quiet and oldstate != self.enabled:
832
771
# Emit D-Bus signal
833
self.PropertyChanged(dbus.String("Enabled"),
772
self.PropertyChanged(dbus.String(u"Enabled"),
834
773
dbus.Boolean(False, variant_level=1))
868
807
def checked_ok(self, *args, **kwargs):
869
Client.checked_ok(self, *args, **kwargs)
808
r = Client.checked_ok(self, *args, **kwargs)
870
809
# Emit D-Bus signal
871
810
self.PropertyChanged(
872
dbus.String("LastCheckedOK"),
811
dbus.String(u"LastCheckedOK"),
873
812
(self._datetime_to_dbus(self.last_checked_ok,
874
813
variant_level=1)))
876
def need_approval(self, *args, **kwargs):
877
r = Client.need_approval(self, *args, **kwargs)
879
self.PropertyChanged(
880
dbus.String("LastApprovalRequest"),
881
(self._datetime_to_dbus(self.last_approval_request,
885
816
def start_checker(self, *args, **kwargs):
895
826
# Emit D-Bus signal
896
827
self.CheckerStarted(self.current_checker_command)
897
828
self.PropertyChanged(
898
dbus.String("CheckerRunning"),
829
dbus.String(u"CheckerRunning"),
899
830
dbus.Boolean(True, variant_level=1))
902
833
def stop_checker(self, *args, **kwargs):
903
old_checker = getattr(self, "checker", None)
834
old_checker = getattr(self, u"checker", None)
904
835
r = Client.stop_checker(self, *args, **kwargs)
905
836
if (old_checker is not None
906
and getattr(self, "checker", None) is None):
907
self.PropertyChanged(dbus.String("CheckerRunning"),
837
and getattr(self, u"checker", None) is None):
838
self.PropertyChanged(dbus.String(u"CheckerRunning"),
908
839
dbus.Boolean(False, variant_level=1))
923
854
## D-Bus methods, signals & properties
924
_interface = "se.bsnet.fukt.Mandos.Client"
855
_interface = u"se.bsnet.fukt.Mandos.Client"
928
859
# CheckerCompleted - signal
929
@dbus.service.signal(_interface, signature="nxs")
860
@dbus.service.signal(_interface, signature=u"nxs")
930
861
def CheckerCompleted(self, exitcode, waitstatus, command):
934
865
# CheckerStarted - signal
935
@dbus.service.signal(_interface, signature="s")
866
@dbus.service.signal(_interface, signature=u"s")
936
867
def CheckerStarted(self, command):
940
871
# PropertyChanged - signal
941
@dbus.service.signal(_interface, signature="sv")
872
@dbus.service.signal(_interface, signature=u"sv")
942
873
def PropertyChanged(self, property, value):
1004
935
# ApprovalPending - property
1005
@dbus_service_property(_interface, signature="b", access="read")
936
@dbus_service_property(_interface, signature=u"b", access=u"read")
1006
937
def ApprovalPending_dbus_property(self):
1007
938
return dbus.Boolean(bool(self.approvals_pending))
1009
940
# ApprovedByDefault - property
1010
@dbus_service_property(_interface, signature="b",
941
@dbus_service_property(_interface, signature=u"b",
1012
943
def ApprovedByDefault_dbus_property(self, value=None):
1013
944
if value is None: # get
1014
945
return dbus.Boolean(self.approved_by_default)
1015
old_value = self.approved_by_default
1016
946
self.approved_by_default = bool(value)
1017
947
# Emit D-Bus signal
1018
if old_value != self.approved_by_default:
1019
self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
dbus.Boolean(value, variant_level=1))
948
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
949
dbus.Boolean(value, variant_level=1))
1022
951
# ApprovalDelay - property
1023
@dbus_service_property(_interface, signature="t",
952
@dbus_service_property(_interface, signature=u"t",
1025
954
def ApprovalDelay_dbus_property(self, value=None):
1026
955
if value is None: # get
1027
956
return dbus.UInt64(self.approval_delay_milliseconds())
1028
old_value = self.approval_delay
1029
957
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
958
# Emit D-Bus signal
1031
if old_value != self.approval_delay:
1032
self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
dbus.UInt64(value, variant_level=1))
959
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
960
dbus.UInt64(value, variant_level=1))
1035
962
# ApprovalDuration - property
1036
@dbus_service_property(_interface, signature="t",
963
@dbus_service_property(_interface, signature=u"t",
1038
965
def ApprovalDuration_dbus_property(self, value=None):
1039
966
if value is None: # get
1040
967
return dbus.UInt64(self._timedelta_to_milliseconds(
1041
968
self.approval_duration))
1042
old_value = self.approval_duration
1043
969
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
970
# Emit D-Bus signal
1045
if old_value != self.approval_duration:
1046
self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
dbus.UInt64(value, variant_level=1))
971
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
972
dbus.UInt64(value, variant_level=1))
1049
974
# Name - property
1050
@dbus_service_property(_interface, signature="s", access="read")
975
@dbus_service_property(_interface, signature=u"s", access=u"read")
1051
976
def Name_dbus_property(self):
1052
977
return dbus.String(self.name)
1054
979
# Fingerprint - property
1055
@dbus_service_property(_interface, signature="s", access="read")
980
@dbus_service_property(_interface, signature=u"s", access=u"read")
1056
981
def Fingerprint_dbus_property(self):
1057
982
return dbus.String(self.fingerprint)
1059
984
# Host - property
1060
@dbus_service_property(_interface, signature="s",
985
@dbus_service_property(_interface, signature=u"s",
1062
987
def Host_dbus_property(self, value=None):
1063
988
if value is None: # get
1064
989
return dbus.String(self.host)
1065
old_value = self.host
1066
990
self.host = value
1067
991
# Emit D-Bus signal
1068
if old_value != self.host:
1069
self.PropertyChanged(dbus.String("Host"),
1070
dbus.String(value, variant_level=1))
992
self.PropertyChanged(dbus.String(u"Host"),
993
dbus.String(value, variant_level=1))
1072
995
# Created - property
1073
@dbus_service_property(_interface, signature="s", access="read")
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1074
997
def Created_dbus_property(self):
1075
998
return dbus.String(self._datetime_to_dbus(self.created))
1077
1000
# LastEnabled - property
1078
@dbus_service_property(_interface, signature="s", access="read")
1001
@dbus_service_property(_interface, signature=u"s", access=u"read")
1079
1002
def LastEnabled_dbus_property(self):
1080
return self._datetime_to_dbus(self.last_enabled)
1003
if self.last_enabled is None:
1004
return dbus.String(u"")
1005
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1082
1007
# Enabled - property
1083
@dbus_service_property(_interface, signature="b",
1008
@dbus_service_property(_interface, signature=u"b",
1009
access=u"readwrite")
1085
1010
def Enabled_dbus_property(self, value=None):
1086
1011
if value is None: # get
1087
1012
return dbus.Boolean(self.enabled)
1093
1018
# LastCheckedOK - property
1094
@dbus_service_property(_interface, signature="s",
1019
@dbus_service_property(_interface, signature=u"s",
1020
access=u"readwrite")
1096
1021
def LastCheckedOK_dbus_property(self, value=None):
1097
1022
if value is not None:
1098
1023
self.checked_ok()
1100
return self._datetime_to_dbus(self.last_checked_ok)
1102
# Expires - property
1103
@dbus_service_property(_interface, signature="s", access="read")
1104
def Expires_dbus_property(self):
1105
return self._datetime_to_dbus(self.expires)
1107
# LastApprovalRequest - property
1108
@dbus_service_property(_interface, signature="s", access="read")
1109
def LastApprovalRequest_dbus_property(self):
1110
return self._datetime_to_dbus(self.last_approval_request)
1025
if self.last_checked_ok is None:
1026
return dbus.String(u"")
1027
return dbus.String(self._datetime_to_dbus(self
1112
1030
# Timeout - property
1113
@dbus_service_property(_interface, signature="t",
1031
@dbus_service_property(_interface, signature=u"t",
1032
access=u"readwrite")
1115
1033
def Timeout_dbus_property(self, value=None):
1116
1034
if value is None: # get
1117
1035
return dbus.UInt64(self.timeout_milliseconds())
1118
old_value = self.timeout
1119
1036
self.timeout = datetime.timedelta(0, 0, 0, value)
1120
1037
# Emit D-Bus signal
1121
if old_value != self.timeout:
1122
self.PropertyChanged(dbus.String("Timeout"),
1123
dbus.UInt64(value, variant_level=1))
1124
if getattr(self, "disable_initiator_tag", None) is None:
1038
self.PropertyChanged(dbus.String(u"Timeout"),
1039
dbus.UInt64(value, variant_level=1))
1040
if getattr(self, u"disable_initiator_tag", None) is None:
1126
1042
# Reschedule timeout
1127
1043
gobject.source_remove(self.disable_initiator_tag)
1128
1044
self.disable_initiator_tag = None
1130
1045
time_to_die = (self.
1131
1046
_timedelta_to_milliseconds((self
1132
1047
.last_checked_ok
1137
1052
# The timeout has passed
1140
self.expires = (datetime.datetime.utcnow()
1141
+ datetime.timedelta(milliseconds = time_to_die))
1142
1055
self.disable_initiator_tag = (gobject.timeout_add
1143
1056
(time_to_die, self.disable))
1145
# ExtendedTimeout - property
1146
@dbus_service_property(_interface, signature="t",
1148
def ExtendedTimeout_dbus_property(self, value=None):
1149
if value is None: # get
1150
return dbus.UInt64(self.extended_timeout_milliseconds())
1151
old_value = self.extended_timeout
1152
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1154
if old_value != self.extended_timeout:
1155
self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
dbus.UInt64(value, variant_level=1))
1158
1058
# Interval - property
1159
@dbus_service_property(_interface, signature="t",
1059
@dbus_service_property(_interface, signature=u"t",
1060
access=u"readwrite")
1161
1061
def Interval_dbus_property(self, value=None):
1162
1062
if value is None: # get
1163
1063
return dbus.UInt64(self.interval_milliseconds())
1164
old_value = self.interval
1165
1064
self.interval = datetime.timedelta(0, 0, 0, value)
1166
1065
# Emit D-Bus signal
1167
if old_value != self.interval:
1168
self.PropertyChanged(dbus.String("Interval"),
1169
dbus.UInt64(value, variant_level=1))
1170
if getattr(self, "checker_initiator_tag", None) is None:
1066
self.PropertyChanged(dbus.String(u"Interval"),
1067
dbus.UInt64(value, variant_level=1))
1068
if getattr(self, u"checker_initiator_tag", None) is None:
1172
1070
# Reschedule checker run
1173
1071
gobject.source_remove(self.checker_initiator_tag)
1176
1074
self.start_checker() # Start one now, too
1178
1076
# Checker - property
1179
@dbus_service_property(_interface, signature="s",
1077
@dbus_service_property(_interface, signature=u"s",
1078
access=u"readwrite")
1181
1079
def Checker_dbus_property(self, value=None):
1182
1080
if value is None: # get
1183
1081
return dbus.String(self.checker_command)
1184
old_value = self.checker_command
1185
1082
self.checker_command = value
1186
1083
# Emit D-Bus signal
1187
if old_value != self.checker_command:
1188
self.PropertyChanged(dbus.String("Checker"),
1189
dbus.String(self.checker_command,
1084
self.PropertyChanged(dbus.String(u"Checker"),
1085
dbus.String(self.checker_command,
1192
1088
# CheckerRunning - property
1193
@dbus_service_property(_interface, signature="b",
1089
@dbus_service_property(_interface, signature=u"b",
1090
access=u"readwrite")
1195
1091
def CheckerRunning_dbus_property(self, value=None):
1196
1092
if value is None: # get
1197
1093
return dbus.Boolean(self.checker is not None)
1263
1159
# no X.509 keys are added to it. Therefore, we can use it
1264
1160
# here despite using OpenPGP certificates.
1266
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
# "+AES-256-CBC", "+SHA1",
1268
# "+COMP-NULL", "+CTYPE-OPENPGP",
1162
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1163
# u"+AES-256-CBC", u"+SHA1",
1164
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1270
1166
# Use a fallback default, since this MUST be set.
1271
1167
priority = self.server.gnutls_priority
1272
1168
if priority is None:
1169
priority = u"NORMAL"
1274
1170
(gnutls.library.functions
1275
1171
.gnutls_priority_set_direct(session._c_object,
1276
1172
priority, None))
1278
1174
# Start communication using the Mandos protocol
1279
1175
# Get protocol number
1280
1176
line = self.request.makefile().readline()
1281
logger.debug("Protocol version: %r", line)
1177
logger.debug(u"Protocol version: %r", line)
1283
1179
if int(line.strip().split()[0]) > 1:
1284
1180
raise RuntimeError
1285
except (ValueError, IndexError, RuntimeError) as error:
1286
logger.error("Unknown protocol version: %s", error)
1181
except (ValueError, IndexError, RuntimeError), error:
1182
logger.error(u"Unknown protocol version: %s", error)
1289
1185
# Start GnuTLS connection
1291
1187
session.handshake()
1292
except gnutls.errors.GNUTLSError as error:
1293
logger.warning("Handshake failed: %s", error)
1188
except gnutls.errors.GNUTLSError, error:
1189
logger.warning(u"Handshake failed: %s", error)
1294
1190
# Do not run session.bye() here: the session is not
1295
1191
# established. Just abandon the request.
1297
logger.debug("Handshake succeeded")
1193
logger.debug(u"Handshake succeeded")
1299
1195
approval_required = False
1302
1198
fpr = self.fingerprint(self.peer_certificate
1305
gnutls.errors.GNUTLSError) as error:
1306
logger.warning("Bad certificate: %s", error)
1200
except (TypeError, gnutls.errors.GNUTLSError), error:
1201
logger.warning(u"Bad certificate: %s", error)
1308
logger.debug("Fingerprint: %s", fpr)
1203
logger.debug(u"Fingerprint: %s", fpr)
1311
1206
client = ProxyClient(child_pipe, fpr,
1512
1407
bind to an address or port if they were not specified."""
1513
1408
if self.interface is not None:
1514
1409
if SO_BINDTODEVICE is None:
1515
logger.error("SO_BINDTODEVICE does not exist;"
1516
" cannot bind to interface %s",
1410
logger.error(u"SO_BINDTODEVICE does not exist;"
1411
u" cannot bind to interface %s",
1517
1412
self.interface)
1520
1415
self.socket.setsockopt(socket.SOL_SOCKET,
1521
1416
SO_BINDTODEVICE,
1522
1417
str(self.interface
1524
except socket.error as error:
1419
except socket.error, error:
1525
1420
if error[0] == errno.EPERM:
1526
logger.error("No permission to"
1527
" bind to interface %s",
1421
logger.error(u"No permission to"
1422
u" bind to interface %s",
1528
1423
self.interface)
1529
1424
elif error[0] == errno.ENOPROTOOPT:
1530
logger.error("SO_BINDTODEVICE not available;"
1531
" cannot bind to interface %s",
1425
logger.error(u"SO_BINDTODEVICE not available;"
1426
u" cannot bind to interface %s",
1532
1427
self.interface)
1591
1486
def handle_ipc(self, source, condition, parent_pipe=None,
1592
1487
client_object=None):
1593
1488
condition_names = {
1594
gobject.IO_IN: "IN", # There is data to read.
1595
gobject.IO_OUT: "OUT", # Data can be written (without
1489
gobject.IO_IN: u"IN", # There is data to read.
1490
gobject.IO_OUT: u"OUT", # Data can be written (without
1597
gobject.IO_PRI: "PRI", # There is urgent data to read.
1598
gobject.IO_ERR: "ERR", # Error condition.
1599
gobject.IO_HUP: "HUP" # Hung up (the connection has been
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
1600
1495
# broken, usually for pipes and
1662
1557
def string_to_delta(interval):
1663
1558
"""Parse a string and return a datetime.timedelta
1665
>>> string_to_delta('7d')
1560
>>> string_to_delta(u'7d')
1666
1561
datetime.timedelta(7)
1667
>>> string_to_delta('60s')
1562
>>> string_to_delta(u'60s')
1668
1563
datetime.timedelta(0, 60)
1669
>>> string_to_delta('60m')
1564
>>> string_to_delta(u'60m')
1670
1565
datetime.timedelta(0, 3600)
1671
>>> string_to_delta('24h')
1566
>>> string_to_delta(u'24h')
1672
1567
datetime.timedelta(1)
1673
>>> string_to_delta('1w')
1568
>>> string_to_delta(u'1w')
1674
1569
datetime.timedelta(7)
1675
>>> string_to_delta('5m 30s')
1570
>>> string_to_delta(u'5m 30s')
1676
1571
datetime.timedelta(0, 330)
1678
1573
timevalue = datetime.timedelta(0)
1681
1576
suffix = unicode(s[-1])
1682
1577
value = int(s[:-1])
1684
1579
delta = datetime.timedelta(value)
1580
elif suffix == u"s":
1686
1581
delta = datetime.timedelta(0, value)
1582
elif suffix == u"m":
1688
1583
delta = datetime.timedelta(0, 0, 0, 0, value)
1584
elif suffix == u"h":
1690
1585
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1586
elif suffix == u"w":
1692
1587
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1694
raise ValueError("Unknown suffix %r" % suffix)
1695
except (ValueError, IndexError) as e:
1696
raise ValueError(*(e.args))
1589
raise ValueError(u"Unknown suffix %r" % suffix)
1590
except (ValueError, IndexError), e:
1591
raise ValueError(e.message)
1697
1592
timevalue += delta
1698
1593
return timevalue
1705
1600
global if_nametoindex
1707
1602
if_nametoindex = (ctypes.cdll.LoadLibrary
1708
(ctypes.util.find_library("c"))
1603
(ctypes.util.find_library(u"c"))
1709
1604
.if_nametoindex)
1710
1605
except (OSError, AttributeError):
1711
logger.warning("Doing if_nametoindex the hard way")
1606
logger.warning(u"Doing if_nametoindex the hard way")
1712
1607
def if_nametoindex(interface):
1713
1608
"Get an interface index the hard way, i.e. using fcntl()"
1714
1609
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1715
1610
with contextlib.closing(socket.socket()) as s:
1716
1611
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
struct.pack(str("16s16x"),
1612
struct.pack(str(u"16s16x"),
1719
interface_index = struct.unpack(str("I"),
1614
interface_index = struct.unpack(str(u"I"),
1720
1615
ifreq[16:20])[0]
1721
1616
return interface_index
1722
1617
return if_nametoindex(interface)
1752
1647
##################################################################
1753
1648
# Parsing of options, both command line and config file
1755
parser = argparse.ArgumentParser()
1756
parser.add_argument("-v", "--version", action="version",
1757
version = "%%(prog)s %s" % version,
1758
help="show version number and exit")
1759
parser.add_argument("-i", "--interface", metavar="IF",
1760
help="Bind to interface IF")
1761
parser.add_argument("-a", "--address",
1762
help="Address to listen for requests on")
1763
parser.add_argument("-p", "--port", type=int,
1764
help="Port number to receive requests on")
1765
parser.add_argument("--check", action="store_true",
1766
help="Run self-test")
1767
parser.add_argument("--debug", action="store_true",
1768
help="Debug mode; run in foreground and log"
1770
parser.add_argument("--debuglevel", metavar="LEVEL",
1771
help="Debug level for stdout output")
1772
parser.add_argument("--priority", help="GnuTLS"
1773
" priority string (see GnuTLS documentation)")
1774
parser.add_argument("--servicename",
1775
metavar="NAME", help="Zeroconf service name")
1776
parser.add_argument("--configdir",
1777
default="/etc/mandos", metavar="DIR",
1778
help="Directory to search for configuration"
1780
parser.add_argument("--no-dbus", action="store_false",
1781
dest="use_dbus", help="Do not provide D-Bus"
1782
" system bus interface")
1783
parser.add_argument("--no-ipv6", action="store_false",
1784
dest="use_ipv6", help="Do not use IPv6")
1785
options = parser.parse_args()
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]
1787
1679
if options.check:
1792
1684
# Default values for config file for server-global settings
1793
server_defaults = { "interface": "",
1798
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1799
"servicename": "Mandos",
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",
1805
1697
# Parse config file for server-global settings
1806
1698
server_config = configparser.SafeConfigParser(server_defaults)
1807
1699
del server_defaults
1808
1700
server_config.read(os.path.join(options.configdir,
1810
1702
# Convert the SafeConfigParser object to a dict
1811
1703
server_settings = server_config.defaults()
1812
1704
# Use the appropriate methods on the non-string config options
1813
for option in ("debug", "use_dbus", "use_ipv6"):
1814
server_settings[option] = server_config.getboolean("DEFAULT",
1705
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1706
server_settings[option] = server_config.getboolean(u"DEFAULT",
1816
1708
if server_settings["port"]:
1817
server_settings["port"] = server_config.getint("DEFAULT",
1709
server_settings["port"] = server_config.getint(u"DEFAULT",
1819
1711
del server_config
1821
1713
# Override the settings from the config file with command line
1822
1714
# options, if set.
1823
for option in ("interface", "address", "port", "debug",
1824
"priority", "servicename", "configdir",
1825
"use_dbus", "use_ipv6", "debuglevel"):
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"):
1826
1718
value = getattr(options, option)
1827
1719
if value is not None:
1828
1720
server_settings[option] = value
1836
1728
##################################################################
1838
1730
# For convenience
1839
debug = server_settings["debug"]
1840
debuglevel = server_settings["debuglevel"]
1841
use_dbus = server_settings["use_dbus"]
1842
use_ipv6 = server_settings["use_ipv6"]
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"]
1844
if server_settings["servicename"] != "Mandos":
1736
if server_settings[u"servicename"] != u"Mandos":
1845
1737
syslogger.setFormatter(logging.Formatter
1846
('Mandos (%s) [%%(process)d]:'
1847
' %%(levelname)s: %%(message)s'
1848
% server_settings["servicename"]))
1738
(u'Mandos (%s) [%%(process)d]:'
1739
u' %%(levelname)s: %%(message)s'
1740
% server_settings[u"servicename"]))
1850
1742
# Parse config file with clients
1851
client_defaults = { "timeout": "5m",
1852
"extended_timeout": "15m",
1854
"checker": "fping -q -- %%(host)s",
1856
"approval_delay": "0s",
1857
"approval_duration": "1s",
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",
1859
1750
client_config = configparser.SafeConfigParser(client_defaults)
1860
client_config.read(os.path.join(server_settings["configdir"],
1751
client_config.read(os.path.join(server_settings[u"configdir"],
1863
1754
global mandos_dbus_service
1864
1755
mandos_dbus_service = None
1866
tcp_server = MandosServer((server_settings["address"],
1867
server_settings["port"]),
1757
tcp_server = MandosServer((server_settings[u"address"],
1758
server_settings[u"port"]),
1869
interface=(server_settings["interface"]
1760
interface=(server_settings[u"interface"]
1871
1762
use_ipv6=use_ipv6,
1872
1763
gnutls_priority=
1873
server_settings["priority"],
1764
server_settings[u"priority"],
1874
1765
use_dbus=use_dbus)
1876
pidfilename = "/var/run/mandos.pid"
1767
pidfilename = u"/var/run/mandos.pid"
1878
pidfile = open(pidfilename, "w")
1769
pidfile = open(pidfilename, u"w")
1879
1770
except IOError:
1880
logger.error("Could not open file %r", pidfilename)
1771
logger.error(u"Could not open file %r", pidfilename)
1883
uid = pwd.getpwnam("_mandos").pw_uid
1884
gid = pwd.getpwnam("_mandos").pw_gid
1774
uid = pwd.getpwnam(u"_mandos").pw_uid
1775
gid = pwd.getpwnam(u"_mandos").pw_gid
1885
1776
except KeyError:
1887
uid = pwd.getpwnam("mandos").pw_uid
1888
gid = pwd.getpwnam("mandos").pw_gid
1778
uid = pwd.getpwnam(u"mandos").pw_uid
1779
gid = pwd.getpwnam(u"mandos").pw_gid
1889
1780
except KeyError:
1891
uid = pwd.getpwnam("nobody").pw_uid
1892
gid = pwd.getpwnam("nobody").pw_gid
1782
uid = pwd.getpwnam(u"nobody").pw_uid
1783
gid = pwd.getpwnam(u"nobody").pw_gid
1893
1784
except KeyError:
1899
except OSError as error:
1790
except OSError, error:
1900
1791
if error[0] != errno.EPERM:
1944
1831
# End of Avahi example code
1947
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1834
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1948
1835
bus, do_not_queue=True)
1949
except dbus.exceptions.NameExistsException as e:
1950
logger.error(unicode(e) + ", disabling D-Bus")
1836
except dbus.exceptions.NameExistsException, e:
1837
logger.error(unicode(e) + u", disabling D-Bus")
1951
1838
use_dbus = False
1952
server_settings["use_dbus"] = False
1839
server_settings[u"use_dbus"] = False
1953
1840
tcp_server.use_dbus = False
1954
1841
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
service = AvahiService(name = server_settings["servicename"],
1956
servicetype = "_mandos._tcp",
1842
service = AvahiService(name = server_settings[u"servicename"],
1843
servicetype = u"_mandos._tcp",
1957
1844
protocol = protocol, bus = bus)
1958
1845
if server_settings["interface"]:
1959
1846
service.interface = (if_nametoindex
1960
(str(server_settings["interface"])))
1847
(str(server_settings[u"interface"])))
1850
# Close all input and output, do double fork, etc.
1962
1853
global multiprocessing_manager
1963
1854
multiprocessing_manager = multiprocessing.Manager()
2008
1899
class MandosDBusService(dbus.service.Object):
2009
1900
"""A D-Bus proxy object"""
2010
1901
def __init__(self):
2011
dbus.service.Object.__init__(self, bus, "/")
2012
_interface = "se.bsnet.fukt.Mandos"
1902
dbus.service.Object.__init__(self, bus, u"/")
1903
_interface = u"se.bsnet.fukt.Mandos"
2014
@dbus.service.signal(_interface, signature="o")
1905
@dbus.service.signal(_interface, signature=u"o")
2015
1906
def ClientAdded(self, objpath):
2019
@dbus.service.signal(_interface, signature="ss")
1910
@dbus.service.signal(_interface, signature=u"ss")
2020
1911
def ClientNotFound(self, fingerprint, address):
2024
@dbus.service.signal(_interface, signature="os")
1915
@dbus.service.signal(_interface, signature=u"os")
2025
1916
def ClientRemoved(self, objpath, name):
2029
@dbus.service.method(_interface, out_signature="ao")
1920
@dbus.service.method(_interface, out_signature=u"ao")
2030
1921
def GetAllClients(self):
2032
1923
return dbus.Array(c.dbus_object_path
2033
1924
for c in tcp_server.clients)
2035
1926
@dbus.service.method(_interface,
2036
out_signature="a{oa{sv}}")
1927
out_signature=u"a{oa{sv}}")
2037
1928
def GetAllClientsWithProperties(self):
2039
1930
return dbus.Dictionary(
2040
((c.dbus_object_path, c.GetAll(""))
1931
((c.dbus_object_path, c.GetAll(u""))
2041
1932
for c in tcp_server.clients),
1933
signature=u"oa{sv}")
2044
@dbus.service.method(_interface, in_signature="o")
1935
@dbus.service.method(_interface, in_signature=u"o")
2045
1936
def RemoveClient(self, object_path):
2047
1938
for c in tcp_server.clients: