381
361
def server_state_changed(self, state, error=None):
382
362
"""Derived from the Avahi example code"""
383
363
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",
364
bad_states = { avahi.SERVER_INVALID:
365
"Zeroconf server invalid",
366
avahi.SERVER_REGISTERING: None,
367
avahi.SERVER_COLLISION:
368
"Zeroconf server name collision",
369
avahi.SERVER_FAILURE:
370
"Zeroconf server failure" }
390
371
if state in bad_states:
391
372
if bad_states[state] is not None:
392
373
if error is None:
430
400
def rename(self, *args, **kwargs):
431
401
"""Add the new name to the syslog messages"""
432
402
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
403
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
405
' %(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
410
class Client(object):
449
411
"""A representation of a client host served by this server.
496
456
"fingerprint", "host", "interval",
497
457
"last_approval_request", "last_checked_ok",
498
458
"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",
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
462
"checker": "fping -q -- %%(host)s",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
466
"approved_by_default": "True",
512
471
def config_parser(config):
590
549
self.current_checker_command = None
591
550
self.approved = None
592
551
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()
552
self.changedstate = (multiprocessing_manager
553
.Condition(multiprocessing_manager
555
self.client_structure = [attr for attr in
556
self.__dict__.iterkeys()
597
557
if not attr.startswith("_")]
598
558
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
560
for name, t in inspect.getmembers(type(self),
602
564
if not name.startswith("_"):
603
565
self.client_structure.append(name)
646
608
# and every interval from then on.
647
609
if self.checker_initiator_tag is not None:
648
610
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
611
self.checker_initiator_tag = (gobject.timeout_add
613
.total_seconds() * 1000),
652
615
# Schedule a disable() when 'timeout' has passed
653
616
if self.disable_initiator_tag is not None:
654
617
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
618
self.disable_initiator_tag = (gobject.timeout_add
620
.total_seconds() * 1000),
657
622
# Also start a new checker *right now*.
658
623
self.start_checker()
660
def checker_callback(self, source, condition, connection,
625
def checker_callback(self, pid, condition, command):
662
626
"""The checker has completed, so take appropriate actions."""
663
627
self.checker_callback_tag = None
664
628
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
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
672
631
if self.last_checker_status == 0:
673
632
logger.info("Checker for %(name)s succeeded",
675
634
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
636
logger.info("Checker for %(name)s failed",
679
639
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
640
logger.warning("Checker for %(name)s crashed?",
685
643
def checked_ok(self):
686
644
"""Assert that the client has been seen, alive and well."""
687
645
self.last_checked_ok = datetime.datetime.utcnow()
688
646
self.last_checker_status = 0
689
self.last_checker_signal = None
690
647
self.bump_timeout()
692
649
def bump_timeout(self, timeout=None):
718
676
# 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")
679
# If a checker exists, make sure it is not a zombie
681
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
except AttributeError:
684
except OSError as error:
685
if error.errno != errno.ECHILD:
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
725
693
# Start a new checker if needed
726
694
if self.checker is None:
727
695
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
732
700
command = self.checker_command % escaped_attrs
733
701
except TypeError as error:
734
702
logger.error('Could not format string "%s"',
735
self.checker_command,
703
self.checker_command, exc_info=error)
704
return True # Try again later
705
self.current_checker_command = command
707
logger.info("Starting checker %r for %s",
709
# We don't need to redirect stdout and stderr, since
710
# in normal mode, that is already done by daemon(),
711
# and in debug mode we don't want to. (Stdin is
712
# always replaced by /dev/null.)
713
# The exception is when not debugging but nevertheless
714
# running in the foreground; use the previously
717
if (not self.server_settings["debug"]
718
and self.server_settings["foreground"]):
719
popen_args.update({"stdout": wnull,
721
self.checker = subprocess.Popen(command,
725
except OSError as error:
726
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)
729
self.checker_callback_tag = (gobject.child_watch_add
731
self.checker_callback,
733
# The checker may have completed before the gobject
734
# watch was added. Check for this.
736
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
737
except OSError as error:
738
if error.errno == errno.ECHILD:
739
# This should never happen
740
logger.error("Child process vanished",
745
gobject.source_remove(self.checker_callback_tag)
746
self.checker_callback(pid, status, command)
764
747
# Re-run this periodically if run by gobject.timeout_add
891
871
def _get_all_dbus_things(self, thing):
892
872
"""Returns a generator of (name, attribute) pairs
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
874
return ((getattr(athing.__get__(self), "_dbus_name",
895
876
athing.__get__(self))
896
877
for cls in self.__class__.__mro__
897
878
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.
879
inspect.getmembers(cls,
880
self._is_dbus_thing(thing)))
971
882
def _get_dbus_property(self, interface_name, property_name):
972
883
"""Returns a bound method if one exists which is a D-Bus
973
884
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")):
886
for cls in self.__class__.__mro__:
887
for name, value in (inspect.getmembers
889
self._is_dbus_thing("property"))):
978
890
if (value._dbus_name == property_name
979
891
and value._dbus_interface == interface_name):
980
892
return value.__get__(self)
982
894
# 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,
895
raise DBusPropertyNotFound(self.dbus_object_path + ":"
896
+ interface_name + "."
899
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
997
900
out_signature="v")
998
901
def Get(self, interface_name, property_name):
999
902
"""Standard D-Bus property Get() method, see D-Bus standard.
1068
970
Inserts property tags and interface annotation tags.
1070
xmlstring = DBusObjectWithAnnotations.Introspect(self,
972
xmlstring = dbus.service.Object.Introspect(self, object_path,
1074
975
document = xml.dom.minidom.parseString(xmlstring)
1076
976
def make_tag(document, name, prop):
1077
977
e = document.createElement("property")
1078
978
e.setAttribute("name", name)
1079
979
e.setAttribute("type", prop._dbus_signature)
1080
980
e.setAttribute("access", prop._dbus_access)
1083
982
for if_tag in document.getElementsByTagName("interface"):
1084
983
# Add property tags
1085
984
for tag in (make_tag(document, name, prop)
1088
987
if prop._dbus_interface
1089
988
== if_tag.getAttribute("name")):
1090
989
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)
990
# Add annotation tags
991
for typ in ("method", "signal", "property"):
992
for tag in if_tag.getElementsByTagName(typ):
994
for name, prop in (self.
995
_get_all_dbus_things(typ)):
996
if (name == tag.getAttribute("name")
997
and prop._dbus_interface
998
== if_tag.getAttribute("name")):
999
annots.update(getattr
1001
"_dbus_annotations",
1003
for name, value in annots.items():
1004
ann_tag = document.createElement(
1006
ann_tag.setAttribute("name", name)
1007
ann_tag.setAttribute("value", value)
1008
tag.appendChild(ann_tag)
1009
# Add interface annotation tags
1010
for annotation, value in dict(
1011
itertools.chain.from_iterable(
1012
annotations().items()
1013
for name, annotations in
1014
self._get_all_dbus_things("interface")
1015
if name == if_tag.getAttribute("name")
1017
ann_tag = document.createElement("annotation")
1018
ann_tag.setAttribute("name", annotation)
1019
ann_tag.setAttribute("value", value)
1020
if_tag.appendChild(ann_tag)
1107
1021
# Add the names to the return values for the
1108
1022
# "org.freedesktop.DBus.Properties" methods
1109
1023
if (if_tag.getAttribute("name")
1127
1041
exc_info=error)
1128
1042
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
1045
def datetime_to_dbus(dt, variant_level=0):
1200
1046
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1202
1048
return dbus.String("", variant_level = variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1049
return dbus.String(dt.isoformat(),
1050
variant_level=variant_level)
1206
1053
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1237
1083
# Ignore non-D-Bus attributes, and D-Bus attributes
1238
1084
# with the wrong interface name
1239
1085
if (not hasattr(attribute, "_dbus_interface")
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1086
or not attribute._dbus_interface
1087
.startswith(orig_interface_name)):
1243
1089
# Create an alternate D-Bus interface name based on
1244
1090
# the current name
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1091
alt_interface = (attribute._dbus_interface
1092
.replace(orig_interface_name,
1093
alt_interface_name))
1247
1094
interface_names.add(alt_interface)
1248
1095
# Is this a D-Bus signal?
1249
1096
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(
1097
# Extract the original non-method undecorated
1098
# function by black magic
1099
nonmethod_func = (dict(
1254
1100
zip(attribute.func_code.co_freevars,
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1101
attribute.__closure__))["func"]
1259
1103
# Create a new, but exactly alike, function
1260
1104
# object, and decorate it to be a new D-Bus signal
1261
1105
# 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))
1106
new_function = (dbus.service.signal
1108
attribute._dbus_signature)
1109
(types.FunctionType(
1110
nonmethod_func.func_code,
1111
nonmethod_func.func_globals,
1112
nonmethod_func.func_name,
1113
nonmethod_func.func_defaults,
1114
nonmethod_func.func_closure)))
1279
1115
# Copy annotations, if any
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1117
new_function._dbus_annotations = (
1118
dict(attribute._dbus_annotations))
1283
1119
except AttributeError:
1285
1121
# Define a creator of a function to call both the
1307
1141
# object. Decorate it to be a new D-Bus method
1308
1142
# with the alternate D-Bus interface name. Add it
1309
1143
# 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)))
1144
attr[attrname] = (dbus.service.method
1146
attribute._dbus_in_signature,
1147
attribute._dbus_out_signature)
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1320
1154
# Copy annotations, if any
1322
attr[attrname]._dbus_annotations = dict(
1323
attribute._dbus_annotations)
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1324
1158
except AttributeError:
1326
1160
# Is this a D-Bus property?
1329
1163
# object, and decorate it to be a new D-Bus
1330
1164
# property with the alternate D-Bus interface
1331
1165
# 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)))
1166
attr[attrname] = (dbus_service_property
1168
attribute._dbus_signature,
1169
attribute._dbus_access,
1171
._dbus_get_args_options
1174
(attribute.func_code,
1175
attribute.func_globals,
1176
attribute.func_name,
1177
attribute.func_defaults,
1178
attribute.func_closure)))
1343
1179
# Copy annotations, if any
1345
attr[attrname]._dbus_annotations = dict(
1346
attribute._dbus_annotations)
1181
attr[attrname]._dbus_annotations = (
1182
dict(attribute._dbus_annotations))
1347
1183
except AttributeError:
1349
1185
# Is this a D-Bus interface?
1430
1264
variant_level: D-Bus variant level. Default: 1
1432
1266
attrname = "_{}".format(dbus_name)
1434
1267
def setter(self, value):
1435
1268
if hasattr(self, "dbus_object_path"):
1436
1269
if (not hasattr(self, attrname) or
1437
1270
type_func(getattr(self, attrname, None))
1438
1271
!= type_func(value)):
1439
1272
if invalidate_only:
1440
self.PropertiesChanged(
1441
_interface, dbus.Dictionary(),
1442
dbus.Array((dbus_name, )))
1273
self.PropertiesChanged(_interface,
1444
dbus_value = transform_func(
1446
variant_level = variant_level)
1278
dbus_value = transform_func(type_func(value),
1447
1281
self.PropertyChanged(dbus.String(dbus_name),
1449
self.PropertiesChanged(
1451
dbus.Dictionary({ dbus.String(dbus_name):
1283
self.PropertiesChanged(_interface,
1285
dbus.String(dbus_name):
1286
dbus_value }), dbus.Array())
1454
1287
setattr(self, attrname, value)
1456
1289
return property(lambda self: getattr(self, attrname), setter)
1473
1306
datetime_to_dbus, "LastApprovalRequest")
1474
1307
approved_by_default = notifychangeproperty(dbus.Boolean,
1475
1308
"ApprovedByDefault")
1476
approval_delay = notifychangeproperty(
1477
dbus.UInt64, "ApprovalDelay",
1478
type_func = lambda td: td.total_seconds() * 1000)
1309
approval_delay = notifychangeproperty(dbus.UInt64,
1312
lambda td: td.total_seconds()
1479
1314
approval_duration = notifychangeproperty(
1480
1315
dbus.UInt64, "ApprovalDuration",
1481
1316
type_func = lambda td: td.total_seconds() * 1000)
1482
1317
host = notifychangeproperty(dbus.String, "Host")
1483
timeout = notifychangeproperty(
1484
dbus.UInt64, "Timeout",
1485
type_func = lambda td: td.total_seconds() * 1000)
1318
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1486
1321
extended_timeout = notifychangeproperty(
1487
1322
dbus.UInt64, "ExtendedTimeout",
1488
1323
type_func = lambda td: td.total_seconds() * 1000)
1489
interval = notifychangeproperty(
1490
dbus.UInt64, "Interval",
1491
type_func = lambda td: td.total_seconds() * 1000)
1324
interval = notifychangeproperty(dbus.UInt64,
1327
lambda td: td.total_seconds()
1492
1329
checker_command = notifychangeproperty(dbus.String, "Checker")
1493
1330
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1494
1331
invalidate_only=True)
1504
1341
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1505
1342
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
1344
def checker_callback(self, pid, condition, command,
1346
self.checker_callback_tag = None
1348
if os.WIFEXITED(condition):
1349
exitstatus = os.WEXITSTATUS(condition)
1514
1350
# Emit D-Bus signal
1515
1351
self.CheckerCompleted(dbus.Int16(exitstatus),
1516
# This is specific to GNU libC
1517
dbus.Int64(exitstatus << 8),
1352
dbus.Int64(condition),
1518
1353
dbus.String(command))
1520
1355
# Emit D-Bus signal
1521
1356
self.CheckerCompleted(dbus.Int16(-1),
1523
# This is specific to GNU libC
1525
| self.last_checker_signal),
1357
dbus.Int64(condition),
1526
1358
dbus.String(command))
1360
return Client.checker_callback(self, pid, condition, command,
1529
1363
def start_checker(self, *args, **kwargs):
1530
1364
old_checker_pid = getattr(self.checker, "pid", None)
1668
1495
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1670
1497
# Name - property
1672
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1673
1498
@dbus_service_property(_interface, signature="s", access="read")
1674
1499
def Name_dbus_property(self):
1675
1500
return dbus.String(self.name)
1677
1502
# Fingerprint - property
1679
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1680
1503
@dbus_service_property(_interface, signature="s", access="read")
1681
1504
def Fingerprint_dbus_property(self):
1682
1505
return dbus.String(self.fingerprint)
1684
1507
# Host - property
1685
@dbus_service_property(_interface,
1508
@dbus_service_property(_interface, signature="s",
1687
1509
access="readwrite")
1688
1510
def Host_dbus_property(self, value=None):
1689
1511
if value is None: # get
2039
1847
def fingerprint(openpgp):
2040
1848
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2041
1849
# 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)))
1850
datum = (gnutls.library.types
1851
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1854
ctypes.c_uint(len(openpgp))))
2046
1855
# New empty GnuTLS certificate
2047
1856
crt = gnutls.library.types.gnutls_openpgp_crt_t()
2048
gnutls.library.functions.gnutls_openpgp_crt_init(
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2050
1859
# 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)
1860
(gnutls.library.functions
1861
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1862
gnutls.library.constants
1863
.GNUTLS_OPENPGP_FMT_RAW))
2054
1864
# Verify the self signature in the key
2055
1865
crtverify = ctypes.c_uint()
2056
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2057
crt, 0, ctypes.byref(crtverify))
1866
(gnutls.library.functions
1867
.gnutls_openpgp_crt_verify_self(crt, 0,
1868
ctypes.byref(crtverify)))
2058
1869
if crtverify.value != 0:
2059
1870
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2060
raise gnutls.errors.CertificateSecurityError(
1871
raise (gnutls.errors.CertificateSecurityError
2062
1873
# New buffer for the fingerprint
2063
1874
buf = ctypes.create_string_buffer(20)
2064
1875
buf_len = ctypes.c_size_t()
2065
1876
# 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))
1877
(gnutls.library.functions
1878
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1879
ctypes.byref(buf_len)))
2068
1880
# Deinit the certificate
2069
1881
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2070
1882
# Convert the buffer to a Python bytestring
2248
2051
def add_pipe(self, parent_pipe, proc):
2249
2052
# 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,
2053
gobject.io_add_watch(parent_pipe.fileno(),
2054
gobject.IO_IN | gobject.IO_HUP,
2055
functools.partial(self.handle_ipc,
2257
def handle_ipc(self, source, condition,
2260
client_object=None):
2060
def handle_ipc(self, source, condition, parent_pipe=None,
2061
proc = None, client_object=None):
2261
2062
# error, or the other end of multiprocessing.Pipe has closed
2262
2063
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2263
2064
# Wait for other process to exit
2350
2151
# avoid excessive use of external libraries.
2352
2153
# 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
2154
Token = collections.namedtuple("Token",
2155
("regexp", # To match token; if
2156
# "value" is not None,
2157
# must have a "group"
2159
"value", # datetime.timedelta or
2161
"followers")) # Tokens valid after
2358
2163
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2359
2164
# the "duration" ABNF definition in RFC 3339, Appendix A.
2360
2165
token_end = Token(re.compile(r"$"), None, frozenset())
2361
2166
token_second = Token(re.compile(r"(\d+)S"),
2362
2167
datetime.timedelta(seconds=1),
2363
frozenset((token_end, )))
2168
frozenset((token_end,)))
2364
2169
token_minute = Token(re.compile(r"(\d+)M"),
2365
2170
datetime.timedelta(minutes=1),
2366
2171
frozenset((token_second, token_end)))
2592
2396
# Override the settings from the config file with command line
2593
2397
# options, if set.
2594
2398
for option in ("interface", "address", "port", "debug",
2595
"priority", "servicename", "configdir", "use_dbus",
2596
"use_ipv6", "debuglevel", "restore", "statedir",
2597
"socket", "foreground", "zeroconf"):
2399
"priority", "servicename", "configdir",
2400
"use_dbus", "use_ipv6", "debuglevel", "restore",
2401
"statedir", "socket", "foreground", "zeroconf"):
2598
2402
value = getattr(options, option)
2599
2403
if value is not None:
2600
2404
server_settings[option] = value
2657
2463
socketfd = None
2658
2464
if server_settings["socket"] != "":
2659
2465
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"],
2466
tcp_server = MandosServer((server_settings["address"],
2467
server_settings["port"]),
2469
interface=(server_settings["interface"]
2473
server_settings["priority"],
2668
2476
if not foreground:
2669
2477
pidfilename = "/run/mandos.pid"
2670
2478
if not os.path.isdir("/run/."):
2671
2479
pidfilename = "/var/run/mandos.pid"
2674
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2482
pidfile = open(pidfilename, "w")
2675
2483
except IOError as e:
2676
2484
logger.error("Could not open file %r", pidfilename,
2733
2541
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:
2542
bus, do_not_queue=True)
2543
old_bus_name = (dbus.service.BusName
2544
("se.bsnet.fukt.Mandos", bus,
2546
except dbus.exceptions.NameExistsException as e:
2740
2547
logger.error("Disabling D-Bus:", exc_info=e)
2741
2548
use_dbus = False
2742
2549
server_settings["use_dbus"] = False
2743
2550
tcp_server.use_dbus = False
2745
2552
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,
2553
service = AvahiServiceToSyslog(name =
2554
server_settings["servicename"],
2555
servicetype = "_mandos._tcp",
2556
protocol = protocol, bus = bus)
2751
2557
if server_settings["interface"]:
2752
service.interface = if_nametoindex(
2753
server_settings["interface"].encode("utf-8"))
2558
service.interface = (if_nametoindex
2559
(server_settings["interface"]
2755
2562
global multiprocessing_manager
2756
2563
multiprocessing_manager = multiprocessing.Manager()
2775
2582
if server_settings["restore"]:
2777
2584
with open(stored_state_path, "rb") as stored_state:
2778
clients_data, old_client_settings = pickle.load(
2585
clients_data, old_client_settings = (pickle.load
2780
2587
os.remove(stored_state_path)
2781
2588
except IOError as e:
2782
2589
if e.errno == errno.ENOENT:
2783
logger.warning("Could not load persistent state:"
2784
" {}".format(os.strerror(e.errno)))
2590
logger.warning("Could not load persistent state: {}"
2591
.format(os.strerror(e.errno)))
2786
2593
logger.critical("Could not load persistent state:",
2789
2596
except EOFError as e:
2790
2597
logger.warning("Could not load persistent state: "
2598
"EOFError:", exc_info=e)
2794
2600
with PGPEngine() as pgp:
2795
2601
for client_name, client in clients_data.items():
2824
2630
if not client["last_checked_ok"]:
2825
2631
logger.warning(
2826
2632
"disabling client {} - Client never "
2827
"performed a successful checker".format(
2633
"performed a successful checker"
2634
.format(client_name))
2829
2635
client["enabled"] = False
2830
2636
elif client["last_checker_status"] != 0:
2831
2637
logger.warning(
2832
2638
"disabling client {} - Client last"
2833
" checker failed with error code"
2836
client["last_checker_status"]))
2639
" checker failed with error code {}"
2640
.format(client_name,
2641
client["last_checker_status"]))
2837
2642
client["enabled"] = False
2839
client["expires"] = (
2840
datetime.datetime.utcnow()
2841
+ client["timeout"])
2644
client["expires"] = (datetime.datetime
2646
+ client["timeout"])
2842
2647
logger.debug("Last checker succeeded,"
2843
" keeping {} enabled".format(
2648
" keeping {} enabled"
2649
.format(client_name))
2846
client["secret"] = pgp.decrypt(
2847
client["encrypted_secret"],
2848
client_settings[client_name]["secret"])
2651
client["secret"] = (
2652
pgp.decrypt(client["encrypted_secret"],
2653
client_settings[client_name]
2849
2655
except PGPError:
2850
2656
# 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]
2657
logger.debug("Failed to decrypt {} old secret"
2658
.format(client_name))
2659
client["secret"] = (
2660
client_settings[client_name]["secret"])
2856
2662
# Add/remove clients based on new changes made to config
2857
2663
for client_name in (set(old_client_settings)
2887
2692
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):
2695
@alternate_dbus_interfaces({"se.recompile.Mandos":
2696
"se.bsnet.fukt.Mandos"})
2697
class MandosDBusService(DBusObjectWithProperties):
2894
2698
"""A D-Bus proxy object"""
2896
2699
def __init__(self):
2897
2700
dbus.service.Object.__init__(self, bus, "/")
2899
2701
_interface = "se.recompile.Mandos"
2703
@dbus_interface_annotations(_interface)
2705
return { "org.freedesktop.DBus.Property"
2706
".EmitsChangedSignal":
2901
2709
@dbus.service.signal(_interface, signature="o")
2902
2710
def ClientAdded(self, objpath):
2911
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2913
2719
@dbus.service.signal(_interface, signature="os")
2914
2720
def ClientRemoved(self, objpath, name):
2918
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2920
2724
@dbus.service.method(_interface, out_signature="ao")
2921
2725
def GetAllClients(self):
2923
return dbus.Array(c.dbus_object_path for c in
2727
return dbus.Array(c.dbus_object_path
2924
2729
tcp_server.clients.itervalues())
2926
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2928
2731
@dbus.service.method(_interface,
2929
2732
out_signature="a{oa{sv}}")
2930
2733
def GetAllClientsWithProperties(self):
2932
2735
return dbus.Dictionary(
2933
{ c.dbus_object_path: c.GetAll(
2934
"se.recompile.Mandos.Client")
2736
{ c.dbus_object_path: c.GetAll("")
2935
2737
for c in tcp_server.clients.itervalues() },
2936
2738
signature="oa{sv}")
2942
2744
if c.dbus_object_path == object_path:
2943
2745
del tcp_server.clients[c.name]
2944
2746
c.remove_from_connection()
2945
# Don't signal the disabling
2747
# Don't signal anything except ClientRemoved
2946
2748
c.disable(quiet=True)
2947
# Emit D-Bus signal for removal
2948
self.client_removed_signal(c)
2750
self.ClientRemoved(object_path, c.name)
2950
2752
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
2756
mandos_dbus_service = MandosDBusService()
3028
2794
del client_settings[client.name]["secret"]
3031
with tempfile.NamedTemporaryFile(
3035
dir=os.path.dirname(stored_state_path),
3036
delete=False) as stored_state:
2797
with (tempfile.NamedTemporaryFile
2798
(mode='wb', suffix=".pickle", prefix='clients-',
2799
dir=os.path.dirname(stored_state_path),
2800
delete=False)) as stored_state:
3037
2801
pickle.dump((clients, client_settings), stored_state)
3038
tempname = stored_state.name
2802
tempname=stored_state.name
3039
2803
os.rename(tempname, stored_state_path)
3040
2804
except (IOError, OSError) as e: