88
101
except ImportError:
89
102
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
92
108
stored_state_file = "clients.pickle"
94
110
logger = logging.getLogger()
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
102
118
def if_nametoindex(interface):
103
119
"Get an interface index the hard way, i.e. using fcntl()"
104
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
121
with contextlib.closing(socket.socket()) as s:
106
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
return interface_index
276
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
279
300
"""Derived from the Avahi example code"""
280
301
if self.rename_count >= self.max_renames:
281
302
logger.critical("No suitable Zeroconf service name found"
282
303
" after %i retries, exiting.",
283
304
self.rename_count)
284
305
raise AvahiServiceError("Too many renames")
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
287
309
logger.info("Changing Zeroconf service name to %r ...",
292
315
except dbus.exceptions.DBusException as error:
293
logger.critical("D-Bus Exception", exc_info=error)
296
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)
298
325
def remove(self):
299
326
"""Derived from the Avahi example code"""
355
381
def server_state_changed(self, state, error=None):
356
382
"""Derived from the Avahi example code"""
357
383
logger.debug("Avahi server state change: %i", state)
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"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",
365
390
if state in bad_states:
366
391
if bad_states[state] is not None:
367
392
if error is None:
386
422
follow_name_owner_changes=True),
387
423
avahi.DBUS_INTERFACE_SERVER)
388
424
self.server.connect_to_signal("StateChanged",
389
self.server_state_changed)
425
self.server_state_changed)
390
426
self.server_state_changed(self.server.GetState())
393
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
395
431
"""Add the new name to the syslog messages"""
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(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))
404
448
class Client(object):
405
449
"""A representation of a client host served by this server.
450
496
"fingerprint", "host", "interval",
451
497
"last_approval_request", "last_checked_ok",
452
498
"last_enabled", "name", "timeout")
453
client_defaults = { "timeout": "PT5M",
454
"extended_timeout": "PT15M",
456
"checker": "fping -q -- %%(host)s",
458
"approval_delay": "PT0S",
459
"approval_duration": "PT1S",
460
"approved_by_default": "True",
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
465
512
def config_parser(config):
543
590
self.current_checker_command = None
544
591
self.approved = None
545
592
self.approvals_pending = 0
546
self.changedstate = (multiprocessing_manager
547
.Condition(multiprocessing_manager
549
self.client_structure = [attr for attr in
550
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()
551
597
if not attr.startswith("_")]
552
598
self.client_structure.append("client_structure")
554
for name, t in inspect.getmembers(type(self),
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
558
602
if not name.startswith("_"):
559
603
self.client_structure.append(name)
602
646
# and every interval from then on.
603
647
if self.checker_initiator_tag is not None:
604
648
gobject.source_remove(self.checker_initiator_tag)
605
self.checker_initiator_tag = (gobject.timeout_add
607
.total_seconds() * 1000),
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
609
652
# Schedule a disable() when 'timeout' has passed
610
653
if self.disable_initiator_tag is not None:
611
654
gobject.source_remove(self.disable_initiator_tag)
612
self.disable_initiator_tag = (gobject.timeout_add
614
.total_seconds() * 1000),
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
616
657
# Also start a new checker *right now*.
617
658
self.start_checker()
619
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
620
662
"""The checker has completed, so take appropriate actions."""
621
663
self.checker_callback_tag = None
622
664
self.checker = None
623
if os.WIFEXITED(condition):
624
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
625
672
if self.last_checker_status == 0:
626
673
logger.info("Checker for %(name)s succeeded",
628
675
self.checked_ok()
630
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
633
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
634
681
logger.warning("Checker for %(name)s crashed?",
637
685
def checked_ok(self):
638
686
"""Assert that the client has been seen, alive and well."""
639
687
self.last_checked_ok = datetime.datetime.utcnow()
640
688
self.last_checker_status = 0
689
self.last_checker_signal = None
641
690
self.bump_timeout()
643
692
def bump_timeout(self, timeout=None):
670
718
# than 'timeout' for the client to be disabled, which is as it
673
# If a checker exists, make sure it is not a zombie
675
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
678
except OSError as error:
679
if error.errno != errno.ECHILD:
683
logger.warning("Checker was a zombie")
684
gobject.source_remove(self.checker_callback_tag)
685
self.checker_callback(pid, status,
686
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")
687
725
# Start a new checker if needed
688
726
if self.checker is None:
689
727
# Escape attributes for the shell
690
escaped_attrs = { attr:
691
re.escape(unicode(getattr(self,
693
for attr in self.runtime_expansions }
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
695
732
command = self.checker_command % escaped_attrs
696
733
except TypeError as error:
697
734
logger.error('Could not format string "%s"',
698
self.checker_command, exc_info=error)
699
return True # Try again later
735
self.checker_command,
737
return True # Try again later
700
738
self.current_checker_command = command
702
logger.info("Starting checker %r for %s",
704
# We don't need to redirect stdout and stderr, since
705
# in normal mode, that is already done by daemon(),
706
# and in debug mode we don't want to. (Stdin is
707
# always replaced by /dev/null.)
708
# The exception is when not debugging but nevertheless
709
# running in the foreground; use the previously
712
if (not self.server_settings["debug"]
713
and self.server_settings["foreground"]):
714
popen_args.update({"stdout": wnull,
716
self.checker = subprocess.Popen(command,
720
except OSError as error:
721
logger.error("Failed to start subprocess",
724
self.checker_callback_tag = (gobject.child_watch_add
726
self.checker_callback,
728
# The checker may have completed before the gobject
729
# watch was added. Check for this.
731
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
732
except OSError as error:
733
if error.errno == errno.ECHILD:
734
# This should never happen
735
logger.error("Child process vanished",
740
gobject.source_remove(self.checker_callback_tag)
741
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)
742
764
# Re-run this periodically if run by gobject.timeout_add
814
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"})
817
841
@dbus_service_property("org.example.Interface", signature="b",
819
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
820
"org.freedesktop.DBus.Property."
821
"EmitsChangedSignal": "false"})
822
843
def Property_dbus_property(self):
823
844
return dbus.Boolean(False)
846
See also the DBusObjectWithAnnotations class.
825
849
def decorator(func):
826
850
func._dbus_annotations = annotations
831
856
class DBusPropertyException(dbus.exceptions.DBusException):
832
857
"""A base class for D-Bus property-related exceptions
834
def __unicode__(self):
835
return unicode(str(self))
838
862
class DBusPropertyAccessException(DBusPropertyException):
868
891
def _get_all_dbus_things(self, thing):
869
892
"""Returns a generator of (name, attribute) pairs
871
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
873
895
athing.__get__(self))
874
896
for cls in self.__class__.__mro__
875
897
for name, athing in
876
inspect.getmembers(cls,
877
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.
879
971
def _get_dbus_property(self, interface_name, property_name):
880
972
"""Returns a bound method if one exists which is a D-Bus
881
973
property with the specified name and interface.
883
for cls in self.__class__.__mro__:
884
for name, value in (inspect.getmembers
886
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")):
887
978
if (value._dbus_name == property_name
888
979
and value._dbus_interface == interface_name):
889
980
return value.__get__(self)
891
982
# No such property
892
raise DBusPropertyNotFound(self.dbus_object_path + ":"
893
+ interface_name + "."
896
@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,
897
997
out_signature="v")
898
998
def Get(self, interface_name, property_name):
899
999
"""Standard D-Bus property Get() method, see D-Bus standard.
959
1068
Inserts property tags and interface annotation tags.
961
xmlstring = dbus.service.Object.Introspect(self, object_path,
1070
xmlstring = DBusObjectWithAnnotations.Introspect(self,
964
1074
document = xml.dom.minidom.parseString(xmlstring)
965
1076
def make_tag(document, name, prop):
966
1077
e = document.createElement("property")
967
1078
e.setAttribute("name", name)
968
1079
e.setAttribute("type", prop._dbus_signature)
969
1080
e.setAttribute("access", prop._dbus_access)
971
1083
for if_tag in document.getElementsByTagName("interface"):
972
1084
# Add property tags
973
1085
for tag in (make_tag(document, name, prop)
976
1088
if prop._dbus_interface
977
1089
== if_tag.getAttribute("name")):
978
1090
if_tag.appendChild(tag)
979
# Add annotation tags
980
for typ in ("method", "signal", "property"):
981
for tag in if_tag.getElementsByTagName(typ):
983
for name, prop in (self.
984
_get_all_dbus_things(typ)):
985
if (name == tag.getAttribute("name")
986
and prop._dbus_interface
987
== if_tag.getAttribute("name")):
988
annots.update(getattr
992
for name, value in annots.items():
993
ann_tag = document.createElement(
995
ann_tag.setAttribute("name", name)
996
ann_tag.setAttribute("value", value)
997
tag.appendChild(ann_tag)
998
# Add interface annotation tags
999
for annotation, value in dict(
1000
itertools.chain.from_iterable(
1001
annotations().items()
1002
for name, annotations in
1003
self._get_all_dbus_things("interface")
1004
if name == if_tag.getAttribute("name")
1006
ann_tag = document.createElement("annotation")
1007
ann_tag.setAttribute("name", annotation)
1008
ann_tag.setAttribute("value", value)
1009
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)
1010
1107
# Add the names to the return values for the
1011
1108
# "org.freedesktop.DBus.Properties" methods
1012
1109
if (if_tag.getAttribute("name")
1030
1127
exc_info=error)
1031
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",
1034
1199
def datetime_to_dbus(dt, variant_level=0):
1035
1200
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1037
1202
return dbus.String("", variant_level = variant_level)
1038
return dbus.String(dt.isoformat(),
1039
variant_level=variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1042
1206
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1072
1237
# Ignore non-D-Bus attributes, and D-Bus attributes
1073
1238
# with the wrong interface name
1074
1239
if (not hasattr(attribute, "_dbus_interface")
1075
or not attribute._dbus_interface
1076
.startswith(orig_interface_name)):
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1078
1243
# Create an alternate D-Bus interface name based on
1079
1244
# the current name
1080
alt_interface = (attribute._dbus_interface
1081
.replace(orig_interface_name,
1082
alt_interface_name))
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1083
1247
interface_names.add(alt_interface)
1084
1248
# Is this a D-Bus signal?
1085
1249
if getattr(attribute, "_dbus_is_signal", False):
1086
# Extract the original non-method undecorated
1087
# function by black magic
1088
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(
1089
1254
zip(attribute.func_code.co_freevars,
1090
attribute.__closure__))["func"]
1255
attribute.__closure__))
1256
["func"].cell_contents)
1258
nonmethod_func = attribute
1092
1259
# Create a new, but exactly alike, function
1093
1260
# object, and decorate it to be a new D-Bus signal
1094
1261
# with the alternate D-Bus interface name
1095
new_function = (dbus.service.signal
1097
attribute._dbus_signature)
1098
(types.FunctionType(
1099
nonmethod_func.func_code,
1100
nonmethod_func.func_globals,
1101
nonmethod_func.func_name,
1102
nonmethod_func.func_defaults,
1103
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))
1104
1279
# Copy annotations, if any
1106
new_function._dbus_annotations = (
1107
dict(attribute._dbus_annotations))
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1108
1283
except AttributeError:
1110
1285
# Define a creator of a function to call both the
1130
1312
# object. Decorate it to be a new D-Bus method
1131
1313
# with the alternate D-Bus interface name. Add it
1132
1314
# to the class.
1133
attr[attrname] = (dbus.service.method
1135
attribute._dbus_in_signature,
1136
attribute._dbus_out_signature)
1138
(attribute.func_code,
1139
attribute.func_globals,
1140
attribute.func_name,
1141
attribute.func_defaults,
1142
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)))
1143
1325
# Copy annotations, if any
1145
attr[attrname]._dbus_annotations = (
1146
dict(attribute._dbus_annotations))
1327
attr[attrname]._dbus_annotations = dict(
1328
attribute._dbus_annotations)
1147
1329
except AttributeError:
1149
1331
# Is this a D-Bus property?
1152
1334
# object, and decorate it to be a new D-Bus
1153
1335
# property with the alternate D-Bus interface
1154
1336
# name. Add it to the class.
1155
attr[attrname] = (dbus_service_property
1157
attribute._dbus_signature,
1158
attribute._dbus_access,
1160
._dbus_get_args_options
1163
(attribute.func_code,
1164
attribute.func_globals,
1165
attribute.func_name,
1166
attribute.func_defaults,
1167
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)))
1168
1348
# Copy annotations, if any
1170
attr[attrname]._dbus_annotations = (
1171
dict(attribute._dbus_annotations))
1350
attr[attrname]._dbus_annotations = dict(
1351
attribute._dbus_annotations)
1172
1352
except AttributeError:
1174
1354
# Is this a D-Bus interface?
1228
1411
Client.__init__(self, *args, **kwargs)
1229
1412
# Only now, when this client is initialized, can it show up on
1231
client_object_name = unicode(self.name).translate(
1414
client_object_name = str(self.name).translate(
1232
1415
{ord("."): ord("_"),
1233
1416
ord("-"): ord("_")})
1234
self.dbus_object_path = (dbus.ObjectPath
1235
("/clients/" + client_object_name))
1417
self.dbus_object_path = dbus.ObjectPath(
1418
"/clients/" + client_object_name)
1236
1419
DBusObjectWithProperties.__init__(self, self.bus,
1237
1420
self.dbus_object_path)
1239
def notifychangeproperty(transform_func,
1240
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):
1242
1427
""" Modify a variable so that it's a property which announces
1243
1428
its changes to DBus.
1250
1435
variant_level: D-Bus variant level. Default: 1
1252
1437
attrname = "_{}".format(dbus_name)
1253
1439
def setter(self, value):
1254
1440
if hasattr(self, "dbus_object_path"):
1255
1441
if (not hasattr(self, attrname) or
1256
1442
type_func(getattr(self, attrname, None))
1257
1443
!= type_func(value)):
1258
dbus_value = transform_func(type_func(value),
1261
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):
1263
1459
setattr(self, attrname, value)
1265
1461
return property(lambda self: getattr(self, attrname), setter)
1282
1478
datetime_to_dbus, "LastApprovalRequest")
1283
1479
approved_by_default = notifychangeproperty(dbus.Boolean,
1284
1480
"ApprovedByDefault")
1285
approval_delay = notifychangeproperty(dbus.UInt64,
1288
lambda td: td.total_seconds()
1481
approval_delay = notifychangeproperty(
1482
dbus.UInt64, "ApprovalDelay",
1483
type_func = lambda td: td.total_seconds() * 1000)
1290
1484
approval_duration = notifychangeproperty(
1291
1485
dbus.UInt64, "ApprovalDuration",
1292
1486
type_func = lambda td: td.total_seconds() * 1000)
1293
1487
host = notifychangeproperty(dbus.String, "Host")
1294
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1295
type_func = lambda td:
1296
td.total_seconds() * 1000)
1488
timeout = notifychangeproperty(
1489
dbus.UInt64, "Timeout",
1490
type_func = lambda td: td.total_seconds() * 1000)
1297
1491
extended_timeout = notifychangeproperty(
1298
1492
dbus.UInt64, "ExtendedTimeout",
1299
1493
type_func = lambda td: td.total_seconds() * 1000)
1300
interval = notifychangeproperty(dbus.UInt64,
1303
lambda td: td.total_seconds()
1494
interval = notifychangeproperty(
1495
dbus.UInt64, "Interval",
1496
type_func = lambda td: td.total_seconds() * 1000)
1305
1497
checker_command = notifychangeproperty(dbus.String, "Checker")
1498
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1499
invalidate_only=True)
1307
1501
del notifychangeproperty
1315
1509
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1316
1510
Client.__del__(self, *args, **kwargs)
1318
def checker_callback(self, pid, condition, command,
1320
self.checker_callback_tag = None
1322
if os.WIFEXITED(condition):
1323
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
1324
1519
# Emit D-Bus signal
1325
1520
self.CheckerCompleted(dbus.Int16(exitstatus),
1326
dbus.Int64(condition),
1521
# This is specific to GNU libC
1522
dbus.Int64(exitstatus << 8),
1327
1523
dbus.String(command))
1329
1525
# Emit D-Bus signal
1330
1526
self.CheckerCompleted(dbus.Int16(-1),
1331
dbus.Int64(condition),
1528
# This is specific to GNU libC
1530
| self.last_checker_signal),
1332
1531
dbus.String(command))
1334
return Client.checker_callback(self, pid, condition, command,
1337
1534
def start_checker(self, *args, **kwargs):
1338
1535
old_checker_pid = getattr(self.checker, "pid", None)
1474
1673
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1476
1675
# Name - property
1677
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1477
1678
@dbus_service_property(_interface, signature="s", access="read")
1478
1679
def Name_dbus_property(self):
1479
1680
return dbus.String(self.name)
1481
1682
# Fingerprint - property
1684
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1482
1685
@dbus_service_property(_interface, signature="s", access="read")
1483
1686
def Fingerprint_dbus_property(self):
1484
1687
return dbus.String(self.fingerprint)
1486
1689
# Host - property
1487
@dbus_service_property(_interface, signature="s",
1690
@dbus_service_property(_interface,
1488
1692
access="readwrite")
1489
1693
def Host_dbus_property(self, value=None):
1490
1694
if value is None: # get
1491
1695
return dbus.String(self.host)
1492
self.host = unicode(value)
1696
self.host = str(value)
1494
1698
# Created - property
1700
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1495
1701
@dbus_service_property(_interface, signature="s", access="read")
1496
1702
def Created_dbus_property(self):
1497
1703
return datetime_to_dbus(self.created)
1583
1792
if self.enabled:
1584
1793
# Reschedule checker run
1585
1794
gobject.source_remove(self.checker_initiator_tag)
1586
self.checker_initiator_tag = (gobject.timeout_add
1587
(value, self.start_checker))
1588
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
1590
1799
# Checker - property
1591
@dbus_service_property(_interface, signature="s",
1800
@dbus_service_property(_interface,
1592
1802
access="readwrite")
1593
1803
def Checker_dbus_property(self, value=None):
1594
1804
if value is None: # get
1595
1805
return dbus.String(self.checker_command)
1596
self.checker_command = unicode(value)
1806
self.checker_command = str(value)
1598
1808
# CheckerRunning - property
1599
@dbus_service_property(_interface, signature="b",
1809
@dbus_service_property(_interface,
1600
1811
access="readwrite")
1601
1812
def CheckerRunning_dbus_property(self, value=None):
1602
1813
if value is None: # get
1826
2044
def fingerprint(openpgp):
1827
2045
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1828
2046
# New GnuTLS "datum" with the OpenPGP public key
1829
datum = (gnutls.library.types
1830
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1833
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)))
1834
2051
# New empty GnuTLS certificate
1835
2052
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1836
(gnutls.library.functions
1837
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2053
gnutls.library.functions.gnutls_openpgp_crt_init(
1838
2055
# Import the OpenPGP public key into the certificate
1839
(gnutls.library.functions
1840
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1841
gnutls.library.constants
1842
.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)
1843
2059
# Verify the self signature in the key
1844
2060
crtverify = ctypes.c_uint()
1845
(gnutls.library.functions
1846
.gnutls_openpgp_crt_verify_self(crt, 0,
1847
ctypes.byref(crtverify)))
2061
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
crt, 0, ctypes.byref(crtverify))
1848
2063
if crtverify.value != 0:
1849
2064
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1850
raise (gnutls.errors.CertificateSecurityError
2065
raise gnutls.errors.CertificateSecurityError(
1852
2067
# New buffer for the fingerprint
1853
2068
buf = ctypes.create_string_buffer(20)
1854
2069
buf_len = ctypes.c_size_t()
1855
2070
# Get the fingerprint from the certificate into the buffer
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1858
ctypes.byref(buf_len)))
2071
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1859
2073
# Deinit the certificate
1860
2074
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
2075
# Convert the buffer to a Python bytestring
2029
2253
def add_pipe(self, parent_pipe, proc):
2030
2254
# Call "handle_ipc" for both data and EOF events
2031
gobject.io_add_watch(parent_pipe.fileno(),
2032
gobject.IO_IN | gobject.IO_HUP,
2033
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,
2038
def handle_ipc(self, source, condition, parent_pipe=None,
2039
proc = None, client_object=None):
2262
def handle_ipc(self, source, condition,
2265
client_object=None):
2040
2266
# error, or the other end of multiprocessing.Pipe has closed
2041
2267
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2042
2268
# Wait for other process to exit
2129
2355
# avoid excessive use of external libraries.
2131
2357
# New type for defining tokens, syntax, and semantics all-in-one
2132
Token = collections.namedtuple("Token",
2133
("regexp", # To match token; if
2134
# "value" is not None,
2135
# must have a "group"
2137
"value", # datetime.timedelta or
2139
"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
2141
2363
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2142
2364
# the "duration" ABNF definition in RFC 3339, Appendix A.
2143
2365
token_end = Token(re.compile(r"$"), None, frozenset())
2144
2366
token_second = Token(re.compile(r"(\d+)S"),
2145
2367
datetime.timedelta(seconds=1),
2146
frozenset((token_end,)))
2368
frozenset((token_end, )))
2147
2369
token_minute = Token(re.compile(r"(\d+)M"),
2148
2370
datetime.timedelta(minutes=1),
2149
2371
frozenset((token_second, token_end)))
2374
2597
# Override the settings from the config file with command line
2375
2598
# options, if set.
2376
2599
for option in ("interface", "address", "port", "debug",
2377
"priority", "servicename", "configdir",
2378
"use_dbus", "use_ipv6", "debuglevel", "restore",
2379
"statedir", "socket", "foreground", "zeroconf"):
2600
"priority", "servicename", "configdir", "use_dbus",
2601
"use_ipv6", "debuglevel", "restore", "statedir",
2602
"socket", "foreground", "zeroconf"):
2380
2603
value = getattr(options, option)
2381
2604
if value is not None:
2382
2605
server_settings[option] = value
2384
2607
# Force all strings to be unicode
2385
2608
for option in server_settings.keys():
2386
if type(server_settings[option]) is str:
2387
server_settings[option] = unicode(server_settings[option])
2609
if isinstance(server_settings[option], bytes):
2610
server_settings[option] = (server_settings[option]
2388
2612
# Force all boolean options to be boolean
2389
2613
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2390
2614
"foreground", "zeroconf"):
2440
2662
socketfd = None
2441
2663
if server_settings["socket"] != "":
2442
2664
socketfd = server_settings["socket"]
2443
tcp_server = MandosServer((server_settings["address"],
2444
server_settings["port"]),
2446
interface=(server_settings["interface"]
2450
server_settings["priority"],
2665
tcp_server = MandosServer(
2666
(server_settings["address"], server_settings["port"]),
2668
interface=(server_settings["interface"] or None),
2670
gnutls_priority=server_settings["priority"],
2453
2673
if not foreground:
2454
2674
pidfilename = "/run/mandos.pid"
2455
2675
if not os.path.isdir("/run/."):
2456
2676
pidfilename = "/var/run/mandos.pid"
2459
pidfile = open(pidfilename, "w")
2679
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2460
2680
except IOError as e:
2461
2681
logger.error("Could not open file %r", pidfilename,
2518
2738
bus_name = dbus.service.BusName("se.recompile.Mandos",
2519
bus, do_not_queue=True)
2520
old_bus_name = (dbus.service.BusName
2521
("se.bsnet.fukt.Mandos", bus,
2523
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:
2524
2745
logger.error("Disabling D-Bus:", exc_info=e)
2525
2746
use_dbus = False
2526
2747
server_settings["use_dbus"] = False
2527
2748
tcp_server.use_dbus = False
2529
2750
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2530
service = AvahiServiceToSyslog(name =
2531
server_settings["servicename"],
2532
servicetype = "_mandos._tcp",
2533
protocol = protocol, bus = bus)
2751
service = AvahiServiceToSyslog(
2752
name = server_settings["servicename"],
2753
servicetype = "_mandos._tcp",
2754
protocol = protocol,
2534
2756
if server_settings["interface"]:
2535
service.interface = (if_nametoindex
2536
(str(server_settings["interface"])))
2757
service.interface = if_nametoindex(
2758
server_settings["interface"].encode("utf-8"))
2538
2760
global multiprocessing_manager
2539
2761
multiprocessing_manager = multiprocessing.Manager()
2558
2780
if server_settings["restore"]:
2560
2782
with open(stored_state_path, "rb") as stored_state:
2561
clients_data, old_client_settings = (pickle.load
2783
clients_data, old_client_settings = pickle.load(
2563
2785
os.remove(stored_state_path)
2564
2786
except IOError as e:
2565
2787
if e.errno == errno.ENOENT:
2566
logger.warning("Could not load persistent state: {}"
2567
.format(os.strerror(e.errno)))
2788
logger.warning("Could not load persistent state:"
2789
" {}".format(os.strerror(e.errno)))
2569
2791
logger.critical("Could not load persistent state:",
2572
2794
except EOFError as e:
2573
2795
logger.warning("Could not load persistent state: "
2574
"EOFError:", exc_info=e)
2576
2799
with PGPEngine() as pgp:
2577
2800
for client_name, client in clients_data.items():
2606
2829
if not client["last_checked_ok"]:
2607
2830
logger.warning(
2608
2831
"disabling client {} - Client never "
2609
"performed a successful checker"
2610
.format(client_name))
2832
"performed a successful checker".format(
2611
2834
client["enabled"] = False
2612
2835
elif client["last_checker_status"] != 0:
2613
2836
logger.warning(
2614
2837
"disabling client {} - Client last"
2615
" checker failed with error code {}"
2616
.format(client_name,
2617
client["last_checker_status"]))
2838
" checker failed with error code"
2841
client["last_checker_status"]))
2618
2842
client["enabled"] = False
2620
client["expires"] = (datetime.datetime
2622
+ client["timeout"])
2844
client["expires"] = (
2845
datetime.datetime.utcnow()
2846
+ client["timeout"])
2623
2847
logger.debug("Last checker succeeded,"
2624
" keeping {} enabled"
2625
.format(client_name))
2848
" keeping {} enabled".format(
2627
client["secret"] = (
2628
pgp.decrypt(client["encrypted_secret"],
2629
client_settings[client_name]
2851
client["secret"] = pgp.decrypt(
2852
client["encrypted_secret"],
2853
client_settings[client_name]["secret"])
2631
2854
except PGPError:
2632
2855
# If decryption fails, we use secret from new settings
2633
logger.debug("Failed to decrypt {} old secret"
2634
.format(client_name))
2635
client["secret"] = (
2636
client_settings[client_name]["secret"])
2856
logger.debug("Failed to decrypt {} old secret".format(
2858
client["secret"] = (client_settings[client_name]
2638
2861
# Add/remove clients based on new changes made to config
2639
2862
for client_name in (set(old_client_settings)
2668
2892
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2671
@alternate_dbus_interfaces({"se.recompile.Mandos":
2672
"se.bsnet.fukt.Mandos"})
2673
class MandosDBusService(DBusObjectWithProperties):
2896
@alternate_dbus_interfaces(
2897
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2898
class MandosDBusService(DBusObjectWithObjectManager):
2674
2899
"""A D-Bus proxy object"""
2675
2901
def __init__(self):
2676
2902
dbus.service.Object.__init__(self, bus, "/")
2677
2904
_interface = "se.recompile.Mandos"
2679
@dbus_interface_annotations(_interface)
2681
return { "org.freedesktop.DBus.Property"
2682
".EmitsChangedSignal":
2685
2906
@dbus.service.signal(_interface, signature="o")
2686
2907
def ClientAdded(self, objpath):
2916
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2695
2918
@dbus.service.signal(_interface, signature="os")
2696
2919
def ClientRemoved(self, objpath, name):
2923
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2700
2925
@dbus.service.method(_interface, out_signature="ao")
2701
2926
def GetAllClients(self):
2703
return dbus.Array(c.dbus_object_path
2928
return dbus.Array(c.dbus_object_path for c in
2705
2929
tcp_server.clients.itervalues())
2931
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2707
2933
@dbus.service.method(_interface,
2708
2934
out_signature="a{oa{sv}}")
2709
2935
def GetAllClientsWithProperties(self):
2711
2937
return dbus.Dictionary(
2712
((c.dbus_object_path, c.GetAll(""))
2713
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() },
2714
2941
signature="oa{sv}")
2716
2943
@dbus.service.method(_interface, in_signature="o")
2720
2947
if c.dbus_object_path == object_path:
2721
2948
del tcp_server.clients[c.name]
2722
2949
c.remove_from_connection()
2723
# Don't signal anything except ClientRemoved
2950
# Don't signal the disabling
2724
2951
c.disable(quiet=True)
2726
self.ClientRemoved(object_path, c.name)
2952
# Emit D-Bus signal for removal
2953
self.client_removed_signal(c)
2728
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,
2732
2995
mandos_dbus_service = MandosDBusService()
2770
3033
del client_settings[client.name]["secret"]
2773
with (tempfile.NamedTemporaryFile
2774
(mode='wb', suffix=".pickle", prefix='clients-',
2775
dir=os.path.dirname(stored_state_path),
2776
delete=False)) as stored_state:
3036
with tempfile.NamedTemporaryFile(
3040
dir=os.path.dirname(stored_state_path),
3041
delete=False) as stored_state:
2777
3042
pickle.dump((clients, client_settings), stored_state)
2778
tempname=stored_state.name
3043
tempname = stored_state.name
2779
3044
os.rename(tempname, stored_state_path)
2780
3045
except (IOError, OSError) as e: