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