150
154
def rename(self):
151
155
"""Derived from the Avahi example code"""
152
156
if self.rename_count >= self.max_renames:
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
157
logger.critical("No suitable Zeroconf service name found"
158
" after %i retries, exiting.",
155
159
self.rename_count)
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
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
164
syslogger.setFormatter(logging.Formatter
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
166
175
self.rename_count += 1
167
176
def remove(self):
168
177
"""Derived from the Avahi example code"""
231
241
"""A representation of a client host served by this server.
234
name: string; from the config file, used in log messages and
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
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
248
247
checker: subprocess.Popen(); a running checker process used
249
248
to see if the client lives.
250
249
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
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
256
253
runtime with vars(self) as dict, so that for
257
254
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
258
257
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.
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
262
282
def _timedelta_to_milliseconds(td):
263
283
"Convert a datetime.timedelta() to milliseconds"
281
304
if config is None:
283
logger.debug(u"Creating client %r", self.name)
306
logger.debug("Creating client %r", self.name)
284
307
# Uppercase and remove spaces from fingerprint for later
285
308
# comparison purposes with return value from the fingerprint()
287
self.fingerprint = (config[u"fingerprint"].upper()
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
295
(config[u"secfile"])),
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:
316
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
297
319
self.secret = secfile.read()
299
raise TypeError(u"No secret or secfile for client %s"
321
raise TypeError("No secret or secfile for client %s"
301
self.host = config.get(u"host", u"")
323
self.host = config.get("host", "")
302
324
self.created = datetime.datetime.utcnow()
303
325
self.enabled = False
326
self.last_approval_request = None
304
327
self.last_enabled = None
305
328
self.last_checked_ok = None
306
self.timeout = string_to_delta(config[u"timeout"])
307
self.interval = string_to_delta(config[u"interval"])
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
308
331
self.disable_hook = disable_hook
309
332
self.checker = None
310
333
self.checker_initiator_tag = None
311
334
self.disable_initiator_tag = None
312
335
self.checker_callback_tag = None
313
self.checker_command = config[u"checker"]
336
self.checker_command = config["checker"]
314
337
self.current_checker_command = None
315
338
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("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"])
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
349
def send_changedstate(self):
350
self.changedstate.acquire()
351
self.changedstate.notify_all()
352
self.changedstate.release()
317
354
def enable(self):
318
355
"""Start this client's checker and timeout hooks"""
319
if getattr(self, u"enabled", False):
356
if getattr(self, "enabled", False):
320
357
# Already enabled
359
self.send_changedstate()
322
360
self.last_enabled = datetime.datetime.utcnow()
323
361
# Schedule a new checker to be started an 'interval' from now,
324
362
# and every interval from then on.
567
606
# No such property
568
raise DBusPropertyNotFound(self.dbus_object_path + u":"
569
+ interface_name + u"."
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
572
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
574
613
def Get(self, interface_name, property_name):
575
614
"""Standard D-Bus property Get() method, see D-Bus standard.
577
616
prop = self._get_dbus_property(interface_name, property_name)
578
if prop._dbus_access == u"write":
617
if prop._dbus_access == "write":
579
618
raise DBusPropertyAccessException(property_name)
581
if not hasattr(value, u"variant_level"):
620
if not hasattr(value, "variant_level"):
583
622
return type(value)(value, variant_level=value.variant_level+1)
585
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
586
625
def Set(self, interface_name, property_name, value):
587
626
"""Standard D-Bus property Set() method, see D-Bus standard.
589
628
prop = self._get_dbus_property(interface_name, property_name)
590
if prop._dbus_access == u"read":
629
if prop._dbus_access == "read":
591
630
raise DBusPropertyAccessException(property_name)
592
if prop._dbus_get_args_options[u"byte_arrays"]:
631
if prop._dbus_get_args_options["byte_arrays"]:
632
# The byte_arrays option is not supported yet on
633
# signatures other than "ay".
634
if prop._dbus_signature != "ay":
593
636
value = dbus.ByteArray(''.join(unichr(byte)
594
637
for byte in value))
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
598
out_signature=u"a{sv}")
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
599
642
def GetAll(self, interface_name):
600
643
"""Standard D-Bus property GetAll() method, see D-Bus
632
675
document = xml.dom.minidom.parseString(xmlstring)
633
676
def make_tag(document, name, prop):
634
e = document.createElement(u"property")
635
e.setAttribute(u"name", name)
636
e.setAttribute(u"type", prop._dbus_signature)
637
e.setAttribute(u"access", prop._dbus_access)
677
e = document.createElement("property")
678
e.setAttribute("name", name)
679
e.setAttribute("type", prop._dbus_signature)
680
e.setAttribute("access", prop._dbus_access)
639
for if_tag in document.getElementsByTagName(u"interface"):
682
for if_tag in document.getElementsByTagName("interface"):
640
683
for tag in (make_tag(document, name, prop)
642
685
in self._get_all_dbus_properties()
643
686
if prop._dbus_interface
644
== if_tag.getAttribute(u"name")):
687
== if_tag.getAttribute("name")):
645
688
if_tag.appendChild(tag)
646
689
# Add the names to the return values for the
647
690
# "org.freedesktop.DBus.Properties" methods
648
if (if_tag.getAttribute(u"name")
649
== u"org.freedesktop.DBus.Properties"):
650
for cn in if_tag.getElementsByTagName(u"method"):
651
if cn.getAttribute(u"name") == u"Get":
652
for arg in cn.getElementsByTagName(u"arg"):
653
if (arg.getAttribute(u"direction")
655
arg.setAttribute(u"name", u"value")
656
elif cn.getAttribute(u"name") == u"GetAll":
657
for arg in cn.getElementsByTagName(u"arg"):
658
if (arg.getAttribute(u"direction")
660
arg.setAttribute(u"name", u"props")
661
xmlstring = document.toxml(u"utf-8")
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")
662
705
document.unlink()
663
706
except (AttributeError, xml.dom.DOMException,
664
707
xml.parsers.expat.ExpatError), error:
665
logger.error(u"Failed to override Introspection method",
708
logger.error("Failed to override Introspection method",
674
717
dbus_object_path: dbus.ObjectPath
675
718
bus: dbus.SystemBus()
721
runtime_expansions = (Client.runtime_expansions
722
+ ("dbus_object_path",))
677
724
# dbus.service.Object doesn't use super(), so we can't either.
679
726
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
681
729
Client.__init__(self, *args, **kwargs)
682
730
# Only now, when this client is initialized, can it show up on
732
client_object_name = unicode(self.name).translate(
684
735
self.dbus_object_path = (dbus.ObjectPath
686
+ self.name.replace(u".", u"_")))
736
("/clients/" + client_object_name))
687
737
DBusObjectWithProperties.__init__(self, self.bus,
688
738
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
691
757
def _datetime_to_dbus(dt, variant_level=0):
694
760
variant_level=variant_level)
696
762
def enable(self):
697
oldstate = getattr(self, u"enabled", False)
763
oldstate = getattr(self, "enabled", False)
698
764
r = Client.enable(self)
699
765
if oldstate != self.enabled:
700
766
# Emit D-Bus signals
701
self.PropertyChanged(dbus.String(u"enabled"),
767
self.PropertyChanged(dbus.String("Enabled"),
702
768
dbus.Boolean(True, variant_level=1))
703
769
self.PropertyChanged(
704
dbus.String(u"last_enabled"),
770
dbus.String("LastEnabled"),
705
771
self._datetime_to_dbus(self.last_enabled,
706
772
variant_level=1))
709
775
def disable(self, quiet = False):
710
oldstate = getattr(self, u"enabled", False)
776
oldstate = getattr(self, "enabled", False)
711
777
r = Client.disable(self, quiet=quiet)
712
778
if not quiet and oldstate != self.enabled:
713
779
# Emit D-Bus signal
714
self.PropertyChanged(dbus.String(u"enabled"),
780
self.PropertyChanged(dbus.String("Enabled"),
715
781
dbus.Boolean(False, variant_level=1))
768
843
# Emit D-Bus signal
769
844
self.CheckerStarted(self.current_checker_command)
770
845
self.PropertyChanged(
771
dbus.String(u"checker_running"),
846
dbus.String("CheckerRunning"),
772
847
dbus.Boolean(True, variant_level=1))
775
850
def stop_checker(self, *args, **kwargs):
776
old_checker = getattr(self, u"checker", None)
851
old_checker = getattr(self, "checker", None)
777
852
r = Client.stop_checker(self, *args, **kwargs)
778
853
if (old_checker is not None
779
and getattr(self, u"checker", None) is None):
780
self.PropertyChanged(dbus.String(u"checker_running"),
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
781
856
dbus.Boolean(False, variant_level=1))
784
## D-Bus methods & signals
785
_interface = u"se.bsnet.fukt.Mandos.Client"
788
@dbus.service.method(_interface)
790
return self.checked_ok()
859
def _reset_approved(self):
860
self._approved = None
863
def approve(self, value=True):
864
self.send_changedstate()
865
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
867
(self.approval_duration),
868
self._reset_approved)
871
## D-Bus methods, signals & properties
872
_interface = "se.bsnet.fukt.Mandos.Client"
792
876
# CheckerCompleted - signal
793
@dbus.service.signal(_interface, signature=u"nxs")
877
@dbus.service.signal(_interface, signature="nxs")
794
878
def CheckerCompleted(self, exitcode, waitstatus, command):
798
882
# CheckerStarted - signal
799
@dbus.service.signal(_interface, signature=u"s")
883
@dbus.service.signal(_interface, signature="s")
800
884
def CheckerStarted(self, command):
804
888
# PropertyChanged - signal
805
@dbus.service.signal(_interface, signature=u"sv")
889
@dbus.service.signal(_interface, signature="sv")
806
890
def PropertyChanged(self, property, value):
842
947
def StopChecker(self):
843
948
self.stop_checker()
846
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
def name_dbus_property(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):
848
994
return dbus.String(self.name)
850
# fingerprint - property
851
@dbus_service_property(_interface, signature=u"s", access=u"read")
852
def fingerprint_dbus_property(self):
996
# Fingerprint - property
997
@dbus_service_property(_interface, signature="s", access="read")
998
def Fingerprint_dbus_property(self):
853
999
return dbus.String(self.fingerprint)
856
@dbus_service_property(_interface, signature=u"s",
858
def host_dbus_property(self, value=None):
1002
@dbus_service_property(_interface, signature="s",
1004
def Host_dbus_property(self, value=None):
859
1005
if value is None: # get
860
1006
return dbus.String(self.host)
861
1007
self.host = value
862
1008
# Emit D-Bus signal
863
self.PropertyChanged(dbus.String(u"host"),
1009
self.PropertyChanged(dbus.String("Host"),
864
1010
dbus.String(value, variant_level=1))
867
@dbus_service_property(_interface, signature=u"s", access=u"read")
868
def created_dbus_property(self):
1012
# Created - property
1013
@dbus_service_property(_interface, signature="s", access="read")
1014
def Created_dbus_property(self):
869
1015
return dbus.String(self._datetime_to_dbus(self.created))
871
# last_enabled - property
872
@dbus_service_property(_interface, signature=u"s", access=u"read")
873
def last_enabled_dbus_property(self):
1017
# LastEnabled - property
1018
@dbus_service_property(_interface, signature="s", access="read")
1019
def LastEnabled_dbus_property(self):
874
1020
if self.last_enabled is None:
875
return dbus.String(u"")
1021
return dbus.String("")
876
1022
return dbus.String(self._datetime_to_dbus(self.last_enabled))
879
@dbus_service_property(_interface, signature=u"b",
881
def enabled_dbus_property(self, value=None):
1024
# Enabled - property
1025
@dbus_service_property(_interface, signature="b",
1027
def Enabled_dbus_property(self, value=None):
882
1028
if value is None: # get
883
1029
return dbus.Boolean(self.enabled)
889
# last_checked_ok - property
890
@dbus_service_property(_interface, signature=u"s",
892
def last_checked_ok_dbus_property(self, value=None):
1035
# LastCheckedOK - property
1036
@dbus_service_property(_interface, signature="s",
1038
def LastCheckedOK_dbus_property(self, value=None):
893
1039
if value is not None:
894
1040
self.checked_ok()
896
1042
if self.last_checked_ok is None:
897
return dbus.String(u"")
1043
return dbus.String("")
898
1044
return dbus.String(self._datetime_to_dbus(self
899
1045
.last_checked_ok))
902
@dbus_service_property(_interface, signature=u"t",
904
def timeout_dbus_property(self, value=None):
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):
905
1060
if value is None: # get
906
1061
return dbus.UInt64(self.timeout_milliseconds())
907
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
908
1063
# Emit D-Bus signal
909
self.PropertyChanged(dbus.String(u"timeout"),
1064
self.PropertyChanged(dbus.String("Timeout"),
910
1065
dbus.UInt64(value, variant_level=1))
911
if getattr(self, u"disable_initiator_tag", None) is None:
1066
if getattr(self, "disable_initiator_tag", None) is None:
913
1068
# Reschedule timeout
914
1069
gobject.source_remove(self.disable_initiator_tag)
944
1099
(value, self.start_checker))
945
1100
self.start_checker() # Start one now, too
948
@dbus_service_property(_interface, signature=u"s",
950
def checker_dbus_property(self, value=None):
1102
# Checker - property
1103
@dbus_service_property(_interface, signature="s",
1105
def Checker_dbus_property(self, value=None):
951
1106
if value is None: # get
952
1107
return dbus.String(self.checker_command)
953
1108
self.checker_command = value
954
1109
# Emit D-Bus signal
955
self.PropertyChanged(dbus.String(u"checker"),
1110
self.PropertyChanged(dbus.String("Checker"),
956
1111
dbus.String(self.checker_command,
957
1112
variant_level=1))
959
# checker_running - property
960
@dbus_service_property(_interface, signature=u"b",
962
def checker_running_dbus_property(self, value=None):
1114
# CheckerRunning - property
1115
@dbus_service_property(_interface, signature="b",
1117
def CheckerRunning_dbus_property(self, value=None):
963
1118
if value is None: # get
964
1119
return dbus.Boolean(self.checker is not None)
968
1123
self.stop_checker()
970
# object_path - property
971
@dbus_service_property(_interface, signature=u"o", access=u"read")
972
def object_path_dbus_property(self):
1125
# ObjectPath - property
1126
@dbus_service_property(_interface, signature="o", access="read")
1127
def ObjectPath_dbus_property(self):
973
1128
return self.dbus_object_path # is already a dbus.ObjectPath
976
@dbus_service_property(_interface, signature=u"ay",
977
access=u"write", byte_arrays=True)
978
def secret_dbus_property(self, value):
1131
@dbus_service_property(_interface, signature="ay",
1132
access="write", byte_arrays=True)
1133
def Secret_dbus_property(self, value):
979
1134
self.secret = str(value)
1139
class ProxyClient(object):
1140
def __init__(self, child_pipe, fpr, address):
1141
self._pipe = child_pipe
1142
self._pipe.send(('init', fpr, address))
1143
if not self._pipe.recv():
1146
def __getattribute__(self, name):
1147
if(name == '_pipe'):
1148
return super(ProxyClient, self).__getattribute__(name)
1149
self._pipe.send(('getattr', name))
1150
data = self._pipe.recv()
1151
if data[0] == 'data':
1153
if data[0] == 'function':
1154
def func(*args, **kwargs):
1155
self._pipe.send(('funcall', name, args, kwargs))
1156
return self._pipe.recv()[1]
1159
def __setattr__(self, name, value):
1160
if(name == '_pipe'):
1161
return super(ProxyClient, self).__setattr__(name, value)
1162
self._pipe.send(('setattr', name, value))
984
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
985
1166
"""A class to handle client connections.
988
1169
Note: This will run in its own forked process."""
990
1171
def handle(self):
991
logger.info(u"TCP connection from: %s",
992
unicode(self.client_address))
993
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
994
# Open IPC pipe to parent process
995
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1172
with contextlib.closing(self.server.child_pipe) as child_pipe:
1173
logger.info("TCP connection from: %s",
1174
unicode(self.client_address))
1175
logger.debug("Pipe FD: %d",
1176
self.server.child_pipe.fileno())
996
1178
session = (gnutls.connection
997
1179
.ClientSession(self.request,
998
1180
gnutls.connection
999
1181
.X509Credentials()))
1001
line = self.request.makefile().readline()
1002
logger.debug(u"Protocol version: %r", line)
1004
if int(line.strip().split()[0]) > 1:
1006
except (ValueError, IndexError, RuntimeError), error:
1007
logger.error(u"Unknown protocol version: %s", error)
1010
1183
# Note: gnutls.connection.X509Credentials is really a
1011
1184
# generic GnuTLS certificate credentials object so long as
1012
1185
# no X.509 keys are added to it. Therefore, we can use it
1013
1186
# here despite using OpenPGP certificates.
1015
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1016
# u"+AES-256-CBC", u"+SHA1",
1017
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1019
1192
# Use a fallback default, since this MUST be set.
1020
1193
priority = self.server.gnutls_priority
1021
1194
if priority is None:
1022
priority = u"NORMAL"
1023
1196
(gnutls.library.functions
1024
1197
.gnutls_priority_set_direct(session._c_object,
1025
1198
priority, None))
1200
# Start communication using the Mandos protocol
1201
# Get protocol number
1202
line = self.request.makefile().readline()
1203
logger.debug("Protocol version: %r", line)
1205
if int(line.strip().split()[0]) > 1:
1207
except (ValueError, IndexError, RuntimeError), error:
1208
logger.error("Unknown protocol version: %s", error)
1211
# Start GnuTLS connection
1028
1213
session.handshake()
1029
1214
except gnutls.errors.GNUTLSError, error:
1030
logger.warning(u"Handshake failed: %s", error)
1215
logger.warning("Handshake failed: %s", error)
1031
1216
# Do not run session.bye() here: the session is not
1032
1217
# established. Just abandon the request.
1034
logger.debug(u"Handshake succeeded")
1219
logger.debug("Handshake succeeded")
1221
approval_required = False
1036
fpr = self.fingerprint(self.peer_certificate(session))
1037
except (TypeError, gnutls.errors.GNUTLSError), error:
1038
logger.warning(u"Bad certificate: %s", error)
1041
logger.debug(u"Fingerprint: %s", fpr)
1224
fpr = self.fingerprint(self.peer_certificate
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1227
logger.warning("Bad certificate: %s", error)
1229
logger.debug("Fingerprint: %s", fpr)
1232
client = ProxyClient(child_pipe, fpr,
1233
self.client_address)
1237
if client.approval_delay:
1238
delay = client.approval_delay
1239
client.approvals_pending += 1
1240
approval_required = True
1243
if not client.enabled:
1244
logger.warning("Client %s is disabled",
1246
if self.server.use_dbus:
1248
client.Rejected("Disabled")
1251
if client._approved or not client.approval_delay:
1252
#We are approved or approval is disabled
1254
elif client._approved is None:
1255
logger.info("Client %s needs approval",
1257
if self.server.use_dbus:
1259
client.NeedApproval(
1260
client.approval_delay_milliseconds(),
1261
client.approved_by_default)
1263
logger.warning("Client %s was not approved",
1265
if self.server.use_dbus:
1267
client.Rejected("Denied")
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1272
time = datetime.datetime.now()
1273
client.changedstate.acquire()
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1275
client.changedstate.release()
1276
time2 = datetime.datetime.now()
1277
if (time2 - time) >= delay:
1278
if not client.approved_by_default:
1279
logger.warning("Client %s timed out while"
1280
" waiting for approval",
1282
if self.server.use_dbus:
1284
client.Rejected("Approval timed out")
1289
delay -= time2 - time
1292
while sent_size < len(client.secret):
1294
sent = session.send(client.secret[sent_size:])
1295
except (gnutls.errors.GNUTLSError), error:
1296
logger.warning("gnutls send failed")
1298
logger.debug("Sent: %d, remaining: %d",
1299
sent, len(client.secret)
1300
- (sent_size + sent))
1303
logger.info("Sending secret to %s", client.name)
1304
# bump the timeout as if seen
1306
if self.server.use_dbus:
1043
for c in self.server.clients:
1044
if c.fingerprint == fpr:
1048
ipc.write(u"NOTFOUND %s %s\n"
1049
% (fpr, unicode(self.client_address)))
1052
# Have to check if client.still_valid(), since it is
1053
# possible that the client timed out while establishing
1054
# the GnuTLS session.
1055
if not client.still_valid():
1056
ipc.write(u"INVALID %s\n" % client.name)
1059
ipc.write(u"SENDING %s\n" % client.name)
1061
while sent_size < len(client.secret):
1062
sent = session.send(client.secret[sent_size:])
1063
logger.debug(u"Sent: %d, remaining: %d",
1064
sent, len(client.secret)
1065
- (sent_size + sent))
1311
if approval_required:
1312
client.approvals_pending -= 1
1315
except (gnutls.errors.GNUTLSError), error:
1316
logger.warning("GnuTLS bye failed")
1070
1319
def peer_certificate(session):
1126
1375
# Convert the buffer to a Python bytestring
1127
1376
fpr = ctypes.string_at(buf, buf_len.value)
1128
1377
# Convert the bytestring to hexadecimal notation
1129
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1133
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1134
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1382
class MultiprocessingMixIn(object):
1383
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1384
def sub_process_main(self, request, address):
1386
self.finish_request(request, address)
1388
self.handle_error(request, address)
1389
self.close_request(request)
1391
def process_request(self, request, address):
1392
"""Start a new process to process the request."""
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1397
""" adds a pipe to the MixIn """
1135
1398
def process_request(self, request, client_address):
1136
1399
"""Overrides and wraps the original process_request().
1138
1401
This function creates a new pipe in self.pipe
1140
self.pipe = os.pipe()
1141
super(ForkingMixInWithPipe,
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1405
super(MultiprocessingMixInWithPipe,
1142
1406
self).process_request(request, client_address)
1143
os.close(self.pipe[1]) # close write end
1144
self.add_pipe(self.pipe[0])
1145
def add_pipe(self, pipe):
1407
self.child_pipe.close()
1408
self.add_pipe(parent_pipe)
1410
def add_pipe(self, parent_pipe):
1146
1411
"""Dummy function; override as necessary"""
1150
class IPv6_TCPServer(ForkingMixInWithPipe,
1412
raise NotImplementedError
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1151
1415
socketserver.TCPServer, object):
1152
1416
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1238
1502
return socketserver.TCPServer.server_activate(self)
1239
1503
def enable(self):
1240
1504
self.enabled = True
1241
def add_pipe(self, pipe):
1505
def add_pipe(self, parent_pipe):
1242
1506
# Call "handle_ipc" for both data and EOF events
1243
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1245
def handle_ipc(self, source, condition, file_objects={}):
1507
gobject.io_add_watch(parent_pipe.fileno(),
1508
gobject.IO_IN | gobject.IO_HUP,
1509
functools.partial(self.handle_ipc,
1510
parent_pipe = parent_pipe))
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1513
client_object=None):
1246
1514
condition_names = {
1247
gobject.IO_IN: u"IN", # There is data to read.
1248
gobject.IO_OUT: u"OUT", # Data can be written (without
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1250
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1251
gobject.IO_ERR: u"ERR", # Error condition.
1252
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
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
1253
1521
# broken, usually for pipes and
1257
1525
for cond, name in
1258
1526
condition_names.iteritems()
1259
1527
if cond & condition)
1260
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1263
# Turn the pipe file descriptor into a Python file object
1264
if source not in file_objects:
1265
file_objects[source] = os.fdopen(source, u"r", 1)
1267
# Read a line from the file object
1268
cmdline = file_objects[source].readline()
1269
if not cmdline: # Empty line means end of file
1270
# close the IPC pipe
1271
file_objects[source].close()
1272
del file_objects[source]
1274
# Stop calling this function
1277
logger.debug(u"IPC command: %r", cmdline)
1279
# Parse and act on command
1280
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1282
if cmd == u"NOTFOUND":
1283
fpr, address = args.split(None, 1)
1284
logger.warning(u"Client not found for fingerprint: %s, ad"
1285
u"dress: %s", fpr, address)
1288
mandos_dbus_service.ClientNotFound(fpr, address)
1289
elif cmd == u"INVALID":
1290
for client in self.clients:
1291
if client.name == args:
1292
logger.warning(u"Client %s is invalid", args)
1298
logger.error(u"Unknown client %s is invalid", args)
1299
elif cmd == u"SENDING":
1300
for client in self.clients:
1301
if client.name == args:
1302
logger.info(u"Sending secret to %s", client.name)
1309
logger.error(u"Sending secret to unknown client %s",
1312
logger.error(u"Unknown IPC command: %r", cmdline)
1314
# Keep calling this function
1528
# error or the other end of multiprocessing.Pipe has closed
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1532
# Read a request from the child
1533
request = parent_pipe.recv()
1534
command = request[0]
1536
if command == 'init':
1538
address = request[2]
1540
for c in self.clients:
1541
if c.fingerprint == fpr:
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1550
parent_pipe.send(False)
1553
gobject.io_add_watch(parent_pipe.fileno(),
1554
gobject.IO_IN | gobject.IO_HUP,
1555
functools.partial(self.handle_ipc,
1556
parent_pipe = parent_pipe,
1557
client_object = client))
1558
parent_pipe.send(True)
1559
# remove the old hook in favor of the new above hook on same fileno
1561
if command == 'funcall':
1562
funcname = request[1]
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1568
if command == 'getattr':
1569
attrname = request[1]
1570
if callable(client_object.__getattribute__(attrname)):
1571
parent_pipe.send(('function',))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1575
if command == 'setattr':
1576
attrname = request[1]
1578
setattr(client_object, attrname, value)
1318
1583
def string_to_delta(interval):
1319
1584
"""Parse a string and return a datetime.timedelta
1321
>>> string_to_delta(u'7d')
1586
>>> string_to_delta('7d')
1322
1587
datetime.timedelta(7)
1323
>>> string_to_delta(u'60s')
1588
>>> string_to_delta('60s')
1324
1589
datetime.timedelta(0, 60)
1325
>>> string_to_delta(u'60m')
1590
>>> string_to_delta('60m')
1326
1591
datetime.timedelta(0, 3600)
1327
>>> string_to_delta(u'24h')
1592
>>> string_to_delta('24h')
1328
1593
datetime.timedelta(1)
1329
>>> string_to_delta(u'1w')
1594
>>> string_to_delta('1w')
1330
1595
datetime.timedelta(7)
1331
>>> string_to_delta(u'5m 30s')
1596
>>> string_to_delta('5m 30s')
1332
1597
datetime.timedelta(0, 330)
1334
1599
timevalue = datetime.timedelta(0)
1408
1673
##################################################################
1409
1674
# Parsing of options, both command line and config file
1411
parser = optparse.OptionParser(version = "%%prog %s" % version)
1412
parser.add_option("-i", u"--interface", type=u"string",
1413
metavar="IF", help=u"Bind to interface IF")
1414
parser.add_option("-a", u"--address", type=u"string",
1415
help=u"Address to listen for requests on")
1416
parser.add_option("-p", u"--port", type=u"int",
1417
help=u"Port number to receive requests on")
1418
parser.add_option("--check", action=u"store_true",
1419
help=u"Run self-test")
1420
parser.add_option("--debug", action=u"store_true",
1421
help=u"Debug mode; run in foreground and log to"
1423
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1424
u" priority string (see GnuTLS documentation)")
1425
parser.add_option("--servicename", type=u"string",
1426
metavar=u"NAME", help=u"Zeroconf service name")
1427
parser.add_option("--configdir", type=u"string",
1428
default=u"/etc/mandos", metavar=u"DIR",
1429
help=u"Directory to search for configuration"
1431
parser.add_option("--no-dbus", action=u"store_false",
1432
dest=u"use_dbus", help=u"Do not provide D-Bus"
1433
u" system bus interface")
1434
parser.add_option("--no-ipv6", action=u"store_false",
1435
dest=u"use_ipv6", help=u"Do not use IPv6")
1436
options = parser.parse_args()[0]
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()
1438
1708
if options.check:
1443
1713
# Default values for config file for server-global settings
1444
server_defaults = { u"interface": u"",
1449
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1450
u"servicename": u"Mandos",
1451
u"use_dbus": u"True",
1452
u"use_ipv6": u"True",
1714
server_defaults = { "interface": "",
1719
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1720
"servicename": "Mandos",
1455
1726
# Parse config file for server-global settings
1456
1727
server_config = configparser.SafeConfigParser(server_defaults)
1457
1728
del server_defaults
1458
1729
server_config.read(os.path.join(options.configdir,
1460
1731
# Convert the SafeConfigParser object to a dict
1461
1732
server_settings = server_config.defaults()
1462
1733
# Use the appropriate methods on the non-string config options
1463
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1464
server_settings[option] = server_config.getboolean(u"DEFAULT",
1734
for option in ("debug", "use_dbus", "use_ipv6"):
1735
server_settings[option] = server_config.getboolean("DEFAULT",
1466
1737
if server_settings["port"]:
1467
server_settings["port"] = server_config.getint(u"DEFAULT",
1738
server_settings["port"] = server_config.getint("DEFAULT",
1469
1740
del server_config
1471
1742
# Override the settings from the config file with command line
1472
1743
# options, if set.
1473
for option in (u"interface", u"address", u"port", u"debug",
1474
u"priority", u"servicename", u"configdir",
1475
u"use_dbus", u"use_ipv6"):
1744
for option in ("interface", "address", "port", "debug",
1745
"priority", "servicename", "configdir",
1746
"use_dbus", "use_ipv6", "debuglevel"):
1476
1747
value = getattr(options, option)
1477
1748
if value is not None:
1478
1749
server_settings[option] = value
1486
1757
##################################################################
1488
1759
# For convenience
1489
debug = server_settings[u"debug"]
1490
use_dbus = server_settings[u"use_dbus"]
1491
use_ipv6 = server_settings[u"use_ipv6"]
1494
syslogger.setLevel(logging.WARNING)
1495
console.setLevel(logging.WARNING)
1497
if server_settings[u"servicename"] != u"Mandos":
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":
1498
1766
syslogger.setFormatter(logging.Formatter
1499
(u'Mandos (%s) [%%(process)d]:'
1500
u' %%(levelname)s: %%(message)s'
1501
% server_settings[u"servicename"]))
1767
('Mandos (%s) [%%(process)d]:'
1768
' %%(levelname)s: %%(message)s'
1769
% server_settings["servicename"]))
1503
1771
# Parse config file with clients
1504
client_defaults = { u"timeout": u"1h",
1506
u"checker": u"fping -q -- %%(host)s",
1772
client_defaults = { "timeout": "1h",
1774
"checker": "fping -q -- %%(host)s",
1776
"approval_delay": "0s",
1777
"approval_duration": "1s",
1509
1779
client_config = configparser.SafeConfigParser(client_defaults)
1510
client_config.read(os.path.join(server_settings[u"configdir"],
1780
client_config.read(os.path.join(server_settings["configdir"],
1513
1783
global mandos_dbus_service
1514
1784
mandos_dbus_service = None
1516
tcp_server = MandosServer((server_settings[u"address"],
1517
server_settings[u"port"]),
1786
tcp_server = MandosServer((server_settings["address"],
1787
server_settings["port"]),
1519
interface=server_settings[u"interface"],
1789
interface=(server_settings["interface"]
1520
1791
use_ipv6=use_ipv6,
1521
1792
gnutls_priority=
1522
server_settings[u"priority"],
1793
server_settings["priority"],
1523
1794
use_dbus=use_dbus)
1524
pidfilename = u"/var/run/mandos.pid"
1526
pidfile = open(pidfilename, u"w")
1528
logger.error(u"Could not open file %r", pidfilename)
1796
pidfilename = "/var/run/mandos.pid"
1798
pidfile = open(pidfilename, "w")
1800
logger.error("Could not open file %r", pidfilename)
1531
uid = pwd.getpwnam(u"_mandos").pw_uid
1532
gid = pwd.getpwnam(u"_mandos").pw_gid
1803
uid = pwd.getpwnam("_mandos").pw_uid
1804
gid = pwd.getpwnam("_mandos").pw_gid
1533
1805
except KeyError:
1535
uid = pwd.getpwnam(u"mandos").pw_uid
1536
gid = pwd.getpwnam(u"mandos").pw_gid
1807
uid = pwd.getpwnam("mandos").pw_uid
1808
gid = pwd.getpwnam("mandos").pw_gid
1537
1809
except KeyError:
1539
uid = pwd.getpwnam(u"nobody").pw_uid
1540
gid = pwd.getpwnam(u"nobody").pw_gid
1811
uid = pwd.getpwnam("nobody").pw_uid
1812
gid = pwd.getpwnam("nobody").pw_gid
1541
1813
except KeyError:
1548
1820
if error[0] != errno.EPERM:
1551
# Enable all possible GnuTLS debugging
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)
1832
# Enable all possible GnuTLS debugging
1553
1834
# "Use a log level over 10 to enable all debugging options."
1554
1835
# - GnuTLS manual
1555
1836
gnutls.library.functions.gnutls_global_set_log_level(11)
1557
1838
@gnutls.library.types.gnutls_log_func
1558
1839
def debug_gnutls(level, string):
1559
logger.debug(u"GnuTLS: %s", string[:-1])
1840
logger.debug("GnuTLS: %s", string[:-1])
1561
1842
(gnutls.library.functions
1562
1843
.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.
1564
1859
global main_loop
1565
1860
# From the Avahi example code
1569
1864
# End of Avahi example code
1572
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1867
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1573
1868
bus, do_not_queue=True)
1574
1869
except dbus.exceptions.NameExistsException, e:
1575
logger.error(unicode(e) + u", disabling D-Bus")
1870
logger.error(unicode(e) + ", disabling D-Bus")
1576
1871
use_dbus = False
1577
server_settings[u"use_dbus"] = False
1872
server_settings["use_dbus"] = False
1578
1873
tcp_server.use_dbus = False
1579
1874
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1580
service = AvahiService(name = server_settings[u"servicename"],
1581
servicetype = u"_mandos._tcp",
1875
service = AvahiService(name = server_settings["servicename"],
1876
servicetype = "_mandos._tcp",
1582
1877
protocol = protocol, bus = bus)
1583
1878
if server_settings["interface"]:
1584
1879
service.interface = (if_nametoindex
1585
(str(server_settings[u"interface"])))
1880
(str(server_settings["interface"])))
1882
global multiprocessing_manager
1883
multiprocessing_manager = multiprocessing.Manager()
1587
1885
client_class = Client
1589
1887
client_class = functools.partial(ClientDBus, bus = bus)
1888
def client_config_items(config, section):
1889
special_settings = {
1890
"approved_by_default":
1891
lambda: config.getboolean(section,
1892
"approved_by_default"),
1894
for name, value in config.items(section):
1896
yield (name, special_settings[name]())
1590
1900
tcp_server.clients.update(set(
1591
1901
client_class(name = section,
1592
config= dict(client_config.items(section)))
1902
config= dict(client_config_items(
1903
client_config, section)))
1593
1904
for section in client_config.sections()))
1594
1905
if not tcp_server.clients:
1595
logger.warning(u"No clients defined")
1598
# Redirect stdin so all checkers get /dev/null
1599
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1600
os.dup2(null, sys.stdin.fileno())
1604
# No console logging
1605
logger.removeHandler(console)
1606
# Close all input and output, do double fork, etc.
1610
with closing(pidfile):
1612
pidfile.write(str(pid) + "\n")
1615
logger.error(u"Could not write to file %r with PID %d",
1618
# "pidfile" was never created
1906
logger.warning("No clients defined")
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
1623
1922
signal.signal(signal.SIGINT, signal.SIG_IGN)
1624
1924
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1625
1925
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1628
1928
class MandosDBusService(dbus.service.Object):
1629
1929
"""A D-Bus proxy object"""
1630
1930
def __init__(self):
1631
dbus.service.Object.__init__(self, bus, u"/")
1632
_interface = u"se.bsnet.fukt.Mandos"
1931
dbus.service.Object.__init__(self, bus, "/")
1932
_interface = "se.bsnet.fukt.Mandos"
1634
@dbus.service.signal(_interface, signature=u"oa{sv}")
1635
def ClientAdded(self, objpath, properties):
1934
@dbus.service.signal(_interface, signature="o")
1935
def ClientAdded(self, objpath):
1639
@dbus.service.signal(_interface, signature=u"ss")
1939
@dbus.service.signal(_interface, signature="ss")
1640
1940
def ClientNotFound(self, fingerprint, address):
1644
@dbus.service.signal(_interface, signature=u"os")
1944
@dbus.service.signal(_interface, signature="os")
1645
1945
def ClientRemoved(self, objpath, name):
1649
@dbus.service.method(_interface, out_signature=u"ao")
1949
@dbus.service.method(_interface, out_signature="ao")
1650
1950
def GetAllClients(self):
1652
1952
return dbus.Array(c.dbus_object_path
1653
1953
for c in tcp_server.clients)
1655
1955
@dbus.service.method(_interface,
1656
out_signature=u"a{oa{sv}}")
1956
out_signature="a{oa{sv}}")
1657
1957
def GetAllClientsWithProperties(self):
1659
1959
return dbus.Dictionary(
1660
((c.dbus_object_path, c.GetAll(u""))
1960
((c.dbus_object_path, c.GetAll(""))
1661
1961
for c in tcp_server.clients),
1662
signature=u"oa{sv}")
1664
@dbus.service.method(_interface, in_signature=u"o")
1964
@dbus.service.method(_interface, in_signature="o")
1665
1965
def RemoveClient(self, object_path):
1667
1967
for c in tcp_server.clients: