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, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
699
logger.warning("Checker was a zombie")
700
gobject.source_remove(self.checker_callback_tag)
701
self.checker_callback(pid, status,
702
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")
703
725
# Start a new checker if needed
704
726
if self.checker is None:
705
727
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
711
732
command = self.checker_command % escaped_attrs
712
733
except TypeError as error:
713
734
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
735
self.checker_command,
737
return True # Try again later
716
738
self.current_checker_command = command
718
logger.info("Starting checker %r for %s",
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
736
except OSError as error:
737
logger.error("Failed to start subprocess",
740
self.checker_callback_tag = (gobject.child_watch_add
742
self.checker_callback,
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
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)
758
764
# Re-run this periodically if run by gobject.timeout_add
830
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"})
833
841
@dbus_service_property("org.example.Interface", signature="b",
835
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
"org.freedesktop.DBus.Property."
837
"EmitsChangedSignal": "false"})
838
843
def Property_dbus_property(self):
839
844
return dbus.Boolean(False)
846
See also the DBusObjectWithAnnotations class.
841
849
def decorator(func):
842
850
func._dbus_annotations = annotations
847
856
class DBusPropertyException(dbus.exceptions.DBusException):
848
857
"""A base class for D-Bus property-related exceptions
850
def __unicode__(self):
851
return unicode(str(self))
854
862
class DBusPropertyAccessException(DBusPropertyException):
878
885
If called like _is_dbus_thing("method") it returns a function
879
886
suitable for use as predicate to inspect.getmembers().
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
891
def _get_all_dbus_things(self, thing):
885
892
"""Returns a generator of (name, attribute) pairs
887
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
889
895
athing.__get__(self))
890
896
for cls in self.__class__.__mro__
891
897
for name, athing in
892
inspect.getmembers(cls,
893
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.
895
971
def _get_dbus_property(self, interface_name, property_name):
896
972
"""Returns a bound method if one exists which is a D-Bus
897
973
property with the specified name and interface.
899
for cls in self.__class__.__mro__:
900
for name, value in (inspect.getmembers
902
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")):
903
978
if (value._dbus_name == property_name
904
979
and value._dbus_interface == interface_name):
905
980
return value.__get__(self)
907
982
# No such property
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@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,
913
997
out_signature="v")
914
998
def Get(self, interface_name, property_name):
915
999
"""Standard D-Bus property Get() method, see D-Bus standard.
990
1088
if prop._dbus_interface
991
1089
== if_tag.getAttribute("name")):
992
1090
if_tag.appendChild(tag)
993
# Add annotation tags
994
for typ in ("method", "signal", "property"):
995
for tag in if_tag.getElementsByTagName(typ):
997
for name, prop in (self.
998
_get_all_dbus_things(typ)):
999
if (name == tag.getAttribute("name")
1000
and prop._dbus_interface
1001
== if_tag.getAttribute("name")):
1002
annots.update(getattr
1004
"_dbus_annotations",
1006
for name, value in annots.iteritems():
1007
ann_tag = document.createElement(
1009
ann_tag.setAttribute("name", name)
1010
ann_tag.setAttribute("value", value)
1011
tag.appendChild(ann_tag)
1012
# Add interface annotation tags
1013
for annotation, value in dict(
1014
itertools.chain.from_iterable(
1015
annotations().iteritems()
1016
for name, annotations in
1017
self._get_all_dbus_things("interface")
1018
if name == if_tag.getAttribute("name")
1020
ann_tag = document.createElement("annotation")
1021
ann_tag.setAttribute("name", annotation)
1022
ann_tag.setAttribute("value", value)
1023
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)
1024
1107
# Add the names to the return values for the
1025
1108
# "org.freedesktop.DBus.Properties" methods
1026
1109
if (if_tag.getAttribute("name")
1044
1127
exc_info=error)
1045
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",
1048
1199
def datetime_to_dbus(dt, variant_level=0):
1049
1200
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1051
1202
return dbus.String("", variant_level = variant_level)
1052
return dbus.String(dt.isoformat(),
1053
variant_level=variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1206
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1086
1237
# Ignore non-D-Bus attributes, and D-Bus attributes
1087
1238
# with the wrong interface name
1088
1239
if (not hasattr(attribute, "_dbus_interface")
1089
or not attribute._dbus_interface
1090
.startswith(orig_interface_name)):
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1092
1243
# Create an alternate D-Bus interface name based on
1093
1244
# the current name
1094
alt_interface = (attribute._dbus_interface
1095
.replace(orig_interface_name,
1096
alt_interface_name))
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1097
1247
interface_names.add(alt_interface)
1098
1248
# Is this a D-Bus signal?
1099
1249
if getattr(attribute, "_dbus_is_signal", False):
1100
# Extract the original non-method undecorated
1101
# function by black magic
1102
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(
1103
1254
zip(attribute.func_code.co_freevars,
1104
attribute.__closure__))["func"]
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1106
1259
# Create a new, but exactly alike, function
1107
1260
# object, and decorate it to be a new D-Bus signal
1108
1261
# with the alternate D-Bus interface name
1109
new_function = (dbus.service.signal
1111
attribute._dbus_signature)
1112
(types.FunctionType(
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
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))
1118
1279
# Copy annotations, if any
1120
new_function._dbus_annotations = (
1121
dict(attribute._dbus_annotations))
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1122
1283
except AttributeError:
1124
1285
# Define a creator of a function to call both the
1144
1307
# object. Decorate it to be a new D-Bus method
1145
1308
# with the alternate D-Bus interface name. Add it
1146
1309
# to the class.
1147
attr[attrname] = (dbus.service.method
1149
attribute._dbus_in_signature,
1150
attribute._dbus_out_signature)
1152
(attribute.func_code,
1153
attribute.func_globals,
1154
attribute.func_name,
1155
attribute.func_defaults,
1156
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)))
1157
1320
# Copy annotations, if any
1159
attr[attrname]._dbus_annotations = (
1160
dict(attribute._dbus_annotations))
1322
attr[attrname]._dbus_annotations = dict(
1323
attribute._dbus_annotations)
1161
1324
except AttributeError:
1163
1326
# Is this a D-Bus property?
1166
1329
# object, and decorate it to be a new D-Bus
1167
1330
# property with the alternate D-Bus interface
1168
1331
# name. Add it to the class.
1169
attr[attrname] = (dbus_service_property
1171
attribute._dbus_signature,
1172
attribute._dbus_access,
1174
._dbus_get_args_options
1177
(attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
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)))
1182
1343
# Copy annotations, if any
1184
attr[attrname]._dbus_annotations = (
1185
dict(attribute._dbus_annotations))
1345
attr[attrname]._dbus_annotations = dict(
1346
attribute._dbus_annotations)
1186
1347
except AttributeError:
1188
1349
# Is this a D-Bus interface?
1242
1406
Client.__init__(self, *args, **kwargs)
1243
1407
# Only now, when this client is initialized, can it show up on
1245
client_object_name = unicode(self.name).translate(
1409
client_object_name = str(self.name).translate(
1246
1410
{ord("."): ord("_"),
1247
1411
ord("-"): ord("_")})
1248
self.dbus_object_path = (dbus.ObjectPath
1249
("/clients/" + client_object_name))
1412
self.dbus_object_path = dbus.ObjectPath(
1413
"/clients/" + client_object_name)
1250
1414
DBusObjectWithProperties.__init__(self, self.bus,
1251
1415
self.dbus_object_path)
1253
def notifychangeproperty(transform_func,
1254
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):
1256
1422
""" Modify a variable so that it's a property which announces
1257
1423
its changes to DBus.
1263
1429
to the D-Bus. Default: no transform
1264
1430
variant_level: D-Bus variant level. Default: 1
1266
attrname = "_{0}".format(dbus_name)
1432
attrname = "_{}".format(dbus_name)
1267
1434
def setter(self, value):
1268
1435
if hasattr(self, "dbus_object_path"):
1269
1436
if (not hasattr(self, attrname) or
1270
1437
type_func(getattr(self, attrname, None))
1271
1438
!= type_func(value)):
1272
dbus_value = transform_func(type_func(value),
1275
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):
1277
1454
setattr(self, attrname, value)
1279
1456
return property(lambda self: getattr(self, attrname), setter)
1296
1473
datetime_to_dbus, "LastApprovalRequest")
1297
1474
approved_by_default = notifychangeproperty(dbus.Boolean,
1298
1475
"ApprovedByDefault")
1299
approval_delay = notifychangeproperty(dbus.UInt64,
1302
timedelta_to_milliseconds)
1476
approval_delay = notifychangeproperty(
1477
dbus.UInt64, "ApprovalDelay",
1478
type_func = lambda td: td.total_seconds() * 1000)
1303
1479
approval_duration = notifychangeproperty(
1304
1480
dbus.UInt64, "ApprovalDuration",
1305
type_func = timedelta_to_milliseconds)
1481
type_func = lambda td: td.total_seconds() * 1000)
1306
1482
host = notifychangeproperty(dbus.String, "Host")
1307
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1309
timedelta_to_milliseconds)
1483
timeout = notifychangeproperty(
1484
dbus.UInt64, "Timeout",
1485
type_func = lambda td: td.total_seconds() * 1000)
1310
1486
extended_timeout = notifychangeproperty(
1311
1487
dbus.UInt64, "ExtendedTimeout",
1312
type_func = timedelta_to_milliseconds)
1313
interval = notifychangeproperty(dbus.UInt64,
1316
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)
1317
1492
checker_command = notifychangeproperty(dbus.String, "Checker")
1493
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1494
invalidate_only=True)
1319
1496
del notifychangeproperty
1327
1504
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1328
1505
Client.__del__(self, *args, **kwargs)
1330
def checker_callback(self, pid, condition, command,
1332
self.checker_callback_tag = None
1334
if os.WIFEXITED(condition):
1335
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
1336
1514
# Emit D-Bus signal
1337
1515
self.CheckerCompleted(dbus.Int16(exitstatus),
1338
dbus.Int64(condition),
1516
# This is specific to GNU libC
1517
dbus.Int64(exitstatus << 8),
1339
1518
dbus.String(command))
1341
1520
# Emit D-Bus signal
1342
1521
self.CheckerCompleted(dbus.Int16(-1),
1343
dbus.Int64(condition),
1523
# This is specific to GNU libC
1525
| self.last_checker_signal),
1344
1526
dbus.String(command))
1346
return Client.checker_callback(self, pid, condition, command,
1349
1529
def start_checker(self, *args, **kwargs):
1350
old_checker = self.checker
1351
if self.checker is not None:
1352
old_checker_pid = self.checker.pid
1354
old_checker_pid = None
1530
old_checker_pid = getattr(self.checker, "pid", None)
1355
1531
r = Client.start_checker(self, *args, **kwargs)
1356
1532
# Only if new checker process was started
1357
1533
if (self.checker is not None
1473
1648
self.approved_by_default = bool(value)
1475
1650
# ApprovalDelay - property
1476
@dbus_service_property(_interface, signature="t",
1651
@dbus_service_property(_interface,
1477
1653
access="readwrite")
1478
1654
def ApprovalDelay_dbus_property(self, value=None):
1479
1655
if value is None: # get
1480
return dbus.UInt64(self.approval_delay_milliseconds())
1656
return dbus.UInt64(self.approval_delay.total_seconds()
1481
1658
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
1660
# ApprovalDuration - property
1484
@dbus_service_property(_interface, signature="t",
1661
@dbus_service_property(_interface,
1485
1663
access="readwrite")
1486
1664
def ApprovalDuration_dbus_property(self, value=None):
1487
1665
if value is None: # get
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
1666
return dbus.UInt64(self.approval_duration.total_seconds()
1490
1668
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
1670
# Name - property
1672
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1493
1673
@dbus_service_property(_interface, signature="s", access="read")
1494
1674
def Name_dbus_property(self):
1495
1675
return dbus.String(self.name)
1497
1677
# Fingerprint - property
1679
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
1680
@dbus_service_property(_interface, signature="s", access="read")
1499
1681
def Fingerprint_dbus_property(self):
1500
1682
return dbus.String(self.fingerprint)
1502
1684
# Host - property
1503
@dbus_service_property(_interface, signature="s",
1685
@dbus_service_property(_interface,
1504
1687
access="readwrite")
1505
1688
def Host_dbus_property(self, value=None):
1506
1689
if value is None: # get
1507
1690
return dbus.String(self.host)
1508
self.host = unicode(value)
1691
self.host = str(value)
1510
1693
# Created - property
1695
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1511
1696
@dbus_service_property(_interface, signature="s", access="read")
1512
1697
def Created_dbus_property(self):
1513
1698
return datetime_to_dbus(self.created)
1575
1762
gobject.source_remove(self.disable_initiator_tag)
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
1763
self.disable_initiator_tag = gobject.timeout_add(
1764
int((self.expires - now).total_seconds() * 1000),
1581
1767
# ExtendedTimeout - property
1582
@dbus_service_property(_interface, signature="t",
1768
@dbus_service_property(_interface,
1583
1770
access="readwrite")
1584
1771
def ExtendedTimeout_dbus_property(self, value=None):
1585
1772
if value is None: # get
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
1773
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
1775
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
1777
# Interval - property
1590
@dbus_service_property(_interface, signature="t",
1778
@dbus_service_property(_interface,
1591
1780
access="readwrite")
1592
1781
def Interval_dbus_property(self, value=None):
1593
1782
if value is None: # get
1594
return dbus.UInt64(self.interval_milliseconds())
1783
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
1784
self.interval = datetime.timedelta(0, 0, 0, value)
1596
1785
if getattr(self, "checker_initiator_tag", None) is None:
1598
1787
if self.enabled:
1599
1788
# Reschedule checker run
1600
1789
gobject.source_remove(self.checker_initiator_tag)
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
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
1605
1794
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
1795
@dbus_service_property(_interface,
1607
1797
access="readwrite")
1608
1798
def Checker_dbus_property(self, value=None):
1609
1799
if value is None: # get
1610
1800
return dbus.String(self.checker_command)
1611
self.checker_command = unicode(value)
1801
self.checker_command = str(value)
1613
1803
# CheckerRunning - property
1614
@dbus_service_property(_interface, signature="b",
1804
@dbus_service_property(_interface,
1615
1806
access="readwrite")
1616
1807
def CheckerRunning_dbus_property(self, value=None):
1617
1808
if value is None: # get
1843
2039
def fingerprint(openpgp):
1844
2040
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
2041
# New GnuTLS "datum" with the OpenPGP public key
1846
datum = (gnutls.library.types
1847
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
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)))
1851
2046
# New empty GnuTLS certificate
1852
2047
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2048
gnutls.library.functions.gnutls_openpgp_crt_init(
1855
2050
# Import the OpenPGP public key into the certificate
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
gnutls.library.constants
1859
.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)
1860
2054
# Verify the self signature in the key
1861
2055
crtverify = ctypes.c_uint()
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2056
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2057
crt, 0, ctypes.byref(crtverify))
1865
2058
if crtverify.value != 0:
1866
2059
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2060
raise gnutls.errors.CertificateSecurityError(
1869
2062
# New buffer for the fingerprint
1870
2063
buf = ctypes.create_string_buffer(20)
1871
2064
buf_len = ctypes.c_size_t()
1872
2065
# Get the fingerprint from the certificate into the buffer
1873
(gnutls.library.functions
1874
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
ctypes.byref(buf_len)))
2066
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2067
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1876
2068
# Deinit the certificate
1877
2069
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1878
2070
# Convert the buffer to a Python bytestring
2046
2248
def add_pipe(self, parent_pipe, proc):
2047
2249
# Call "handle_ipc" for both data and EOF events
2048
gobject.io_add_watch(parent_pipe.fileno(),
2049
gobject.IO_IN | gobject.IO_HUP,
2050
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,
2055
def handle_ipc(self, source, condition, parent_pipe=None,
2056
proc = None, client_object=None):
2257
def handle_ipc(self, source, condition,
2260
client_object=None):
2057
2261
# error, or the other end of multiprocessing.Pipe has closed
2058
2262
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2059
2263
# Wait for other process to exit
2146
2350
# avoid excessive use of external libraries.
2148
2352
# New type for defining tokens, syntax, and semantics all-in-one
2149
Token = collections.namedtuple("Token",
2150
("regexp", # To match token; if
2151
# "value" is not None,
2152
# must have a "group"
2154
"value", # datetime.timedelta or
2156
"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
2158
2358
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
2359
# the "duration" ABNF definition in RFC 3339, Appendix A.
2160
2360
token_end = Token(re.compile(r"$"), None, frozenset())
2161
2361
token_second = Token(re.compile(r"(\d+)S"),
2162
2362
datetime.timedelta(seconds=1),
2163
frozenset((token_end,)))
2363
frozenset((token_end, )))
2164
2364
token_minute = Token(re.compile(r"(\d+)M"),
2165
2365
datetime.timedelta(minutes=1),
2166
2366
frozenset((token_second, token_end)))
2388
2592
# Override the settings from the config file with command line
2389
2593
# options, if set.
2390
2594
for option in ("interface", "address", "port", "debug",
2391
"priority", "servicename", "configdir",
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2393
"statedir", "socket", "foreground"):
2595
"priority", "servicename", "configdir", "use_dbus",
2596
"use_ipv6", "debuglevel", "restore", "statedir",
2597
"socket", "foreground", "zeroconf"):
2394
2598
value = getattr(options, option)
2395
2599
if value is not None:
2396
2600
server_settings[option] = value
2398
2602
# Force all strings to be unicode
2399
2603
for option in server_settings.keys():
2400
if type(server_settings[option]) is str:
2401
server_settings[option] = unicode(server_settings[option])
2604
if isinstance(server_settings[option], bytes):
2605
server_settings[option] = (server_settings[option]
2402
2607
# Force all boolean options to be boolean
2403
2608
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2609
"foreground", "zeroconf"):
2405
2610
server_settings[option] = bool(server_settings[option])
2406
2611
# Debug implies foreground
2407
2612
if server_settings["debug"]:
2444
2654
global mandos_dbus_service
2445
2655
mandos_dbus_service = None
2447
tcp_server = MandosServer((server_settings["address"],
2448
server_settings["port"]),
2450
interface=(server_settings["interface"]
2454
server_settings["priority"],
2456
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"],
2458
2668
if not foreground:
2459
2669
pidfilename = "/run/mandos.pid"
2670
if not os.path.isdir("/run/."):
2671
pidfilename = "/var/run/mandos.pid"
2462
pidfile = open(pidfilename, "w")
2674
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2463
2675
except IOError as e:
2464
2676
logger.error("Could not open file %r", pidfilename,
2521
2733
bus_name = dbus.service.BusName("se.recompile.Mandos",
2522
bus, do_not_queue=True)
2523
old_bus_name = (dbus.service.BusName
2524
("se.bsnet.fukt.Mandos", bus,
2526
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:
2527
2740
logger.error("Disabling D-Bus:", exc_info=e)
2528
2741
use_dbus = False
2529
2742
server_settings["use_dbus"] = False
2530
2743
tcp_server.use_dbus = False
2531
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2532
service = AvahiServiceToSyslog(name =
2533
server_settings["servicename"],
2534
servicetype = "_mandos._tcp",
2535
protocol = protocol, bus = bus)
2536
if server_settings["interface"]:
2537
service.interface = (if_nametoindex
2538
(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"))
2540
2755
global multiprocessing_manager
2541
2756
multiprocessing_manager = multiprocessing.Manager()
2560
2775
if server_settings["restore"]:
2562
2777
with open(stored_state_path, "rb") as stored_state:
2563
clients_data, old_client_settings = (pickle.load
2778
clients_data, old_client_settings = pickle.load(
2565
2780
os.remove(stored_state_path)
2566
2781
except IOError as e:
2567
2782
if e.errno == errno.ENOENT:
2568
logger.warning("Could not load persistent state: {0}"
2569
.format(os.strerror(e.errno)))
2783
logger.warning("Could not load persistent state:"
2784
" {}".format(os.strerror(e.errno)))
2571
2786
logger.critical("Could not load persistent state:",
2574
2789
except EOFError as e:
2575
2790
logger.warning("Could not load persistent state: "
2576
"EOFError:", exc_info=e)
2578
2794
with PGPEngine() as pgp:
2579
for client_name, client in clients_data.iteritems():
2795
for client_name, client in clients_data.items():
2580
2796
# Skip removed clients
2581
2797
if client_name not in client_settings:
2607
2823
if datetime.datetime.utcnow() >= client["expires"]:
2608
2824
if not client["last_checked_ok"]:
2609
2825
logger.warning(
2610
"disabling client {0} - Client never "
2611
"performed a successful checker"
2612
.format(client_name))
2826
"disabling client {} - Client never "
2827
"performed a successful checker".format(
2613
2829
client["enabled"] = False
2614
2830
elif client["last_checker_status"] != 0:
2615
2831
logger.warning(
2616
"disabling client {0} - Client "
2617
"last checker failed with error code {1}"
2618
.format(client_name,
2619
client["last_checker_status"]))
2832
"disabling client {} - Client last"
2833
" checker failed with error code"
2836
client["last_checker_status"]))
2620
2837
client["enabled"] = False
2622
client["expires"] = (datetime.datetime
2624
+ client["timeout"])
2839
client["expires"] = (
2840
datetime.datetime.utcnow()
2841
+ client["timeout"])
2625
2842
logger.debug("Last checker succeeded,"
2626
" keeping {0} enabled"
2627
.format(client_name))
2843
" keeping {} enabled".format(
2629
client["secret"] = (
2630
pgp.decrypt(client["encrypted_secret"],
2631
client_settings[client_name]
2846
client["secret"] = pgp.decrypt(
2847
client["encrypted_secret"],
2848
client_settings[client_name]["secret"])
2633
2849
except PGPError:
2634
2850
# If decryption fails, we use secret from new settings
2635
logger.debug("Failed to decrypt {0} old secret"
2636
.format(client_name))
2637
client["secret"] = (
2638
client_settings[client_name]["secret"])
2851
logger.debug("Failed to decrypt {} old secret".format(
2853
client["secret"] = (client_settings[client_name]
2640
2856
# Add/remove clients based on new changes made to config
2641
2857
for client_name in (set(old_client_settings)
2911
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2697
2913
@dbus.service.signal(_interface, signature="os")
2698
2914
def ClientRemoved(self, objpath, name):
2918
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2702
2920
@dbus.service.method(_interface, out_signature="ao")
2703
2921
def GetAllClients(self):
2705
return dbus.Array(c.dbus_object_path
2923
return dbus.Array(c.dbus_object_path for c in
2707
2924
tcp_server.clients.itervalues())
2926
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2709
2928
@dbus.service.method(_interface,
2710
2929
out_signature="a{oa{sv}}")
2711
2930
def GetAllClientsWithProperties(self):
2713
2932
return dbus.Dictionary(
2714
((c.dbus_object_path, c.GetAll(""))
2715
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() },
2716
2936
signature="oa{sv}")
2718
2938
@dbus.service.method(_interface, in_signature="o")
2722
2942
if c.dbus_object_path == object_path:
2723
2943
del tcp_server.clients[c.name]
2724
2944
c.remove_from_connection()
2725
# Don't signal anything except ClientRemoved
2945
# Don't signal the disabling
2726
2946
c.disable(quiet=True)
2728
self.ClientRemoved(object_path, c.name)
2947
# Emit D-Bus signal for removal
2948
self.client_removed_signal(c)
2730
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,
2734
2990
mandos_dbus_service = MandosDBusService()
2737
2993
"Cleanup function; run on exit"
2740
2997
multiprocessing.active_children()
2771
3028
del client_settings[client.name]["secret"]
2774
with (tempfile.NamedTemporaryFile
2775
(mode='wb', suffix=".pickle", prefix='clients-',
2776
dir=os.path.dirname(stored_state_path),
2777
delete=False)) as stored_state:
3031
with tempfile.NamedTemporaryFile(
3035
dir=os.path.dirname(stored_state_path),
3036
delete=False) as stored_state:
2778
3037
pickle.dump((clients, client_settings), stored_state)
2779
tempname=stored_state.name
3038
tempname = stored_state.name
2780
3039
os.rename(tempname, stored_state_path)
2781
3040
except (IOError, OSError) as e:
2785
3044
except NameError:
2787
3046
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2788
logger.warning("Could not save persistent state: {0}"
3047
logger.warning("Could not save persistent state: {}"
2789
3048
.format(os.strerror(e.errno)))
2791
3050
logger.warning("Could not save persistent state:",
2795
3054
# Delete all clients, and settings from config
2796
3055
while tcp_server.clients:
2797
3056
name, client = tcp_server.clients.popitem()
2799
3058
client.remove_from_connection()
2800
# Don't signal anything except ClientRemoved
3059
# Don't signal the disabling
2801
3060
client.disable(quiet=True)
2804
mandos_dbus_service.ClientRemoved(client
3061
# Emit D-Bus signal for removal
3062
mandos_dbus_service.client_removed_signal(client)
2807
3063
client_settings.clear()
2809
3065
atexit.register(cleanup)
2811
3067
for client in tcp_server.clients.itervalues():
2814
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3069
# Emit D-Bus signal for adding
3070
mandos_dbus_service.client_added_signal(client)
2815
3071
# Need to initiate checking of clients
2816
3072
if client.enabled:
2817
3073
client.init_checker()