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()
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
102
118
def if_nametoindex(interface):
103
119
"Get an interface index the hard way, i.e. using fcntl()"
104
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
121
with contextlib.closing(socket.socket()) as s:
106
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
return interface_index
114
128
def initlogger(debug, level=logging.WARNING):
115
129
"""init logger and add loglevel"""
117
syslogger = (logging.handlers.SysLogHandler
119
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
121
135
syslogger.setFormatter(logging.Formatter
122
136
('Mandos [%(process)d]: %(levelname)s:'
275
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
278
300
"""Derived from the Avahi example code"""
279
301
if self.rename_count >= self.max_renames:
280
302
logger.critical("No suitable Zeroconf service name found"
281
303
" after %i retries, exiting.",
282
304
self.rename_count)
283
305
raise AvahiServiceError("Too many renames")
284
self.name = unicode(self.server
285
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
286
309
logger.info("Changing Zeroconf service name to %r ...",
291
315
except dbus.exceptions.DBusException as error:
292
logger.critical("D-Bus Exception", exc_info=error)
295
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)
297
325
def remove(self):
298
326
"""Derived from the Avahi example code"""
354
381
def server_state_changed(self, state, error=None):
355
382
"""Derived from the Avahi example code"""
356
383
logger.debug("Avahi server state change: %i", state)
357
bad_states = { avahi.SERVER_INVALID:
358
"Zeroconf server invalid",
359
avahi.SERVER_REGISTERING: None,
360
avahi.SERVER_COLLISION:
361
"Zeroconf server name collision",
362
avahi.SERVER_FAILURE:
363
"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",
364
390
if state in bad_states:
365
391
if bad_states[state] is not None:
366
392
if error is None:
385
422
follow_name_owner_changes=True),
386
423
avahi.DBUS_INTERFACE_SERVER)
387
424
self.server.connect_to_signal("StateChanged",
388
self.server_state_changed)
425
self.server_state_changed)
389
426
self.server_state_changed(self.server.GetState())
392
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
394
431
"""Add the new name to the syslog messages"""
395
ret = AvahiService.rename(self)
396
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
398
' %(levelname)s: %(message)s'
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
403
def timedelta_to_milliseconds(td):
404
"Convert a datetime.timedelta() to milliseconds"
405
return ((td.days * 24 * 60 * 60 * 1000)
406
+ (td.seconds * 1000)
407
+ (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))
410
448
class Client(object):
411
449
"""A representation of a client host served by this server.
456
496
"fingerprint", "host", "interval",
457
497
"last_approval_request", "last_checked_ok",
458
498
"last_enabled", "name", "timeout")
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
462
"checker": "fping -q -- %%(host)s",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
466
"approved_by_default": "True",
470
def timeout_milliseconds(self):
471
"Return the 'timeout' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.timeout)
474
def extended_timeout_milliseconds(self):
475
"Return the 'extended_timeout' attribute in milliseconds"
476
return timedelta_to_milliseconds(self.extended_timeout)
478
def interval_milliseconds(self):
479
"Return the 'interval' attribute in milliseconds"
480
return timedelta_to_milliseconds(self.interval)
482
def approval_delay_milliseconds(self):
483
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",
486
512
def config_parser(config):
564
590
self.current_checker_command = None
565
591
self.approved = None
566
592
self.approvals_pending = 0
567
self.changedstate = (multiprocessing_manager
568
.Condition(multiprocessing_manager
570
self.client_structure = [attr for attr in
571
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()
572
597
if not attr.startswith("_")]
573
598
self.client_structure.append("client_structure")
575
for name, t in inspect.getmembers(type(self),
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
579
602
if not name.startswith("_"):
580
603
self.client_structure.append(name)
623
646
# and every interval from then on.
624
647
if self.checker_initiator_tag is not None:
625
648
gobject.source_remove(self.checker_initiator_tag)
626
self.checker_initiator_tag = (gobject.timeout_add
627
(self.interval_milliseconds(),
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
629
652
# Schedule a disable() when 'timeout' has passed
630
653
if self.disable_initiator_tag is not None:
631
654
gobject.source_remove(self.disable_initiator_tag)
632
self.disable_initiator_tag = (gobject.timeout_add
633
(self.timeout_milliseconds(),
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
635
657
# Also start a new checker *right now*.
636
658
self.start_checker()
638
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
639
662
"""The checker has completed, so take appropriate actions."""
640
663
self.checker_callback_tag = None
641
664
self.checker = None
642
if os.WIFEXITED(condition):
643
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
644
672
if self.last_checker_status == 0:
645
673
logger.info("Checker for %(name)s succeeded",
647
675
self.checked_ok()
649
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
652
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
653
681
logger.warning("Checker for %(name)s crashed?",
656
685
def checked_ok(self):
657
686
"""Assert that the client has been seen, alive and well."""
658
687
self.last_checked_ok = datetime.datetime.utcnow()
659
688
self.last_checker_status = 0
689
self.last_checker_signal = None
660
690
self.bump_timeout()
662
692
def bump_timeout(self, timeout=None):
689
718
# than 'timeout' for the client to be disabled, which is as it
692
# If a checker exists, make sure it is not a zombie
694
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
695
except AttributeError:
697
except OSError as error:
698
if error.errno != errno.ECHILD:
702
logger.warning("Checker was a zombie")
703
gobject.source_remove(self.checker_callback_tag)
704
self.checker_callback(pid, status,
705
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")
706
725
# Start a new checker if needed
707
726
if self.checker is None:
708
727
# Escape attributes for the shell
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
712
self.runtime_expansions)
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
714
732
command = self.checker_command % escaped_attrs
715
733
except TypeError as error:
716
734
logger.error('Could not format string "%s"',
717
self.checker_command, exc_info=error)
718
return True # Try again later
735
self.checker_command,
737
return True # Try again later
719
738
self.current_checker_command = command
721
logger.info("Starting checker %r for %s",
723
# We don't need to redirect stdout and stderr, since
724
# in normal mode, that is already done by daemon(),
725
# and in debug mode we don't want to. (Stdin is
726
# always replaced by /dev/null.)
727
# The exception is when not debugging but nevertheless
728
# running in the foreground; use the previously
731
if (not self.server_settings["debug"]
732
and self.server_settings["foreground"]):
733
popen_args.update({"stdout": wnull,
735
self.checker = subprocess.Popen(command,
739
except OSError as error:
740
logger.error("Failed to start subprocess",
743
self.checker_callback_tag = (gobject.child_watch_add
745
self.checker_callback,
747
# The checker may have completed before the gobject
748
# watch was added. Check for this.
750
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
751
except OSError as error:
752
if error.errno == errno.ECHILD:
753
# This should never happen
754
logger.error("Child process vanished",
759
gobject.source_remove(self.checker_callback_tag)
760
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)
761
764
# Re-run this periodically if run by gobject.timeout_add
833
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"})
836
841
@dbus_service_property("org.example.Interface", signature="b",
838
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
843
def Property_dbus_property(self):
842
844
return dbus.Boolean(False)
846
See also the DBusObjectWithAnnotations class.
844
849
def decorator(func):
845
850
func._dbus_annotations = annotations
850
856
class DBusPropertyException(dbus.exceptions.DBusException):
851
857
"""A base class for D-Bus property-related exceptions
853
def __unicode__(self):
854
return unicode(str(self))
857
862
class DBusPropertyAccessException(DBusPropertyException):
881
885
If called like _is_dbus_thing("method") it returns a function
882
886
suitable for use as predicate to inspect.getmembers().
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
887
891
def _get_all_dbus_things(self, thing):
888
892
"""Returns a generator of (name, attribute) pairs
890
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
892
895
athing.__get__(self))
893
896
for cls in self.__class__.__mro__
894
897
for name, athing in
895
inspect.getmembers(cls,
896
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.
898
971
def _get_dbus_property(self, interface_name, property_name):
899
972
"""Returns a bound method if one exists which is a D-Bus
900
973
property with the specified name and interface.
902
for cls in self.__class__.__mro__:
903
for name, value in (inspect.getmembers
905
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")):
906
978
if (value._dbus_name == property_name
907
979
and value._dbus_interface == interface_name):
908
980
return value.__get__(self)
910
982
# No such property
911
raise DBusPropertyNotFound(self.dbus_object_path + ":"
912
+ interface_name + "."
915
@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,
916
997
out_signature="v")
917
998
def Get(self, interface_name, property_name):
918
999
"""Standard D-Bus property Get() method, see D-Bus standard.
995
1088
if prop._dbus_interface
996
1089
== if_tag.getAttribute("name")):
997
1090
if_tag.appendChild(tag)
998
# Add annotation tags
999
for typ in ("method", "signal", "property"):
1000
for tag in if_tag.getElementsByTagName(typ):
1002
for name, prop in (self.
1003
_get_all_dbus_things(typ)):
1004
if (name == tag.getAttribute("name")
1005
and prop._dbus_interface
1006
== if_tag.getAttribute("name")):
1007
annots.update(getattr
1009
"_dbus_annotations",
1011
for name, value in annots.iteritems():
1012
ann_tag = document.createElement(
1014
ann_tag.setAttribute("name", name)
1015
ann_tag.setAttribute("value", value)
1016
tag.appendChild(ann_tag)
1017
# Add interface annotation tags
1018
for annotation, value in dict(
1019
itertools.chain.from_iterable(
1020
annotations().iteritems()
1021
for name, annotations in
1022
self._get_all_dbus_things("interface")
1023
if name == if_tag.getAttribute("name")
1025
ann_tag = document.createElement("annotation")
1026
ann_tag.setAttribute("name", annotation)
1027
ann_tag.setAttribute("value", value)
1028
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)
1029
1107
# Add the names to the return values for the
1030
1108
# "org.freedesktop.DBus.Properties" methods
1031
1109
if (if_tag.getAttribute("name")
1049
1127
exc_info=error)
1050
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,
1159
def InterfacesRemoved(self, object_path, interfaces):
1162
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1163
out_signature = "s",
1164
path_keyword = 'object_path',
1165
connection_keyword = 'connection')
1166
def Introspect(self, object_path, connection):
1167
"""Overloading of standard D-Bus method.
1169
Override return argument name of GetManagedObjects to be
1170
"objpath_interfaces_and_properties"
1172
xmlstring = DBusObjectWithAnnotations(self, object_path,
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",
1053
1199
def datetime_to_dbus(dt, variant_level=0):
1054
1200
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1056
1202
return dbus.String("", variant_level = variant_level)
1057
return dbus.String(dt.isoformat(),
1058
variant_level=variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1061
1206
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1091
1237
# Ignore non-D-Bus attributes, and D-Bus attributes
1092
1238
# with the wrong interface name
1093
1239
if (not hasattr(attribute, "_dbus_interface")
1094
or not attribute._dbus_interface
1095
.startswith(orig_interface_name)):
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1097
1243
# Create an alternate D-Bus interface name based on
1098
1244
# the current name
1099
alt_interface = (attribute._dbus_interface
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1102
1247
interface_names.add(alt_interface)
1103
1248
# Is this a D-Bus signal?
1104
1249
if getattr(attribute, "_dbus_is_signal", False):
1105
# Extract the original non-method undecorated
1106
# function by black magic
1107
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(
1108
1254
zip(attribute.func_code.co_freevars,
1109
attribute.__closure__))["func"]
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1111
1259
# Create a new, but exactly alike, function
1112
1260
# object, and decorate it to be a new D-Bus signal
1113
1261
# with the alternate D-Bus interface name
1114
new_function = (dbus.service.signal
1116
attribute._dbus_signature)
1117
(types.FunctionType(
1118
nonmethod_func.func_code,
1119
nonmethod_func.func_globals,
1120
nonmethod_func.func_name,
1121
nonmethod_func.func_defaults,
1122
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))
1123
1279
# Copy annotations, if any
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1127
1283
except AttributeError:
1129
1285
# Define a creator of a function to call both the
1149
1307
# object. Decorate it to be a new D-Bus method
1150
1308
# with the alternate D-Bus interface name. Add it
1151
1309
# to the class.
1152
attr[attrname] = (dbus.service.method
1154
attribute._dbus_in_signature,
1155
attribute._dbus_out_signature)
1157
(attribute.func_code,
1158
attribute.func_globals,
1159
attribute.func_name,
1160
attribute.func_defaults,
1161
attribute.func_closure)))
1311
dbus.service.method(
1313
attribute._dbus_in_signature,
1314
attribute._dbus_out_signature)
1315
(types.FunctionType(attribute.func_code,
1316
attribute.func_globals,
1317
attribute.func_name,
1318
attribute.func_defaults,
1319
attribute.func_closure)))
1162
1320
# Copy annotations, if any
1164
attr[attrname]._dbus_annotations = (
1165
dict(attribute._dbus_annotations))
1322
attr[attrname]._dbus_annotations = dict(
1323
attribute._dbus_annotations)
1166
1324
except AttributeError:
1168
1326
# Is this a D-Bus property?
1171
1329
# object, and decorate it to be a new D-Bus
1172
1330
# property with the alternate D-Bus interface
1173
1331
# name. Add it to the class.
1174
attr[attrname] = (dbus_service_property
1176
attribute._dbus_signature,
1177
attribute._dbus_access,
1179
._dbus_get_args_options
1182
(attribute.func_code,
1183
attribute.func_globals,
1184
attribute.func_name,
1185
attribute.func_defaults,
1186
attribute.func_closure)))
1332
attr[attrname] = (dbus_service_property(
1333
alt_interface, attribute._dbus_signature,
1334
attribute._dbus_access,
1335
attribute._dbus_get_args_options
1337
(types.FunctionType(
1338
attribute.func_code,
1339
attribute.func_globals,
1340
attribute.func_name,
1341
attribute.func_defaults,
1342
attribute.func_closure)))
1187
1343
# Copy annotations, if any
1189
attr[attrname]._dbus_annotations = (
1190
dict(attribute._dbus_annotations))
1345
attr[attrname]._dbus_annotations = dict(
1346
attribute._dbus_annotations)
1191
1347
except AttributeError:
1193
1349
# Is this a D-Bus interface?
1247
1406
Client.__init__(self, *args, **kwargs)
1248
1407
# Only now, when this client is initialized, can it show up on
1250
client_object_name = unicode(self.name).translate(
1409
client_object_name = str(self.name).translate(
1251
1410
{ord("."): ord("_"),
1252
1411
ord("-"): ord("_")})
1253
self.dbus_object_path = (dbus.ObjectPath
1254
("/clients/" + client_object_name))
1412
self.dbus_object_path = dbus.ObjectPath(
1413
"/clients/" + client_object_name)
1255
1414
DBusObjectWithProperties.__init__(self, self.bus,
1256
1415
self.dbus_object_path)
1258
def notifychangeproperty(transform_func,
1259
dbus_name, type_func=lambda x: x,
1417
def notifychangeproperty(transform_func, dbus_name,
1418
type_func=lambda x: x,
1420
invalidate_only=False,
1421
_interface=_interface):
1261
1422
""" Modify a variable so that it's a property which announces
1262
1423
its changes to DBus.
1268
1429
to the D-Bus. Default: no transform
1269
1430
variant_level: D-Bus variant level. Default: 1
1271
attrname = "_{0}".format(dbus_name)
1432
attrname = "_{}".format(dbus_name)
1272
1434
def setter(self, value):
1273
1435
if hasattr(self, "dbus_object_path"):
1274
1436
if (not hasattr(self, attrname) or
1275
1437
type_func(getattr(self, attrname, None))
1276
1438
!= type_func(value)):
1277
dbus_value = transform_func(type_func(value),
1280
self.PropertyChanged(dbus.String(dbus_name),
1440
self.PropertiesChanged(
1441
_interface, dbus.Dictionary(),
1442
dbus.Array((dbus_name, )))
1444
dbus_value = transform_func(
1446
variant_level = variant_level)
1447
self.PropertyChanged(dbus.String(dbus_name),
1449
self.PropertiesChanged(
1451
dbus.Dictionary({ dbus.String(dbus_name):
1282
1454
setattr(self, attrname, value)
1284
1456
return property(lambda self: getattr(self, attrname), setter)
1301
1473
datetime_to_dbus, "LastApprovalRequest")
1302
1474
approved_by_default = notifychangeproperty(dbus.Boolean,
1303
1475
"ApprovedByDefault")
1304
approval_delay = notifychangeproperty(dbus.UInt64,
1307
timedelta_to_milliseconds)
1476
approval_delay = notifychangeproperty(
1477
dbus.UInt64, "ApprovalDelay",
1478
type_func = lambda td: td.total_seconds() * 1000)
1308
1479
approval_duration = notifychangeproperty(
1309
1480
dbus.UInt64, "ApprovalDuration",
1310
type_func = timedelta_to_milliseconds)
1481
type_func = lambda td: td.total_seconds() * 1000)
1311
1482
host = notifychangeproperty(dbus.String, "Host")
1312
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1314
timedelta_to_milliseconds)
1483
timeout = notifychangeproperty(
1484
dbus.UInt64, "Timeout",
1485
type_func = lambda td: td.total_seconds() * 1000)
1315
1486
extended_timeout = notifychangeproperty(
1316
1487
dbus.UInt64, "ExtendedTimeout",
1317
type_func = timedelta_to_milliseconds)
1318
interval = notifychangeproperty(dbus.UInt64,
1321
timedelta_to_milliseconds)
1488
type_func = lambda td: td.total_seconds() * 1000)
1489
interval = notifychangeproperty(
1490
dbus.UInt64, "Interval",
1491
type_func = lambda td: td.total_seconds() * 1000)
1322
1492
checker_command = notifychangeproperty(dbus.String, "Checker")
1493
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1494
invalidate_only=True)
1324
1496
del notifychangeproperty
1332
1504
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1333
1505
Client.__del__(self, *args, **kwargs)
1335
def checker_callback(self, pid, condition, command,
1337
self.checker_callback_tag = None
1339
if os.WIFEXITED(condition):
1340
exitstatus = os.WEXITSTATUS(condition)
1507
def checker_callback(self, source, condition,
1508
connection, command, *args, **kwargs):
1509
ret = Client.checker_callback(self, source, condition,
1510
connection, command, *args,
1512
exitstatus = self.last_checker_status
1341
1514
# Emit D-Bus signal
1342
1515
self.CheckerCompleted(dbus.Int16(exitstatus),
1343
dbus.Int64(condition),
1516
# This is specific to GNU libC
1517
dbus.Int64(exitstatus << 8),
1344
1518
dbus.String(command))
1346
1520
# Emit D-Bus signal
1347
1521
self.CheckerCompleted(dbus.Int16(-1),
1348
dbus.Int64(condition),
1523
# This is specific to GNU libC
1525
| self.last_checker_signal),
1349
1526
dbus.String(command))
1351
return Client.checker_callback(self, pid, condition, command,
1354
1529
def start_checker(self, *args, **kwargs):
1355
1530
old_checker_pid = getattr(self.checker, "pid", None)
1474
1648
self.approved_by_default = bool(value)
1476
1650
# ApprovalDelay - property
1477
@dbus_service_property(_interface, signature="t",
1651
@dbus_service_property(_interface,
1478
1653
access="readwrite")
1479
1654
def ApprovalDelay_dbus_property(self, value=None):
1480
1655
if value is None: # get
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1656
return dbus.UInt64(self.approval_delay.total_seconds()
1482
1658
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1484
1660
# ApprovalDuration - property
1485
@dbus_service_property(_interface, signature="t",
1661
@dbus_service_property(_interface,
1486
1663
access="readwrite")
1487
1664
def ApprovalDuration_dbus_property(self, value=None):
1488
1665
if value is None: # get
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1666
return dbus.UInt64(self.approval_duration.total_seconds()
1491
1668
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1493
1670
# Name - property
1672
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1494
1673
@dbus_service_property(_interface, signature="s", access="read")
1495
1674
def Name_dbus_property(self):
1496
1675
return dbus.String(self.name)
1498
1677
# Fingerprint - property
1679
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1499
1680
@dbus_service_property(_interface, signature="s", access="read")
1500
1681
def Fingerprint_dbus_property(self):
1501
1682
return dbus.String(self.fingerprint)
1503
1684
# Host - property
1504
@dbus_service_property(_interface, signature="s",
1685
@dbus_service_property(_interface,
1505
1687
access="readwrite")
1506
1688
def Host_dbus_property(self, value=None):
1507
1689
if value is None: # get
1508
1690
return dbus.String(self.host)
1509
self.host = unicode(value)
1691
self.host = str(value)
1511
1693
# Created - property
1695
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1512
1696
@dbus_service_property(_interface, signature="s", access="read")
1513
1697
def Created_dbus_property(self):
1514
1698
return datetime_to_dbus(self.created)
1576
1762
gobject.source_remove(self.disable_initiator_tag)
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1763
self.disable_initiator_tag = gobject.timeout_add(
1764
int((self.expires - now).total_seconds() * 1000),
1582
1767
# ExtendedTimeout - property
1583
@dbus_service_property(_interface, signature="t",
1768
@dbus_service_property(_interface,
1584
1770
access="readwrite")
1585
1771
def ExtendedTimeout_dbus_property(self, value=None):
1586
1772
if value is None: # get
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
1773
return dbus.UInt64(self.extended_timeout.total_seconds()
1588
1775
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1590
1777
# Interval - property
1591
@dbus_service_property(_interface, signature="t",
1778
@dbus_service_property(_interface,
1592
1780
access="readwrite")
1593
1781
def Interval_dbus_property(self, value=None):
1594
1782
if value is None: # get
1595
return dbus.UInt64(self.interval_milliseconds())
1783
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
1784
self.interval = datetime.timedelta(0, 0, 0, value)
1597
1785
if getattr(self, "checker_initiator_tag", None) is None:
1599
1787
if self.enabled:
1600
1788
# Reschedule checker run
1601
1789
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
1790
self.checker_initiator_tag = gobject.timeout_add(
1791
value, self.start_checker)
1792
self.start_checker() # Start one now, too
1606
1794
# Checker - property
1607
@dbus_service_property(_interface, signature="s",
1795
@dbus_service_property(_interface,
1608
1797
access="readwrite")
1609
1798
def Checker_dbus_property(self, value=None):
1610
1799
if value is None: # get
1611
1800
return dbus.String(self.checker_command)
1612
self.checker_command = unicode(value)
1801
self.checker_command = str(value)
1614
1803
# CheckerRunning - property
1615
@dbus_service_property(_interface, signature="b",
1804
@dbus_service_property(_interface,
1616
1806
access="readwrite")
1617
1807
def CheckerRunning_dbus_property(self, value=None):
1618
1808
if value is None: # get
1844
2039
def fingerprint(openpgp):
1845
2040
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1846
2041
# 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))))
2042
datum = gnutls.library.types.gnutls_datum_t(
2043
ctypes.cast(ctypes.c_char_p(openpgp),
2044
ctypes.POINTER(ctypes.c_ubyte)),
2045
ctypes.c_uint(len(openpgp)))
1852
2046
# New empty GnuTLS certificate
1853
2047
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2048
gnutls.library.functions.gnutls_openpgp_crt_init(
1856
2050
# 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))
2051
gnutls.library.functions.gnutls_openpgp_crt_import(
2052
crt, ctypes.byref(datum),
2053
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1861
2054
# Verify the self signature in the key
1862
2055
crtverify = ctypes.c_uint()
1863
(gnutls.library.functions
1864
.gnutls_openpgp_crt_verify_self(crt, 0,
1865
ctypes.byref(crtverify)))
2056
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2057
crt, 0, ctypes.byref(crtverify))
1866
2058
if crtverify.value != 0:
1867
2059
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1868
raise (gnutls.errors.CertificateSecurityError
2060
raise gnutls.errors.CertificateSecurityError(
1870
2062
# New buffer for the fingerprint
1871
2063
buf = ctypes.create_string_buffer(20)
1872
2064
buf_len = ctypes.c_size_t()
1873
2065
# 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)))
2066
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2067
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1877
2068
# Deinit the certificate
1878
2069
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1879
2070
# Convert the buffer to a Python bytestring
2047
2248
def add_pipe(self, parent_pipe, proc):
2048
2249
# 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,
2250
gobject.io_add_watch(
2251
parent_pipe.fileno(),
2252
gobject.IO_IN | gobject.IO_HUP,
2253
functools.partial(self.handle_ipc,
2254
parent_pipe = parent_pipe,
2056
def handle_ipc(self, source, condition, parent_pipe=None,
2057
proc = None, client_object=None):
2257
def handle_ipc(self, source, condition,
2260
client_object=None):
2058
2261
# error, or the other end of multiprocessing.Pipe has closed
2059
2262
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2060
2263
# Wait for other process to exit
2147
2350
# avoid excessive use of external libraries.
2149
2352
# 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
2353
Token = collections.namedtuple("Token", (
2354
"regexp", # To match token; if "value" is not None, must have
2355
# a "group" containing digits
2356
"value", # datetime.timedelta or None
2357
"followers")) # Tokens valid after this token
2159
2358
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2160
2359
# the "duration" ABNF definition in RFC 3339, Appendix A.
2161
2360
token_end = Token(re.compile(r"$"), None, frozenset())
2162
2361
token_second = Token(re.compile(r"(\d+)S"),
2163
2362
datetime.timedelta(seconds=1),
2164
frozenset((token_end,)))
2363
frozenset((token_end, )))
2165
2364
token_minute = Token(re.compile(r"(\d+)M"),
2166
2365
datetime.timedelta(minutes=1),
2167
2366
frozenset((token_second, token_end)))
2389
2592
# Override the settings from the config file with command line
2390
2593
# options, if set.
2391
2594
for option in ("interface", "address", "port", "debug",
2392
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2595
"priority", "servicename", "configdir", "use_dbus",
2596
"use_ipv6", "debuglevel", "restore", "statedir",
2597
"socket", "foreground", "zeroconf"):
2395
2598
value = getattr(options, option)
2396
2599
if value is not None:
2397
2600
server_settings[option] = value
2399
2602
# Force all strings to be unicode
2400
2603
for option in server_settings.keys():
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2604
if isinstance(server_settings[option], bytes):
2605
server_settings[option] = (server_settings[option]
2403
2607
# Force all boolean options to be boolean
2404
2608
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2609
"foreground", "zeroconf"):
2406
2610
server_settings[option] = bool(server_settings[option])
2407
2611
# Debug implies foreground
2408
2612
if server_settings["debug"]:
2445
2654
global mandos_dbus_service
2446
2655
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"]
2658
if server_settings["socket"] != "":
2659
socketfd = server_settings["socket"]
2660
tcp_server = MandosServer(
2661
(server_settings["address"], server_settings["port"]),
2663
interface=(server_settings["interface"] or None),
2665
gnutls_priority=server_settings["priority"],
2459
2668
if not foreground:
2460
2669
pidfilename = "/run/mandos.pid"
2461
2670
if not os.path.isdir("/run/."):
2462
2671
pidfilename = "/var/run/mandos.pid"
2465
pidfile = open(pidfilename, "w")
2674
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2466
2675
except IOError as e:
2467
2676
logger.error("Could not open file %r", pidfilename,
2524
2733
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:
2736
old_bus_name = dbus.service.BusName(
2737
"se.bsnet.fukt.Mandos", bus,
2739
except dbus.exceptions.DBusException as e:
2530
2740
logger.error("Disabling D-Bus:", exc_info=e)
2531
2741
use_dbus = False
2532
2742
server_settings["use_dbus"] = False
2533
2743
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"])))
2745
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2746
service = AvahiServiceToSyslog(
2747
name = server_settings["servicename"],
2748
servicetype = "_mandos._tcp",
2749
protocol = protocol,
2751
if server_settings["interface"]:
2752
service.interface = if_nametoindex(
2753
server_settings["interface"].encode("utf-8"))
2543
2755
global multiprocessing_manager
2544
2756
multiprocessing_manager = multiprocessing.Manager()
2563
2775
if server_settings["restore"]:
2565
2777
with open(stored_state_path, "rb") as stored_state:
2566
clients_data, old_client_settings = (pickle.load
2778
clients_data, old_client_settings = pickle.load(
2568
2780
os.remove(stored_state_path)
2569
2781
except IOError as e:
2570
2782
if e.errno == errno.ENOENT:
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
2783
logger.warning("Could not load persistent state:"
2784
" {}".format(os.strerror(e.errno)))
2574
2786
logger.critical("Could not load persistent state:",
2577
2789
except EOFError as e:
2578
2790
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
2581
2794
with PGPEngine() as pgp:
2582
for client_name, client in clients_data.iteritems():
2795
for client_name, client in clients_data.items():
2583
2796
# Skip removed clients
2584
2797
if client_name not in client_settings:
2610
2823
if datetime.datetime.utcnow() >= client["expires"]:
2611
2824
if not client["last_checked_ok"]:
2612
2825
logger.warning(
2613
"disabling client {0} - Client never "
2614
"performed a successful checker"
2615
.format(client_name))
2826
"disabling client {} - Client never "
2827
"performed a successful checker".format(
2616
2829
client["enabled"] = False
2617
2830
elif client["last_checker_status"] != 0:
2618
2831
logger.warning(
2619
"disabling client {0} - Client "
2620
"last checker failed with error code {1}"
2621
.format(client_name,
2622
client["last_checker_status"]))
2832
"disabling client {} - Client last"
2833
" checker failed with error code"
2836
client["last_checker_status"]))
2623
2837
client["enabled"] = False
2625
client["expires"] = (datetime.datetime
2627
+ client["timeout"])
2839
client["expires"] = (
2840
datetime.datetime.utcnow()
2841
+ client["timeout"])
2628
2842
logger.debug("Last checker succeeded,"
2629
" keeping {0} enabled"
2630
.format(client_name))
2843
" keeping {} enabled".format(
2632
client["secret"] = (
2633
pgp.decrypt(client["encrypted_secret"],
2634
client_settings[client_name]
2846
client["secret"] = pgp.decrypt(
2847
client["encrypted_secret"],
2848
client_settings[client_name]["secret"])
2636
2849
except PGPError:
2637
2850
# 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"])
2851
logger.debug("Failed to decrypt {} old secret".format(
2853
client["secret"] = (client_settings[client_name]
2643
2856
# Add/remove clients based on new changes made to config
2644
2857
for client_name in (set(old_client_settings)
2911
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2700
2913
@dbus.service.signal(_interface, signature="os")
2701
2914
def ClientRemoved(self, objpath, name):
2918
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2705
2920
@dbus.service.method(_interface, out_signature="ao")
2706
2921
def GetAllClients(self):
2708
return dbus.Array(c.dbus_object_path
2923
return dbus.Array(c.dbus_object_path for c in
2710
2924
tcp_server.clients.itervalues())
2926
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2712
2928
@dbus.service.method(_interface,
2713
2929
out_signature="a{oa{sv}}")
2714
2930
def GetAllClientsWithProperties(self):
2716
2932
return dbus.Dictionary(
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
2933
{ c.dbus_object_path: c.GetAll(
2934
"se.recompile.Mandos.Client")
2935
for c in tcp_server.clients.itervalues() },
2719
2936
signature="oa{sv}")
2721
2938
@dbus.service.method(_interface, in_signature="o")
2725
2942
if c.dbus_object_path == object_path:
2726
2943
del tcp_server.clients[c.name]
2727
2944
c.remove_from_connection()
2728
# Don't signal anything except ClientRemoved
2945
# Don't signal the disabling
2729
2946
c.disable(quiet=True)
2731
self.ClientRemoved(object_path, c.name)
2947
# Emit D-Bus signal for removal
2948
self.client_removed_signal(c)
2733
2950
raise KeyError(object_path)
2954
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
2955
out_signature = "a{oa{sa{sv}}}")
2956
def GetManagedObjects(self):
2958
return dbus.Dictionary(
2959
{ client.dbus_object_path:
2961
{ interface: client.GetAll(interface)
2963
client._get_all_interface_names()})
2964
for client in tcp_server.clients.values()})
2966
def client_added_signal(self, client):
2967
"""Send the new standard signal and the old signal"""
2969
# New standard signal
2970
self.InterfacesAdded(
2971
client.dbus_object_path,
2973
{ interface: client.GetAll(interface)
2975
client._get_all_interface_names()}))
2977
self.ClientAdded(client.dbus_object_path)
2979
def client_removed_signal(self, client):
2980
"""Send the new standard signal and the old signal"""
2982
# New standard signal
2983
self.InterfacesRemoved(
2984
client.dbus_object_path,
2985
client._get_all_interface_names())
2987
self.ClientRemoved(client.dbus_object_path,
2737
2990
mandos_dbus_service = MandosDBusService()
2740
2993
"Cleanup function; run on exit"
2743
2997
multiprocessing.active_children()
2774
3028
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:
3031
with tempfile.NamedTemporaryFile(
3035
dir=os.path.dirname(stored_state_path),
3036
delete=False) as stored_state:
2781
3037
pickle.dump((clients, client_settings), stored_state)
2782
tempname=stored_state.name
3038
tempname = stored_state.name
2783
3039
os.rename(tempname, stored_state_path)
2784
3040
except (IOError, OSError) as e: