82
81
SO_BINDTODEVICE = None
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
86
logger = logging.Logger(u'mandos')
89
87
syslogger = (logging.handlers.SysLogHandler
90
88
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
address = str("/dev/log")))
89
address = "/dev/log"))
92
90
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
91
(u'Mandos [%(process)d]: %(levelname)s:'
95
93
logger.addHandler(syslogger)
97
95
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
101
99
logger.addHandler(console)
101
multiprocessing_manager = multiprocessing.Manager()
103
103
class AvahiError(Exception):
104
104
def __init__(self, value, *args, **kwargs):
105
105
self.value = value
154
154
def rename(self):
155
155
"""Derived from the Avahi example code"""
156
156
if self.rename_count >= self.max_renames:
157
logger.critical("No suitable Zeroconf service name found"
158
" after %i retries, exiting.",
157
logger.critical(u"No suitable Zeroconf service name found"
158
u" after %i retries, exiting.",
159
159
self.rename_count)
160
raise AvahiServiceError("Too many renames")
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
162
logger.info("Changing Zeroconf service name to %r ...",
160
raise AvahiServiceError(u"Too many renames")
161
self.name = self.server.GetAlternativeServiceName(self.name)
162
logger.info(u"Changing Zeroconf service name to %r ...",
164
164
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
165
(u'Mandos (%s) [%%(process)d]:'
166
u' %%(levelname)s: %%(message)s'
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
175
170
self.rename_count += 1
176
171
def remove(self):
177
172
"""Derived from the Avahi example code"""
200
195
self.group.Commit()
201
196
def entry_group_state_changed(self, state, error):
202
197
"""Derived from the Avahi example code"""
203
logger.debug("Avahi entry group state change: %i", state)
198
logger.debug(u"Avahi state change: %i", state)
205
200
if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
logger.debug("Zeroconf service established.")
201
logger.debug(u"Zeroconf service established.")
207
202
elif state == avahi.ENTRY_GROUP_COLLISION:
208
logger.info("Zeroconf service name collision.")
203
logger.warning(u"Zeroconf service name collision.")
210
205
elif state == avahi.ENTRY_GROUP_FAILURE:
211
logger.critical("Avahi: Error in group state changed %s",
206
logger.critical(u"Avahi: Error in group state changed %s",
213
raise AvahiGroupError("State changed: %s"
208
raise AvahiGroupError(u"State changed: %s"
214
209
% unicode(error))
215
210
def cleanup(self):
216
211
"""Derived from the Avahi example code"""
241
235
"""A representation of a client host served by this server.
244
_approved: bool(); 'None' if not yet approved/disapproved
245
approval_delay: datetime.timedelta(); Time to wait for approval
246
approval_duration: datetime.timedelta(); Duration of one approval
238
name: string; from the config file, used in log messages and
240
fingerprint: string (40 or 32 hexadecimal digits); used to
241
uniquely identify the client
242
secret: bytestring; sent verbatim (over TLS) to client
243
host: string; available for use by the checker command
244
created: datetime.datetime(); (UTC) object creation
245
last_enabled: datetime.datetime(); (UTC)
247
last_checked_ok: datetime.datetime(); (UTC) or None
248
timeout: datetime.timedelta(); How long from last_checked_ok
249
until this client is disabled
250
interval: datetime.timedelta(); How often to start a new checker
251
disable_hook: If set, called by disable() as disable_hook(self)
247
252
checker: subprocess.Popen(); a running checker process used
248
253
to see if the client lives.
249
254
'None' if no process is running.
250
checker_callback_tag: a gobject event source tag, or None
251
checker_command: string; External command which is run to check
252
if client lives. %() expansions are done at
255
checker_initiator_tag: a gobject event source tag, or None
256
disable_initiator_tag: - '' -
257
checker_callback_tag: - '' -
258
checker_command: string; External command which is run to check if
259
client lives. %() expansions are done at
253
260
runtime with vars(self) as dict, so that for
254
261
instance %(name)s can be used in the command.
255
checker_initiator_tag: a gobject event source tag, or None
256
created: datetime.datetime(); (UTC) object creation
257
262
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
259
disable_initiator_tag: a gobject event source tag, or None
261
fingerprint: string (40 or 32 hexadecimal digits); used to
262
uniquely identify the client
263
host: string; available for use by the checker command
264
interval: datetime.timedelta(); How often to start a new checker
265
last_approval_request: datetime.datetime(); (UTC) or None
266
last_checked_ok: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
268
name: string; from the config file, used in log messages and
270
secret: bytestring; sent verbatim (over TLS) to client
271
timeout: datetime.timedelta(); How long from last_checked_ok
272
until this client is disabled
273
runtime_expansions: Allowed attributes for runtime expansion.
263
approved_delay: datetime.timedelta(); Time to wait for approval
264
_approved: bool(); 'None' if not yet approved/disapproved
265
approved_duration: datetime.timedelta(); Duration of one approval
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
282
269
def _timedelta_to_milliseconds(td):
283
270
"Convert a datetime.timedelta() to milliseconds"
304
291
if config is None:
306
logger.debug("Creating client %r", self.name)
293
logger.debug(u"Creating client %r", self.name)
307
294
# Uppercase and remove spaces from fingerprint for later
308
295
# comparison purposes with return value from the fingerprint()
310
self.fingerprint = (config["fingerprint"].upper()
312
logger.debug(" Fingerprint: %s", self.fingerprint)
313
if "secret" in config:
314
self.secret = config["secret"].decode("base64")
315
elif "secfile" in config:
297
self.fingerprint = (config[u"fingerprint"].upper()
299
logger.debug(u" Fingerprint: %s", self.fingerprint)
300
if u"secret" in config:
301
self.secret = config[u"secret"].decode(u"base64")
302
elif u"secfile" in config:
316
303
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
304
(config[u"secfile"])),
318
305
"rb") as secfile:
319
306
self.secret = secfile.read()
321
raise TypeError("No secret or secfile for client %s"
308
#XXX Need to allow secret on demand!
309
raise TypeError(u"No secret or secfile for client %s"
323
self.host = config.get("host", "")
311
self.host = config.get(u"host", u"")
324
312
self.created = datetime.datetime.utcnow()
325
313
self.enabled = False
326
self.last_approval_request = None
327
314
self.last_enabled = None
328
315
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
316
self.timeout = string_to_delta(config[u"timeout"])
317
self.interval = string_to_delta(config[u"interval"])
331
318
self.disable_hook = disable_hook
332
319
self.checker = None
333
320
self.checker_initiator_tag = None
334
321
self.disable_initiator_tag = None
335
322
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
323
self.checker_command = config[u"checker"]
337
324
self.current_checker_command = None
338
325
self.last_connect = None
326
self.approvals_pending = 0
339
327
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
328
self.approved_by_default = config.get(u"approved_by_default",
342
self.approvals_pending = 0
343
self.approval_delay = string_to_delta(
344
config["approval_delay"])
345
self.approval_duration = string_to_delta(
346
config["approval_duration"])
330
self.approved_delay = string_to_delta(
331
config[u"approved_delay"])
332
self.approved_duration = string_to_delta(
333
config[u"approved_duration"])
347
334
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
349
336
def send_changedstate(self):
350
337
self.changedstate.acquire()
351
338
self.changedstate.notify_all()
462
446
command = self.checker_command % self.host
463
447
except TypeError:
464
448
# Escape attributes for the shell
465
escaped_attrs = dict(
467
re.escape(unicode(str(getattr(self, attr, "")),
471
self.runtime_expansions)
449
escaped_attrs = dict((key,
450
re.escape(unicode(str(val),
454
vars(self).iteritems())
474
456
command = self.checker_command % escaped_attrs
475
457
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
458
logger.error(u'Could not format string "%s":'
459
u' %s', self.checker_command, error)
478
460
return True # Try again later
479
461
self.current_checker_command = command
481
logger.info("Starting checker %r for %s",
463
logger.info(u"Starting checker %r for %s",
482
464
command, self.name)
483
465
# We don't need to redirect stdout and stderr, since
484
466
# in normal mode, that is already done by daemon(),
536
518
# Encoding deeply encoded byte arrays is not supported yet by the
537
519
# "Set" method, so we fail early here:
538
if byte_arrays and signature != "ay":
539
raise ValueError("Byte arrays not supported for non-'ay'"
540
" signature %r" % signature)
520
if byte_arrays and signature != u"ay":
521
raise ValueError(u"Byte arrays not supported for non-'ay'"
522
u" signature %r" % signature)
541
523
def decorator(func):
542
524
func._dbus_is_property = True
543
525
func._dbus_interface = dbus_interface
544
526
func._dbus_signature = signature
545
527
func._dbus_access = access
546
528
func._dbus_name = func.__name__
547
if func._dbus_name.endswith("_dbus_property"):
529
if func._dbus_name.endswith(u"_dbus_property"):
548
530
func._dbus_name = func._dbus_name[:-14]
549
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
531
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
606
588
# No such property
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
589
raise DBusPropertyNotFound(self.dbus_object_path + u":"
590
+ interface_name + u"."
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
593
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
613
595
def Get(self, interface_name, property_name):
614
596
"""Standard D-Bus property Get() method, see D-Bus standard.
616
598
prop = self._get_dbus_property(interface_name, property_name)
617
if prop._dbus_access == "write":
599
if prop._dbus_access == u"write":
618
600
raise DBusPropertyAccessException(property_name)
620
if not hasattr(value, "variant_level"):
602
if not hasattr(value, u"variant_level"):
622
604
return type(value)(value, variant_level=value.variant_level+1)
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
606
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
625
607
def Set(self, interface_name, property_name, value):
626
608
"""Standard D-Bus property Set() method, see D-Bus standard.
628
610
prop = self._get_dbus_property(interface_name, property_name)
629
if prop._dbus_access == "read":
611
if prop._dbus_access == u"read":
630
612
raise DBusPropertyAccessException(property_name)
631
if prop._dbus_get_args_options["byte_arrays"]:
613
if prop._dbus_get_args_options[u"byte_arrays"]:
632
614
# The byte_arrays option is not supported yet on
633
615
# signatures other than "ay".
634
if prop._dbus_signature != "ay":
616
if prop._dbus_signature != u"ay":
636
618
value = dbus.ByteArray(''.join(unichr(byte)
637
619
for byte in value))
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
622
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
623
out_signature=u"a{sv}")
642
624
def GetAll(self, interface_name):
643
625
"""Standard D-Bus property GetAll() method, see D-Bus
675
657
document = xml.dom.minidom.parseString(xmlstring)
676
658
def make_tag(document, name, prop):
677
e = document.createElement("property")
678
e.setAttribute("name", name)
679
e.setAttribute("type", prop._dbus_signature)
680
e.setAttribute("access", prop._dbus_access)
659
e = document.createElement(u"property")
660
e.setAttribute(u"name", name)
661
e.setAttribute(u"type", prop._dbus_signature)
662
e.setAttribute(u"access", prop._dbus_access)
682
for if_tag in document.getElementsByTagName("interface"):
664
for if_tag in document.getElementsByTagName(u"interface"):
683
665
for tag in (make_tag(document, name, prop)
685
667
in self._get_all_dbus_properties()
686
668
if prop._dbus_interface
687
== if_tag.getAttribute("name")):
669
== if_tag.getAttribute(u"name")):
688
670
if_tag.appendChild(tag)
689
671
# Add the names to the return values for the
690
672
# "org.freedesktop.DBus.Properties" methods
691
if (if_tag.getAttribute("name")
692
== "org.freedesktop.DBus.Properties"):
693
for cn in if_tag.getElementsByTagName("method"):
694
if cn.getAttribute("name") == "Get":
695
for arg in cn.getElementsByTagName("arg"):
696
if (arg.getAttribute("direction")
698
arg.setAttribute("name", "value")
699
elif cn.getAttribute("name") == "GetAll":
700
for arg in cn.getElementsByTagName("arg"):
701
if (arg.getAttribute("direction")
703
arg.setAttribute("name", "props")
704
xmlstring = document.toxml("utf-8")
673
if (if_tag.getAttribute(u"name")
674
== u"org.freedesktop.DBus.Properties"):
675
for cn in if_tag.getElementsByTagName(u"method"):
676
if cn.getAttribute(u"name") == u"Get":
677
for arg in cn.getElementsByTagName(u"arg"):
678
if (arg.getAttribute(u"direction")
680
arg.setAttribute(u"name", u"value")
681
elif cn.getAttribute(u"name") == u"GetAll":
682
for arg in cn.getElementsByTagName(u"arg"):
683
if (arg.getAttribute(u"direction")
685
arg.setAttribute(u"name", u"props")
686
xmlstring = document.toxml(u"utf-8")
705
687
document.unlink()
706
688
except (AttributeError, xml.dom.DOMException,
707
689
xml.parsers.expat.ExpatError), error:
708
logger.error("Failed to override Introspection method",
690
logger.error(u"Failed to override Introspection method",
717
699
dbus_object_path: dbus.ObjectPath
718
700
bus: dbus.SystemBus()
721
runtime_expansions = (Client.runtime_expansions
722
+ ("dbus_object_path",))
724
702
# dbus.service.Object doesn't use super(), so we can't either.
726
704
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
729
706
Client.__init__(self, *args, **kwargs)
730
707
# Only now, when this client is initialized, can it show up on
732
client_object_name = unicode(self.name).translate(
735
709
self.dbus_object_path = (dbus.ObjectPath
736
("/clients/" + client_object_name))
711
+ self.name.replace(u".", u"_")))
737
712
DBusObjectWithProperties.__init__(self, self.bus,
738
713
self.dbus_object_path)
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
757
716
def _datetime_to_dbus(dt, variant_level=0):
760
719
variant_level=variant_level)
762
721
def enable(self):
763
oldstate = getattr(self, "enabled", False)
722
oldstate = getattr(self, u"enabled", False)
764
723
r = Client.enable(self)
765
724
if oldstate != self.enabled:
766
725
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
726
self.PropertyChanged(dbus.String(u"enabled"),
768
727
dbus.Boolean(True, variant_level=1))
769
728
self.PropertyChanged(
770
dbus.String("LastEnabled"),
729
dbus.String(u"last_enabled"),
771
730
self._datetime_to_dbus(self.last_enabled,
772
731
variant_level=1))
775
734
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
735
oldstate = getattr(self, u"enabled", False)
777
736
r = Client.disable(self, quiet=quiet)
778
737
if not quiet and oldstate != self.enabled:
779
738
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
739
self.PropertyChanged(dbus.String(u"enabled"),
781
740
dbus.Boolean(False, variant_level=1))
843
793
# Emit D-Bus signal
844
794
self.CheckerStarted(self.current_checker_command)
845
795
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
796
dbus.String(u"checker_running"),
847
797
dbus.Boolean(True, variant_level=1))
850
800
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
801
old_checker = getattr(self, u"checker", None)
852
802
r = Client.stop_checker(self, *args, **kwargs)
853
803
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
804
and getattr(self, u"checker", None) is None):
805
self.PropertyChanged(dbus.String(u"checker_running"),
856
806
dbus.Boolean(False, variant_level=1))
863
813
def approve(self, value=True):
864
self.send_changedstate()
865
814
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
867
(self.approval_duration),
868
self._reset_approved)
815
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
817
def approved_pending(self):
818
return self.approvals_pending > 0
871
821
## D-Bus methods, signals & properties
872
_interface = "se.bsnet.fukt.Mandos.Client"
822
_interface = u"se.bsnet.fukt.Mandos.Client"
876
826
# CheckerCompleted - signal
877
@dbus.service.signal(_interface, signature="nxs")
827
@dbus.service.signal(_interface, signature=u"nxs")
878
828
def CheckerCompleted(self, exitcode, waitstatus, command):
882
832
# CheckerStarted - signal
883
@dbus.service.signal(_interface, signature="s")
833
@dbus.service.signal(_interface, signature=u"s")
884
834
def CheckerStarted(self, command):
888
838
# PropertyChanged - signal
889
@dbus.service.signal(_interface, signature="sv")
839
@dbus.service.signal(_interface, signature=u"sv")
890
840
def PropertyChanged(self, property, value):
894
844
# GotSecret - signal
895
845
@dbus.service.signal(_interface)
896
846
def GotSecret(self):
898
Is sent after a successful transfer of secret from the Mandos
899
server to mandos-client
848
if self.approved_pending():
849
self.PropertyChanged(dbus.String(u"checker_running"),
850
dbus.Boolean(False, variant_level=1))
903
852
# Rejected - signal
904
@dbus.service.signal(_interface, signature="s")
853
@dbus.service.signal(_interface, signature=u"s")
905
854
def Rejected(self, reason):
856
if self.approved_pending():
857
self.PropertyChanged(dbus.String(u"checker_running"),
858
dbus.Boolean(False, variant_level=1))
909
860
# NeedApproval - signal
910
@dbus.service.signal(_interface, signature="tb")
861
@dbus.service.signal(_interface, signature=u"db")
911
862
def NeedApproval(self, timeout, default):
913
return self.need_approval()
864
if not self.approved_pending():
865
self.PropertyChanged(dbus.String(u"approved_pending"),
866
dbus.Boolean(True, variant_level=1))
917
870
# Approve - method
918
@dbus.service.method(_interface, in_signature="b")
871
@dbus.service.method(_interface, in_signature=u"b")
919
872
def Approve(self, value):
920
873
self.approve(value)
922
875
# CheckedOK - method
923
876
@dbus.service.method(_interface)
924
877
def CheckedOK(self):
952
# ApprovalPending - property
953
@dbus_service_property(_interface, signature="b", access="read")
954
def ApprovalPending_dbus_property(self):
955
return dbus.Boolean(bool(self.approvals_pending))
957
# ApprovedByDefault - property
958
@dbus_service_property(_interface, signature="b",
960
def ApprovedByDefault_dbus_property(self, value=None):
961
if value is None: # get
962
return dbus.Boolean(self.approved_by_default)
963
self.approved_by_default = bool(value)
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
dbus.Boolean(value, variant_level=1))
968
# ApprovalDelay - property
969
@dbus_service_property(_interface, signature="t",
971
def ApprovalDelay_dbus_property(self, value=None):
972
if value is None: # get
973
return dbus.UInt64(self.approval_delay_milliseconds())
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
979
# ApprovalDuration - property
980
@dbus_service_property(_interface, signature="t",
982
def ApprovalDuration_dbus_property(self, value=None):
983
if value is None: # get
984
return dbus.UInt64(self._timedelta_to_milliseconds(
985
self.approval_duration))
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
992
@dbus_service_property(_interface, signature="s", access="read")
993
def Name_dbus_property(self):
905
# approved_pending - property
906
@dbus_service_property(_interface, signature=u"b", access=u"read")
907
def approved_pending_dbus_property(self):
908
return dbus.Boolean(self.approved_pending())
910
# approved_by_default - property
911
@dbus_service_property(_interface, signature=u"b",
913
def approved_by_default_dbus_property(self):
914
return dbus.Boolean(self.approved_by_default)
916
# approved_delay - property
917
@dbus_service_property(_interface, signature=u"t",
919
def approved_delay_dbus_property(self):
920
return dbus.UInt64(self.approved_delay_milliseconds())
922
# approved_duration - property
923
@dbus_service_property(_interface, signature=u"t",
925
def approved_duration_dbus_property(self):
926
return dbus.UInt64(self._timedelta_to_milliseconds(
927
self.approved_duration))
930
@dbus_service_property(_interface, signature=u"s", access=u"read")
931
def name_dbus_property(self):
994
932
return dbus.String(self.name)
996
# Fingerprint - property
997
@dbus_service_property(_interface, signature="s", access="read")
998
def Fingerprint_dbus_property(self):
934
# fingerprint - property
935
@dbus_service_property(_interface, signature=u"s", access=u"read")
936
def fingerprint_dbus_property(self):
999
937
return dbus.String(self.fingerprint)
1002
@dbus_service_property(_interface, signature="s",
1004
def Host_dbus_property(self, value=None):
940
@dbus_service_property(_interface, signature=u"s",
942
def host_dbus_property(self, value=None):
1005
943
if value is None: # get
1006
944
return dbus.String(self.host)
1007
945
self.host = value
1008
946
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
947
self.PropertyChanged(dbus.String(u"host"),
1010
948
dbus.String(value, variant_level=1))
1012
# Created - property
1013
@dbus_service_property(_interface, signature="s", access="read")
1014
def Created_dbus_property(self):
951
@dbus_service_property(_interface, signature=u"s", access=u"read")
952
def created_dbus_property(self):
1015
953
return dbus.String(self._datetime_to_dbus(self.created))
1017
# LastEnabled - property
1018
@dbus_service_property(_interface, signature="s", access="read")
1019
def LastEnabled_dbus_property(self):
955
# last_enabled - property
956
@dbus_service_property(_interface, signature=u"s", access=u"read")
957
def last_enabled_dbus_property(self):
1020
958
if self.last_enabled is None:
1021
return dbus.String("")
959
return dbus.String(u"")
1022
960
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1024
# Enabled - property
1025
@dbus_service_property(_interface, signature="b",
1027
def Enabled_dbus_property(self, value=None):
963
@dbus_service_property(_interface, signature=u"b",
965
def enabled_dbus_property(self, value=None):
1028
966
if value is None: # get
1029
967
return dbus.Boolean(self.enabled)
1035
# LastCheckedOK - property
1036
@dbus_service_property(_interface, signature="s",
1038
def LastCheckedOK_dbus_property(self, value=None):
973
# last_checked_ok - property
974
@dbus_service_property(_interface, signature=u"s",
976
def last_checked_ok_dbus_property(self, value=None):
1039
977
if value is not None:
1040
978
self.checked_ok()
1042
980
if self.last_checked_ok is None:
1043
return dbus.String("")
981
return dbus.String(u"")
1044
982
return dbus.String(self._datetime_to_dbus(self
1045
983
.last_checked_ok))
1047
# LastApprovalRequest - property
1048
@dbus_service_property(_interface, signature="s", access="read")
1049
def LastApprovalRequest_dbus_property(self):
1050
if self.last_approval_request is None:
1051
return dbus.String("")
1052
return dbus.String(self.
1053
_datetime_to_dbus(self
1054
.last_approval_request))
1056
# Timeout - property
1057
@dbus_service_property(_interface, signature="t",
1059
def Timeout_dbus_property(self, value=None):
986
@dbus_service_property(_interface, signature=u"t",
988
def timeout_dbus_property(self, value=None):
1060
989
if value is None: # get
1061
990
return dbus.UInt64(self.timeout_milliseconds())
1062
991
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
992
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
993
self.PropertyChanged(dbus.String(u"timeout"),
1065
994
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
995
if getattr(self, u"disable_initiator_tag", None) is None:
1068
997
# Reschedule timeout
1069
998
gobject.source_remove(self.disable_initiator_tag)
1081
1010
self.disable_initiator_tag = (gobject.timeout_add
1082
1011
(time_to_die, self.disable))
1084
# Interval - property
1085
@dbus_service_property(_interface, signature="t",
1087
def Interval_dbus_property(self, value=None):
1013
# interval - property
1014
@dbus_service_property(_interface, signature=u"t",
1015
access=u"readwrite")
1016
def interval_dbus_property(self, value=None):
1088
1017
if value is None: # get
1089
1018
return dbus.UInt64(self.interval_milliseconds())
1090
1019
self.interval = datetime.timedelta(0, 0, 0, value)
1091
1020
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1021
self.PropertyChanged(dbus.String(u"interval"),
1093
1022
dbus.UInt64(value, variant_level=1))
1094
if getattr(self, "checker_initiator_tag", None) is None:
1023
if getattr(self, u"checker_initiator_tag", None) is None:
1096
1025
# Reschedule checker run
1097
1026
gobject.source_remove(self.checker_initiator_tag)
1099
1028
(value, self.start_checker))
1100
1029
self.start_checker() # Start one now, too
1102
# Checker - property
1103
@dbus_service_property(_interface, signature="s",
1105
def Checker_dbus_property(self, value=None):
1031
# checker - property
1032
@dbus_service_property(_interface, signature=u"s",
1033
access=u"readwrite")
1034
def checker_dbus_property(self, value=None):
1106
1035
if value is None: # get
1107
1036
return dbus.String(self.checker_command)
1108
1037
self.checker_command = value
1109
1038
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1039
self.PropertyChanged(dbus.String(u"checker"),
1111
1040
dbus.String(self.checker_command,
1112
1041
variant_level=1))
1114
# CheckerRunning - property
1115
@dbus_service_property(_interface, signature="b",
1117
def CheckerRunning_dbus_property(self, value=None):
1043
# checker_running - property
1044
@dbus_service_property(_interface, signature=u"b",
1045
access=u"readwrite")
1046
def checker_running_dbus_property(self, value=None):
1118
1047
if value is None: # get
1119
1048
return dbus.Boolean(self.checker is not None)
1185
1114
# no X.509 keys are added to it. Therefore, we can use it
1186
1115
# here despite using OpenPGP certificates.
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1117
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1118
# u"+AES-256-CBC", u"+SHA1",
1119
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1192
1121
# Use a fallback default, since this MUST be set.
1193
1122
priority = self.server.gnutls_priority
1194
1123
if priority is None:
1124
priority = u"NORMAL"
1196
1125
(gnutls.library.functions
1197
1126
.gnutls_priority_set_direct(session._c_object,
1198
1127
priority, None))
1200
1129
# Start communication using the Mandos protocol
1201
1130
# Get protocol number
1202
1131
line = self.request.makefile().readline()
1203
logger.debug("Protocol version: %r", line)
1132
logger.debug(u"Protocol version: %r", line)
1205
1134
if int(line.strip().split()[0]) > 1:
1206
1135
raise RuntimeError
1207
1136
except (ValueError, IndexError, RuntimeError), error:
1208
logger.error("Unknown protocol version: %s", error)
1137
logger.error(u"Unknown protocol version: %s", error)
1211
1140
# Start GnuTLS connection
1213
1142
session.handshake()
1214
1143
except gnutls.errors.GNUTLSError, error:
1215
logger.warning("Handshake failed: %s", error)
1144
logger.warning(u"Handshake failed: %s", error)
1216
1145
# Do not run session.bye() here: the session is not
1217
1146
# established. Just abandon the request.
1219
logger.debug("Handshake succeeded")
1148
logger.debug(u"Handshake succeeded")
1221
1150
approval_required = False
1234
1163
except KeyError:
1237
if client.approval_delay:
1238
delay = client.approval_delay
1166
if client.approved_delay:
1167
delay = client.approved_delay
1239
1168
client.approvals_pending += 1
1240
1169
approval_required = True
1243
1172
if not client.enabled:
1244
logger.warning("Client %s is disabled",
1173
logger.warning(u"Client %s is disabled",
1246
1175
if self.server.use_dbus:
1247
1176
# Emit D-Bus signal
1248
1177
client.Rejected("Disabled")
1251
if client._approved or not client.approval_delay:
1180
if client._approved or not client.approved_delay:
1252
1181
#We are approved or approval is disabled
1254
1183
elif client._approved is None:
1255
logger.info("Client %s needs approval",
1184
logger.info(u"Client %s need approval",
1257
1186
if self.server.use_dbus:
1258
1187
# Emit D-Bus signal
1259
1188
client.NeedApproval(
1260
client.approval_delay_milliseconds(),
1189
client.approved_delay_milliseconds(),
1261
1190
client.approved_by_default)
1263
logger.warning("Client %s was not approved",
1192
logger.warning(u"Client %s was not approved",
1265
1194
if self.server.use_dbus:
1266
1195
# Emit D-Bus signal
1267
client.Rejected("Denied")
1196
client.Rejected("Disapproved")
1270
1199
#wait until timeout or approved
1433
1354
bind to an address or port if they were not specified."""
1434
1355
if self.interface is not None:
1435
1356
if SO_BINDTODEVICE is None:
1436
logger.error("SO_BINDTODEVICE does not exist;"
1437
" cannot bind to interface %s",
1357
logger.error(u"SO_BINDTODEVICE does not exist;"
1358
u" cannot bind to interface %s",
1438
1359
self.interface)
1441
1362
self.socket.setsockopt(socket.SOL_SOCKET,
1442
1363
SO_BINDTODEVICE,
1443
1364
str(self.interface
1445
1366
except socket.error, error:
1446
1367
if error[0] == errno.EPERM:
1447
logger.error("No permission to"
1448
" bind to interface %s",
1368
logger.error(u"No permission to"
1369
u" bind to interface %s",
1449
1370
self.interface)
1450
1371
elif error[0] == errno.ENOPROTOOPT:
1451
logger.error("SO_BINDTODEVICE not available;"
1452
" cannot bind to interface %s",
1372
logger.error(u"SO_BINDTODEVICE not available;"
1373
u" cannot bind to interface %s",
1453
1374
self.interface)
1512
1433
def handle_ipc(self, source, condition, parent_pipe=None,
1513
1434
client_object=None):
1514
1435
condition_names = {
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1436
gobject.IO_IN: u"IN", # There is data to read.
1437
gobject.IO_OUT: u"OUT", # Data can be written (without
1518
gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
gobject.IO_ERR: "ERR", # Error condition.
1520
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1439
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1440
gobject.IO_ERR: u"ERR", # Error condition.
1441
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1521
1442
# broken, usually for pipes and
1571
1491
parent_pipe.send(('function',))
1573
1493
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1575
1495
if command == 'setattr':
1576
1496
attrname = request[1]
1577
1497
value = request[2]
1578
1498
setattr(client_object, attrname, value)
1583
1503
def string_to_delta(interval):
1584
1504
"""Parse a string and return a datetime.timedelta
1586
>>> string_to_delta('7d')
1506
>>> string_to_delta(u'7d')
1587
1507
datetime.timedelta(7)
1588
>>> string_to_delta('60s')
1508
>>> string_to_delta(u'60s')
1589
1509
datetime.timedelta(0, 60)
1590
>>> string_to_delta('60m')
1510
>>> string_to_delta(u'60m')
1591
1511
datetime.timedelta(0, 3600)
1592
>>> string_to_delta('24h')
1512
>>> string_to_delta(u'24h')
1593
1513
datetime.timedelta(1)
1594
>>> string_to_delta('1w')
1514
>>> string_to_delta(u'1w')
1595
1515
datetime.timedelta(7)
1596
>>> string_to_delta('5m 30s')
1516
>>> string_to_delta(u'5m 30s')
1597
1517
datetime.timedelta(0, 330)
1599
1519
timevalue = datetime.timedelta(0)
1602
1522
suffix = unicode(s[-1])
1603
1523
value = int(s[:-1])
1605
1525
delta = datetime.timedelta(value)
1526
elif suffix == u"s":
1607
1527
delta = datetime.timedelta(0, value)
1528
elif suffix == u"m":
1609
1529
delta = datetime.timedelta(0, 0, 0, 0, value)
1530
elif suffix == u"h":
1611
1531
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1532
elif suffix == u"w":
1613
1533
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1615
raise ValueError("Unknown suffix %r" % suffix)
1535
raise ValueError(u"Unknown suffix %r" % suffix)
1616
1536
except (ValueError, IndexError), e:
1617
raise ValueError(*(e.args))
1537
raise ValueError(e.message)
1618
1538
timevalue += delta
1619
1539
return timevalue
1626
1546
global if_nametoindex
1628
1548
if_nametoindex = (ctypes.cdll.LoadLibrary
1629
(ctypes.util.find_library("c"))
1549
(ctypes.util.find_library(u"c"))
1630
1550
.if_nametoindex)
1631
1551
except (OSError, AttributeError):
1632
logger.warning("Doing if_nametoindex the hard way")
1552
logger.warning(u"Doing if_nametoindex the hard way")
1633
1553
def if_nametoindex(interface):
1634
1554
"Get an interface index the hard way, i.e. using fcntl()"
1635
1555
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1636
1556
with contextlib.closing(socket.socket()) as s:
1637
1557
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
struct.pack(str("16s16x"),
1558
struct.pack(str(u"16s16x"),
1640
interface_index = struct.unpack(str("I"),
1560
interface_index = struct.unpack(str(u"I"),
1641
1561
ifreq[16:20])[0]
1642
1562
return interface_index
1643
1563
return if_nametoindex(interface)
1673
1593
##################################################################
1674
1594
# Parsing of options, both command line and config file
1676
parser = argparse.ArgumentParser()
1677
parser.add_argument("-v", "--version", action="version",
1678
version = "%%(prog)s %s" % version,
1679
help="show version number and exit")
1680
parser.add_argument("-i", "--interface", metavar="IF",
1681
help="Bind to interface IF")
1682
parser.add_argument("-a", "--address",
1683
help="Address to listen for requests on")
1684
parser.add_argument("-p", "--port", type=int,
1685
help="Port number to receive requests on")
1686
parser.add_argument("--check", action="store_true",
1687
help="Run self-test")
1688
parser.add_argument("--debug", action="store_true",
1689
help="Debug mode; run in foreground and log"
1691
parser.add_argument("--debuglevel", metavar="LEVEL",
1692
help="Debug level for stdout output")
1693
parser.add_argument("--priority", help="GnuTLS"
1694
" priority string (see GnuTLS documentation)")
1695
parser.add_argument("--servicename",
1696
metavar="NAME", help="Zeroconf service name")
1697
parser.add_argument("--configdir",
1698
default="/etc/mandos", metavar="DIR",
1699
help="Directory to search for configuration"
1701
parser.add_argument("--no-dbus", action="store_false",
1702
dest="use_dbus", help="Do not provide D-Bus"
1703
" system bus interface")
1704
parser.add_argument("--no-ipv6", action="store_false",
1705
dest="use_ipv6", help="Do not use IPv6")
1706
options = parser.parse_args()
1596
parser = optparse.OptionParser(version = "%%prog %s" % version)
1597
parser.add_option("-i", u"--interface", type=u"string",
1598
metavar="IF", help=u"Bind to interface IF")
1599
parser.add_option("-a", u"--address", type=u"string",
1600
help=u"Address to listen for requests on")
1601
parser.add_option("-p", u"--port", type=u"int",
1602
help=u"Port number to receive requests on")
1603
parser.add_option("--check", action=u"store_true",
1604
help=u"Run self-test")
1605
parser.add_option("--debug", action=u"store_true",
1606
help=u"Debug mode; run in foreground and log to"
1608
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1609
u" priority string (see GnuTLS documentation)")
1610
parser.add_option("--servicename", type=u"string",
1611
metavar=u"NAME", help=u"Zeroconf service name")
1612
parser.add_option("--configdir", type=u"string",
1613
default=u"/etc/mandos", metavar=u"DIR",
1614
help=u"Directory to search for configuration"
1616
parser.add_option("--no-dbus", action=u"store_false",
1617
dest=u"use_dbus", help=u"Do not provide D-Bus"
1618
u" system bus interface")
1619
parser.add_option("--no-ipv6", action=u"store_false",
1620
dest=u"use_ipv6", help=u"Do not use IPv6")
1621
options = parser.parse_args()[0]
1708
1623
if options.check:
1713
1628
# Default values for config file for server-global settings
1714
server_defaults = { "interface": "",
1719
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1720
"servicename": "Mandos",
1629
server_defaults = { u"interface": u"",
1634
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1635
u"servicename": u"Mandos",
1636
u"use_dbus": u"True",
1637
u"use_ipv6": u"True",
1726
1640
# Parse config file for server-global settings
1727
1641
server_config = configparser.SafeConfigParser(server_defaults)
1728
1642
del server_defaults
1729
1643
server_config.read(os.path.join(options.configdir,
1731
1645
# Convert the SafeConfigParser object to a dict
1732
1646
server_settings = server_config.defaults()
1733
1647
# Use the appropriate methods on the non-string config options
1734
for option in ("debug", "use_dbus", "use_ipv6"):
1735
server_settings[option] = server_config.getboolean("DEFAULT",
1648
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1649
server_settings[option] = server_config.getboolean(u"DEFAULT",
1737
1651
if server_settings["port"]:
1738
server_settings["port"] = server_config.getint("DEFAULT",
1652
server_settings["port"] = server_config.getint(u"DEFAULT",
1740
1654
del server_config
1742
1656
# Override the settings from the config file with command line
1743
1657
# options, if set.
1744
for option in ("interface", "address", "port", "debug",
1745
"priority", "servicename", "configdir",
1746
"use_dbus", "use_ipv6", "debuglevel"):
1658
for option in (u"interface", u"address", u"port", u"debug",
1659
u"priority", u"servicename", u"configdir",
1660
u"use_dbus", u"use_ipv6"):
1747
1661
value = getattr(options, option)
1748
1662
if value is not None:
1749
1663
server_settings[option] = value
1757
1671
##################################################################
1759
1673
# For convenience
1760
debug = server_settings["debug"]
1761
debuglevel = server_settings["debuglevel"]
1762
use_dbus = server_settings["use_dbus"]
1763
use_ipv6 = server_settings["use_ipv6"]
1765
if server_settings["servicename"] != "Mandos":
1674
debug = server_settings[u"debug"]
1675
use_dbus = server_settings[u"use_dbus"]
1676
use_ipv6 = server_settings[u"use_ipv6"]
1679
syslogger.setLevel(logging.WARNING)
1680
console.setLevel(logging.WARNING)
1682
if server_settings[u"servicename"] != u"Mandos":
1766
1683
syslogger.setFormatter(logging.Formatter
1767
('Mandos (%s) [%%(process)d]:'
1768
' %%(levelname)s: %%(message)s'
1769
% server_settings["servicename"]))
1684
(u'Mandos (%s) [%%(process)d]:'
1685
u' %%(levelname)s: %%(message)s'
1686
% server_settings[u"servicename"]))
1771
1688
# Parse config file with clients
1772
client_defaults = { "timeout": "1h",
1774
"checker": "fping -q -- %%(host)s",
1776
"approval_delay": "0s",
1777
"approval_duration": "1s",
1689
client_defaults = { u"timeout": u"1h",
1691
u"checker": u"fping -q -- %%(host)s",
1693
u"approved_delay": u"0s",
1694
u"approved_duration": u"1s",
1779
1696
client_config = configparser.SafeConfigParser(client_defaults)
1780
client_config.read(os.path.join(server_settings["configdir"],
1697
client_config.read(os.path.join(server_settings[u"configdir"],
1783
1700
global mandos_dbus_service
1784
1701
mandos_dbus_service = None
1786
tcp_server = MandosServer((server_settings["address"],
1787
server_settings["port"]),
1703
tcp_server = MandosServer((server_settings[u"address"],
1704
server_settings[u"port"]),
1789
interface=(server_settings["interface"]
1706
interface=server_settings[u"interface"],
1791
1707
use_ipv6=use_ipv6,
1792
1708
gnutls_priority=
1793
server_settings["priority"],
1709
server_settings[u"priority"],
1794
1710
use_dbus=use_dbus)
1796
pidfilename = "/var/run/mandos.pid"
1798
pidfile = open(pidfilename, "w")
1800
logger.error("Could not open file %r", pidfilename)
1711
pidfilename = u"/var/run/mandos.pid"
1713
pidfile = open(pidfilename, u"w")
1715
logger.error(u"Could not open file %r", pidfilename)
1803
uid = pwd.getpwnam("_mandos").pw_uid
1804
gid = pwd.getpwnam("_mandos").pw_gid
1718
uid = pwd.getpwnam(u"_mandos").pw_uid
1719
gid = pwd.getpwnam(u"_mandos").pw_gid
1805
1720
except KeyError:
1807
uid = pwd.getpwnam("mandos").pw_uid
1808
gid = pwd.getpwnam("mandos").pw_gid
1722
uid = pwd.getpwnam(u"mandos").pw_uid
1723
gid = pwd.getpwnam(u"mandos").pw_gid
1809
1724
except KeyError:
1811
uid = pwd.getpwnam("nobody").pw_uid
1812
gid = pwd.getpwnam("nobody").pw_gid
1726
uid = pwd.getpwnam(u"nobody").pw_uid
1727
gid = pwd.getpwnam(u"nobody").pw_gid
1813
1728
except KeyError:
1820
1735
if error[0] != errno.EPERM:
1823
if not debug and not debuglevel:
1824
syslogger.setLevel(logging.WARNING)
1825
console.setLevel(logging.WARNING)
1827
level = getattr(logging, debuglevel.upper())
1828
syslogger.setLevel(level)
1829
console.setLevel(level)
1738
# Enable all possible GnuTLS debugging
1832
# Enable all possible GnuTLS debugging
1834
1740
# "Use a log level over 10 to enable all debugging options."
1835
1741
# - GnuTLS manual
1836
1742
gnutls.library.functions.gnutls_global_set_log_level(11)
1838
1744
@gnutls.library.types.gnutls_log_func
1839
1745
def debug_gnutls(level, string):
1840
logger.debug("GnuTLS: %s", string[:-1])
1746
logger.debug(u"GnuTLS: %s", string[:-1])
1842
1748
(gnutls.library.functions
1843
1749
.gnutls_global_set_log_function(debug_gnutls))
1845
# Redirect stdin so all checkers get /dev/null
1846
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1847
os.dup2(null, sys.stdin.fileno())
1851
# No console logging
1852
logger.removeHandler(console)
1854
# Need to fork before connecting to D-Bus
1856
# Close all input and output, do double fork, etc.
1859
1751
global main_loop
1860
1752
# From the Avahi example code
1864
1756
# End of Avahi example code
1867
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1759
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1868
1760
bus, do_not_queue=True)
1869
1761
except dbus.exceptions.NameExistsException, e:
1870
logger.error(unicode(e) + ", disabling D-Bus")
1762
logger.error(unicode(e) + u", disabling D-Bus")
1871
1763
use_dbus = False
1872
server_settings["use_dbus"] = False
1764
server_settings[u"use_dbus"] = False
1873
1765
tcp_server.use_dbus = False
1874
1766
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1875
service = AvahiService(name = server_settings["servicename"],
1876
servicetype = "_mandos._tcp",
1767
service = AvahiService(name = server_settings[u"servicename"],
1768
servicetype = u"_mandos._tcp",
1877
1769
protocol = protocol, bus = bus)
1878
1770
if server_settings["interface"]:
1879
1771
service.interface = (if_nametoindex
1880
(str(server_settings["interface"])))
1882
global multiprocessing_manager
1883
multiprocessing_manager = multiprocessing.Manager()
1772
(str(server_settings[u"interface"])))
1885
1774
client_class = Client
1903
1792
client_config, section)))
1904
1793
for section in client_config.sections()))
1905
1794
if not tcp_server.clients:
1906
logger.warning("No clients defined")
1795
logger.warning(u"No clients defined")
1798
# Redirect stdin so all checkers get /dev/null
1799
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1800
os.dup2(null, sys.stdin.fileno())
1804
# No console logging
1805
logger.removeHandler(console)
1806
# Close all input and output, do double fork, etc.
1812
pidfile.write(str(pid) + "\n")
1815
logger.error(u"Could not write to file %r with PID %d",
1818
# "pidfile" was never created
1912
pidfile.write(str(pid) + "\n".encode("utf-8"))
1915
logger.error("Could not write to file %r with PID %d",
1918
# "pidfile" was never created
1922
1823
signal.signal(signal.SIGINT, signal.SIG_IGN)
1924
1824
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1925
1825
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1928
1828
class MandosDBusService(dbus.service.Object):
1929
1829
"""A D-Bus proxy object"""
1930
1830
def __init__(self):
1931
dbus.service.Object.__init__(self, bus, "/")
1932
_interface = "se.bsnet.fukt.Mandos"
1831
dbus.service.Object.__init__(self, bus, u"/")
1832
_interface = u"se.bsnet.fukt.Mandos"
1934
@dbus.service.signal(_interface, signature="o")
1834
@dbus.service.signal(_interface, signature=u"o")
1935
1835
def ClientAdded(self, objpath):
1939
@dbus.service.signal(_interface, signature="ss")
1839
@dbus.service.signal(_interface, signature=u"ss")
1940
1840
def ClientNotFound(self, fingerprint, address):
1944
@dbus.service.signal(_interface, signature="os")
1844
@dbus.service.signal(_interface, signature=u"os")
1945
1845
def ClientRemoved(self, objpath, name):
1949
@dbus.service.method(_interface, out_signature="ao")
1849
@dbus.service.method(_interface, out_signature=u"ao")
1950
1850
def GetAllClients(self):
1952
1852
return dbus.Array(c.dbus_object_path
1953
1853
for c in tcp_server.clients)
1955
1855
@dbus.service.method(_interface,
1956
out_signature="a{oa{sv}}")
1856
out_signature=u"a{oa{sv}}")
1957
1857
def GetAllClientsWithProperties(self):
1959
1859
return dbus.Dictionary(
1960
((c.dbus_object_path, c.GetAll(""))
1860
((c.dbus_object_path, c.GetAll(u""))
1961
1861
for c in tcp_server.clients),
1862
signature=u"oa{sv}")
1964
@dbus.service.method(_interface, in_signature="o")
1864
@dbus.service.method(_interface, in_signature=u"o")
1965
1865
def RemoveClient(self, object_path):
1967
1867
for c in tcp_server.clients: