297
273
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
276
"""Derived from the Avahi example code"""
301
277
if self.rename_count >= self.max_renames:
302
278
logger.critical("No suitable Zeroconf service name found"
303
279
" after %i retries, exiting.",
304
280
self.rename_count)
305
281
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
309
284
logger.info("Changing Zeroconf service name to %r ...",
315
289
except dbus.exceptions.DBusException as error:
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)
290
logger.critical("D-Bus Exception", exc_info=error)
293
self.rename_count += 1
325
295
def remove(self):
326
296
"""Derived from the Avahi example code"""
381
352
def server_state_changed(self, state, error=None):
382
353
"""Derived from the Avahi example code"""
383
354
logger.debug("Avahi server state change: %i", state)
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",
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" }
390
362
if state in bad_states:
391
363
if bad_states[state] is not None:
392
364
if error is None:
422
383
follow_name_owner_changes=True),
423
384
avahi.DBUS_INTERFACE_SERVER)
424
385
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
386
self.server_state_changed)
426
387
self.server_state_changed(self.server.GetState())
429
390
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
431
392
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
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))
448
401
class Client(object):
449
402
"""A representation of a client host served by this server.
496
447
"fingerprint", "host", "interval",
497
448
"last_approval_request", "last_checked_ok",
498
449
"last_enabled", "name", "timeout")
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
453
"checker": "fping -q -- %%(host)s",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
512
462
def config_parser(config):
590
540
self.current_checker_command = None
591
541
self.approved = None
592
542
self.approvals_pending = 0
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
543
self.changedstate = (multiprocessing_manager
544
.Condition(multiprocessing_manager
546
self.client_structure = [attr for attr in
547
self.__dict__.iterkeys()
597
548
if not attr.startswith("_")]
598
549
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
551
for name, t in inspect.getmembers(type(self),
602
555
if not name.startswith("_"):
603
556
self.client_structure.append(name)
646
599
# and every interval from then on.
647
600
if self.checker_initiator_tag is not None:
648
601
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
602
self.checker_initiator_tag = (gobject.timeout_add
604
.total_seconds() * 1000),
652
606
# Schedule a disable() when 'timeout' has passed
653
607
if self.disable_initiator_tag is not None:
654
608
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
609
self.disable_initiator_tag = (gobject.timeout_add
611
.total_seconds() * 1000),
657
613
# Also start a new checker *right now*.
658
614
self.start_checker()
660
def checker_callback(self, source, condition, connection,
616
def checker_callback(self, pid, condition, command):
662
617
"""The checker has completed, so take appropriate actions."""
663
618
self.checker_callback_tag = None
664
619
self.checker = None
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
620
if os.WIFEXITED(condition):
621
self.last_checker_status = os.WEXITSTATUS(condition)
672
622
if self.last_checker_status == 0:
673
623
logger.info("Checker for %(name)s succeeded",
675
625
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
627
logger.info("Checker for %(name)s failed",
679
630
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
631
logger.warning("Checker for %(name)s crashed?",
685
634
def checked_ok(self):
686
635
"""Assert that the client has been seen, alive and well."""
687
636
self.last_checked_ok = datetime.datetime.utcnow()
688
637
self.last_checker_status = 0
689
self.last_checker_signal = None
690
638
self.bump_timeout()
692
640
def bump_timeout(self, timeout=None):
718
667
# than 'timeout' for the client to be disabled, which is as it
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
670
# If a checker exists, make sure it is not a zombie
672
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
673
except AttributeError:
675
except OSError as error:
676
if error.errno != errno.ECHILD:
680
logger.warning("Checker was a zombie")
681
gobject.source_remove(self.checker_callback_tag)
682
self.checker_callback(pid, status,
683
self.current_checker_command)
725
684
# Start a new checker if needed
726
685
if self.checker is None:
727
686
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
687
escaped_attrs = { attr:
688
re.escape(unicode(getattr(self,
690
for attr in self.runtime_expansions }
732
692
command = self.checker_command % escaped_attrs
733
693
except TypeError as error:
734
694
logger.error('Could not format string "%s"',
735
self.checker_command,
695
self.checker_command, exc_info=error)
696
return True # Try again later
697
self.current_checker_command = command
699
logger.info("Starting checker %r for %s",
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
# The exception is when not debugging but nevertheless
706
# running in the foreground; use the previously
709
if (not self.server_settings["debug"]
710
and self.server_settings["foreground"]):
711
popen_args.update({"stdout": wnull,
713
self.checker = subprocess.Popen(command,
717
except OSError as error:
718
logger.error("Failed to start subprocess",
737
return True # Try again later
738
self.current_checker_command = 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)
721
self.checker_callback_tag = (gobject.child_watch_add
723
self.checker_callback,
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
728
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
729
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
764
739
# Re-run this periodically if run by gobject.timeout_add
891
863
def _get_all_dbus_things(self, thing):
892
864
"""Returns a generator of (name, attribute) pairs
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
866
return ((getattr(athing.__get__(self), "_dbus_name",
895
868
athing.__get__(self))
896
869
for cls in self.__class__.__mro__
897
870
for name, athing in
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.
871
inspect.getmembers(cls,
872
self._is_dbus_thing(thing)))
971
874
def _get_dbus_property(self, interface_name, property_name):
972
875
"""Returns a bound method if one exists which is a D-Bus
973
876
property with the specified name and interface.
975
for cls in self.__class__.__mro__:
976
for name, value in inspect.getmembers(
977
cls, self._is_dbus_thing("property")):
878
for cls in self.__class__.__mro__:
879
for name, value in (inspect.getmembers
881
self._is_dbus_thing("property"))):
978
882
if (value._dbus_name == property_name
979
883
and value._dbus_interface == interface_name):
980
884
return value.__get__(self)
982
886
# No such property
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,
887
raise DBusPropertyNotFound(self.dbus_object_path + ":"
888
+ interface_name + "."
891
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
997
892
out_signature="v")
998
893
def Get(self, interface_name, property_name):
999
894
"""Standard D-Bus property Get() method, see D-Bus standard.
1068
954
Inserts property tags and interface annotation tags.
1070
xmlstring = DBusObjectWithAnnotations.Introspect(self,
956
xmlstring = dbus.service.Object.Introspect(self, object_path,
1074
959
document = xml.dom.minidom.parseString(xmlstring)
1076
960
def make_tag(document, name, prop):
1077
961
e = document.createElement("property")
1078
962
e.setAttribute("name", name)
1079
963
e.setAttribute("type", prop._dbus_signature)
1080
964
e.setAttribute("access", prop._dbus_access)
1083
966
for if_tag in document.getElementsByTagName("interface"):
1084
967
# Add property tags
1085
968
for tag in (make_tag(document, name, prop)
1088
971
if prop._dbus_interface
1089
972
== if_tag.getAttribute("name")):
1090
973
if_tag.appendChild(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)
974
# Add annotation tags
975
for typ in ("method", "signal", "property"):
976
for tag in if_tag.getElementsByTagName(typ):
978
for name, prop in (self.
979
_get_all_dbus_things(typ)):
980
if (name == tag.getAttribute("name")
981
and prop._dbus_interface
982
== if_tag.getAttribute("name")):
983
annots.update(getattr
987
for name, value in annots.items():
988
ann_tag = document.createElement(
990
ann_tag.setAttribute("name", name)
991
ann_tag.setAttribute("value", value)
992
tag.appendChild(ann_tag)
993
# Add interface annotation tags
994
for annotation, value in dict(
995
itertools.chain.from_iterable(
996
annotations().items()
997
for name, annotations in
998
self._get_all_dbus_things("interface")
999
if name == if_tag.getAttribute("name")
1001
ann_tag = document.createElement("annotation")
1002
ann_tag.setAttribute("name", annotation)
1003
ann_tag.setAttribute("value", value)
1004
if_tag.appendChild(ann_tag)
1107
1005
# Add the names to the return values for the
1108
1006
# "org.freedesktop.DBus.Properties" methods
1109
1007
if (if_tag.getAttribute("name")
1127
1025
exc_info=error)
1128
1026
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",
1199
1029
def datetime_to_dbus(dt, variant_level=0):
1200
1030
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1202
1032
return dbus.String("", variant_level = variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1033
return dbus.String(dt.isoformat(),
1034
variant_level=variant_level)
1206
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1237
1067
# Ignore non-D-Bus attributes, and D-Bus attributes
1238
1068
# with the wrong interface name
1239
1069
if (not hasattr(attribute, "_dbus_interface")
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1070
or not attribute._dbus_interface
1071
.startswith(orig_interface_name)):
1243
1073
# Create an alternate D-Bus interface name based on
1244
1074
# the current name
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1075
alt_interface = (attribute._dbus_interface
1076
.replace(orig_interface_name,
1077
alt_interface_name))
1247
1078
interface_names.add(alt_interface)
1248
1079
# Is this a D-Bus signal?
1249
1080
if getattr(attribute, "_dbus_is_signal", False):
1250
if sys.version_info.major == 2:
1251
# Extract the original non-method undecorated
1252
# function by black magic
1253
nonmethod_func = (dict(
1081
# Extract the original non-method undecorated
1082
# function by black magic
1083
nonmethod_func = (dict(
1254
1084
zip(attribute.func_code.co_freevars,
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1085
attribute.__closure__))["func"]
1259
1087
# Create a new, but exactly alike, function
1260
1088
# object, and decorate it to be a new D-Bus signal
1261
1089
# with the alternate D-Bus interface name
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))
1090
new_function = (dbus.service.signal
1092
attribute._dbus_signature)
1093
(types.FunctionType(
1094
nonmethod_func.func_code,
1095
nonmethod_func.func_globals,
1096
nonmethod_func.func_name,
1097
nonmethod_func.func_defaults,
1098
nonmethod_func.func_closure)))
1279
1099
# Copy annotations, if any
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1101
new_function._dbus_annotations = (
1102
dict(attribute._dbus_annotations))
1283
1103
except AttributeError:
1285
1105
# Define a creator of a function to call both the
1307
1125
# object. Decorate it to be a new D-Bus method
1308
1126
# with the alternate D-Bus interface name. Add it
1309
1127
# to the class.
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)))
1128
attr[attrname] = (dbus.service.method
1130
attribute._dbus_in_signature,
1131
attribute._dbus_out_signature)
1133
(attribute.func_code,
1134
attribute.func_globals,
1135
attribute.func_name,
1136
attribute.func_defaults,
1137
attribute.func_closure)))
1320
1138
# Copy annotations, if any
1322
attr[attrname]._dbus_annotations = dict(
1323
attribute._dbus_annotations)
1140
attr[attrname]._dbus_annotations = (
1141
dict(attribute._dbus_annotations))
1324
1142
except AttributeError:
1326
1144
# Is this a D-Bus property?
1329
1147
# object, and decorate it to be a new D-Bus
1330
1148
# property with the alternate D-Bus interface
1331
1149
# name. Add it to the class.
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)))
1150
attr[attrname] = (dbus_service_property
1152
attribute._dbus_signature,
1153
attribute._dbus_access,
1155
._dbus_get_args_options
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1343
1163
# Copy annotations, if any
1345
attr[attrname]._dbus_annotations = dict(
1346
attribute._dbus_annotations)
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1347
1167
except AttributeError:
1349
1169
# Is this a D-Bus interface?
1406
1223
Client.__init__(self, *args, **kwargs)
1407
1224
# Only now, when this client is initialized, can it show up on
1409
client_object_name = str(self.name).translate(
1226
client_object_name = unicode(self.name).translate(
1410
1227
{ord("."): ord("_"),
1411
1228
ord("-"): ord("_")})
1412
self.dbus_object_path = dbus.ObjectPath(
1413
"/clients/" + client_object_name)
1229
self.dbus_object_path = (dbus.ObjectPath
1230
("/clients/" + client_object_name))
1414
1231
DBusObjectWithProperties.__init__(self, self.bus,
1415
1232
self.dbus_object_path)
1417
def notifychangeproperty(transform_func, dbus_name,
1418
type_func=lambda x: x,
1420
invalidate_only=False,
1421
_interface=_interface):
1234
def notifychangeproperty(transform_func,
1235
dbus_name, type_func=lambda x: x,
1422
1237
""" Modify a variable so that it's a property which announces
1423
1238
its changes to DBus.
1430
1245
variant_level: D-Bus variant level. Default: 1
1432
1247
attrname = "_{}".format(dbus_name)
1434
1248
def setter(self, value):
1435
1249
if hasattr(self, "dbus_object_path"):
1436
1250
if (not hasattr(self, attrname) or
1437
1251
type_func(getattr(self, attrname, None))
1438
1252
!= type_func(value)):
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):
1253
dbus_value = transform_func(type_func(value),
1256
self.PropertyChanged(dbus.String(dbus_name),
1454
1258
setattr(self, attrname, value)
1456
1260
return property(lambda self: getattr(self, attrname), setter)
1473
1277
datetime_to_dbus, "LastApprovalRequest")
1474
1278
approved_by_default = notifychangeproperty(dbus.Boolean,
1475
1279
"ApprovedByDefault")
1476
approval_delay = notifychangeproperty(
1477
dbus.UInt64, "ApprovalDelay",
1478
type_func = lambda td: td.total_seconds() * 1000)
1280
approval_delay = notifychangeproperty(dbus.UInt64,
1283
lambda td: td.total_seconds()
1479
1285
approval_duration = notifychangeproperty(
1480
1286
dbus.UInt64, "ApprovalDuration",
1481
1287
type_func = lambda td: td.total_seconds() * 1000)
1482
1288
host = notifychangeproperty(dbus.String, "Host")
1483
timeout = notifychangeproperty(
1484
dbus.UInt64, "Timeout",
1485
type_func = lambda td: td.total_seconds() * 1000)
1289
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1290
type_func = lambda td:
1291
td.total_seconds() * 1000)
1486
1292
extended_timeout = notifychangeproperty(
1487
1293
dbus.UInt64, "ExtendedTimeout",
1488
1294
type_func = lambda td: td.total_seconds() * 1000)
1489
interval = notifychangeproperty(
1490
dbus.UInt64, "Interval",
1491
type_func = lambda td: td.total_seconds() * 1000)
1295
interval = notifychangeproperty(dbus.UInt64,
1298
lambda td: td.total_seconds()
1492
1300
checker_command = notifychangeproperty(dbus.String, "Checker")
1493
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1494
invalidate_only=True)
1496
1302
del notifychangeproperty
1504
1310
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1505
1311
Client.__del__(self, *args, **kwargs)
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
1313
def checker_callback(self, pid, condition, command,
1315
self.checker_callback_tag = None
1317
if os.WIFEXITED(condition):
1318
exitstatus = os.WEXITSTATUS(condition)
1514
1319
# Emit D-Bus signal
1515
1320
self.CheckerCompleted(dbus.Int16(exitstatus),
1516
# This is specific to GNU libC
1517
dbus.Int64(exitstatus << 8),
1321
dbus.Int64(condition),
1518
1322
dbus.String(command))
1520
1324
# Emit D-Bus signal
1521
1325
self.CheckerCompleted(dbus.Int16(-1),
1523
# This is specific to GNU libC
1525
| self.last_checker_signal),
1326
dbus.Int64(condition),
1526
1327
dbus.String(command))
1329
return Client.checker_callback(self, pid, condition, command,
1529
1332
def start_checker(self, *args, **kwargs):
1530
1333
old_checker_pid = getattr(self.checker, "pid", None)
1668
1469
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1670
1471
# Name - property
1672
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1673
1472
@dbus_service_property(_interface, signature="s", access="read")
1674
1473
def Name_dbus_property(self):
1675
1474
return dbus.String(self.name)
1677
1476
# Fingerprint - property
1679
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1680
1477
@dbus_service_property(_interface, signature="s", access="read")
1681
1478
def Fingerprint_dbus_property(self):
1682
1479
return dbus.String(self.fingerprint)
1684
1481
# Host - property
1685
@dbus_service_property(_interface,
1482
@dbus_service_property(_interface, signature="s",
1687
1483
access="readwrite")
1688
1484
def Host_dbus_property(self, value=None):
1689
1485
if value is None: # get
1690
1486
return dbus.String(self.host)
1691
self.host = str(value)
1487
self.host = unicode(value)
1693
1489
# Created - property
1695
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1696
1490
@dbus_service_property(_interface, signature="s", access="read")
1697
1491
def Created_dbus_property(self):
1698
1492
return datetime_to_dbus(self.created)
1787
1578
if self.enabled:
1788
1579
# Reschedule checker run
1789
1580
gobject.source_remove(self.checker_initiator_tag)
1790
self.checker_initiator_tag = gobject.timeout_add(
1791
value, self.start_checker)
1792
self.start_checker() # Start one now, too
1581
self.checker_initiator_tag = (gobject.timeout_add
1582
(value, self.start_checker))
1583
self.start_checker() # Start one now, too
1794
1585
# Checker - property
1795
@dbus_service_property(_interface,
1586
@dbus_service_property(_interface, signature="s",
1797
1587
access="readwrite")
1798
1588
def Checker_dbus_property(self, value=None):
1799
1589
if value is None: # get
1800
1590
return dbus.String(self.checker_command)
1801
self.checker_command = str(value)
1591
self.checker_command = unicode(value)
1803
1593
# CheckerRunning - property
1804
@dbus_service_property(_interface,
1594
@dbus_service_property(_interface, signature="b",
1806
1595
access="readwrite")
1807
1596
def CheckerRunning_dbus_property(self, value=None):
1808
1597
if value is None: # get
2039
1821
def fingerprint(openpgp):
2040
1822
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2041
1823
# New GnuTLS "datum" with the OpenPGP public key
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)))
1824
datum = (gnutls.library.types
1825
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1828
ctypes.c_uint(len(openpgp))))
2046
1829
# New empty GnuTLS certificate
2047
1830
crt = gnutls.library.types.gnutls_openpgp_crt_t()
2048
gnutls.library.functions.gnutls_openpgp_crt_init(
1831
(gnutls.library.functions
1832
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2050
1833
# Import the OpenPGP public key into the certificate
2051
gnutls.library.functions.gnutls_openpgp_crt_import(
2052
crt, ctypes.byref(datum),
2053
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1836
gnutls.library.constants
1837
.GNUTLS_OPENPGP_FMT_RAW))
2054
1838
# Verify the self signature in the key
2055
1839
crtverify = ctypes.c_uint()
2056
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2057
crt, 0, ctypes.byref(crtverify))
1840
(gnutls.library.functions
1841
.gnutls_openpgp_crt_verify_self(crt, 0,
1842
ctypes.byref(crtverify)))
2058
1843
if crtverify.value != 0:
2059
1844
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2060
raise gnutls.errors.CertificateSecurityError(
1845
raise (gnutls.errors.CertificateSecurityError
2062
1847
# New buffer for the fingerprint
2063
1848
buf = ctypes.create_string_buffer(20)
2064
1849
buf_len = ctypes.c_size_t()
2065
1850
# Get the fingerprint from the certificate into the buffer
2066
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2067
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1851
(gnutls.library.functions
1852
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1853
ctypes.byref(buf_len)))
2068
1854
# Deinit the certificate
2069
1855
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2070
1856
# Convert the buffer to a Python bytestring
2248
2025
def add_pipe(self, parent_pipe, proc):
2249
2026
# Call "handle_ipc" for both data and EOF events
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,
2027
gobject.io_add_watch(parent_pipe.fileno(),
2028
gobject.IO_IN | gobject.IO_HUP,
2029
functools.partial(self.handle_ipc,
2257
def handle_ipc(self, source, condition,
2260
client_object=None):
2034
def handle_ipc(self, source, condition, parent_pipe=None,
2035
proc = None, client_object=None):
2261
2036
# error, or the other end of multiprocessing.Pipe has closed
2262
2037
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2263
2038
# Wait for other process to exit
2350
2125
# avoid excessive use of external libraries.
2352
2127
# New type for defining tokens, syntax, and semantics all-in-one
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
2128
Token = collections.namedtuple("Token",
2129
("regexp", # To match token; if
2130
# "value" is not None,
2131
# must have a "group"
2133
"value", # datetime.timedelta or
2135
"followers")) # Tokens valid after
2358
2137
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2359
2138
# the "duration" ABNF definition in RFC 3339, Appendix A.
2360
2139
token_end = Token(re.compile(r"$"), None, frozenset())
2361
2140
token_second = Token(re.compile(r"(\d+)S"),
2362
2141
datetime.timedelta(seconds=1),
2363
frozenset((token_end, )))
2142
frozenset((token_end,)))
2364
2143
token_minute = Token(re.compile(r"(\d+)M"),
2365
2144
datetime.timedelta(minutes=1),
2366
2145
frozenset((token_second, token_end)))
2592
2370
# Override the settings from the config file with command line
2593
2371
# options, if set.
2594
2372
for option in ("interface", "address", "port", "debug",
2595
"priority", "servicename", "configdir", "use_dbus",
2596
"use_ipv6", "debuglevel", "restore", "statedir",
2597
"socket", "foreground", "zeroconf"):
2373
"priority", "servicename", "configdir",
2374
"use_dbus", "use_ipv6", "debuglevel", "restore",
2375
"statedir", "socket", "foreground", "zeroconf"):
2598
2376
value = getattr(options, option)
2599
2377
if value is not None:
2600
2378
server_settings[option] = value
2657
2437
socketfd = None
2658
2438
if server_settings["socket"] != "":
2659
2439
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"],
2440
tcp_server = MandosServer((server_settings["address"],
2441
server_settings["port"]),
2443
interface=(server_settings["interface"]
2447
server_settings["priority"],
2668
2450
if not foreground:
2669
2451
pidfilename = "/run/mandos.pid"
2670
2452
if not os.path.isdir("/run/."):
2671
2453
pidfilename = "/var/run/mandos.pid"
2674
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2456
pidfile = open(pidfilename, "w")
2675
2457
except IOError as e:
2676
2458
logger.error("Could not open file %r", pidfilename,
2733
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
2736
old_bus_name = dbus.service.BusName(
2737
"se.bsnet.fukt.Mandos", bus,
2739
except dbus.exceptions.DBusException as e:
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:
2740
2521
logger.error("Disabling D-Bus:", exc_info=e)
2741
2522
use_dbus = False
2742
2523
server_settings["use_dbus"] = False
2743
2524
tcp_server.use_dbus = False
2745
2526
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,
2527
service = AvahiServiceToSyslog(name =
2528
server_settings["servicename"],
2529
servicetype = "_mandos._tcp",
2530
protocol = protocol, bus = bus)
2751
2531
if server_settings["interface"]:
2752
service.interface = if_nametoindex(
2753
server_settings["interface"].encode("utf-8"))
2532
service.interface = (if_nametoindex
2533
(server_settings["interface"]
2755
2536
global multiprocessing_manager
2756
2537
multiprocessing_manager = multiprocessing.Manager()
2775
2556
if server_settings["restore"]:
2777
2558
with open(stored_state_path, "rb") as stored_state:
2778
clients_data, old_client_settings = pickle.load(
2559
clients_data, old_client_settings = (pickle.load
2780
2561
os.remove(stored_state_path)
2781
2562
except IOError as e:
2782
2563
if e.errno == errno.ENOENT:
2783
logger.warning("Could not load persistent state:"
2784
" {}".format(os.strerror(e.errno)))
2564
logger.warning("Could not load persistent state: {}"
2565
.format(os.strerror(e.errno)))
2786
2567
logger.critical("Could not load persistent state:",
2789
2570
except EOFError as e:
2790
2571
logger.warning("Could not load persistent state: "
2572
"EOFError:", exc_info=e)
2794
2574
with PGPEngine() as pgp:
2795
2575
for client_name, client in clients_data.items():
2824
2604
if not client["last_checked_ok"]:
2825
2605
logger.warning(
2826
2606
"disabling client {} - Client never "
2827
"performed a successful checker".format(
2607
"performed a successful checker"
2608
.format(client_name))
2829
2609
client["enabled"] = False
2830
2610
elif client["last_checker_status"] != 0:
2831
2611
logger.warning(
2832
2612
"disabling client {} - Client last"
2833
" checker failed with error code"
2836
client["last_checker_status"]))
2613
" checker failed with error code {}"
2614
.format(client_name,
2615
client["last_checker_status"]))
2837
2616
client["enabled"] = False
2839
client["expires"] = (
2840
datetime.datetime.utcnow()
2841
+ client["timeout"])
2618
client["expires"] = (datetime.datetime
2620
+ client["timeout"])
2842
2621
logger.debug("Last checker succeeded,"
2843
" keeping {} enabled".format(
2622
" keeping {} enabled"
2623
.format(client_name))
2846
client["secret"] = pgp.decrypt(
2847
client["encrypted_secret"],
2848
client_settings[client_name]["secret"])
2625
client["secret"] = (
2626
pgp.decrypt(client["encrypted_secret"],
2627
client_settings[client_name]
2849
2629
except PGPError:
2850
2630
# If decryption fails, we use secret from new settings
2851
logger.debug("Failed to decrypt {} old secret".format(
2853
client["secret"] = (client_settings[client_name]
2631
logger.debug("Failed to decrypt {} old secret"
2632
.format(client_name))
2633
client["secret"] = (
2634
client_settings[client_name]["secret"])
2856
2636
# Add/remove clients based on new changes made to config
2857
2637
for client_name in (set(old_client_settings)
2887
2666
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2891
@alternate_dbus_interfaces(
2892
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2893
class MandosDBusService(DBusObjectWithObjectManager):
2669
@alternate_dbus_interfaces({"se.recompile.Mandos":
2670
"se.bsnet.fukt.Mandos"})
2671
class MandosDBusService(DBusObjectWithProperties):
2894
2672
"""A D-Bus proxy object"""
2896
2673
def __init__(self):
2897
2674
dbus.service.Object.__init__(self, bus, "/")
2899
2675
_interface = "se.recompile.Mandos"
2677
@dbus_interface_annotations(_interface)
2679
return { "org.freedesktop.DBus.Property"
2680
".EmitsChangedSignal":
2901
2683
@dbus.service.signal(_interface, signature="o")
2902
2684
def ClientAdded(self, objpath):
2911
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2913
2693
@dbus.service.signal(_interface, signature="os")
2914
2694
def ClientRemoved(self, objpath, name):
2918
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2920
2698
@dbus.service.method(_interface, out_signature="ao")
2921
2699
def GetAllClients(self):
2923
return dbus.Array(c.dbus_object_path for c in
2701
return dbus.Array(c.dbus_object_path
2924
2703
tcp_server.clients.itervalues())
2926
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2928
2705
@dbus.service.method(_interface,
2929
2706
out_signature="a{oa{sv}}")
2930
2707
def GetAllClientsWithProperties(self):
2932
2709
return dbus.Dictionary(
2933
{ c.dbus_object_path: c.GetAll(
2934
"se.recompile.Mandos.Client")
2935
for c in tcp_server.clients.itervalues() },
2710
((c.dbus_object_path, c.GetAll(""))
2711
for c in tcp_server.clients.itervalues()),
2936
2712
signature="oa{sv}")
2938
2714
@dbus.service.method(_interface, in_signature="o")
2942
2718
if c.dbus_object_path == object_path:
2943
2719
del tcp_server.clients[c.name]
2944
2720
c.remove_from_connection()
2945
# Don't signal the disabling
2721
# Don't signal anything except ClientRemoved
2946
2722
c.disable(quiet=True)
2947
# Emit D-Bus signal for removal
2948
self.client_removed_signal(c)
2724
self.ClientRemoved(object_path, c.name)
2950
2726
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,
2990
2730
mandos_dbus_service = MandosDBusService()
3028
2768
del client_settings[client.name]["secret"]
3031
with tempfile.NamedTemporaryFile(
3035
dir=os.path.dirname(stored_state_path),
3036
delete=False) as stored_state:
2771
with (tempfile.NamedTemporaryFile
2772
(mode='wb', suffix=".pickle", prefix='clients-',
2773
dir=os.path.dirname(stored_state_path),
2774
delete=False)) as stored_state:
3037
2775
pickle.dump((clients, client_settings), stored_state)
3038
tempname = stored_state.name
2776
tempname=stored_state.name
3039
2777
os.rename(tempname, stored_state_path)
3040
2778
except (IOError, OSError) as e: