88
101
except ImportError:
89
102
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
92
108
stored_state_file = "clients.pickle"
94
110
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
103
116
except (OSError, AttributeError):
104
118
def if_nametoindex(interface):
105
119
"Get an interface index the hard way, i.e. using fcntl()"
106
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
121
with contextlib.closing(socket.socket()) as s:
108
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
125
return interface_index
116
128
def initlogger(debug, level=logging.WARNING):
117
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
119
135
syslogger.setFormatter(logging.Formatter
120
136
('Mandos [%(process)d]: %(levelname)s:'
273
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
276
300
"""Derived from the Avahi example code"""
277
301
if self.rename_count >= self.max_renames:
278
302
logger.critical("No suitable Zeroconf service name found"
279
303
" after %i retries, exiting.",
280
304
self.rename_count)
281
305
raise AvahiServiceError("Too many renames")
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
284
309
logger.info("Changing Zeroconf service name to %r ...",
289
315
except dbus.exceptions.DBusException as error:
290
logger.critical("D-Bus Exception", exc_info=error)
293
self.rename_count += 1
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
321
logger.critical("D-Bus Exception", exc_info=error)
295
325
def remove(self):
296
326
"""Derived from the Avahi example code"""
352
381
def server_state_changed(self, state, error=None):
353
382
"""Derived from the Avahi example code"""
354
383
logger.debug("Avahi server state change: %i", state)
355
bad_states = { avahi.SERVER_INVALID:
356
"Zeroconf server invalid",
357
avahi.SERVER_REGISTERING: None,
358
avahi.SERVER_COLLISION:
359
"Zeroconf server name collision",
360
avahi.SERVER_FAILURE:
361
"Zeroconf server failure" }
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
362
390
if state in bad_states:
363
391
if bad_states[state] is not None:
364
392
if error is None:
383
422
follow_name_owner_changes=True),
384
423
avahi.DBUS_INTERFACE_SERVER)
385
424
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
425
self.server_state_changed)
387
426
self.server_state_changed(self.server.GetState())
390
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
392
431
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
445
connection.send(func(*args, **kwargs))
408
448
class Client(object):
409
449
"""A representation of a client host served by this server.
454
496
"fingerprint", "host", "interval",
455
497
"last_approval_request", "last_checked_ok",
456
498
"last_enabled", "name", "timeout")
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
460
"checker": "fping -q -- %%(host)s",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
464
"approved_by_default": "True",
468
def timeout_milliseconds(self):
469
"Return the 'timeout' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.timeout)
472
def extended_timeout_milliseconds(self):
473
"Return the 'extended_timeout' attribute in milliseconds"
474
return timedelta_to_milliseconds(self.extended_timeout)
476
def interval_milliseconds(self):
477
"Return the 'interval' attribute in milliseconds"
478
return timedelta_to_milliseconds(self.interval)
480
def approval_delay_milliseconds(self):
481
return timedelta_to_milliseconds(self.approval_delay)
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
484
512
def config_parser(config):
562
590
self.current_checker_command = None
563
591
self.approved = None
564
592
self.approvals_pending = 0
565
self.changedstate = (multiprocessing_manager
566
.Condition(multiprocessing_manager
568
self.client_structure = [attr for attr in
569
self.__dict__.iterkeys()
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
570
597
if not attr.startswith("_")]
571
598
self.client_structure.append("client_structure")
573
for name, t in inspect.getmembers(type(self),
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
577
602
if not name.startswith("_"):
578
603
self.client_structure.append(name)
621
646
# and every interval from then on.
622
647
if self.checker_initiator_tag is not None:
623
648
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
627
652
# Schedule a disable() when 'timeout' has passed
628
653
if self.disable_initiator_tag is not None:
629
654
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
633
657
# Also start a new checker *right now*.
634
658
self.start_checker()
636
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
637
662
"""The checker has completed, so take appropriate actions."""
638
663
self.checker_callback_tag = None
639
664
self.checker = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
642
672
if self.last_checker_status == 0:
643
673
logger.info("Checker for %(name)s succeeded",
645
675
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
650
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
651
681
logger.warning("Checker for %(name)s crashed?",
654
685
def checked_ok(self):
655
686
"""Assert that the client has been seen, alive and well."""
656
687
self.last_checked_ok = datetime.datetime.utcnow()
657
688
self.last_checker_status = 0
689
self.last_checker_signal = None
658
690
self.bump_timeout()
660
692
def bump_timeout(self, timeout=None):
687
718
# than 'timeout' for the client to be disabled, which is as it
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except AttributeError:
695
except OSError as error:
696
if error.errno != errno.ECHILD:
700
logger.warning("Checker was a zombie")
701
gobject.source_remove(self.checker_callback_tag)
702
self.checker_callback(pid, status,
703
self.current_checker_command)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
704
725
# Start a new checker if needed
705
726
if self.checker is None:
706
727
# Escape attributes for the shell
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
712
732
command = self.checker_command % escaped_attrs
713
733
except TypeError as error:
714
734
logger.error('Could not format string "%s"',
715
self.checker_command, exc_info=error)
716
return True # Try again later
735
self.checker_command,
737
return True # Try again later
717
738
self.current_checker_command = command
719
logger.info("Starting checker %r for %s",
721
# We don't need to redirect stdout and stderr, since
722
# in normal mode, that is already done by daemon(),
723
# and in debug mode we don't want to. (Stdin is
724
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
741
self.checker_callback_tag = (gobject.child_watch_add
743
self.checker_callback,
745
# The checker may have completed before the gobject
746
# watch was added. Check for this.
748
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
except OSError as error:
750
if error.errno == errno.ECHILD:
751
# This should never happen
752
logger.error("Child process vanished",
757
gobject.source_remove(self.checker_callback_tag)
758
self.checker_callback(pid, status, command)
739
logger.info("Starting checker %r for %s", command,
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
748
popen_args = { "close_fds": True,
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
758
args = (pipe[1], subprocess.call, command),
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
759
764
# Re-run this periodically if run by gobject.timeout_add
831
835
"""Decorator to annotate D-Bus methods, signals or properties
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
834
841
@dbus_service_property("org.example.Interface", signature="b",
836
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
"org.freedesktop.DBus.Property."
838
"EmitsChangedSignal": "false"})
839
843
def Property_dbus_property(self):
840
844
return dbus.Boolean(False)
846
See also the DBusObjectWithAnnotations class.
842
849
def decorator(func):
843
850
func._dbus_annotations = annotations
848
856
class DBusPropertyException(dbus.exceptions.DBusException):
849
857
"""A base class for D-Bus property-related exceptions
851
def __unicode__(self):
852
return unicode(str(self))
855
862
class DBusPropertyAccessException(DBusPropertyException):
879
885
If called like _is_dbus_thing("method") it returns a function
880
886
suitable for use as predicate to inspect.getmembers().
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
891
def _get_all_dbus_things(self, thing):
886
892
"""Returns a generator of (name, attribute) pairs
888
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
890
895
athing.__get__(self))
891
896
for cls in self.__class__.__mro__
892
897
for name, athing in
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
900
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
902
path_keyword = 'object_path',
903
connection_keyword = 'connection')
904
def Introspect(self, object_path, connection):
905
"""Overloading of standard D-Bus method.
907
Inserts annotation tags on methods and signals.
909
xmlstring = dbus.service.Object.Introspect(self, object_path,
912
document = xml.dom.minidom.parseString(xmlstring)
914
for if_tag in document.getElementsByTagName("interface"):
915
# Add annotation tags
916
for typ in ("method", "signal"):
917
for tag in if_tag.getElementsByTagName(typ):
919
for name, prop in (self.
920
_get_all_dbus_things(typ)):
921
if (name == tag.getAttribute("name")
922
and prop._dbus_interface
923
== if_tag.getAttribute("name")):
924
annots.update(getattr(
925
prop, "_dbus_annotations", {}))
926
for name, value in annots.items():
927
ann_tag = document.createElement(
929
ann_tag.setAttribute("name", name)
930
ann_tag.setAttribute("value", value)
931
tag.appendChild(ann_tag)
932
# Add interface annotation tags
933
for annotation, value in dict(
934
itertools.chain.from_iterable(
935
annotations().items()
936
for name, annotations
937
in self._get_all_dbus_things("interface")
938
if name == if_tag.getAttribute("name")
940
ann_tag = document.createElement("annotation")
941
ann_tag.setAttribute("name", annotation)
942
ann_tag.setAttribute("value", value)
943
if_tag.appendChild(ann_tag)
944
# Fix argument name for the Introspect method itself
945
if (if_tag.getAttribute("name")
946
== dbus.INTROSPECTABLE_IFACE):
947
for cn in if_tag.getElementsByTagName("method"):
948
if cn.getAttribute("name") == "Introspect":
949
for arg in cn.getElementsByTagName("arg"):
950
if (arg.getAttribute("direction")
952
arg.setAttribute("name",
954
xmlstring = document.toxml("utf-8")
956
except (AttributeError, xml.dom.DOMException,
957
xml.parsers.expat.ExpatError) as error:
958
logger.error("Failed to override Introspection method",
963
class DBusObjectWithProperties(DBusObjectWithAnnotations):
964
"""A D-Bus object with properties.
966
Classes inheriting from this can use the dbus_service_property
967
decorator to expose methods as D-Bus properties. It exposes the
968
standard Get(), Set(), and GetAll() methods on the D-Bus.
896
971
def _get_dbus_property(self, interface_name, property_name):
897
972
"""Returns a bound method if one exists which is a D-Bus
898
973
property with the specified name and interface.
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
903
self._is_dbus_thing("property"))):
975
for cls in self.__class__.__mro__:
976
for name, value in inspect.getmembers(
977
cls, self._is_dbus_thing("property")):
904
978
if (value._dbus_name == property_name
905
979
and value._dbus_interface == interface_name):
906
980
return value.__get__(self)
908
982
# No such property
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
983
raise DBusPropertyNotFound("{}:{}.{}".format(
984
self.dbus_object_path, interface_name, property_name))
987
def _get_all_interface_names(cls):
988
"""Get a sequence of all interfaces supported by an object"""
989
return (name for name in set(getattr(getattr(x, attr),
990
"_dbus_interface", None)
991
for x in (inspect.getmro(cls))
995
@dbus.service.method(dbus.PROPERTIES_IFACE,
914
997
out_signature="v")
915
998
def Get(self, interface_name, property_name):
916
999
"""Standard D-Bus property Get() method, see D-Bus standard.
991
1088
if prop._dbus_interface
992
1089
== if_tag.getAttribute("name")):
993
1090
if_tag.appendChild(tag)
994
# Add annotation tags
995
for typ in ("method", "signal", "property"):
996
for tag in if_tag.getElementsByTagName(typ):
998
for name, prop in (self.
999
_get_all_dbus_things(typ)):
1000
if (name == tag.getAttribute("name")
1001
and prop._dbus_interface
1002
== if_tag.getAttribute("name")):
1003
annots.update(getattr
1005
"_dbus_annotations",
1007
for name, value in annots.iteritems():
1008
ann_tag = document.createElement(
1010
ann_tag.setAttribute("name", name)
1011
ann_tag.setAttribute("value", value)
1012
tag.appendChild(ann_tag)
1013
# Add interface annotation tags
1014
for annotation, value in dict(
1015
itertools.chain.from_iterable(
1016
annotations().iteritems()
1017
for name, annotations in
1018
self._get_all_dbus_things("interface")
1019
if name == if_tag.getAttribute("name")
1021
ann_tag = document.createElement("annotation")
1022
ann_tag.setAttribute("name", annotation)
1023
ann_tag.setAttribute("value", value)
1024
if_tag.appendChild(ann_tag)
1091
# Add annotation tags for properties
1092
for tag in if_tag.getElementsByTagName("property"):
1094
for name, prop in self._get_all_dbus_things(
1096
if (name == tag.getAttribute("name")
1097
and prop._dbus_interface
1098
== if_tag.getAttribute("name")):
1099
annots.update(getattr(
1100
prop, "_dbus_annotations", {}))
1101
for name, value in annots.items():
1102
ann_tag = document.createElement(
1104
ann_tag.setAttribute("name", name)
1105
ann_tag.setAttribute("value", value)
1106
tag.appendChild(ann_tag)
1025
1107
# Add the names to the return values for the
1026
1108
# "org.freedesktop.DBus.Properties" methods
1027
1109
if (if_tag.getAttribute("name")
1045
1127
exc_info=error)
1046
1128
return xmlstring
1131
dbus.OBJECT_MANAGER_IFACE
1132
except AttributeError:
1133
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1135
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1136
"""A D-Bus object with an ObjectManager.
1138
Classes inheriting from this exposes the standard
1139
GetManagedObjects call and the InterfacesAdded and
1140
InterfacesRemoved signals on the standard
1141
"org.freedesktop.DBus.ObjectManager" interface.
1143
Note: No signals are sent automatically; they must be sent
1146
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1147
out_signature = "a{oa{sa{sv}}}")
1148
def GetManagedObjects(self):
1149
"""This function must be overridden"""
1150
raise NotImplementedError()
1152
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1153
signature = "oa{sa{sv}}")
1154
def InterfacesAdded(self, object_path, interfaces_and_properties):
1157
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1158
def InterfacesRemoved(self, object_path, interfaces):
1161
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1162
out_signature = "s",
1163
path_keyword = 'object_path',
1164
connection_keyword = 'connection')
1165
def Introspect(self, object_path, connection):
1166
"""Overloading of standard D-Bus method.
1168
Override return argument name of GetManagedObjects to be
1169
"objpath_interfaces_and_properties"
1171
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1175
document = xml.dom.minidom.parseString(xmlstring)
1177
for if_tag in document.getElementsByTagName("interface"):
1178
# Fix argument name for the GetManagedObjects method
1179
if (if_tag.getAttribute("name")
1180
== dbus.OBJECT_MANAGER_IFACE):
1181
for cn in if_tag.getElementsByTagName("method"):
1182
if (cn.getAttribute("name")
1183
== "GetManagedObjects"):
1184
for arg in cn.getElementsByTagName("arg"):
1185
if (arg.getAttribute("direction")
1189
"objpath_interfaces"
1191
xmlstring = document.toxml("utf-8")
1193
except (AttributeError, xml.dom.DOMException,
1194
xml.parsers.expat.ExpatError) as error:
1195
logger.error("Failed to override Introspection method",
1049
1199
def datetime_to_dbus(dt, variant_level=0):
1050
1200
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1052
1202
return dbus.String("", variant_level = variant_level)
1053
return dbus.String(dt.isoformat(),
1054
variant_level=variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
1206
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1087
1237
# Ignore non-D-Bus attributes, and D-Bus attributes
1088
1238
# with the wrong interface name
1089
1239
if (not hasattr(attribute, "_dbus_interface")
1090
or not attribute._dbus_interface
1091
.startswith(orig_interface_name)):
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1093
1243
# Create an alternate D-Bus interface name based on
1094
1244
# the current name
1095
alt_interface = (attribute._dbus_interface
1096
.replace(orig_interface_name,
1097
alt_interface_name))
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1098
1247
interface_names.add(alt_interface)
1099
1248
# Is this a D-Bus signal?
1100
1249
if getattr(attribute, "_dbus_is_signal", False):
1101
# Extract the original non-method undecorated
1102
# function by black magic
1103
nonmethod_func = (dict(
1250
if sys.version_info.major == 2:
1251
# Extract the original non-method undecorated
1252
# function by black magic
1253
nonmethod_func = (dict(
1104
1254
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))["func"]
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1107
1259
# Create a new, but exactly alike, function
1108
1260
# object, and decorate it to be a new D-Bus signal
1109
1261
# with the alternate D-Bus interface name
1110
new_function = (dbus.service.signal
1112
attribute._dbus_signature)
1113
(types.FunctionType(
1114
nonmethod_func.func_code,
1115
nonmethod_func.func_globals,
1116
nonmethod_func.func_name,
1117
nonmethod_func.func_defaults,
1118
nonmethod_func.func_closure)))
1262
if sys.version_info.major == 2:
1263
new_function = types.FunctionType(
1264
nonmethod_func.func_code,
1265
nonmethod_func.func_globals,
1266
nonmethod_func.func_name,
1267
nonmethod_func.func_defaults,
1268
nonmethod_func.func_closure)
1270
new_function = types.FunctionType(
1271
nonmethod_func.__code__,
1272
nonmethod_func.__globals__,
1273
nonmethod_func.__name__,
1274
nonmethod_func.__defaults__,
1275
nonmethod_func.__closure__)
1276
new_function = (dbus.service.signal(
1278
attribute._dbus_signature)(new_function))
1119
1279
# Copy annotations, if any
1121
new_function._dbus_annotations = (
1122
dict(attribute._dbus_annotations))
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1123
1283
except AttributeError:
1125
1285
# Define a creator of a function to call both the
1145
1312
# object. Decorate it to be a new D-Bus method
1146
1313
# with the alternate D-Bus interface name. Add it
1147
1314
# to the class.
1148
attr[attrname] = (dbus.service.method
1150
attribute._dbus_in_signature,
1151
attribute._dbus_out_signature)
1153
(attribute.func_code,
1154
attribute.func_globals,
1155
attribute.func_name,
1156
attribute.func_defaults,
1157
attribute.func_closure)))
1316
dbus.service.method(
1318
attribute._dbus_in_signature,
1319
attribute._dbus_out_signature)
1320
(types.FunctionType(attribute.func_code,
1321
attribute.func_globals,
1322
attribute.func_name,
1323
attribute.func_defaults,
1324
attribute.func_closure)))
1158
1325
# Copy annotations, if any
1160
attr[attrname]._dbus_annotations = (
1161
dict(attribute._dbus_annotations))
1327
attr[attrname]._dbus_annotations = dict(
1328
attribute._dbus_annotations)
1162
1329
except AttributeError:
1164
1331
# Is this a D-Bus property?
1167
1334
# object, and decorate it to be a new D-Bus
1168
1335
# property with the alternate D-Bus interface
1169
1336
# name. Add it to the class.
1170
attr[attrname] = (dbus_service_property
1172
attribute._dbus_signature,
1173
attribute._dbus_access,
1175
._dbus_get_args_options
1178
(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1337
attr[attrname] = (dbus_service_property(
1338
alt_interface, attribute._dbus_signature,
1339
attribute._dbus_access,
1340
attribute._dbus_get_args_options
1342
(types.FunctionType(
1343
attribute.func_code,
1344
attribute.func_globals,
1345
attribute.func_name,
1346
attribute.func_defaults,
1347
attribute.func_closure)))
1183
1348
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = (
1186
dict(attribute._dbus_annotations))
1350
attr[attrname]._dbus_annotations = dict(
1351
attribute._dbus_annotations)
1187
1352
except AttributeError:
1189
1354
# Is this a D-Bus interface?
1243
1411
Client.__init__(self, *args, **kwargs)
1244
1412
# Only now, when this client is initialized, can it show up on
1246
client_object_name = unicode(self.name).translate(
1414
client_object_name = str(self.name).translate(
1247
1415
{ord("."): ord("_"),
1248
1416
ord("-"): ord("_")})
1249
self.dbus_object_path = (dbus.ObjectPath
1250
("/clients/" + client_object_name))
1417
self.dbus_object_path = dbus.ObjectPath(
1418
"/clients/" + client_object_name)
1251
1419
DBusObjectWithProperties.__init__(self, self.bus,
1252
1420
self.dbus_object_path)
1254
def notifychangeproperty(transform_func,
1255
dbus_name, type_func=lambda x: x,
1422
def notifychangeproperty(transform_func, dbus_name,
1423
type_func=lambda x: x,
1425
invalidate_only=False,
1426
_interface=_interface):
1257
1427
""" Modify a variable so that it's a property which announces
1258
1428
its changes to DBus.
1264
1434
to the D-Bus. Default: no transform
1265
1435
variant_level: D-Bus variant level. Default: 1
1267
attrname = "_{0}".format(dbus_name)
1437
attrname = "_{}".format(dbus_name)
1268
1439
def setter(self, value):
1269
1440
if hasattr(self, "dbus_object_path"):
1270
1441
if (not hasattr(self, attrname) or
1271
1442
type_func(getattr(self, attrname, None))
1272
1443
!= type_func(value)):
1273
dbus_value = transform_func(type_func(value),
1276
self.PropertyChanged(dbus.String(dbus_name),
1445
self.PropertiesChanged(
1446
_interface, dbus.Dictionary(),
1447
dbus.Array((dbus_name, )))
1449
dbus_value = transform_func(
1451
variant_level = variant_level)
1452
self.PropertyChanged(dbus.String(dbus_name),
1454
self.PropertiesChanged(
1456
dbus.Dictionary({ dbus.String(dbus_name):
1278
1459
setattr(self, attrname, value)
1280
1461
return property(lambda self: getattr(self, attrname), setter)
1297
1478
datetime_to_dbus, "LastApprovalRequest")
1298
1479
approved_by_default = notifychangeproperty(dbus.Boolean,
1299
1480
"ApprovedByDefault")
1300
approval_delay = notifychangeproperty(dbus.UInt64,
1303
timedelta_to_milliseconds)
1481
approval_delay = notifychangeproperty(
1482
dbus.UInt64, "ApprovalDelay",
1483
type_func = lambda td: td.total_seconds() * 1000)
1304
1484
approval_duration = notifychangeproperty(
1305
1485
dbus.UInt64, "ApprovalDuration",
1306
type_func = timedelta_to_milliseconds)
1486
type_func = lambda td: td.total_seconds() * 1000)
1307
1487
host = notifychangeproperty(dbus.String, "Host")
1308
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1310
timedelta_to_milliseconds)
1488
timeout = notifychangeproperty(
1489
dbus.UInt64, "Timeout",
1490
type_func = lambda td: td.total_seconds() * 1000)
1311
1491
extended_timeout = notifychangeproperty(
1312
1492
dbus.UInt64, "ExtendedTimeout",
1313
type_func = timedelta_to_milliseconds)
1314
interval = notifychangeproperty(dbus.UInt64,
1317
timedelta_to_milliseconds)
1493
type_func = lambda td: td.total_seconds() * 1000)
1494
interval = notifychangeproperty(
1495
dbus.UInt64, "Interval",
1496
type_func = lambda td: td.total_seconds() * 1000)
1318
1497
checker_command = notifychangeproperty(dbus.String, "Checker")
1498
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1499
invalidate_only=True)
1320
1501
del notifychangeproperty
1328
1509
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1329
1510
Client.__del__(self, *args, **kwargs)
1331
def checker_callback(self, pid, condition, command,
1333
self.checker_callback_tag = None
1335
if os.WIFEXITED(condition):
1336
exitstatus = os.WEXITSTATUS(condition)
1512
def checker_callback(self, source, condition,
1513
connection, command, *args, **kwargs):
1514
ret = Client.checker_callback(self, source, condition,
1515
connection, command, *args,
1517
exitstatus = self.last_checker_status
1337
1519
# Emit D-Bus signal
1338
1520
self.CheckerCompleted(dbus.Int16(exitstatus),
1339
dbus.Int64(condition),
1521
# This is specific to GNU libC
1522
dbus.Int64(exitstatus << 8),
1340
1523
dbus.String(command))
1342
1525
# Emit D-Bus signal
1343
1526
self.CheckerCompleted(dbus.Int16(-1),
1344
dbus.Int64(condition),
1528
# This is specific to GNU libC
1530
| self.last_checker_signal),
1345
1531
dbus.String(command))
1347
return Client.checker_callback(self, pid, condition, command,
1350
1534
def start_checker(self, *args, **kwargs):
1351
old_checker = self.checker
1352
if self.checker is not None:
1353
old_checker_pid = self.checker.pid
1355
old_checker_pid = None
1535
old_checker_pid = getattr(self.checker, "pid", None)
1356
1536
r = Client.start_checker(self, *args, **kwargs)
1357
1537
# Only if new checker process was started
1358
1538
if (self.checker is not None
1474
1653
self.approved_by_default = bool(value)
1476
1655
# ApprovalDelay - property
1477
@dbus_service_property(_interface, signature="t",
1656
@dbus_service_property(_interface,
1478
1658
access="readwrite")
1479
1659
def ApprovalDelay_dbus_property(self, value=None):
1480
1660
if value is None: # get
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1661
return dbus.UInt64(self.approval_delay.total_seconds()
1482
1663
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1484
1665
# ApprovalDuration - property
1485
@dbus_service_property(_interface, signature="t",
1666
@dbus_service_property(_interface,
1486
1668
access="readwrite")
1487
1669
def ApprovalDuration_dbus_property(self, value=None):
1488
1670
if value is None: # get
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1671
return dbus.UInt64(self.approval_duration.total_seconds()
1491
1673
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1493
1675
# Name - property
1677
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1494
1678
@dbus_service_property(_interface, signature="s", access="read")
1495
1679
def Name_dbus_property(self):
1496
1680
return dbus.String(self.name)
1498
1682
# Fingerprint - property
1684
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1499
1685
@dbus_service_property(_interface, signature="s", access="read")
1500
1686
def Fingerprint_dbus_property(self):
1501
1687
return dbus.String(self.fingerprint)
1503
1689
# Host - property
1504
@dbus_service_property(_interface, signature="s",
1690
@dbus_service_property(_interface,
1505
1692
access="readwrite")
1506
1693
def Host_dbus_property(self, value=None):
1507
1694
if value is None: # get
1508
1695
return dbus.String(self.host)
1509
self.host = unicode(value)
1696
self.host = str(value)
1511
1698
# Created - property
1700
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1512
1701
@dbus_service_property(_interface, signature="s", access="read")
1513
1702
def Created_dbus_property(self):
1514
1703
return datetime_to_dbus(self.created)
1576
1767
gobject.source_remove(self.disable_initiator_tag)
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1768
self.disable_initiator_tag = gobject.timeout_add(
1769
int((self.expires - now).total_seconds() * 1000),
1582
1772
# ExtendedTimeout - property
1583
@dbus_service_property(_interface, signature="t",
1773
@dbus_service_property(_interface,
1584
1775
access="readwrite")
1585
1776
def ExtendedTimeout_dbus_property(self, value=None):
1586
1777
if value is None: # get
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
1778
return dbus.UInt64(self.extended_timeout.total_seconds()
1588
1780
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1590
1782
# Interval - property
1591
@dbus_service_property(_interface, signature="t",
1783
@dbus_service_property(_interface,
1592
1785
access="readwrite")
1593
1786
def Interval_dbus_property(self, value=None):
1594
1787
if value is None: # get
1595
return dbus.UInt64(self.interval_milliseconds())
1788
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
1789
self.interval = datetime.timedelta(0, 0, 0, value)
1597
1790
if getattr(self, "checker_initiator_tag", None) is None:
1599
1792
if self.enabled:
1600
1793
# Reschedule checker run
1601
1794
gobject.source_remove(self.checker_initiator_tag)
1602
self.checker_initiator_tag = (gobject.timeout_add
1603
(value, self.start_checker))
1604
self.start_checker() # Start one now, too
1795
self.checker_initiator_tag = gobject.timeout_add(
1796
value, self.start_checker)
1797
self.start_checker() # Start one now, too
1606
1799
# Checker - property
1607
@dbus_service_property(_interface, signature="s",
1800
@dbus_service_property(_interface,
1608
1802
access="readwrite")
1609
1803
def Checker_dbus_property(self, value=None):
1610
1804
if value is None: # get
1611
1805
return dbus.String(self.checker_command)
1612
self.checker_command = unicode(value)
1806
self.checker_command = str(value)
1614
1808
# CheckerRunning - property
1615
@dbus_service_property(_interface, signature="b",
1809
@dbus_service_property(_interface,
1616
1811
access="readwrite")
1617
1812
def CheckerRunning_dbus_property(self, value=None):
1618
1813
if value is None: # get
1844
2044
def fingerprint(openpgp):
1845
2045
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1846
2046
# New GnuTLS "datum" with the OpenPGP public key
1847
datum = (gnutls.library.types
1848
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1851
ctypes.c_uint(len(openpgp))))
2047
datum = gnutls.library.types.gnutls_datum_t(
2048
ctypes.cast(ctypes.c_char_p(openpgp),
2049
ctypes.POINTER(ctypes.c_ubyte)),
2050
ctypes.c_uint(len(openpgp)))
1852
2051
# New empty GnuTLS certificate
1853
2052
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2053
gnutls.library.functions.gnutls_openpgp_crt_init(
1856
2055
# Import the OpenPGP public key into the certificate
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1859
gnutls.library.constants
1860
.GNUTLS_OPENPGP_FMT_RAW))
2056
gnutls.library.functions.gnutls_openpgp_crt_import(
2057
crt, ctypes.byref(datum),
2058
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1861
2059
# Verify the self signature in the key
1862
2060
crtverify = ctypes.c_uint()
1863
(gnutls.library.functions
1864
.gnutls_openpgp_crt_verify_self(crt, 0,
1865
ctypes.byref(crtverify)))
2061
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
crt, 0, ctypes.byref(crtverify))
1866
2063
if crtverify.value != 0:
1867
2064
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1868
raise (gnutls.errors.CertificateSecurityError
2065
raise gnutls.errors.CertificateSecurityError(
1870
2067
# New buffer for the fingerprint
1871
2068
buf = ctypes.create_string_buffer(20)
1872
2069
buf_len = ctypes.c_size_t()
1873
2070
# Get the fingerprint from the certificate into the buffer
1874
(gnutls.library.functions
1875
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1876
ctypes.byref(buf_len)))
2071
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1877
2073
# Deinit the certificate
1878
2074
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1879
2075
# Convert the buffer to a Python bytestring
2047
2253
def add_pipe(self, parent_pipe, proc):
2048
2254
# Call "handle_ipc" for both data and EOF events
2049
gobject.io_add_watch(parent_pipe.fileno(),
2050
gobject.IO_IN | gobject.IO_HUP,
2051
functools.partial(self.handle_ipc,
2255
gobject.io_add_watch(
2256
parent_pipe.fileno(),
2257
gobject.IO_IN | gobject.IO_HUP,
2258
functools.partial(self.handle_ipc,
2259
parent_pipe = parent_pipe,
2056
def handle_ipc(self, source, condition, parent_pipe=None,
2057
proc = None, client_object=None):
2262
def handle_ipc(self, source, condition,
2265
client_object=None):
2058
2266
# error, or the other end of multiprocessing.Pipe has closed
2059
2267
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2060
2268
# Wait for other process to exit
2147
2355
# avoid excessive use of external libraries.
2149
2357
# New type for defining tokens, syntax, and semantics all-in-one
2150
Token = collections.namedtuple("Token",
2151
("regexp", # To match token; if
2152
# "value" is not None,
2153
# must have a "group"
2155
"value", # datetime.timedelta or
2157
"followers")) # Tokens valid after
2358
Token = collections.namedtuple("Token", (
2359
"regexp", # To match token; if "value" is not None, must have
2360
# a "group" containing digits
2361
"value", # datetime.timedelta or None
2362
"followers")) # Tokens valid after this token
2159
2363
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2160
2364
# the "duration" ABNF definition in RFC 3339, Appendix A.
2161
2365
token_end = Token(re.compile(r"$"), None, frozenset())
2162
2366
token_second = Token(re.compile(r"(\d+)S"),
2163
2367
datetime.timedelta(seconds=1),
2164
frozenset((token_end,)))
2368
frozenset((token_end, )))
2165
2369
token_minute = Token(re.compile(r"(\d+)M"),
2166
2370
datetime.timedelta(minutes=1),
2167
2371
frozenset((token_second, token_end)))
2389
2597
# Override the settings from the config file with command line
2390
2598
# options, if set.
2391
2599
for option in ("interface", "address", "port", "debug",
2392
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2600
"priority", "servicename", "configdir", "use_dbus",
2601
"use_ipv6", "debuglevel", "restore", "statedir",
2602
"socket", "foreground", "zeroconf"):
2395
2603
value = getattr(options, option)
2396
2604
if value is not None:
2397
2605
server_settings[option] = value
2399
2607
# Force all strings to be unicode
2400
2608
for option in server_settings.keys():
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2609
if isinstance(server_settings[option], bytes):
2610
server_settings[option] = (server_settings[option]
2403
2612
# Force all boolean options to be boolean
2404
2613
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2614
"foreground", "zeroconf"):
2406
2615
server_settings[option] = bool(server_settings[option])
2407
2616
# Debug implies foreground
2408
2617
if server_settings["debug"]:
2445
2659
global mandos_dbus_service
2446
2660
mandos_dbus_service = None
2448
tcp_server = MandosServer((server_settings["address"],
2449
server_settings["port"]),
2451
interface=(server_settings["interface"]
2455
server_settings["priority"],
2457
socketfd=(server_settings["socket"]
2663
if server_settings["socket"] != "":
2664
socketfd = server_settings["socket"]
2665
tcp_server = MandosServer(
2666
(server_settings["address"], server_settings["port"]),
2668
interface=(server_settings["interface"] or None),
2670
gnutls_priority=server_settings["priority"],
2459
2673
if not foreground:
2460
2674
pidfilename = "/run/mandos.pid"
2461
2675
if not os.path.isdir("/run/."):
2462
2676
pidfilename = "/var/run/mandos.pid"
2465
pidfile = open(pidfilename, "w")
2679
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2466
2680
except IOError as e:
2467
2681
logger.error("Could not open file %r", pidfilename,
2524
2738
bus_name = dbus.service.BusName("se.recompile.Mandos",
2525
bus, do_not_queue=True)
2526
old_bus_name = (dbus.service.BusName
2527
("se.bsnet.fukt.Mandos", bus,
2529
except dbus.exceptions.NameExistsException as e:
2741
old_bus_name = dbus.service.BusName(
2742
"se.bsnet.fukt.Mandos", bus,
2744
except dbus.exceptions.DBusException as e:
2530
2745
logger.error("Disabling D-Bus:", exc_info=e)
2531
2746
use_dbus = False
2532
2747
server_settings["use_dbus"] = False
2533
2748
tcp_server.use_dbus = False
2534
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2535
service = AvahiServiceToSyslog(name =
2536
server_settings["servicename"],
2537
servicetype = "_mandos._tcp",
2538
protocol = protocol, bus = bus)
2539
if server_settings["interface"]:
2540
service.interface = (if_nametoindex
2541
(str(server_settings["interface"])))
2750
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2751
service = AvahiServiceToSyslog(
2752
name = server_settings["servicename"],
2753
servicetype = "_mandos._tcp",
2754
protocol = protocol,
2756
if server_settings["interface"]:
2757
service.interface = if_nametoindex(
2758
server_settings["interface"].encode("utf-8"))
2543
2760
global multiprocessing_manager
2544
2761
multiprocessing_manager = multiprocessing.Manager()
2563
2780
if server_settings["restore"]:
2565
2782
with open(stored_state_path, "rb") as stored_state:
2566
clients_data, old_client_settings = (pickle.load
2783
clients_data, old_client_settings = pickle.load(
2568
2785
os.remove(stored_state_path)
2569
2786
except IOError as e:
2570
2787
if e.errno == errno.ENOENT:
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
2788
logger.warning("Could not load persistent state:"
2789
" {}".format(os.strerror(e.errno)))
2574
2791
logger.critical("Could not load persistent state:",
2577
2794
except EOFError as e:
2578
2795
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
2581
2799
with PGPEngine() as pgp:
2582
for client_name, client in clients_data.iteritems():
2800
for client_name, client in clients_data.items():
2583
2801
# Skip removed clients
2584
2802
if client_name not in client_settings:
2610
2828
if datetime.datetime.utcnow() >= client["expires"]:
2611
2829
if not client["last_checked_ok"]:
2612
2830
logger.warning(
2613
"disabling client {0} - Client never "
2614
"performed a successful checker"
2615
.format(client_name))
2831
"disabling client {} - Client never "
2832
"performed a successful checker".format(
2616
2834
client["enabled"] = False
2617
2835
elif client["last_checker_status"] != 0:
2618
2836
logger.warning(
2619
"disabling client {0} - Client "
2620
"last checker failed with error code {1}"
2621
.format(client_name,
2622
client["last_checker_status"]))
2837
"disabling client {} - Client last"
2838
" checker failed with error code"
2841
client["last_checker_status"]))
2623
2842
client["enabled"] = False
2625
client["expires"] = (datetime.datetime
2627
+ client["timeout"])
2844
client["expires"] = (
2845
datetime.datetime.utcnow()
2846
+ client["timeout"])
2628
2847
logger.debug("Last checker succeeded,"
2629
" keeping {0} enabled"
2630
.format(client_name))
2848
" keeping {} enabled".format(
2632
client["secret"] = (
2633
pgp.decrypt(client["encrypted_secret"],
2634
client_settings[client_name]
2851
client["secret"] = pgp.decrypt(
2852
client["encrypted_secret"],
2853
client_settings[client_name]["secret"])
2636
2854
except PGPError:
2637
2855
# If decryption fails, we use secret from new settings
2638
logger.debug("Failed to decrypt {0} old secret"
2639
.format(client_name))
2640
client["secret"] = (
2641
client_settings[client_name]["secret"])
2856
logger.debug("Failed to decrypt {} old secret".format(
2858
client["secret"] = (client_settings[client_name]
2643
2861
# Add/remove clients based on new changes made to config
2644
2862
for client_name in (set(old_client_settings)
2916
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2700
2918
@dbus.service.signal(_interface, signature="os")
2701
2919
def ClientRemoved(self, objpath, name):
2923
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2705
2925
@dbus.service.method(_interface, out_signature="ao")
2706
2926
def GetAllClients(self):
2708
return dbus.Array(c.dbus_object_path
2928
return dbus.Array(c.dbus_object_path for c in
2710
2929
tcp_server.clients.itervalues())
2931
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2712
2933
@dbus.service.method(_interface,
2713
2934
out_signature="a{oa{sv}}")
2714
2935
def GetAllClientsWithProperties(self):
2716
2937
return dbus.Dictionary(
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
2938
{ c.dbus_object_path: c.GetAll(
2939
"se.recompile.Mandos.Client")
2940
for c in tcp_server.clients.itervalues() },
2719
2941
signature="oa{sv}")
2721
2943
@dbus.service.method(_interface, in_signature="o")
2725
2947
if c.dbus_object_path == object_path:
2726
2948
del tcp_server.clients[c.name]
2727
2949
c.remove_from_connection()
2728
# Don't signal anything except ClientRemoved
2950
# Don't signal the disabling
2729
2951
c.disable(quiet=True)
2731
self.ClientRemoved(object_path, c.name)
2952
# Emit D-Bus signal for removal
2953
self.client_removed_signal(c)
2733
2955
raise KeyError(object_path)
2959
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
2960
out_signature = "a{oa{sa{sv}}}")
2961
def GetManagedObjects(self):
2963
return dbus.Dictionary(
2964
{ client.dbus_object_path:
2966
{ interface: client.GetAll(interface)
2968
client._get_all_interface_names()})
2969
for client in tcp_server.clients.values()})
2971
def client_added_signal(self, client):
2972
"""Send the new standard signal and the old signal"""
2974
# New standard signal
2975
self.InterfacesAdded(
2976
client.dbus_object_path,
2978
{ interface: client.GetAll(interface)
2980
client._get_all_interface_names()}))
2982
self.ClientAdded(client.dbus_object_path)
2984
def client_removed_signal(self, client):
2985
"""Send the new standard signal and the old signal"""
2987
# New standard signal
2988
self.InterfacesRemoved(
2989
client.dbus_object_path,
2990
client._get_all_interface_names())
2992
self.ClientRemoved(client.dbus_object_path,
2737
2995
mandos_dbus_service = MandosDBusService()
2740
2998
"Cleanup function; run on exit"
2743
3002
multiprocessing.active_children()
2774
3033
del client_settings[client.name]["secret"]
2777
with (tempfile.NamedTemporaryFile
2778
(mode='wb', suffix=".pickle", prefix='clients-',
2779
dir=os.path.dirname(stored_state_path),
2780
delete=False)) as stored_state:
3036
with tempfile.NamedTemporaryFile(
3040
dir=os.path.dirname(stored_state_path),
3041
delete=False) as stored_state:
2781
3042
pickle.dump((clients, client_settings), stored_state)
2782
tempname=stored_state.name
3043
tempname = stored_state.name
2783
3044
os.rename(tempname, stored_state_path)
2784
3045
except (IOError, OSError) as e: