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:'
172
189
def password_encode(self, password):
173
190
# Passphrase can not be empty and can not contain newlines or
174
191
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
177
200
def encrypt(self, data, password):
178
201
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
181
204
passfile.write(passphrase)
183
206
proc = subprocess.Popen(['gpg', '--symmetric',
267
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
270
300
"""Derived from the Avahi example code"""
271
301
if self.rename_count >= self.max_renames:
272
302
logger.critical("No suitable Zeroconf service name found"
273
303
" after %i retries, exiting.",
274
304
self.rename_count)
275
305
raise AvahiServiceError("Too many renames")
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
278
309
logger.info("Changing Zeroconf service name to %r ...",
283
315
except dbus.exceptions.DBusException as error:
284
logger.critical("D-Bus Exception", exc_info=error)
287
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)
289
325
def remove(self):
290
326
"""Derived from the Avahi example code"""
346
381
def server_state_changed(self, state, error=None):
347
382
"""Derived from the Avahi example code"""
348
383
logger.debug("Avahi server state change: %i", state)
349
bad_states = { avahi.SERVER_INVALID:
350
"Zeroconf server invalid",
351
avahi.SERVER_REGISTERING: None,
352
avahi.SERVER_COLLISION:
353
"Zeroconf server name collision",
354
avahi.SERVER_FAILURE:
355
"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",
356
390
if state in bad_states:
357
391
if bad_states[state] is not None:
358
392
if error is None:
377
422
follow_name_owner_changes=True),
378
423
avahi.DBUS_INTERFACE_SERVER)
379
424
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
425
self.server_state_changed)
381
426
self.server_state_changed(self.server.GetState())
384
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
386
431
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (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))
402
448
class Client(object):
403
449
"""A representation of a client host served by this server.
448
496
"fingerprint", "host", "interval",
449
497
"last_approval_request", "last_checked_ok",
450
498
"last_enabled", "name", "timeout")
451
client_defaults = { "timeout": "PT5M",
452
"extended_timeout": "PT15M",
454
"checker": "fping -q -- %%(host)s",
456
"approval_delay": "PT0S",
457
"approval_duration": "PT1S",
458
"approved_by_default": "True",
462
def timeout_milliseconds(self):
463
"Return the 'timeout' attribute in milliseconds"
464
return timedelta_to_milliseconds(self.timeout)
466
def extended_timeout_milliseconds(self):
467
"Return the 'extended_timeout' attribute in milliseconds"
468
return timedelta_to_milliseconds(self.extended_timeout)
470
def interval_milliseconds(self):
471
"Return the 'interval' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.interval)
474
def approval_delay_milliseconds(self):
475
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",
478
512
def config_parser(config):
556
590
self.current_checker_command = None
557
591
self.approved = None
558
592
self.approvals_pending = 0
559
self.changedstate = (multiprocessing_manager
560
.Condition(multiprocessing_manager
562
self.client_structure = [attr for attr in
563
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()
564
597
if not attr.startswith("_")]
565
598
self.client_structure.append("client_structure")
567
for name, t in inspect.getmembers(type(self),
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
571
602
if not name.startswith("_"):
572
603
self.client_structure.append(name)
615
646
# and every interval from then on.
616
647
if self.checker_initiator_tag is not None:
617
648
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
621
652
# Schedule a disable() when 'timeout' has passed
622
653
if self.disable_initiator_tag is not None:
623
654
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
627
657
# Also start a new checker *right now*.
628
658
self.start_checker()
630
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
631
662
"""The checker has completed, so take appropriate actions."""
632
663
self.checker_callback_tag = None
633
664
self.checker = None
634
if os.WIFEXITED(condition):
635
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
636
672
if self.last_checker_status == 0:
637
673
logger.info("Checker for %(name)s succeeded",
639
675
self.checked_ok()
641
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
644
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
645
681
logger.warning("Checker for %(name)s crashed?",
648
685
def checked_ok(self):
649
686
"""Assert that the client has been seen, alive and well."""
650
687
self.last_checked_ok = datetime.datetime.utcnow()
651
688
self.last_checker_status = 0
689
self.last_checker_signal = None
652
690
self.bump_timeout()
654
692
def bump_timeout(self, timeout=None):
681
718
# than 'timeout' for the client to be disabled, which is as it
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
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")
697
725
# Start a new checker if needed
698
726
if self.checker is None:
699
727
# Escape attributes for the shell
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
705
732
command = self.checker_command % escaped_attrs
706
733
except TypeError as error:
707
734
logger.error('Could not format string "%s"',
708
self.checker_command, exc_info=error)
709
return True # Try again later
735
self.checker_command,
737
return True # Try again later
710
738
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
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)
752
764
# Re-run this periodically if run by gobject.timeout_add
824
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"})
827
841
@dbus_service_property("org.example.Interface", signature="b",
829
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
"org.freedesktop.DBus.Property."
831
"EmitsChangedSignal": "false"})
832
843
def Property_dbus_property(self):
833
844
return dbus.Boolean(False)
846
See also the DBusObjectWithAnnotations class.
835
849
def decorator(func):
836
850
func._dbus_annotations = annotations
841
856
class DBusPropertyException(dbus.exceptions.DBusException):
842
857
"""A base class for D-Bus property-related exceptions
844
def __unicode__(self):
845
return unicode(str(self))
848
862
class DBusPropertyAccessException(DBusPropertyException):
872
885
If called like _is_dbus_thing("method") it returns a function
873
886
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
878
891
def _get_all_dbus_things(self, thing):
879
892
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
895
athing.__get__(self))
884
896
for cls in self.__class__.__mro__
885
897
for name, athing in
886
inspect.getmembers(cls,
887
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.
889
971
def _get_dbus_property(self, interface_name, property_name):
890
972
"""Returns a bound method if one exists which is a D-Bus
891
973
property with the specified name and interface.
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
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")):
897
978
if (value._dbus_name == property_name
898
979
and value._dbus_interface == interface_name):
899
980
return value.__get__(self)
901
982
# No such property
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@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,
907
997
out_signature="v")
908
998
def Get(self, interface_name, property_name):
909
999
"""Standard D-Bus property Get() method, see D-Bus standard.
984
1088
if prop._dbus_interface
985
1089
== if_tag.getAttribute("name")):
986
1090
if_tag.appendChild(tag)
987
# Add annotation tags
988
for typ in ("method", "signal", "property"):
989
for tag in if_tag.getElementsByTagName(typ):
991
for name, prop in (self.
992
_get_all_dbus_things(typ)):
993
if (name == tag.getAttribute("name")
994
and prop._dbus_interface
995
== if_tag.getAttribute("name")):
996
annots.update(getattr
1000
for name, value in annots.iteritems():
1001
ann_tag = document.createElement(
1003
ann_tag.setAttribute("name", name)
1004
ann_tag.setAttribute("value", value)
1005
tag.appendChild(ann_tag)
1006
# Add interface annotation tags
1007
for annotation, value in dict(
1008
itertools.chain.from_iterable(
1009
annotations().iteritems()
1010
for name, annotations in
1011
self._get_all_dbus_things("interface")
1012
if name == if_tag.getAttribute("name")
1014
ann_tag = document.createElement("annotation")
1015
ann_tag.setAttribute("name", annotation)
1016
ann_tag.setAttribute("value", value)
1017
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)
1018
1107
# Add the names to the return values for the
1019
1108
# "org.freedesktop.DBus.Properties" methods
1020
1109
if (if_tag.getAttribute("name")
1038
1127
exc_info=error)
1039
1128
return xmlstring
1131
dbus.OBJECT_MANAGER_IFACE
1132
except AttributeError:
1133
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1135
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1136
"""A D-Bus object with an ObjectManager.
1138
Classes inheriting from this exposes the standard
1139
GetManagedObjects call and the InterfacesAdded and
1140
InterfacesRemoved signals on the standard
1141
"org.freedesktop.DBus.ObjectManager" interface.
1143
Note: No signals are sent automatically; they must be sent
1146
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1147
out_signature = "a{oa{sa{sv}}}")
1148
def GetManagedObjects(self):
1149
"""This function must be overridden"""
1150
raise NotImplementedError()
1152
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1153
signature = "oa{sa{sv}}")
1154
def InterfacesAdded(self, object_path, interfaces_and_properties):
1157
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1158
def InterfacesRemoved(self, object_path, interfaces):
1161
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1162
out_signature = "s",
1163
path_keyword = 'object_path',
1164
connection_keyword = 'connection')
1165
def Introspect(self, object_path, connection):
1166
"""Overloading of standard D-Bus method.
1168
Override return argument name of GetManagedObjects to be
1169
"objpath_interfaces_and_properties"
1171
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1175
document = xml.dom.minidom.parseString(xmlstring)
1177
for if_tag in document.getElementsByTagName("interface"):
1178
# Fix argument name for the GetManagedObjects method
1179
if (if_tag.getAttribute("name")
1180
== dbus.OBJECT_MANAGER_IFACE):
1181
for cn in if_tag.getElementsByTagName("method"):
1182
if (cn.getAttribute("name")
1183
== "GetManagedObjects"):
1184
for arg in cn.getElementsByTagName("arg"):
1185
if (arg.getAttribute("direction")
1189
"objpath_interfaces"
1191
xmlstring = document.toxml("utf-8")
1193
except (AttributeError, xml.dom.DOMException,
1194
xml.parsers.expat.ExpatError) as error:
1195
logger.error("Failed to override Introspection method",
1042
1199
def datetime_to_dbus(dt, variant_level=0):
1043
1200
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1045
1202
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1050
1206
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1080
1237
# Ignore non-D-Bus attributes, and D-Bus attributes
1081
1238
# with the wrong interface name
1082
1239
if (not hasattr(attribute, "_dbus_interface")
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1086
1243
# Create an alternate D-Bus interface name based on
1087
1244
# the current name
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1091
1247
interface_names.add(alt_interface)
1092
1248
# Is this a D-Bus signal?
1093
1249
if getattr(attribute, "_dbus_is_signal", False):
1094
# Extract the original non-method undecorated
1095
# function by black magic
1096
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(
1097
1254
zip(attribute.func_code.co_freevars,
1098
attribute.__closure__))["func"]
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1100
1259
# Create a new, but exactly alike, function
1101
1260
# object, and decorate it to be a new D-Bus signal
1102
1261
# with the alternate D-Bus interface name
1103
new_function = (dbus.service.signal
1105
attribute._dbus_signature)
1106
(types.FunctionType(
1107
nonmethod_func.func_code,
1108
nonmethod_func.func_globals,
1109
nonmethod_func.func_name,
1110
nonmethod_func.func_defaults,
1111
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))
1112
1279
# Copy annotations, if any
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1116
1283
except AttributeError:
1118
1285
# Define a creator of a function to call both the
1138
1312
# object. Decorate it to be a new D-Bus method
1139
1313
# with the alternate D-Bus interface name. Add it
1140
1314
# to the class.
1141
attr[attrname] = (dbus.service.method
1143
attribute._dbus_in_signature,
1144
attribute._dbus_out_signature)
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1316
dbus.service.method(
1318
attribute._dbus_in_signature,
1319
attribute._dbus_out_signature)
1320
(types.FunctionType(attribute.func_code,
1321
attribute.func_globals,
1322
attribute.func_name,
1323
attribute.func_defaults,
1324
attribute.func_closure)))
1151
1325
# Copy annotations, if any
1153
attr[attrname]._dbus_annotations = (
1154
dict(attribute._dbus_annotations))
1327
attr[attrname]._dbus_annotations = dict(
1328
attribute._dbus_annotations)
1155
1329
except AttributeError:
1157
1331
# Is this a D-Bus property?
1160
1334
# object, and decorate it to be a new D-Bus
1161
1335
# property with the alternate D-Bus interface
1162
1336
# name. Add it to the class.
1163
attr[attrname] = (dbus_service_property
1165
attribute._dbus_signature,
1166
attribute._dbus_access,
1168
._dbus_get_args_options
1171
(attribute.func_code,
1172
attribute.func_globals,
1173
attribute.func_name,
1174
attribute.func_defaults,
1175
attribute.func_closure)))
1337
attr[attrname] = (dbus_service_property(
1338
alt_interface, attribute._dbus_signature,
1339
attribute._dbus_access,
1340
attribute._dbus_get_args_options
1342
(types.FunctionType(
1343
attribute.func_code,
1344
attribute.func_globals,
1345
attribute.func_name,
1346
attribute.func_defaults,
1347
attribute.func_closure)))
1176
1348
# Copy annotations, if any
1178
attr[attrname]._dbus_annotations = (
1179
dict(attribute._dbus_annotations))
1350
attr[attrname]._dbus_annotations = dict(
1351
attribute._dbus_annotations)
1180
1352
except AttributeError:
1182
1354
# Is this a D-Bus interface?
1236
1411
Client.__init__(self, *args, **kwargs)
1237
1412
# Only now, when this client is initialized, can it show up on
1239
client_object_name = unicode(self.name).translate(
1414
client_object_name = str(self.name).translate(
1240
1415
{ord("."): ord("_"),
1241
1416
ord("-"): ord("_")})
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1417
self.dbus_object_path = dbus.ObjectPath(
1418
"/clients/" + client_object_name)
1244
1419
DBusObjectWithProperties.__init__(self, self.bus,
1245
1420
self.dbus_object_path)
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1422
def notifychangeproperty(transform_func, dbus_name,
1423
type_func=lambda x: x,
1425
invalidate_only=False,
1426
_interface=_interface):
1250
1427
""" Modify a variable so that it's a property which announces
1251
1428
its changes to DBus.
1257
1434
to the D-Bus. Default: no transform
1258
1435
variant_level: D-Bus variant level. Default: 1
1260
attrname = "_{0}".format(dbus_name)
1437
attrname = "_{}".format(dbus_name)
1261
1439
def setter(self, value):
1262
1440
if hasattr(self, "dbus_object_path"):
1263
1441
if (not hasattr(self, attrname) or
1264
1442
type_func(getattr(self, attrname, None))
1265
1443
!= type_func(value)):
1266
dbus_value = transform_func(type_func(value),
1269
self.PropertyChanged(dbus.String(dbus_name),
1445
self.PropertiesChanged(
1446
_interface, dbus.Dictionary(),
1447
dbus.Array((dbus_name, )))
1449
dbus_value = transform_func(
1451
variant_level = variant_level)
1452
self.PropertyChanged(dbus.String(dbus_name),
1454
self.PropertiesChanged(
1456
dbus.Dictionary({ dbus.String(dbus_name):
1271
1459
setattr(self, attrname, value)
1273
1461
return property(lambda self: getattr(self, attrname), setter)
1290
1478
datetime_to_dbus, "LastApprovalRequest")
1291
1479
approved_by_default = notifychangeproperty(dbus.Boolean,
1292
1480
"ApprovedByDefault")
1293
approval_delay = notifychangeproperty(dbus.UInt64,
1296
timedelta_to_milliseconds)
1481
approval_delay = notifychangeproperty(
1482
dbus.UInt64, "ApprovalDelay",
1483
type_func = lambda td: td.total_seconds() * 1000)
1297
1484
approval_duration = notifychangeproperty(
1298
1485
dbus.UInt64, "ApprovalDuration",
1299
type_func = timedelta_to_milliseconds)
1486
type_func = lambda td: td.total_seconds() * 1000)
1300
1487
host = notifychangeproperty(dbus.String, "Host")
1301
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1303
timedelta_to_milliseconds)
1488
timeout = notifychangeproperty(
1489
dbus.UInt64, "Timeout",
1490
type_func = lambda td: td.total_seconds() * 1000)
1304
1491
extended_timeout = notifychangeproperty(
1305
1492
dbus.UInt64, "ExtendedTimeout",
1306
type_func = timedelta_to_milliseconds)
1307
interval = notifychangeproperty(dbus.UInt64,
1310
timedelta_to_milliseconds)
1493
type_func = lambda td: td.total_seconds() * 1000)
1494
interval = notifychangeproperty(
1495
dbus.UInt64, "Interval",
1496
type_func = lambda td: td.total_seconds() * 1000)
1311
1497
checker_command = notifychangeproperty(dbus.String, "Checker")
1498
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1499
invalidate_only=True)
1313
1501
del notifychangeproperty
1321
1509
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1322
1510
Client.__del__(self, *args, **kwargs)
1324
def checker_callback(self, pid, condition, command,
1326
self.checker_callback_tag = None
1328
if os.WIFEXITED(condition):
1329
exitstatus = os.WEXITSTATUS(condition)
1512
def checker_callback(self, source, condition,
1513
connection, command, *args, **kwargs):
1514
ret = Client.checker_callback(self, source, condition,
1515
connection, command, *args,
1517
exitstatus = self.last_checker_status
1330
1519
# Emit D-Bus signal
1331
1520
self.CheckerCompleted(dbus.Int16(exitstatus),
1332
dbus.Int64(condition),
1521
# This is specific to GNU libC
1522
dbus.Int64(exitstatus << 8),
1333
1523
dbus.String(command))
1335
1525
# Emit D-Bus signal
1336
1526
self.CheckerCompleted(dbus.Int16(-1),
1337
dbus.Int64(condition),
1528
# This is specific to GNU libC
1530
| self.last_checker_signal),
1338
1531
dbus.String(command))
1340
return Client.checker_callback(self, pid, condition, command,
1343
1534
def start_checker(self, *args, **kwargs):
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1535
old_checker_pid = getattr(self.checker, "pid", None)
1349
1536
r = Client.start_checker(self, *args, **kwargs)
1350
1537
# Only if new checker process was started
1351
1538
if (self.checker is not None
1467
1653
self.approved_by_default = bool(value)
1469
1655
# ApprovalDelay - property
1470
@dbus_service_property(_interface, signature="t",
1656
@dbus_service_property(_interface,
1471
1658
access="readwrite")
1472
1659
def ApprovalDelay_dbus_property(self, value=None):
1473
1660
if value is None: # get
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1661
return dbus.UInt64(self.approval_delay.total_seconds()
1475
1663
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1477
1665
# ApprovalDuration - property
1478
@dbus_service_property(_interface, signature="t",
1666
@dbus_service_property(_interface,
1479
1668
access="readwrite")
1480
1669
def ApprovalDuration_dbus_property(self, value=None):
1481
1670
if value is None: # get
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1671
return dbus.UInt64(self.approval_duration.total_seconds()
1484
1673
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1486
1675
# Name - property
1677
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1487
1678
@dbus_service_property(_interface, signature="s", access="read")
1488
1679
def Name_dbus_property(self):
1489
1680
return dbus.String(self.name)
1491
1682
# Fingerprint - property
1684
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1492
1685
@dbus_service_property(_interface, signature="s", access="read")
1493
1686
def Fingerprint_dbus_property(self):
1494
1687
return dbus.String(self.fingerprint)
1496
1689
# Host - property
1497
@dbus_service_property(_interface, signature="s",
1690
@dbus_service_property(_interface,
1498
1692
access="readwrite")
1499
1693
def Host_dbus_property(self, value=None):
1500
1694
if value is None: # get
1501
1695
return dbus.String(self.host)
1502
self.host = unicode(value)
1696
self.host = str(value)
1504
1698
# Created - property
1700
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1505
1701
@dbus_service_property(_interface, signature="s", access="read")
1506
1702
def Created_dbus_property(self):
1507
1703
return datetime_to_dbus(self.created)
1569
1767
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
1768
self.disable_initiator_tag = gobject.timeout_add(
1769
int((self.expires - now).total_seconds() * 1000),
1575
1772
# ExtendedTimeout - property
1576
@dbus_service_property(_interface, signature="t",
1773
@dbus_service_property(_interface,
1577
1775
access="readwrite")
1578
1776
def ExtendedTimeout_dbus_property(self, value=None):
1579
1777
if value is None: # get
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
1778
return dbus.UInt64(self.extended_timeout.total_seconds()
1581
1780
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1583
1782
# Interval - property
1584
@dbus_service_property(_interface, signature="t",
1783
@dbus_service_property(_interface,
1585
1785
access="readwrite")
1586
1786
def Interval_dbus_property(self, value=None):
1587
1787
if value is None: # get
1588
return dbus.UInt64(self.interval_milliseconds())
1788
return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
1789
self.interval = datetime.timedelta(0, 0, 0, value)
1590
1790
if getattr(self, "checker_initiator_tag", None) is None:
1592
1792
if self.enabled:
1593
1793
# Reschedule checker run
1594
1794
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
1795
self.checker_initiator_tag = gobject.timeout_add(
1796
value, self.start_checker)
1797
self.start_checker() # Start one now, too
1599
1799
# Checker - property
1600
@dbus_service_property(_interface, signature="s",
1800
@dbus_service_property(_interface,
1601
1802
access="readwrite")
1602
1803
def Checker_dbus_property(self, value=None):
1603
1804
if value is None: # get
1604
1805
return dbus.String(self.checker_command)
1605
self.checker_command = unicode(value)
1806
self.checker_command = str(value)
1607
1808
# CheckerRunning - property
1608
@dbus_service_property(_interface, signature="b",
1809
@dbus_service_property(_interface,
1609
1811
access="readwrite")
1610
1812
def CheckerRunning_dbus_property(self, value=None):
1611
1813
if value is None: # get
1837
2044
def fingerprint(openpgp):
1838
2045
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
2046
# New GnuTLS "datum" with the OpenPGP public key
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2047
datum = gnutls.library.types.gnutls_datum_t(
2048
ctypes.cast(ctypes.c_char_p(openpgp),
2049
ctypes.POINTER(ctypes.c_ubyte)),
2050
ctypes.c_uint(len(openpgp)))
1845
2051
# New empty GnuTLS certificate
1846
2052
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2053
gnutls.library.functions.gnutls_openpgp_crt_init(
1849
2055
# Import the OpenPGP public key into the certificate
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2056
gnutls.library.functions.gnutls_openpgp_crt_import(
2057
crt, ctypes.byref(datum),
2058
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1854
2059
# Verify the self signature in the key
1855
2060
crtverify = ctypes.c_uint()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2061
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
crt, 0, ctypes.byref(crtverify))
1859
2063
if crtverify.value != 0:
1860
2064
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2065
raise gnutls.errors.CertificateSecurityError(
1863
2067
# New buffer for the fingerprint
1864
2068
buf = ctypes.create_string_buffer(20)
1865
2069
buf_len = ctypes.c_size_t()
1866
2070
# Get the fingerprint from the certificate into the buffer
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2071
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1870
2073
# Deinit the certificate
1871
2074
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1872
2075
# Convert the buffer to a Python bytestring
2040
2253
def add_pipe(self, parent_pipe, proc):
2041
2254
# Call "handle_ipc" for both data and EOF events
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
functools.partial(self.handle_ipc,
2255
gobject.io_add_watch(
2256
parent_pipe.fileno(),
2257
gobject.IO_IN | gobject.IO_HUP,
2258
functools.partial(self.handle_ipc,
2259
parent_pipe = parent_pipe,
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2262
def handle_ipc(self, source, condition,
2265
client_object=None):
2051
2266
# error, or the other end of multiprocessing.Pipe has closed
2052
2267
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2053
2268
# Wait for other process to exit
2140
2355
# avoid excessive use of external libraries.
2142
2357
# New type for defining tokens, syntax, and semantics all-in-one
2143
Token = collections.namedtuple("Token",
2144
("regexp", # To match token; if
2145
# "value" is not None,
2146
# must have a "group"
2148
"value", # datetime.timedelta or
2150
"followers")) # Tokens valid after
2358
Token = collections.namedtuple("Token", (
2359
"regexp", # To match token; if "value" is not None, must have
2360
# a "group" containing digits
2361
"value", # datetime.timedelta or None
2362
"followers")) # Tokens valid after this token
2152
2363
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
2364
# the "duration" ABNF definition in RFC 3339, Appendix A.
2154
2365
token_end = Token(re.compile(r"$"), None, frozenset())
2155
2366
token_second = Token(re.compile(r"(\d+)S"),
2156
2367
datetime.timedelta(seconds=1),
2157
frozenset((token_end,)))
2368
frozenset((token_end, )))
2158
2369
token_minute = Token(re.compile(r"(\d+)M"),
2159
2370
datetime.timedelta(minutes=1),
2160
2371
frozenset((token_second, token_end)))
2382
2597
# Override the settings from the config file with command line
2383
2598
# options, if set.
2384
2599
for option in ("interface", "address", "port", "debug",
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2600
"priority", "servicename", "configdir", "use_dbus",
2601
"use_ipv6", "debuglevel", "restore", "statedir",
2602
"socket", "foreground", "zeroconf"):
2388
2603
value = getattr(options, option)
2389
2604
if value is not None:
2390
2605
server_settings[option] = value
2392
2607
# Force all strings to be unicode
2393
2608
for option in server_settings.keys():
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2609
if isinstance(server_settings[option], bytes):
2610
server_settings[option] = (server_settings[option]
2396
2612
# Force all boolean options to be boolean
2397
2613
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2614
"foreground", "zeroconf"):
2399
2615
server_settings[option] = bool(server_settings[option])
2400
2616
# Debug implies foreground
2401
2617
if server_settings["debug"]:
2438
2659
global mandos_dbus_service
2439
2660
mandos_dbus_service = None
2441
tcp_server = MandosServer((server_settings["address"],
2442
server_settings["port"]),
2444
interface=(server_settings["interface"]
2448
server_settings["priority"],
2450
socketfd=(server_settings["socket"]
2663
if server_settings["socket"] != "":
2664
socketfd = server_settings["socket"]
2665
tcp_server = MandosServer(
2666
(server_settings["address"], server_settings["port"]),
2668
interface=(server_settings["interface"] or None),
2670
gnutls_priority=server_settings["priority"],
2452
2673
if not foreground:
2453
2674
pidfilename = "/run/mandos.pid"
2675
if not os.path.isdir("/run/."):
2676
pidfilename = "/var/run/mandos.pid"
2456
pidfile = open(pidfilename, "w")
2679
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2680
except IOError as e:
2458
2681
logger.error("Could not open file %r", pidfilename,
2515
2738
bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
2741
old_bus_name = dbus.service.BusName(
2742
"se.bsnet.fukt.Mandos", bus,
2744
except dbus.exceptions.DBusException as e:
2521
2745
logger.error("Disabling D-Bus:", exc_info=e)
2522
2746
use_dbus = False
2523
2747
server_settings["use_dbus"] = False
2524
2748
tcp_server.use_dbus = False
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
2750
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2751
service = AvahiServiceToSyslog(
2752
name = server_settings["servicename"],
2753
servicetype = "_mandos._tcp",
2754
protocol = protocol,
2756
if server_settings["interface"]:
2757
service.interface = if_nametoindex(
2758
server_settings["interface"].encode("utf-8"))
2534
2760
global multiprocessing_manager
2535
2761
multiprocessing_manager = multiprocessing.Manager()
2554
2780
if server_settings["restore"]:
2556
2782
with open(stored_state_path, "rb") as stored_state:
2557
clients_data, old_client_settings = (pickle.load
2783
clients_data, old_client_settings = pickle.load(
2559
2785
os.remove(stored_state_path)
2560
2786
except IOError as e:
2561
2787
if e.errno == errno.ENOENT:
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
2788
logger.warning("Could not load persistent state:"
2789
" {}".format(os.strerror(e.errno)))
2565
2791
logger.critical("Could not load persistent state:",
2568
2794
except EOFError as e:
2569
2795
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2572
2799
with PGPEngine() as pgp:
2573
for client_name, client in clients_data.iteritems():
2800
for client_name, client in clients_data.items():
2574
2801
# Skip removed clients
2575
2802
if client_name not in client_settings:
2601
2828
if datetime.datetime.utcnow() >= client["expires"]:
2602
2829
if not client["last_checked_ok"]:
2603
2830
logger.warning(
2604
"disabling client {0} - Client never "
2605
"performed a successful checker"
2606
.format(client_name))
2831
"disabling client {} - Client never "
2832
"performed a successful checker".format(
2607
2834
client["enabled"] = False
2608
2835
elif client["last_checker_status"] != 0:
2609
2836
logger.warning(
2610
"disabling client {0} - Client "
2611
"last checker failed with error code {1}"
2612
.format(client_name,
2613
client["last_checker_status"]))
2837
"disabling client {} - Client last"
2838
" checker failed with error code"
2841
client["last_checker_status"]))
2614
2842
client["enabled"] = False
2616
client["expires"] = (datetime.datetime
2618
+ client["timeout"])
2844
client["expires"] = (
2845
datetime.datetime.utcnow()
2846
+ client["timeout"])
2619
2847
logger.debug("Last checker succeeded,"
2620
" keeping {0} enabled"
2621
.format(client_name))
2848
" keeping {} enabled".format(
2623
client["secret"] = (
2624
pgp.decrypt(client["encrypted_secret"],
2625
client_settings[client_name]
2851
client["secret"] = pgp.decrypt(
2852
client["encrypted_secret"],
2853
client_settings[client_name]["secret"])
2627
2854
except PGPError:
2628
2855
# If decryption fails, we use secret from new settings
2629
logger.debug("Failed to decrypt {0} old secret"
2630
.format(client_name))
2631
client["secret"] = (
2632
client_settings[client_name]["secret"])
2856
logger.debug("Failed to decrypt {} old secret".format(
2858
client["secret"] = (client_settings[client_name]
2634
2861
# Add/remove clients based on new changes made to config
2635
2862
for client_name in (set(old_client_settings)
2916
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2691
2918
@dbus.service.signal(_interface, signature="os")
2692
2919
def ClientRemoved(self, objpath, name):
2923
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2696
2925
@dbus.service.method(_interface, out_signature="ao")
2697
2926
def GetAllClients(self):
2699
return dbus.Array(c.dbus_object_path
2928
return dbus.Array(c.dbus_object_path for c in
2701
2929
tcp_server.clients.itervalues())
2931
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2703
2933
@dbus.service.method(_interface,
2704
2934
out_signature="a{oa{sv}}")
2705
2935
def GetAllClientsWithProperties(self):
2707
2937
return dbus.Dictionary(
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
2938
{ c.dbus_object_path: c.GetAll(
2939
"se.recompile.Mandos.Client")
2940
for c in tcp_server.clients.itervalues() },
2710
2941
signature="oa{sv}")
2712
2943
@dbus.service.method(_interface, in_signature="o")
2716
2947
if c.dbus_object_path == object_path:
2717
2948
del tcp_server.clients[c.name]
2718
2949
c.remove_from_connection()
2719
# Don't signal anything except ClientRemoved
2950
# Don't signal the disabling
2720
2951
c.disable(quiet=True)
2722
self.ClientRemoved(object_path, c.name)
2952
# Emit D-Bus signal for removal
2953
self.client_removed_signal(c)
2724
2955
raise KeyError(object_path)
2959
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
2960
out_signature = "a{oa{sa{sv}}}")
2961
def GetManagedObjects(self):
2963
return dbus.Dictionary(
2964
{ client.dbus_object_path:
2966
{ interface: client.GetAll(interface)
2968
client._get_all_interface_names()})
2969
for client in tcp_server.clients.values()})
2971
def client_added_signal(self, client):
2972
"""Send the new standard signal and the old signal"""
2974
# New standard signal
2975
self.InterfacesAdded(
2976
client.dbus_object_path,
2978
{ interface: client.GetAll(interface)
2980
client._get_all_interface_names()}))
2982
self.ClientAdded(client.dbus_object_path)
2984
def client_removed_signal(self, client):
2985
"""Send the new standard signal and the old signal"""
2987
# New standard signal
2988
self.InterfacesRemoved(
2989
client.dbus_object_path,
2990
client._get_all_interface_names())
2992
self.ClientRemoved(client.dbus_object_path,
2728
2995
mandos_dbus_service = MandosDBusService()
2731
2998
"Cleanup function; run on exit"
2734
3002
multiprocessing.active_children()
2765
3033
del client_settings[client.name]["secret"]
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
3036
with tempfile.NamedTemporaryFile(
3040
dir=os.path.dirname(stored_state_path),
3041
delete=False) as stored_state:
2772
3042
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
3043
tempname = stored_state.name
2774
3044
os.rename(tempname, stored_state_path)
2775
3045
except (IOError, OSError) as e:
2779
3049
except NameError:
2781
3051
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
logger.warning("Could not save persistent state: {0}"
3052
logger.warning("Could not save persistent state: {}"
2783
3053
.format(os.strerror(e.errno)))
2785
3055
logger.warning("Could not save persistent state:",
2789
3059
# Delete all clients, and settings from config
2790
3060
while tcp_server.clients:
2791
3061
name, client = tcp_server.clients.popitem()
2793
3063
client.remove_from_connection()
2794
# Don't signal anything except ClientRemoved
3064
# Don't signal the disabling
2795
3065
client.disable(quiet=True)
2798
mandos_dbus_service.ClientRemoved(client
3066
# Emit D-Bus signal for removal
3067
mandos_dbus_service.client_removed_signal(client)
2801
3068
client_settings.clear()
2803
3070
atexit.register(cleanup)
2805
3072
for client in tcp_server.clients.itervalues():
2808
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3074
# Emit D-Bus signal for adding
3075
mandos_dbus_service.client_added_signal(client)
2809
3076
# Need to initiate checking of clients
2810
3077
if client.enabled:
2811
3078
client.init_checker()