171
188
def password_encode(self, password):
172
189
# Passphrase can not be empty and can not contain newlines or
173
190
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
191
encoded = b"mandos" + binascii.hexlify(password)
192
if len(encoded) > 2048:
193
# GnuPG can't handle long passwords, so encode differently
194
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
195
.replace(b"\n", b"\\n")
196
.replace(b"\0", b"\\x00"))
176
199
def encrypt(self, data, password):
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
200
passphrase = self.password_encode(password)
201
with tempfile.NamedTemporaryFile(
202
dir=self.tempdir) as passfile:
203
passfile.write(passphrase)
205
proc = subprocess.Popen(['gpg', '--symmetric',
209
stdin = subprocess.PIPE,
210
stdout = subprocess.PIPE,
211
stderr = subprocess.PIPE)
212
ciphertext, err = proc.communicate(input = data)
213
if proc.returncode != 0:
191
215
return ciphertext
193
217
def decrypt(self, data, password):
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
218
passphrase = self.password_encode(password)
219
with tempfile.NamedTemporaryFile(
220
dir = self.tempdir) as passfile:
221
passfile.write(passphrase)
223
proc = subprocess.Popen(['gpg', '--decrypt',
227
stdin = subprocess.PIPE,
228
stdout = subprocess.PIPE,
229
stderr = subprocess.PIPE)
230
decrypted_plaintext, err = proc.communicate(input = data)
231
if proc.returncode != 0:
208
233
return decrypted_plaintext
212
236
class AvahiError(Exception):
213
237
def __init__(self, value, *args, **kwargs):
214
238
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
239
return super(AvahiError, self).__init__(value, *args,
219
243
class AvahiServiceError(AvahiError):
222
247
class AvahiGroupError(AvahiError):
426
476
runtime_expansions: Allowed attributes for runtime expansion.
427
477
expires: datetime.datetime(); time (UTC) when a client will be
428
478
disabled, or None
479
server_settings: The server_settings dict from main()
431
482
runtime_expansions = ("approval_delay", "approval_duration",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
483
"created", "enabled", "expires",
484
"fingerprint", "host", "interval",
485
"last_approval_request", "last_checked_ok",
434
486
"last_enabled", "name", "timeout")
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
438
"checker": "fping -q -- %%(host)s",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
446
def timeout_milliseconds(self):
447
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
454
def interval_milliseconds(self):
455
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
458
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
489
"extended_timeout": "PT15M",
491
"checker": "fping -q -- %%(host)s",
493
"approval_delay": "PT0S",
494
"approval_duration": "PT1S",
495
"approved_by_default": "True",
462
500
def config_parser(config):
463
501
"""Construct a new dict of client settings of this form:
598
632
def init_checker(self):
599
633
# Schedule a new checker to be started an 'interval' from now,
600
634
# and every interval from then on.
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
635
if self.checker_initiator_tag is not None:
636
gobject.source_remove(self.checker_initiator_tag)
637
self.checker_initiator_tag = gobject.timeout_add(
638
int(self.interval.total_seconds() * 1000),
604
640
# Schedule a disable() when 'timeout' has passed
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
641
if self.disable_initiator_tag is not None:
642
gobject.source_remove(self.disable_initiator_tag)
643
self.disable_initiator_tag = gobject.timeout_add(
644
int(self.timeout.total_seconds() * 1000), self.disable)
608
645
# Also start a new checker *right now*.
609
646
self.start_checker()
611
def checker_callback(self, pid, condition, command):
648
def checker_callback(self, source, condition,
649
(connection, command)):
612
650
"""The checker has completed, so take appropriate actions."""
613
651
self.checker_callback_tag = None
614
652
self.checker = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
653
# Read return code from connection (see call_pipe)
654
returncode = connection.recv()
658
self.last_checker_status = returncode
659
self.last_checker_signal = None
617
660
if self.last_checker_status == 0:
618
661
logger.info("Checker for %(name)s succeeded",
620
663
self.checked_ok()
622
logger.info("Checker for %(name)s failed",
665
logger.info("Checker for %(name)s failed", vars(self))
625
667
self.last_checker_status = -1
668
self.last_checker_signal = -returncode
626
669
logger.warning("Checker for %(name)s crashed?",
629
673
def checked_ok(self):
630
674
"""Assert that the client has been seen, alive and well."""
631
675
self.last_checked_ok = datetime.datetime.utcnow()
632
676
self.last_checker_status = 0
677
self.last_checker_signal = None
633
678
self.bump_timeout()
635
680
def bump_timeout(self, timeout=None):
653
698
If a checker already exists, leave it running and do
655
700
# The reason for not killing a running checker is that if we
656
# did that, then if a checker (for some reason) started
657
# running slowly and taking more than 'interval' time, the
658
# client would inevitably timeout, since no checker would get
659
# a chance to run to completion. If we instead leave running
701
# did that, and if a checker (for some reason) started running
702
# slowly and taking more than 'interval' time, then the client
703
# would inevitably timeout, since no checker would get a
704
# chance to run to completion. If we instead leave running
660
705
# checkers alone, the checker would have to take more time
661
706
# than 'timeout' for the client to be disabled, which is as it
664
# If a checker exists, make sure it is not a zombie
666
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
667
except (AttributeError, OSError) as error:
668
if (isinstance(error, OSError)
669
and error.errno != errno.ECHILD):
673
logger.warning("Checker was a zombie")
674
gobject.source_remove(self.checker_callback_tag)
675
self.checker_callback(pid, status,
676
self.current_checker_command)
709
if self.checker is not None and not self.checker.is_alive():
710
logger.warning("Checker was not alive; joining")
677
713
# Start a new checker if needed
678
714
if self.checker is None:
715
# Escape attributes for the shell
717
attr: re.escape(str(getattr(self, attr)))
718
for attr in self.runtime_expansions }
680
# In case checker_command has exactly one % operator
681
command = self.checker_command % self.host
683
# Escape attributes for the shell
684
escaped_attrs = dict(
686
re.escape(unicode(str(getattr(self, attr, "")),
690
self.runtime_expansions)
693
command = self.checker_command % escaped_attrs
694
except TypeError as error:
695
logger.error('Could not format string "%s":'
696
' %s', self.checker_command, error)
697
return True # Try again later
720
command = self.checker_command % escaped_attrs
721
except TypeError as error:
722
logger.error('Could not format string "%s"',
723
self.checker_command,
725
return True # Try again later
698
726
self.current_checker_command = command
700
logger.info("Starting checker %r for %s",
702
# We don't need to redirect stdout and stderr, since
703
# in normal mode, that is already done by daemon(),
704
# and in debug mode we don't want to. (Stdin is
705
# always replaced by /dev/null.)
706
self.checker = subprocess.Popen(command,
709
self.checker_callback_tag = (gobject.child_watch_add
711
self.checker_callback,
713
# The checker may have completed before the gobject
714
# watch was added. Check for this.
715
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
gobject.source_remove(self.checker_callback_tag)
718
self.checker_callback(pid, status, command)
719
except OSError as error:
720
logger.error("Failed to start subprocess: %s",
727
logger.info("Starting checker %r for %s", command,
729
# We don't need to redirect stdout and stderr, since
730
# in normal mode, that is already done by daemon(),
731
# and in debug mode we don't want to. (Stdin is
732
# always replaced by /dev/null.)
733
# The exception is when not debugging but nevertheless
734
# running in the foreground; use the previously
736
popen_args = { "close_fds": True,
739
if (not self.server_settings["debug"]
740
and self.server_settings["foreground"]):
741
popen_args.update({"stdout": wnull,
743
pipe = multiprocessing.Pipe(duplex=False)
744
self.checker = multiprocessing.Process(
746
args = (subprocess.call, pipe[1], command),
749
self.checker_callback_tag = gobject.io_add_watch(
750
pipe[0].fileno(), gobject.IO_IN,
751
self.checker_callback, (pipe[0], command))
722
752
# Re-run this periodically if run by gobject.timeout_add
802
def _is_dbus_property(obj):
803
return getattr(obj, "_dbus_is_property", False)
869
def _is_dbus_thing(thing):
870
"""Returns a function testing if an attribute is a D-Bus thing
872
If called like _is_dbus_thing("method") it returns a function
873
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
805
def _get_all_dbus_properties(self):
878
def _get_all_dbus_things(self, thing):
806
879
"""Returns a generator of (name, attribute) pairs
808
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
881
return ((getattr(athing.__get__(self), "_dbus_name", name),
882
athing.__get__(self))
809
883
for cls in self.__class__.__mro__
811
inspect.getmembers(cls, self._is_dbus_property))
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
813
887
def _get_dbus_property(self, interface_name, property_name):
814
888
"""Returns a bound method if one exists which is a D-Bus
815
889
property with the specified name and interface.
817
for cls in self.__class__.__mro__:
818
for name, value in (inspect.getmembers
819
(cls, self._is_dbus_property)):
891
for cls in self.__class__.__mro__:
892
for name, value in inspect.getmembers(
893
cls, self._is_dbus_thing("property")):
820
894
if (value._dbus_name == property_name
821
895
and value._dbus_interface == interface_name):
822
896
return value.__get__(self)
824
898
# No such property
825
raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
+ interface_name + "."
899
raise DBusPropertyNotFound("{}:{}.{}".format(
900
self.dbus_object_path, interface_name, property_name))
829
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
830
904
out_signature="v")
831
905
def Get(self, interface_name, property_name):
832
906
"""Standard D-Bus property Get() method, see D-Bus standard.
876
953
if not hasattr(value, "variant_level"):
877
954
properties[name] = value
879
properties[name] = type(value)(value, variant_level=
880
value.variant_level+1)
956
properties[name] = type(value)(
957
value, variant_level = value.variant_level + 1)
881
958
return dbus.Dictionary(properties, signature="sv")
960
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
961
def PropertiesChanged(self, interface_name, changed_properties,
962
invalidated_properties):
963
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
883
968
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
969
out_signature="s",
885
970
path_keyword='object_path',
886
971
connection_keyword='connection')
887
972
def Introspect(self, object_path, connection):
888
"""Standard D-Bus method, overloaded to insert property tags.
973
"""Overloading of standard D-Bus method.
975
Inserts property tags and interface annotation tags.
890
977
xmlstring = dbus.service.Object.Introspect(self, object_path,
893
980
document = xml.dom.minidom.parseString(xmlstring)
894
982
def make_tag(document, name, prop):
895
983
e = document.createElement("property")
896
984
e.setAttribute("name", name)
897
985
e.setAttribute("type", prop._dbus_signature)
898
986
e.setAttribute("access", prop._dbus_access)
900
989
for if_tag in document.getElementsByTagName("interface"):
901
991
for tag in (make_tag(document, name, prop)
903
in self._get_all_dbus_properties()
993
in self._get_all_dbus_things("property")
904
994
if prop._dbus_interface
905
995
== if_tag.getAttribute("name")):
906
996
if_tag.appendChild(tag)
997
# Add annotation tags
998
for typ in ("method", "signal", "property"):
999
for tag in if_tag.getElementsByTagName(typ):
1001
for name, prop in (self.
1002
_get_all_dbus_things(typ)):
1003
if (name == tag.getAttribute("name")
1004
and prop._dbus_interface
1005
== if_tag.getAttribute("name")):
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1008
for name, value in annots.items():
1009
ann_tag = document.createElement(
1011
ann_tag.setAttribute("name", name)
1012
ann_tag.setAttribute("value", value)
1013
tag.appendChild(ann_tag)
1014
# Add interface annotation tags
1015
for annotation, value in dict(
1016
itertools.chain.from_iterable(
1017
annotations().items()
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1020
if name == if_tag.getAttribute("name")
1022
ann_tag = document.createElement("annotation")
1023
ann_tag.setAttribute("name", annotation)
1024
ann_tag.setAttribute("value", value)
1025
if_tag.appendChild(ann_tag)
907
1026
# Add the names to the return values for the
908
1027
# "org.freedesktop.DBus.Properties" methods
909
1028
if (if_tag.getAttribute("name")
924
1043
except (AttributeError, xml.dom.DOMException,
925
1044
xml.parsers.expat.ExpatError) as error:
926
1045
logger.error("Failed to override Introspection method",
928
1047
return xmlstring
931
def datetime_to_dbus (dt, variant_level=0):
1050
def datetime_to_dbus(dt, variant_level=0):
932
1051
"""Convert a UTC datetime.datetime() to a D-Bus type."""
934
1053
return dbus.String("", variant_level = variant_level)
935
return dbus.String(dt.isoformat(),
936
variant_level=variant_level)
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
941
"""Applied to an empty subclass of a D-Bus object, this metaclass
942
will add additional D-Bus attributes matching a certain pattern.
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1058
"""A class decorator; applied to a subclass of
1059
dbus.service.Object, it will add alternate D-Bus attributes with
1060
interface names according to the "alt_interface_names" mapping.
1063
@alternate_dbus_interfaces({"org.example.Interface":
1064
"net.example.AlternateInterface"})
1065
class SampleDBusObject(dbus.service.Object):
1066
@dbus.service.method("org.example.Interface")
1067
def SampleDBusMethod():
1070
The above "SampleDBusMethod" on "SampleDBusObject" will be
1071
reachable via two interfaces: "org.example.Interface" and
1072
"net.example.AlternateInterface", the latter of which will have
1073
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1074
"true", unless "deprecate" is passed with a False value.
1076
This works for methods and signals, and also for D-Bus properties
1077
(from DBusObjectWithProperties) and interfaces (from the
1078
dbus_interface_annotations decorator).
944
def __new__(mcs, name, bases, attr):
945
# Go through all the base classes which could have D-Bus
946
# methods, signals, or properties in them
947
for base in (b for b in bases
948
if issubclass(b, dbus.service.Object)):
949
# Go though all attributes of the base class
950
for attrname, attribute in inspect.getmembers(base):
1082
for orig_interface_name, alt_interface_name in (
1083
alt_interface_names.items()):
1085
interface_names = set()
1086
# Go though all attributes of the class
1087
for attrname, attribute in inspect.getmembers(cls):
951
1088
# Ignore non-D-Bus attributes, and D-Bus attributes
952
1089
# with the wrong interface name
953
1090
if (not hasattr(attribute, "_dbus_interface")
954
or not attribute._dbus_interface
955
.startswith("se.recompile.Mandos")):
1091
or not attribute._dbus_interface.startswith(
1092
orig_interface_name)):
957
1094
# Create an alternate D-Bus interface name based on
958
1095
# the current name
959
alt_interface = (attribute._dbus_interface
960
.replace("se.recompile.Mandos",
961
"se.bsnet.fukt.Mandos"))
1096
alt_interface = attribute._dbus_interface.replace(
1097
orig_interface_name, alt_interface_name)
1098
interface_names.add(alt_interface)
962
1099
# Is this a D-Bus signal?
963
1100
if getattr(attribute, "_dbus_is_signal", False):
964
# Extract the original non-method function by
1101
# Extract the original non-method undecorated
1102
# function by black magic
966
1103
nonmethod_func = (dict(
967
zip(attribute.func_code.co_freevars,
968
attribute.__closure__))["func"]
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
970
1107
# Create a new, but exactly alike, function
971
1108
# object, and decorate it to be a new D-Bus signal
972
1109
# with the alternate D-Bus interface name
973
new_function = (dbus.service.signal
975
attribute._dbus_signature)
1110
new_function = (dbus.service.signal(
1111
alt_interface, attribute._dbus_signature)
976
1112
(types.FunctionType(
977
nonmethod_func.func_code,
978
nonmethod_func.func_globals,
979
nonmethod_func.func_name,
980
nonmethod_func.func_defaults,
981
nonmethod_func.func_closure)))
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
1118
# Copy annotations, if any
1120
new_function._dbus_annotations = dict(
1121
attribute._dbus_annotations)
1122
except AttributeError:
982
1124
# Define a creator of a function to call both the
983
# old and new functions, so both the old and new
984
# signals gets sent when the function is called
1125
# original and alternate functions, so both the
1126
# original and alternate signals gets sent when
1127
# the function is called
985
1128
def fixscope(func1, func2):
986
1129
"""This function is a scope container to pass
987
1130
func1 and func2 to the "call_both" function
988
1131
outside of its arguments"""
989
1133
def call_both(*args, **kwargs):
990
1134
"""This function will emit two D-Bus
991
1135
signals by calling func1 and func2"""
992
1136
func1(*args, **kwargs)
993
1137
func2(*args, **kwargs)
994
1139
return call_both
995
1140
# Create the "call_both" function and add it to
997
attr[attrname] = fixscope(attribute,
1142
attr[attrname] = fixscope(attribute, new_function)
999
1143
# Is this a D-Bus method?
1000
1144
elif getattr(attribute, "_dbus_is_method", False):
1001
1145
# Create a new, but exactly alike, function
1002
1146
# object. Decorate it to be a new D-Bus method
1003
1147
# with the alternate D-Bus interface name. Add it
1004
1148
# to the class.
1005
attr[attrname] = (dbus.service.method
1007
attribute._dbus_in_signature,
1008
attribute._dbus_out_signature)
1010
(attribute.func_code,
1011
attribute.func_globals,
1012
attribute.func_name,
1013
attribute.func_defaults,
1014
attribute.func_closure)))
1150
dbus.service.method(
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1154
(types.FunctionType(attribute.func_code,
1155
attribute.func_globals,
1156
attribute.func_name,
1157
attribute.func_defaults,
1158
attribute.func_closure)))
1159
# Copy annotations, if any
1161
attr[attrname]._dbus_annotations = dict(
1162
attribute._dbus_annotations)
1163
except AttributeError:
1015
1165
# Is this a D-Bus property?
1016
1166
elif getattr(attribute, "_dbus_is_property", False):
1017
1167
# Create a new, but exactly alike, function
1018
1168
# object, and decorate it to be a new D-Bus
1019
1169
# property with the alternate D-Bus interface
1020
1170
# name. Add it to the class.
1021
attr[attrname] = (dbus_service_property
1023
attribute._dbus_signature,
1024
attribute._dbus_access,
1026
._dbus_get_args_options
1029
(attribute.func_code,
1030
attribute.func_globals,
1031
attribute.func_name,
1032
attribute.func_defaults,
1033
attribute.func_closure)))
1034
return type.__new__(mcs, name, bases, attr)
1171
attr[attrname] = (dbus_service_property(
1172
alt_interface, attribute._dbus_signature,
1173
attribute._dbus_access,
1174
attribute._dbus_get_args_options
1176
(types.FunctionType(
1177
attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
1182
# Copy annotations, if any
1184
attr[attrname]._dbus_annotations = dict(
1185
attribute._dbus_annotations)
1186
except AttributeError:
1188
# Is this a D-Bus interface?
1189
elif getattr(attribute, "_dbus_is_interface", False):
1190
# Create a new, but exactly alike, function
1191
# object. Decorate it to be a new D-Bus interface
1192
# with the alternate D-Bus interface name. Add it
1195
dbus_interface_annotations(alt_interface)
1196
(types.FunctionType(attribute.func_code,
1197
attribute.func_globals,
1198
attribute.func_name,
1199
attribute.func_defaults,
1200
attribute.func_closure)))
1202
# Deprecate all alternate interfaces
1203
iname="_AlternateDBusNames_interface_annotation{}"
1204
for interface_name in interface_names:
1206
@dbus_interface_annotations(interface_name)
1208
return { "org.freedesktop.DBus.Deprecated":
1210
# Find an unused name
1211
for aname in (iname.format(i)
1212
for i in itertools.count()):
1213
if aname not in attr:
1217
# Replace the class with a new subclass of it with
1218
# methods, signals, etc. as created above.
1219
cls = type(b"{}Alternate".format(cls.__name__),
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1227
"se.bsnet.fukt.Mandos"})
1037
1228
class ClientDBus(Client, DBusObjectWithProperties):
1038
1229
"""A Client class using D-Bus
1138
1343
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1139
1344
Client.__del__(self, *args, **kwargs)
1141
def checker_callback(self, pid, condition, command,
1143
self.checker_callback_tag = None
1145
if os.WIFEXITED(condition):
1146
exitstatus = os.WEXITSTATUS(condition)
1346
def checker_callback(self, source, condition,
1347
(connection, command), *args, **kwargs):
1348
ret = Client.checker_callback(self, source, condition,
1349
(connection, command), *args,
1351
exitstatus = self.last_checker_status
1147
1353
# Emit D-Bus signal
1148
1354
self.CheckerCompleted(dbus.Int16(exitstatus),
1149
dbus.Int64(condition),
1150
1356
dbus.String(command))
1152
1358
# Emit D-Bus signal
1153
1359
self.CheckerCompleted(dbus.Int16(-1),
1154
dbus.Int64(condition),
1361
self.last_checker_signal),
1155
1362
dbus.String(command))
1157
return Client.checker_callback(self, pid, condition, command,
1160
1365
def start_checker(self, *args, **kwargs):
1161
old_checker = self.checker
1162
if self.checker is not None:
1163
old_checker_pid = self.checker.pid
1165
old_checker_pid = None
1366
old_checker_pid = getattr(self.checker, "pid", None)
1166
1367
r = Client.start_checker(self, *args, **kwargs)
1167
1368
# Only if new checker process was started
1168
1369
if (self.checker is not None
1359
1566
return datetime_to_dbus(self.last_approval_request)
1361
1568
# Timeout - property
1362
@dbus_service_property(_interface, signature="t",
1569
@dbus_service_property(_interface,
1363
1571
access="readwrite")
1364
1572
def Timeout_dbus_property(self, value=None):
1365
1573
if value is None: # get
1366
return dbus.UInt64(self.timeout_milliseconds())
1574
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1575
old_timeout = self.timeout
1367
1576
self.timeout = datetime.timedelta(0, 0, 0, value)
1368
# Reschedule timeout
1577
# Reschedule disabling
1369
1578
if self.enabled:
1370
1579
now = datetime.datetime.utcnow()
1371
time_to_die = timedelta_to_milliseconds(
1372
(self.last_checked_ok + self.timeout) - now)
1373
if time_to_die <= 0:
1580
self.expires += self.timeout - old_timeout
1581
if self.expires <= now:
1374
1582
# The timeout has passed
1377
self.expires = (now +
1378
datetime.timedelta(milliseconds =
1380
1585
if (getattr(self, "disable_initiator_tag", None)
1383
1588
gobject.source_remove(self.disable_initiator_tag)
1384
self.disable_initiator_tag = (gobject.timeout_add
1589
self.disable_initiator_tag = gobject.timeout_add(
1590
int((self.expires - now).total_seconds() * 1000),
1388
1593
# ExtendedTimeout - property
1389
@dbus_service_property(_interface, signature="t",
1594
@dbus_service_property(_interface,
1390
1596
access="readwrite")
1391
1597
def ExtendedTimeout_dbus_property(self, value=None):
1392
1598
if value is None: # get
1393
return dbus.UInt64(self.extended_timeout_milliseconds())
1599
return dbus.UInt64(self.extended_timeout.total_seconds()
1394
1601
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1396
1603
# Interval - property
1397
@dbus_service_property(_interface, signature="t",
1604
@dbus_service_property(_interface,
1398
1606
access="readwrite")
1399
1607
def Interval_dbus_property(self, value=None):
1400
1608
if value is None: # get
1401
return dbus.UInt64(self.interval_milliseconds())
1609
return dbus.UInt64(self.interval.total_seconds() * 1000)
1402
1610
self.interval = datetime.timedelta(0, 0, 0, value)
1403
1611
if getattr(self, "checker_initiator_tag", None) is None:
1405
1613
if self.enabled:
1406
1614
# Reschedule checker run
1407
1615
gobject.source_remove(self.checker_initiator_tag)
1408
self.checker_initiator_tag = (gobject.timeout_add
1409
(value, self.start_checker))
1410
self.start_checker() # Start one now, too
1616
self.checker_initiator_tag = gobject.timeout_add(
1617
value, self.start_checker)
1618
self.start_checker() # Start one now, too
1412
1620
# Checker - property
1413
@dbus_service_property(_interface, signature="s",
1621
@dbus_service_property(_interface,
1414
1623
access="readwrite")
1415
1624
def Checker_dbus_property(self, value=None):
1416
1625
if value is None: # get
1417
1626
return dbus.String(self.checker_command)
1418
self.checker_command = unicode(value)
1627
self.checker_command = str(value)
1420
1629
# CheckerRunning - property
1421
@dbus_service_property(_interface, signature="b",
1630
@dbus_service_property(_interface,
1422
1632
access="readwrite")
1423
1633
def CheckerRunning_dbus_property(self, value=None):
1424
1634
if value is None: # get
1652
1859
def fingerprint(openpgp):
1653
1860
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1654
1861
# New GnuTLS "datum" with the OpenPGP public key
1655
datum = (gnutls.library.types
1656
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1659
ctypes.c_uint(len(openpgp))))
1862
datum = gnutls.library.types.gnutls_datum_t(
1863
ctypes.cast(ctypes.c_char_p(openpgp),
1864
ctypes.POINTER(ctypes.c_ubyte)),
1865
ctypes.c_uint(len(openpgp)))
1660
1866
# New empty GnuTLS certificate
1661
1867
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1664
1870
# Import the OpenPGP public key into the certificate
1665
(gnutls.library.functions
1666
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1667
gnutls.library.constants
1668
.GNUTLS_OPENPGP_FMT_RAW))
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1669
1874
# Verify the self signature in the key
1670
1875
crtverify = ctypes.c_uint()
1671
(gnutls.library.functions
1672
.gnutls_openpgp_crt_verify_self(crt, 0,
1673
ctypes.byref(crtverify)))
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
1674
1878
if crtverify.value != 0:
1675
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1676
raise (gnutls.errors.CertificateSecurityError
1880
raise gnutls.errors.CertificateSecurityError(
1678
1882
# New buffer for the fingerprint
1679
1883
buf = ctypes.create_string_buffer(20)
1680
1884
buf_len = ctypes.c_size_t()
1681
1885
# Get the fingerprint from the certificate into the buffer
1682
(gnutls.library.functions
1683
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1684
ctypes.byref(buf_len)))
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1685
1888
# Deinit the certificate
1686
1889
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1687
1890
# Convert the buffer to a Python bytestring
1737
1941
interface: None or a network interface name (string)
1738
1942
use_ipv6: Boolean; to use IPv6 or not
1740
1945
def __init__(self, server_address, RequestHandlerClass,
1741
interface=None, use_ipv6=True):
1949
"""If socketfd is set, use that file descriptor instead of
1950
creating a new one with socket.socket().
1742
1952
self.interface = interface
1744
1954
self.address_family = socket.AF_INET6
1955
if socketfd is not None:
1956
# Save the file descriptor
1957
self.socketfd = socketfd
1958
# Save the original socket.socket() function
1959
self.socket_socket = socket.socket
1960
# To implement --socket, we monkey patch socket.socket.
1962
# (When socketserver.TCPServer is a new-style class, we
1963
# could make self.socket into a property instead of monkey
1964
# patching socket.socket.)
1966
# Create a one-time-only replacement for socket.socket()
1967
@functools.wraps(socket.socket)
1968
def socket_wrapper(*args, **kwargs):
1969
# Restore original function so subsequent calls are
1971
socket.socket = self.socket_socket
1972
del self.socket_socket
1973
# This time only, return a new socket object from the
1974
# saved file descriptor.
1975
return socket.fromfd(self.socketfd, *args, **kwargs)
1976
# Replace socket.socket() function with wrapper
1977
socket.socket = socket_wrapper
1978
# The socketserver.TCPServer.__init__ will call
1979
# socket.socket(), which might be our replacement,
1980
# socket_wrapper(), if socketfd was set.
1745
1981
socketserver.TCPServer.__init__(self, server_address,
1746
1982
RequestHandlerClass)
1747
1984
def server_bind(self):
1748
1985
"""This overrides the normal server_bind() function
1749
1986
to bind to an interface if one was specified, and also NOT to
2145
def rfc3339_duration_to_delta(duration):
2146
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2148
>>> rfc3339_duration_to_delta("P7D")
2149
datetime.timedelta(7)
2150
>>> rfc3339_duration_to_delta("PT60S")
2151
datetime.timedelta(0, 60)
2152
>>> rfc3339_duration_to_delta("PT60M")
2153
datetime.timedelta(0, 3600)
2154
>>> rfc3339_duration_to_delta("PT24H")
2155
datetime.timedelta(1)
2156
>>> rfc3339_duration_to_delta("P1W")
2157
datetime.timedelta(7)
2158
>>> rfc3339_duration_to_delta("PT5M30S")
2159
datetime.timedelta(0, 330)
2160
>>> rfc3339_duration_to_delta("P1DT3M20S")
2161
datetime.timedelta(1, 200)
2164
# Parsing an RFC 3339 duration with regular expressions is not
2165
# possible - there would have to be multiple places for the same
2166
# values, like seconds. The current code, while more esoteric, is
2167
# cleaner without depending on a parsing library. If Python had a
2168
# built-in library for parsing we would use it, but we'd like to
2169
# avoid excessive use of external libraries.
2171
# New type for defining tokens, syntax, and semantics all-in-one
2172
Token = collections.namedtuple("Token",
2173
("regexp", # To match token; if
2174
# "value" is not None,
2175
# must have a "group"
2177
"value", # datetime.timedelta or
2179
"followers")) # Tokens valid after
2181
Token = collections.namedtuple("Token", (
2182
"regexp", # To match token; if "value" is not None, must have
2183
# a "group" containing digits
2184
"value", # datetime.timedelta or None
2185
"followers")) # Tokens valid after this token
2186
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2187
# the "duration" ABNF definition in RFC 3339, Appendix A.
2188
token_end = Token(re.compile(r"$"), None, frozenset())
2189
token_second = Token(re.compile(r"(\d+)S"),
2190
datetime.timedelta(seconds=1),
2191
frozenset((token_end, )))
2192
token_minute = Token(re.compile(r"(\d+)M"),
2193
datetime.timedelta(minutes=1),
2194
frozenset((token_second, token_end)))
2195
token_hour = Token(re.compile(r"(\d+)H"),
2196
datetime.timedelta(hours=1),
2197
frozenset((token_minute, token_end)))
2198
token_time = Token(re.compile(r"T"),
2200
frozenset((token_hour, token_minute,
2202
token_day = Token(re.compile(r"(\d+)D"),
2203
datetime.timedelta(days=1),
2204
frozenset((token_time, token_end)))
2205
token_month = Token(re.compile(r"(\d+)M"),
2206
datetime.timedelta(weeks=4),
2207
frozenset((token_day, token_end)))
2208
token_year = Token(re.compile(r"(\d+)Y"),
2209
datetime.timedelta(weeks=52),
2210
frozenset((token_month, token_end)))
2211
token_week = Token(re.compile(r"(\d+)W"),
2212
datetime.timedelta(weeks=1),
2213
frozenset((token_end, )))
2214
token_duration = Token(re.compile(r"P"), None,
2215
frozenset((token_year, token_month,
2216
token_day, token_time,
2218
# Define starting values
2219
value = datetime.timedelta() # Value so far
2221
followers = frozenset((token_duration,)) # Following valid tokens
2222
s = duration # String left to parse
2223
# Loop until end token is found
2224
while found_token is not token_end:
2225
# Search for any currently valid tokens
2226
for token in followers:
2227
match = token.regexp.match(s)
2228
if match is not None:
2230
if token.value is not None:
2231
# Value found, parse digits
2232
factor = int(match.group(1), 10)
2233
# Add to value so far
2234
value += factor * token.value
2235
# Strip token from string
2236
s = token.regexp.sub("", s, 1)
2239
# Set valid next tokens
2240
followers = found_token.followers
2243
# No currently valid tokens were found
2244
raise ValueError("Invalid RFC 3339 duration")
1914
2249
def string_to_delta(interval):
1915
2250
"""Parse a string and return a datetime.timedelta
2030
2380
"debug": "False",
2032
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2382
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2383
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2033
2384
"servicename": "Mandos",
2034
2385
"use_dbus": "True",
2035
2386
"use_ipv6": "True",
2036
2387
"debuglevel": "",
2037
2388
"restore": "True",
2038
"statedir": "/var/lib/mandos"
2390
"statedir": "/var/lib/mandos",
2391
"foreground": "False",
2041
2395
# Parse config file for server-global settings
2042
2396
server_config = configparser.SafeConfigParser(server_defaults)
2043
2397
del server_defaults
2044
server_config.read(os.path.join(options.configdir,
2398
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2046
2399
# Convert the SafeConfigParser object to a dict
2047
2400
server_settings = server_config.defaults()
2048
2401
# Use the appropriate methods on the non-string config options
2049
for option in ("debug", "use_dbus", "use_ipv6"):
2402
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2050
2403
server_settings[option] = server_config.getboolean("DEFAULT",
2052
2405
if server_settings["port"]:
2053
2406
server_settings["port"] = server_config.getint("DEFAULT",
2408
if server_settings["socket"]:
2409
server_settings["socket"] = server_config.getint("DEFAULT",
2411
# Later, stdin will, and stdout and stderr might, be dup'ed
2412
# over with an opened os.devnull. But we don't want this to
2413
# happen with a supplied network socket.
2414
if 0 <= server_settings["socket"] <= 2:
2415
server_settings["socket"] = os.dup(server_settings
2055
2417
del server_config
2057
2419
# Override the settings from the config file with command line
2058
2420
# options, if set.
2059
2421
for option in ("interface", "address", "port", "debug",
2060
"priority", "servicename", "configdir",
2061
"use_dbus", "use_ipv6", "debuglevel", "restore",
2422
"priority", "servicename", "configdir", "use_dbus",
2423
"use_ipv6", "debuglevel", "restore", "statedir",
2424
"socket", "foreground", "zeroconf"):
2063
2425
value = getattr(options, option)
2064
2426
if value is not None:
2065
2427
server_settings[option] = value
2067
2429
# Force all strings to be unicode
2068
2430
for option in server_settings.keys():
2069
if type(server_settings[option]) is str:
2070
server_settings[option] = unicode(server_settings[option])
2431
if isinstance(server_settings[option], bytes):
2432
server_settings[option] = (server_settings[option]
2434
# Force all boolean options to be boolean
2435
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2436
"foreground", "zeroconf"):
2437
server_settings[option] = bool(server_settings[option])
2438
# Debug implies foreground
2439
if server_settings["debug"]:
2440
server_settings["foreground"] = True
2071
2441
# Now we have our good server settings in "server_settings"
2073
2443
##################################################################
2445
if (not server_settings["zeroconf"]
2446
and not (server_settings["port"]
2447
or server_settings["socket"] != "")):
2448
parser.error("Needs port or socket to work without Zeroconf")
2075
2450
# For convenience
2076
2451
debug = server_settings["debug"]
2077
2452
debuglevel = server_settings["debuglevel"]
2104
2481
global mandos_dbus_service
2105
2482
mandos_dbus_service = None
2107
tcp_server = MandosServer((server_settings["address"],
2108
server_settings["port"]),
2110
interface=(server_settings["interface"]
2114
server_settings["priority"],
2117
pidfilename = "/var/run/mandos.pid"
2485
if server_settings["socket"] != "":
2486
socketfd = server_settings["socket"]
2487
tcp_server = MandosServer(
2488
(server_settings["address"], server_settings["port"]),
2490
interface=(server_settings["interface"] or None),
2492
gnutls_priority=server_settings["priority"],
2496
pidfilename = "/run/mandos.pid"
2497
if not os.path.isdir("/run/."):
2498
pidfilename = "/var/run/mandos.pid"
2119
2501
pidfile = open(pidfilename, "w")
2121
logger.error("Could not open file %r", pidfilename)
2502
except IOError as e:
2503
logger.error("Could not open file %r", pidfilename,
2124
uid = pwd.getpwnam("_mandos").pw_uid
2125
gid = pwd.getpwnam("_mandos").pw_gid
2506
for name in ("_mandos", "mandos", "nobody"):
2128
uid = pwd.getpwnam("mandos").pw_uid
2129
gid = pwd.getpwnam("mandos").pw_gid
2508
uid = pwd.getpwnam(name).pw_uid
2509
gid = pwd.getpwnam(name).pw_gid
2130
2511
except KeyError:
2132
uid = pwd.getpwnam("nobody").pw_uid
2133
gid = pwd.getpwnam("nobody").pw_gid
2140
2519
except OSError as error:
2141
if error[0] != errno.EPERM:
2520
if error.errno != errno.EPERM:
2145
2524
# Enable all possible GnuTLS debugging
2152
2531
def debug_gnutls(level, string):
2153
2532
logger.debug("GnuTLS: %s", string[:-1])
2155
(gnutls.library.functions
2156
.gnutls_global_set_log_function(debug_gnutls))
2534
gnutls.library.functions.gnutls_global_set_log_function(
2158
2537
# Redirect stdin so all checkers get /dev/null
2159
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2538
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2160
2539
os.dup2(null, sys.stdin.fileno())
2164
2543
# Need to fork before connecting to D-Bus
2166
2545
# Close all input and output, do double fork, etc.
2548
# multiprocessing will use threads, so before we use gobject we
2549
# need to inform gobject that threads will be used.
2169
2550
gobject.threads_init()
2171
2552
global main_loop
2172
2553
# From the Avahi example code
2173
DBusGMainLoop(set_as_default=True )
2554
DBusGMainLoop(set_as_default=True)
2174
2555
main_loop = gobject.MainLoop()
2175
2556
bus = dbus.SystemBus()
2176
2557
# End of Avahi example code
2179
2560
bus_name = dbus.service.BusName("se.recompile.Mandos",
2180
bus, do_not_queue=True)
2181
old_bus_name = (dbus.service.BusName
2182
("se.bsnet.fukt.Mandos", bus,
2563
old_bus_name = dbus.service.BusName(
2564
"se.bsnet.fukt.Mandos", bus,
2184
2566
except dbus.exceptions.NameExistsException as e:
2185
logger.error(unicode(e) + ", disabling D-Bus")
2567
logger.error("Disabling D-Bus:", exc_info=e)
2186
2568
use_dbus = False
2187
2569
server_settings["use_dbus"] = False
2188
2570
tcp_server.use_dbus = False
2189
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2190
service = AvahiServiceToSyslog(name =
2191
server_settings["servicename"],
2192
servicetype = "_mandos._tcp",
2193
protocol = protocol, bus = bus)
2194
if server_settings["interface"]:
2195
service.interface = (if_nametoindex
2196
(str(server_settings["interface"])))
2572
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2573
service = AvahiServiceToSyslog(
2574
name = server_settings["servicename"],
2575
servicetype = "_mandos._tcp",
2576
protocol = protocol,
2578
if server_settings["interface"]:
2579
service.interface = if_nametoindex(
2580
server_settings["interface"].encode("utf-8"))
2198
2582
global multiprocessing_manager
2199
2583
multiprocessing_manager = multiprocessing.Manager()
2201
2585
client_class = Client
2203
client_class = functools.partial(ClientDBusTransitional,
2587
client_class = functools.partial(ClientDBus, bus = bus)
2206
2589
client_settings = Client.config_parser(client_config)
2207
2590
old_client_settings = {}
2208
2591
clients_data = {}
2593
# This is used to redirect stdout and stderr for checker processes
2595
wnull = open(os.devnull, "w") # A writable /dev/null
2596
# Only used if server is running in foreground but not in debug
2598
if debug or not foreground:
2210
2601
# Get client data and settings from last running state.
2211
2602
if server_settings["restore"]:
2213
2604
with open(stored_state_path, "rb") as stored_state:
2214
clients_data, old_client_settings = (pickle.load
2605
clients_data, old_client_settings = pickle.load(
2216
2607
os.remove(stored_state_path)
2217
2608
except IOError as e:
2218
logger.warning("Could not load persistent state: {0}"
2220
if e.errno != errno.ENOENT:
2609
if e.errno == errno.ENOENT:
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
2613
logger.critical("Could not load persistent state:",
2222
2616
except EOFError as e:
2223
2617
logger.warning("Could not load persistent state: "
2224
"EOFError: {0}".format(e))
2226
2621
with PGPEngine() as pgp:
2227
for client_name, client in clients_data.iteritems():
2622
for client_name, client in clients_data.items():
2623
# Skip removed clients
2624
if client_name not in client_settings:
2228
2627
# Decide which value to use after restoring saved state.
2229
2628
# We have three different values: Old config file,
2230
2629
# new config file, and saved state.
2289
2687
for client_name in (set(client_settings)
2290
2688
- set(old_client_settings)):
2291
2689
clients_data[client_name] = client_settings[client_name]
2293
2691
# Create all client objects
2294
for client_name, client in clients_data.iteritems():
2692
for client_name, client in clients_data.items():
2295
2693
tcp_server.clients[client_name] = client_class(
2296
name = client_name, settings = client)
2696
server_settings = server_settings)
2298
2698
if not tcp_server.clients:
2299
2699
logger.warning("No clients defined")
2305
pidfile.write(str(pid) + "\n".encode("utf-8"))
2308
logger.error("Could not write to file %r with PID %d",
2311
# "pidfile" was never created
2702
if pidfile is not None:
2706
pidfile.write("{}\n".format(pid).encode("utf-8"))
2708
logger.error("Could not write to file %r with PID %d",
2313
2711
del pidfilename
2314
signal.signal(signal.SIGINT, signal.SIG_IGN)
2316
2713
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
2714
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2320
class MandosDBusService(dbus.service.Object):
2718
@alternate_dbus_interfaces(
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2720
class MandosDBusService(DBusObjectWithProperties):
2321
2721
"""A D-Bus proxy object"""
2322
2723
def __init__(self):
2323
2724
dbus.service.Object.__init__(self, bus, "/")
2324
2726
_interface = "se.recompile.Mandos"
2728
@dbus_interface_annotations(_interface)
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2326
2734
@dbus.service.signal(_interface, signature="o")
2327
2735
def ClientAdded(self, objpath):