188
171
def password_encode(self, password):
189
172
# Passphrase can not be empty and can not contain newlines or
190
173
# NUL bytes. So we prefix it and hex encode it.
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"))
174
return b"mandos" + binascii.hexlify(password)
199
176
def encrypt(self, data, password):
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:
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
215
191
return ciphertext
217
193
def decrypt(self, data, password):
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:
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
233
208
return decrypted_plaintext
236
212
class AvahiError(Exception):
237
213
def __init__(self, value, *args, **kwargs):
238
214
self.value = value
239
return super(AvahiError, self).__init__(value, *args,
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
243
219
class AvahiServiceError(AvahiError):
247
222
class AvahiGroupError(AvahiError):
463
415
last_checked_ok: datetime.datetime(); (UTC) or None
464
416
last_checker_status: integer between 0 and 255 reflecting exit
465
417
status of last checker. -1 reflects crashed
466
checker, -2 means no checker completed yet.
467
last_checker_signal: The signal which killed the last checker, if
468
last_checker_status is -1
469
419
last_enabled: datetime.datetime(); (UTC) or None
470
420
name: string; from the config file, used in log messages and
471
421
D-Bus identifiers
472
422
secret: bytestring; sent verbatim (over TLS) to client
473
423
timeout: datetime.timedelta(); How long from last_checked_ok
474
424
until this client is disabled
475
extended_timeout: extra long timeout when secret has been sent
425
extended_timeout: extra long timeout when password has been sent
476
426
runtime_expansions: Allowed attributes for runtime expansion.
477
427
expires: datetime.datetime(); time (UTC) when a client will be
478
428
disabled, or None
479
server_settings: The server_settings dict from main()
482
431
runtime_expansions = ("approval_delay", "approval_duration",
483
"created", "enabled", "expires",
484
"fingerprint", "host", "interval",
485
"last_approval_request", "last_checked_ok",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
486
434
"last_enabled", "name", "timeout")
489
"extended_timeout": "PT15M",
491
"checker": "fping -q -- %%(host)s",
493
"approval_delay": "PT0S",
494
"approval_duration": "PT1S",
495
"approved_by_default": "True",
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)
500
462
def config_parser(config):
501
463
"""Construct a new dict of client settings of this form:
632
598
def init_checker(self):
633
599
# Schedule a new checker to be started an 'interval' from now,
634
600
# and every interval from then on.
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),
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
640
604
# Schedule a disable() when 'timeout' has passed
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)
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
645
608
# Also start a new checker *right now*.
646
609
self.start_checker()
648
def checker_callback(self, source, condition,
649
(connection, command)):
611
def checker_callback(self, pid, condition, command):
650
612
"""The checker has completed, so take appropriate actions."""
651
613
self.checker_callback_tag = None
652
614
self.checker = None
653
# Read return code from connection (see subprocess_call_pipe)
654
returncode = connection.recv()
658
self.last_checker_status = returncode
659
self.last_checker_signal = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
660
617
if self.last_checker_status == 0:
661
618
logger.info("Checker for %(name)s succeeded",
663
620
self.checked_ok()
665
logger.info("Checker for %(name)s failed", vars(self))
622
logger.info("Checker for %(name)s failed",
667
625
self.last_checker_status = -1
668
self.last_checker_signal = -returncode
669
626
logger.warning("Checker for %(name)s crashed?",
673
def checked_ok(self):
674
"""Assert that the client has been seen, alive and well."""
675
self.last_checked_ok = datetime.datetime.utcnow()
676
self.last_checker_status = 0
677
self.last_checker_signal = None
680
def bump_timeout(self, timeout=None):
681
"""Bump up the timeout for this client."""
629
def checked_ok(self, timeout=None):
630
"""Bump up the timeout for this client.
632
This should only be called when the client has been seen,
682
635
if timeout is None:
683
636
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
684
638
if self.disable_initiator_tag is not None:
685
639
gobject.source_remove(self.disable_initiator_tag)
686
self.disable_initiator_tag = None
687
640
if getattr(self, "enabled", False):
688
self.disable_initiator_tag = gobject.timeout_add(
689
int(timeout.total_seconds() * 1000), self.disable)
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
690
644
self.expires = datetime.datetime.utcnow() + timeout
692
646
def need_approval(self):
698
652
If a checker already exists, leave it running and do
700
654
# The reason for not killing a running checker is that if we
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
655
# did that, then if a checker (for some reason) started
656
# running slowly and taking more than 'interval' time, the
657
# client would inevitably timeout, since no checker would get
658
# a chance to run to completion. If we instead leave running
705
659
# checkers alone, the checker would have to take more time
706
660
# than 'timeout' for the client to be disabled, which is as it
709
if self.checker is not None and not self.checker.is_alive():
710
logger.warning("Checker was not alive; joining")
663
# If a checker exists, make sure it is not a zombie
665
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
except (AttributeError, OSError) as error:
667
if (isinstance(error, OSError)
668
and error.errno != errno.ECHILD):
672
logger.warning("Checker was a zombie")
673
gobject.source_remove(self.checker_callback_tag)
674
self.checker_callback(pid, status,
675
self.current_checker_command)
713
676
# Start a new checker if needed
714
677
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 }
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
679
# In case checker_command has exactly one % operator
680
command = self.checker_command % self.host
682
# Escape attributes for the shell
683
escaped_attrs = dict(
685
re.escape(unicode(str(getattr(self, attr, "")),
689
self.runtime_expansions)
692
command = self.checker_command % escaped_attrs
693
except TypeError as error:
694
logger.error('Could not format string "%s":'
695
' %s', self.checker_command, error)
696
return True # Try again later
726
697
self.current_checker_command = command
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(
745
target=subprocess_call_pipe, args=(pipe[1], command),
748
self.checker_callback_tag = gobject.io_add_watch(
749
pipe[0].fileno(), gobject.IO_IN,
750
self.checker_callback, (pipe[0], command))
699
logger.info("Starting checker %r for %s",
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
self.checker = subprocess.Popen(command,
708
self.checker_callback_tag = (gobject.child_watch_add
710
self.checker_callback,
712
# The checker may have completed before the gobject
713
# watch was added. Check for this.
714
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
716
gobject.source_remove(self.checker_callback_tag)
717
self.checker_callback(pid, status, command)
718
except OSError as error:
719
logger.error("Failed to start subprocess: %s",
751
721
# Re-run this periodically if run by gobject.timeout_add
868
def _is_dbus_thing(thing):
869
"""Returns a function testing if an attribute is a D-Bus thing
871
If called like _is_dbus_thing("method") it returns a function
872
suitable for use as predicate to inspect.getmembers().
874
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
877
def _get_all_dbus_things(self, thing):
804
def _get_all_dbus_properties(self):
878
805
"""Returns a generator of (name, attribute) pairs
880
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
athing.__get__(self))
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
882
808
for cls in self.__class__.__mro__
884
inspect.getmembers(cls, self._is_dbus_thing(thing)))
810
inspect.getmembers(cls, self._is_dbus_property))
886
812
def _get_dbus_property(self, interface_name, property_name):
887
813
"""Returns a bound method if one exists which is a D-Bus
888
814
property with the specified name and interface.
890
for cls in self.__class__.__mro__:
891
for name, value in inspect.getmembers(
892
cls, self._is_dbus_thing("property")):
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
893
819
if (value._dbus_name == property_name
894
820
and value._dbus_interface == interface_name):
895
821
return value.__get__(self)
897
823
# No such property
898
raise DBusPropertyNotFound("{}:{}.{}".format(
899
self.dbus_object_path, interface_name, property_name))
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
901
@dbus.service.method(dbus.PROPERTIES_IFACE,
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
903
829
out_signature="v")
904
830
def Get(self, interface_name, property_name):
905
831
"""Standard D-Bus property Get() method, see D-Bus standard.
952
875
if not hasattr(value, "variant_level"):
953
876
properties[name] = value
955
properties[name] = type(value)(
956
value, variant_level = value.variant_level + 1)
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
957
880
return dbus.Dictionary(properties, signature="sv")
959
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
960
def PropertiesChanged(self, interface_name, changed_properties,
961
invalidated_properties):
962
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
967
882
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
968
883
out_signature="s",
969
884
path_keyword='object_path',
970
885
connection_keyword='connection')
971
886
def Introspect(self, object_path, connection):
972
"""Overloading of standard D-Bus method.
974
Inserts property tags and interface annotation tags.
887
"""Standard D-Bus method, overloaded to insert property tags.
976
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
979
892
document = xml.dom.minidom.parseString(xmlstring)
981
893
def make_tag(document, name, prop):
982
894
e = document.createElement("property")
983
895
e.setAttribute("name", name)
984
896
e.setAttribute("type", prop._dbus_signature)
985
897
e.setAttribute("access", prop._dbus_access)
988
899
for if_tag in document.getElementsByTagName("interface"):
990
900
for tag in (make_tag(document, name, prop)
992
in self._get_all_dbus_things("property")
902
in self._get_all_dbus_properties()
993
903
if prop._dbus_interface
994
904
== if_tag.getAttribute("name")):
995
905
if_tag.appendChild(tag)
996
# Add annotation tags
997
for typ in ("method", "signal", "property"):
998
for tag in if_tag.getElementsByTagName(typ):
1000
for name, prop in (self.
1001
_get_all_dbus_things(typ)):
1002
if (name == tag.getAttribute("name")
1003
and prop._dbus_interface
1004
== if_tag.getAttribute("name")):
1005
annots.update(getattr(
1006
prop, "_dbus_annotations", {}))
1007
for name, value in annots.items():
1008
ann_tag = document.createElement(
1010
ann_tag.setAttribute("name", name)
1011
ann_tag.setAttribute("value", value)
1012
tag.appendChild(ann_tag)
1013
# Add interface annotation tags
1014
for annotation, value in dict(
1015
itertools.chain.from_iterable(
1016
annotations().items()
1017
for name, annotations
1018
in self._get_all_dbus_things("interface")
1019
if name == if_tag.getAttribute("name")
1021
ann_tag = document.createElement("annotation")
1022
ann_tag.setAttribute("name", annotation)
1023
ann_tag.setAttribute("value", value)
1024
if_tag.appendChild(ann_tag)
1025
906
# Add the names to the return values for the
1026
907
# "org.freedesktop.DBus.Properties" methods
1027
908
if (if_tag.getAttribute("name")
1042
923
except (AttributeError, xml.dom.DOMException,
1043
924
xml.parsers.expat.ExpatError) as error:
1044
925
logger.error("Failed to override Introspection method",
1046
927
return xmlstring
1049
def datetime_to_dbus(dt, variant_level=0):
930
def datetime_to_dbus (dt, variant_level=0):
1050
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1052
933
return dbus.String("", variant_level = variant_level)
1053
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
"""A class decorator; applied to a subclass of
1058
dbus.service.Object, it will add alternate D-Bus attributes with
1059
interface names according to the "alt_interface_names" mapping.
1062
@alternate_dbus_interfaces({"org.example.Interface":
1063
"net.example.AlternateInterface"})
1064
class SampleDBusObject(dbus.service.Object):
1065
@dbus.service.method("org.example.Interface")
1066
def SampleDBusMethod():
1069
The above "SampleDBusMethod" on "SampleDBusObject" will be
1070
reachable via two interfaces: "org.example.Interface" and
1071
"net.example.AlternateInterface", the latter of which will have
1072
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1073
"true", unless "deprecate" is passed with a False value.
1075
This works for methods and signals, and also for D-Bus properties
1076
(from DBusObjectWithProperties) and interfaces (from the
1077
dbus_interface_annotations decorator).
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
1081
for orig_interface_name, alt_interface_name in (
1082
alt_interface_names.items()):
1084
interface_names = set()
1085
# Go though all attributes of the class
1086
for attrname, attribute in inspect.getmembers(cls):
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
1087
950
# Ignore non-D-Bus attributes, and D-Bus attributes
1088
951
# with the wrong interface name
1089
952
if (not hasattr(attribute, "_dbus_interface")
1090
or not attribute._dbus_interface.startswith(
1091
orig_interface_name)):
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1093
956
# Create an alternate D-Bus interface name based on
1094
957
# the current name
1095
alt_interface = attribute._dbus_interface.replace(
1096
orig_interface_name, alt_interface_name)
1097
interface_names.add(alt_interface)
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1098
961
# Is this a D-Bus signal?
1099
962
if getattr(attribute, "_dbus_is_signal", False):
1100
# Extract the original non-method undecorated
1101
# function by black magic
963
# Extract the original non-method function by
1102
965
nonmethod_func = (dict(
1103
zip(attribute.func_code.co_freevars,
1104
attribute.__closure__))
1105
["func"].cell_contents)
966
zip(attribute.func_code.co_freevars,
967
attribute.__closure__))["func"]
1106
969
# Create a new, but exactly alike, function
1107
970
# object, and decorate it to be a new D-Bus signal
1108
971
# with the alternate D-Bus interface name
1109
new_function = (dbus.service.signal(
1110
alt_interface, attribute._dbus_signature)
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
1111
975
(types.FunctionType(
1112
nonmethod_func.func_code,
1113
nonmethod_func.func_globals,
1114
nonmethod_func.func_name,
1115
nonmethod_func.func_defaults,
1116
nonmethod_func.func_closure)))
1117
# Copy annotations, if any
1119
new_function._dbus_annotations = dict(
1120
attribute._dbus_annotations)
1121
except AttributeError:
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
1123
981
# Define a creator of a function to call both the
1124
# original and alternate functions, so both the
1125
# original and alternate signals gets sent when
1126
# the function is called
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1127
984
def fixscope(func1, func2):
1128
985
"""This function is a scope container to pass
1129
986
func1 and func2 to the "call_both" function
1130
987
outside of its arguments"""
1132
988
def call_both(*args, **kwargs):
1133
989
"""This function will emit two D-Bus
1134
990
signals by calling func1 and func2"""
1135
991
func1(*args, **kwargs)
1136
992
func2(*args, **kwargs)
1138
993
return call_both
1139
994
# Create the "call_both" function and add it to
1141
attr[attrname] = fixscope(attribute, new_function)
996
attr[attrname] = fixscope(attribute,
1142
998
# Is this a D-Bus method?
1143
999
elif getattr(attribute, "_dbus_is_method", False):
1144
1000
# Create a new, but exactly alike, function
1145
1001
# object. Decorate it to be a new D-Bus method
1146
1002
# with the alternate D-Bus interface name. Add it
1147
1003
# to the class.
1149
dbus.service.method(
1151
attribute._dbus_in_signature,
1152
attribute._dbus_out_signature)
1153
(types.FunctionType(attribute.func_code,
1154
attribute.func_globals,
1155
attribute.func_name,
1156
attribute.func_defaults,
1157
attribute.func_closure)))
1158
# Copy annotations, if any
1160
attr[attrname]._dbus_annotations = dict(
1161
attribute._dbus_annotations)
1162
except AttributeError:
1004
attr[attrname] = (dbus.service.method
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1164
1014
# Is this a D-Bus property?
1165
1015
elif getattr(attribute, "_dbus_is_property", False):
1166
1016
# Create a new, but exactly alike, function
1167
1017
# object, and decorate it to be a new D-Bus
1168
1018
# property with the alternate D-Bus interface
1169
1019
# name. Add it to the class.
1170
attr[attrname] = (dbus_service_property(
1171
alt_interface, attribute._dbus_signature,
1172
attribute._dbus_access,
1173
attribute._dbus_get_args_options
1175
(types.FunctionType(
1176
attribute.func_code,
1177
attribute.func_globals,
1178
attribute.func_name,
1179
attribute.func_defaults,
1180
attribute.func_closure)))
1181
# Copy annotations, if any
1183
attr[attrname]._dbus_annotations = dict(
1184
attribute._dbus_annotations)
1185
except AttributeError:
1187
# Is this a D-Bus interface?
1188
elif getattr(attribute, "_dbus_is_interface", False):
1189
# Create a new, but exactly alike, function
1190
# object. Decorate it to be a new D-Bus interface
1191
# with the alternate D-Bus interface name. Add it
1194
dbus_interface_annotations(alt_interface)
1195
(types.FunctionType(attribute.func_code,
1196
attribute.func_globals,
1197
attribute.func_name,
1198
attribute.func_defaults,
1199
attribute.func_closure)))
1201
# Deprecate all alternate interfaces
1202
iname="_AlternateDBusNames_interface_annotation{}"
1203
for interface_name in interface_names:
1205
@dbus_interface_annotations(interface_name)
1207
return { "org.freedesktop.DBus.Deprecated":
1209
# Find an unused name
1210
for aname in (iname.format(i)
1211
for i in itertools.count()):
1212
if aname not in attr:
1216
# Replace the class with a new subclass of it with
1217
# methods, signals, etc. as created above.
1218
cls = type(b"{}Alternate".format(cls.__name__),
1225
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
"se.bsnet.fukt.Mandos"})
1020
attr[attrname] = (dbus_service_property
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1025
._dbus_get_args_options
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1227
1036
class ClientDBus(Client, DBusObjectWithProperties):
1228
1037
"""A Client class using D-Bus
1300
1098
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1301
1099
last_enabled = notifychangeproperty(datetime_to_dbus,
1303
checker = notifychangeproperty(
1304
dbus.Boolean, "CheckerRunning",
1305
type_func = lambda checker: checker is not None)
1101
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1102
type_func = lambda checker:
1103
checker is not None)
1306
1104
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1307
1105
"LastCheckedOK")
1308
last_checker_status = notifychangeproperty(dbus.Int16,
1309
"LastCheckerStatus")
1310
1106
last_approval_request = notifychangeproperty(
1311
1107
datetime_to_dbus, "LastApprovalRequest")
1312
1108
approved_by_default = notifychangeproperty(dbus.Boolean,
1313
1109
"ApprovedByDefault")
1314
approval_delay = notifychangeproperty(
1315
dbus.UInt64, "ApprovalDelay",
1316
type_func = lambda td: td.total_seconds() * 1000)
1110
approval_delay = notifychangeproperty(dbus.UInt64,
1113
timedelta_to_milliseconds)
1317
1114
approval_duration = notifychangeproperty(
1318
1115
dbus.UInt64, "ApprovalDuration",
1319
type_func = lambda td: td.total_seconds() * 1000)
1116
type_func = timedelta_to_milliseconds)
1320
1117
host = notifychangeproperty(dbus.String, "Host")
1321
timeout = notifychangeproperty(
1322
dbus.UInt64, "Timeout",
1323
type_func = lambda td: td.total_seconds() * 1000)
1118
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1120
timedelta_to_milliseconds)
1324
1121
extended_timeout = notifychangeproperty(
1325
1122
dbus.UInt64, "ExtendedTimeout",
1326
type_func = lambda td: td.total_seconds() * 1000)
1327
interval = notifychangeproperty(
1328
dbus.UInt64, "Interval",
1329
type_func = lambda td: td.total_seconds() * 1000)
1123
type_func = timedelta_to_milliseconds)
1124
interval = notifychangeproperty(dbus.UInt64,
1127
timedelta_to_milliseconds)
1330
1128
checker_command = notifychangeproperty(dbus.String, "Checker")
1331
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1332
invalidate_only=True)
1334
1130
del notifychangeproperty
1342
1138
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1343
1139
Client.__del__(self, *args, **kwargs)
1345
def checker_callback(self, source, condition,
1346
(connection, command), *args, **kwargs):
1347
ret = Client.checker_callback(self, source, condition,
1348
(connection, command), *args,
1350
exitstatus = self.last_checker_status
1141
def checker_callback(self, pid, condition, command,
1143
self.checker_callback_tag = None
1145
if os.WIFEXITED(condition):
1146
exitstatus = os.WEXITSTATUS(condition)
1352
1147
# Emit D-Bus signal
1353
1148
self.CheckerCompleted(dbus.Int16(exitstatus),
1149
dbus.Int64(condition),
1355
1150
dbus.String(command))
1357
1152
# Emit D-Bus signal
1358
1153
self.CheckerCompleted(dbus.Int16(-1),
1360
self.last_checker_signal),
1154
dbus.Int64(condition),
1361
1155
dbus.String(command))
1157
return Client.checker_callback(self, pid, condition, command,
1364
1160
def start_checker(self, *args, **kwargs):
1365
old_checker_pid = getattr(self.checker, "pid", None)
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
1166
r = Client.start_checker(self, *args, **kwargs)
1367
1167
# Only if new checker process was started
1368
1168
if (self.checker is not None
1565
1361
return datetime_to_dbus(self.last_approval_request)
1567
1363
# Timeout - property
1568
@dbus_service_property(_interface,
1364
@dbus_service_property(_interface, signature="t",
1570
1365
access="readwrite")
1571
1366
def Timeout_dbus_property(self, value=None):
1572
1367
if value is None: # get
1573
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1574
old_timeout = self.timeout
1368
return dbus.UInt64(self.timeout_milliseconds())
1575
1369
self.timeout = datetime.timedelta(0, 0, 0, value)
1576
# Reschedule disabling
1370
# Reschedule timeout
1577
1371
if self.enabled:
1578
1372
now = datetime.datetime.utcnow()
1579
self.expires += self.timeout - old_timeout
1580
if self.expires <= now:
1373
time_to_die = timedelta_to_milliseconds(
1374
(self.last_checked_ok + self.timeout) - now)
1375
if time_to_die <= 0:
1581
1376
# The timeout has passed
1379
self.expires = (now +
1380
datetime.timedelta(milliseconds =
1584
1382
if (getattr(self, "disable_initiator_tag", None)
1587
1385
gobject.source_remove(self.disable_initiator_tag)
1588
self.disable_initiator_tag = gobject.timeout_add(
1589
int((self.expires - now).total_seconds() * 1000),
1386
self.disable_initiator_tag = (gobject.timeout_add
1592
1390
# ExtendedTimeout - property
1593
@dbus_service_property(_interface,
1391
@dbus_service_property(_interface, signature="t",
1595
1392
access="readwrite")
1596
1393
def ExtendedTimeout_dbus_property(self, value=None):
1597
1394
if value is None: # get
1598
return dbus.UInt64(self.extended_timeout.total_seconds()
1395
return dbus.UInt64(self.extended_timeout_milliseconds())
1600
1396
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1602
1398
# Interval - property
1603
@dbus_service_property(_interface,
1399
@dbus_service_property(_interface, signature="t",
1605
1400
access="readwrite")
1606
1401
def Interval_dbus_property(self, value=None):
1607
1402
if value is None: # get
1608
return dbus.UInt64(self.interval.total_seconds() * 1000)
1403
return dbus.UInt64(self.interval_milliseconds())
1609
1404
self.interval = datetime.timedelta(0, 0, 0, value)
1610
1405
if getattr(self, "checker_initiator_tag", None) is None:
1612
1407
if self.enabled:
1613
1408
# Reschedule checker run
1614
1409
gobject.source_remove(self.checker_initiator_tag)
1615
self.checker_initiator_tag = gobject.timeout_add(
1616
value, self.start_checker)
1617
self.start_checker() # Start one now, too
1410
self.checker_initiator_tag = (gobject.timeout_add
1411
(value, self.start_checker))
1412
self.start_checker() # Start one now, too
1619
1414
# Checker - property
1620
@dbus_service_property(_interface,
1415
@dbus_service_property(_interface, signature="s",
1622
1416
access="readwrite")
1623
1417
def Checker_dbus_property(self, value=None):
1624
1418
if value is None: # get
1625
1419
return dbus.String(self.checker_command)
1626
self.checker_command = str(value)
1420
self.checker_command = unicode(value)
1628
1422
# CheckerRunning - property
1629
@dbus_service_property(_interface,
1423
@dbus_service_property(_interface, signature="b",
1631
1424
access="readwrite")
1632
1425
def CheckerRunning_dbus_property(self, value=None):
1633
1426
if value is None: # get
1858
1658
def fingerprint(openpgp):
1859
1659
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1860
1660
# New GnuTLS "datum" with the OpenPGP public key
1861
datum = gnutls.library.types.gnutls_datum_t(
1862
ctypes.cast(ctypes.c_char_p(openpgp),
1863
ctypes.POINTER(ctypes.c_ubyte)),
1864
ctypes.c_uint(len(openpgp)))
1661
datum = (gnutls.library.types
1662
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1665
ctypes.c_uint(len(openpgp))))
1865
1666
# New empty GnuTLS certificate
1866
1667
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1867
gnutls.library.functions.gnutls_openpgp_crt_init(
1668
(gnutls.library.functions
1669
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1869
1670
# Import the OpenPGP public key into the certificate
1870
gnutls.library.functions.gnutls_openpgp_crt_import(
1871
crt, ctypes.byref(datum),
1872
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1671
(gnutls.library.functions
1672
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1673
gnutls.library.constants
1674
.GNUTLS_OPENPGP_FMT_RAW))
1873
1675
# Verify the self signature in the key
1874
1676
crtverify = ctypes.c_uint()
1875
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1876
crt, 0, ctypes.byref(crtverify))
1677
(gnutls.library.functions
1678
.gnutls_openpgp_crt_verify_self(crt, 0,
1679
ctypes.byref(crtverify)))
1877
1680
if crtverify.value != 0:
1878
1681
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1879
raise gnutls.errors.CertificateSecurityError(
1682
raise (gnutls.errors.CertificateSecurityError
1881
1684
# New buffer for the fingerprint
1882
1685
buf = ctypes.create_string_buffer(20)
1883
1686
buf_len = ctypes.c_size_t()
1884
1687
# Get the fingerprint from the certificate into the buffer
1885
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1886
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1688
(gnutls.library.functions
1689
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1690
ctypes.byref(buf_len)))
1887
1691
# Deinit the certificate
1888
1692
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1889
1693
# Convert the buffer to a Python bytestring
1940
1743
interface: None or a network interface name (string)
1941
1744
use_ipv6: Boolean; to use IPv6 or not
1944
1746
def __init__(self, server_address, RequestHandlerClass,
1948
"""If socketfd is set, use that file descriptor instead of
1949
creating a new one with socket.socket().
1747
interface=None, use_ipv6=True):
1951
1748
self.interface = interface
1953
1750
self.address_family = socket.AF_INET6
1954
if socketfd is not None:
1955
# Save the file descriptor
1956
self.socketfd = socketfd
1957
# Save the original socket.socket() function
1958
self.socket_socket = socket.socket
1959
# To implement --socket, we monkey patch socket.socket.
1961
# (When socketserver.TCPServer is a new-style class, we
1962
# could make self.socket into a property instead of monkey
1963
# patching socket.socket.)
1965
# Create a one-time-only replacement for socket.socket()
1966
@functools.wraps(socket.socket)
1967
def socket_wrapper(*args, **kwargs):
1968
# Restore original function so subsequent calls are
1970
socket.socket = self.socket_socket
1971
del self.socket_socket
1972
# This time only, return a new socket object from the
1973
# saved file descriptor.
1974
return socket.fromfd(self.socketfd, *args, **kwargs)
1975
# Replace socket.socket() function with wrapper
1976
socket.socket = socket_wrapper
1977
# The socketserver.TCPServer.__init__ will call
1978
# socket.socket(), which might be our replacement,
1979
# socket_wrapper(), if socketfd was set.
1980
1751
socketserver.TCPServer.__init__(self, server_address,
1981
1752
RequestHandlerClass)
1983
1753
def server_bind(self):
1984
1754
"""This overrides the normal server_bind() function
1985
1755
to bind to an interface if one was specified, and also NOT to
2144
def rfc3339_duration_to_delta(duration):
2145
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2147
>>> rfc3339_duration_to_delta("P7D")
2148
datetime.timedelta(7)
2149
>>> rfc3339_duration_to_delta("PT60S")
2150
datetime.timedelta(0, 60)
2151
>>> rfc3339_duration_to_delta("PT60M")
2152
datetime.timedelta(0, 3600)
2153
>>> rfc3339_duration_to_delta("PT24H")
2154
datetime.timedelta(1)
2155
>>> rfc3339_duration_to_delta("P1W")
2156
datetime.timedelta(7)
2157
>>> rfc3339_duration_to_delta("PT5M30S")
2158
datetime.timedelta(0, 330)
2159
>>> rfc3339_duration_to_delta("P1DT3M20S")
2160
datetime.timedelta(1, 200)
2163
# Parsing an RFC 3339 duration with regular expressions is not
2164
# possible - there would have to be multiple places for the same
2165
# values, like seconds. The current code, while more esoteric, is
2166
# cleaner without depending on a parsing library. If Python had a
2167
# built-in library for parsing we would use it, but we'd like to
2168
# avoid excessive use of external libraries.
2170
# New type for defining tokens, syntax, and semantics all-in-one
2171
Token = collections.namedtuple("Token",
2172
("regexp", # To match token; if
2173
# "value" is not None,
2174
# must have a "group"
2176
"value", # datetime.timedelta or
2178
"followers")) # Tokens valid after
2180
Token = collections.namedtuple("Token", (
2181
"regexp", # To match token; if "value" is not None, must have
2182
# a "group" containing digits
2183
"value", # datetime.timedelta or None
2184
"followers")) # Tokens valid after this token
2185
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2186
# the "duration" ABNF definition in RFC 3339, Appendix A.
2187
token_end = Token(re.compile(r"$"), None, frozenset())
2188
token_second = Token(re.compile(r"(\d+)S"),
2189
datetime.timedelta(seconds=1),
2190
frozenset((token_end, )))
2191
token_minute = Token(re.compile(r"(\d+)M"),
2192
datetime.timedelta(minutes=1),
2193
frozenset((token_second, token_end)))
2194
token_hour = Token(re.compile(r"(\d+)H"),
2195
datetime.timedelta(hours=1),
2196
frozenset((token_minute, token_end)))
2197
token_time = Token(re.compile(r"T"),
2199
frozenset((token_hour, token_minute,
2201
token_day = Token(re.compile(r"(\d+)D"),
2202
datetime.timedelta(days=1),
2203
frozenset((token_time, token_end)))
2204
token_month = Token(re.compile(r"(\d+)M"),
2205
datetime.timedelta(weeks=4),
2206
frozenset((token_day, token_end)))
2207
token_year = Token(re.compile(r"(\d+)Y"),
2208
datetime.timedelta(weeks=52),
2209
frozenset((token_month, token_end)))
2210
token_week = Token(re.compile(r"(\d+)W"),
2211
datetime.timedelta(weeks=1),
2212
frozenset((token_end, )))
2213
token_duration = Token(re.compile(r"P"), None,
2214
frozenset((token_year, token_month,
2215
token_day, token_time,
2217
# Define starting values
2218
value = datetime.timedelta() # Value so far
2220
followers = frozenset((token_duration,)) # Following valid tokens
2221
s = duration # String left to parse
2222
# Loop until end token is found
2223
while found_token is not token_end:
2224
# Search for any currently valid tokens
2225
for token in followers:
2226
match = token.regexp.match(s)
2227
if match is not None:
2229
if token.value is not None:
2230
# Value found, parse digits
2231
factor = int(match.group(1), 10)
2232
# Add to value so far
2233
value += factor * token.value
2234
# Strip token from string
2235
s = token.regexp.sub("", s, 1)
2238
# Set valid next tokens
2239
followers = found_token.followers
2242
# No currently valid tokens were found
2243
raise ValueError("Invalid RFC 3339 duration")
2248
1920
def string_to_delta(interval):
2249
1921
"""Parse a string and return a datetime.timedelta
2379
2036
"debug": "False",
2381
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2382
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2038
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2383
2039
"servicename": "Mandos",
2384
2040
"use_dbus": "True",
2385
2041
"use_ipv6": "True",
2386
2042
"debuglevel": "",
2387
2043
"restore": "True",
2389
"statedir": "/var/lib/mandos",
2390
"foreground": "False",
2044
"statedir": "/var/lib/mandos"
2394
2047
# Parse config file for server-global settings
2395
2048
server_config = configparser.SafeConfigParser(server_defaults)
2396
2049
del server_defaults
2397
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2050
server_config.read(os.path.join(options.configdir,
2398
2052
# Convert the SafeConfigParser object to a dict
2399
2053
server_settings = server_config.defaults()
2400
2054
# Use the appropriate methods on the non-string config options
2401
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2055
for option in ("debug", "use_dbus", "use_ipv6"):
2402
2056
server_settings[option] = server_config.getboolean("DEFAULT",
2404
2058
if server_settings["port"]:
2405
2059
server_settings["port"] = server_config.getint("DEFAULT",
2407
if server_settings["socket"]:
2408
server_settings["socket"] = server_config.getint("DEFAULT",
2410
# Later, stdin will, and stdout and stderr might, be dup'ed
2411
# over with an opened os.devnull. But we don't want this to
2412
# happen with a supplied network socket.
2413
if 0 <= server_settings["socket"] <= 2:
2414
server_settings["socket"] = os.dup(server_settings
2416
2061
del server_config
2418
2063
# Override the settings from the config file with command line
2419
2064
# options, if set.
2420
2065
for option in ("interface", "address", "port", "debug",
2421
"priority", "servicename", "configdir", "use_dbus",
2422
"use_ipv6", "debuglevel", "restore", "statedir",
2423
"socket", "foreground", "zeroconf"):
2066
"priority", "servicename", "configdir",
2067
"use_dbus", "use_ipv6", "debuglevel", "restore",
2424
2069
value = getattr(options, option)
2425
2070
if value is not None:
2426
2071
server_settings[option] = value
2428
2073
# Force all strings to be unicode
2429
2074
for option in server_settings.keys():
2430
if isinstance(server_settings[option], bytes):
2431
server_settings[option] = (server_settings[option]
2433
# Force all boolean options to be boolean
2434
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2435
"foreground", "zeroconf"):
2436
server_settings[option] = bool(server_settings[option])
2437
# Debug implies foreground
2438
if server_settings["debug"]:
2439
server_settings["foreground"] = True
2075
if type(server_settings[option]) is str:
2076
server_settings[option] = unicode(server_settings[option])
2440
2077
# Now we have our good server settings in "server_settings"
2442
2079
##################################################################
2444
if (not server_settings["zeroconf"]
2445
and not (server_settings["port"]
2446
or server_settings["socket"] != "")):
2447
parser.error("Needs port or socket to work without Zeroconf")
2449
2081
# For convenience
2450
2082
debug = server_settings["debug"]
2451
2083
debuglevel = server_settings["debuglevel"]
2480
2110
global mandos_dbus_service
2481
2111
mandos_dbus_service = None
2484
if server_settings["socket"] != "":
2485
socketfd = server_settings["socket"]
2486
tcp_server = MandosServer(
2487
(server_settings["address"], server_settings["port"]),
2489
interface=(server_settings["interface"] or None),
2491
gnutls_priority=server_settings["priority"],
2495
pidfilename = "/run/mandos.pid"
2496
if not os.path.isdir("/run/."):
2497
pidfilename = "/var/run/mandos.pid"
2113
tcp_server = MandosServer((server_settings["address"],
2114
server_settings["port"]),
2116
interface=(server_settings["interface"]
2120
server_settings["priority"],
2123
pidfilename = "/var/run/mandos.pid"
2500
2125
pidfile = open(pidfilename, "w")
2501
except IOError as e:
2502
logger.error("Could not open file %r", pidfilename,
2127
logger.error("Could not open file %r", pidfilename)
2505
for name in ("_mandos", "mandos", "nobody"):
2130
uid = pwd.getpwnam("_mandos").pw_uid
2131
gid = pwd.getpwnam("_mandos").pw_gid
2507
uid = pwd.getpwnam(name).pw_uid
2508
gid = pwd.getpwnam(name).pw_gid
2134
uid = pwd.getpwnam("mandos").pw_uid
2135
gid = pwd.getpwnam("mandos").pw_gid
2510
2136
except KeyError:
2138
uid = pwd.getpwnam("nobody").pw_uid
2139
gid = pwd.getpwnam("nobody").pw_gid
2518
2146
except OSError as error:
2519
if error.errno != errno.EPERM:
2147
if error[0] != errno.EPERM:
2523
2151
# Enable all possible GnuTLS debugging
2530
2158
def debug_gnutls(level, string):
2531
2159
logger.debug("GnuTLS: %s", string[:-1])
2533
gnutls.library.functions.gnutls_global_set_log_function(
2161
(gnutls.library.functions
2162
.gnutls_global_set_log_function(debug_gnutls))
2536
2164
# Redirect stdin so all checkers get /dev/null
2537
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2165
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2538
2166
os.dup2(null, sys.stdin.fileno())
2542
2170
# Need to fork before connecting to D-Bus
2544
2172
# Close all input and output, do double fork, etc.
2547
# multiprocessing will use threads, so before we use gobject we
2548
# need to inform gobject that threads will be used.
2549
2175
gobject.threads_init()
2551
2177
global main_loop
2552
2178
# From the Avahi example code
2553
DBusGMainLoop(set_as_default=True)
2179
DBusGMainLoop(set_as_default=True )
2554
2180
main_loop = gobject.MainLoop()
2555
2181
bus = dbus.SystemBus()
2556
2182
# End of Avahi example code
2559
2185
bus_name = dbus.service.BusName("se.recompile.Mandos",
2562
old_bus_name = dbus.service.BusName(
2563
"se.bsnet.fukt.Mandos", bus,
2186
bus, do_not_queue=True)
2187
old_bus_name = (dbus.service.BusName
2188
("se.bsnet.fukt.Mandos", bus,
2565
2190
except dbus.exceptions.NameExistsException as e:
2566
logger.error("Disabling D-Bus:", exc_info=e)
2191
logger.error(unicode(e) + ", disabling D-Bus")
2567
2192
use_dbus = False
2568
2193
server_settings["use_dbus"] = False
2569
2194
tcp_server.use_dbus = False
2571
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2572
service = AvahiServiceToSyslog(
2573
name = server_settings["servicename"],
2574
servicetype = "_mandos._tcp",
2575
protocol = protocol,
2577
if server_settings["interface"]:
2578
service.interface = if_nametoindex(
2579
server_settings["interface"].encode("utf-8"))
2195
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2196
service = AvahiServiceToSyslog(name =
2197
server_settings["servicename"],
2198
servicetype = "_mandos._tcp",
2199
protocol = protocol, bus = bus)
2200
if server_settings["interface"]:
2201
service.interface = (if_nametoindex
2202
(str(server_settings["interface"])))
2581
2204
global multiprocessing_manager
2582
2205
multiprocessing_manager = multiprocessing.Manager()
2584
2207
client_class = Client
2586
client_class = functools.partial(ClientDBus, bus = bus)
2209
client_class = functools.partial(ClientDBusTransitional,
2588
2212
client_settings = Client.config_parser(client_config)
2589
2213
old_client_settings = {}
2590
2214
clients_data = {}
2592
# This is used to redirect stdout and stderr for checker processes
2594
wnull = open(os.devnull, "w") # A writable /dev/null
2595
# Only used if server is running in foreground but not in debug
2597
if debug or not foreground:
2600
2216
# Get client data and settings from last running state.
2601
2217
if server_settings["restore"]:
2603
2219
with open(stored_state_path, "rb") as stored_state:
2604
clients_data, old_client_settings = pickle.load(
2220
clients_data, old_client_settings = (pickle.load
2606
2222
os.remove(stored_state_path)
2607
2223
except IOError as e:
2608
if e.errno == errno.ENOENT:
2609
logger.warning("Could not load persistent state:"
2610
" {}".format(os.strerror(e.errno)))
2612
logger.critical("Could not load persistent state:",
2224
logger.warning("Could not load persistent state: {0}"
2226
if e.errno != errno.ENOENT:
2615
2228
except EOFError as e:
2616
2229
logger.warning("Could not load persistent state: "
2230
"EOFError: {0}".format(e))
2620
2232
with PGPEngine() as pgp:
2621
for client_name, client in clients_data.items():
2622
# Skip removed clients
2623
if client_name not in client_settings:
2233
for client_name, client in clients_data.iteritems():
2626
2234
# Decide which value to use after restoring saved state.
2627
2235
# We have three different values: Old config file,
2628
2236
# new config file, and saved state.
2633
2241
# For each value in new config, check if it
2634
2242
# differs from the old config value (Except for
2635
2243
# the "secret" attribute)
2636
if (name != "secret"
2638
old_client_settings[client_name][name])):
2244
if (name != "secret" and
2245
value != old_client_settings[client_name]
2639
2247
client[name] = value
2640
2248
except KeyError:
2643
2251
# Clients who has passed its expire date can still be
2644
# enabled if its last checker was successful. A Client
2645
# whose checker succeeded before we stored its state is
2646
# assumed to have successfully run all checkers during
2252
# enabled if its last checker was successful. Clients
2253
# whose checker failed before we stored its state is
2254
# assumed to have failed all checkers during downtime.
2648
2255
if client["enabled"]:
2649
2256
if datetime.datetime.utcnow() >= client["expires"]:
2650
2257
if not client["last_checked_ok"]:
2651
2258
logger.warning(
2652
"disabling client {} - Client never "
2653
"performed a successful checker".format(
2259
"disabling client {0} - Client never "
2260
"performed a successfull checker"
2261
.format(client["name"]))
2655
2262
client["enabled"] = False
2656
2263
elif client["last_checker_status"] != 0:
2657
2264
logger.warning(
2658
"disabling client {} - Client last"
2659
" checker failed with error code"
2662
client["last_checker_status"]))
2265
"disabling client {0} - Client "
2266
"last checker failed with error code {1}"
2267
.format(client["name"],
2268
client["last_checker_status"]))
2663
2269
client["enabled"] = False
2665
client["expires"] = (
2666
datetime.datetime.utcnow()
2667
+ client["timeout"])
2271
client["expires"] = (datetime.datetime
2273
+ client["timeout"])
2668
2274
logger.debug("Last checker succeeded,"
2669
" keeping {} enabled".format(
2275
" keeping {0} enabled"
2276
.format(client["name"]))
2672
client["secret"] = pgp.decrypt(
2673
client["encrypted_secret"],
2674
client_settings[client_name]["secret"])
2278
client["secret"] = (
2279
pgp.decrypt(client["encrypted_secret"],
2280
client_settings[client_name]
2675
2282
except PGPError:
2676
2283
# If decryption fails, we use secret from new settings
2677
logger.debug("Failed to decrypt {} old secret".format(
2679
client["secret"] = (client_settings[client_name]
2284
logger.debug("Failed to decrypt {0} old secret"
2285
.format(client_name))
2286
client["secret"] = (
2287
client_settings[client_name]["secret"])
2682
2290
# Add/remove clients based on new changes made to config
2683
2291
for client_name in (set(old_client_settings)
2686
2294
for client_name in (set(client_settings)
2687
2295
- set(old_client_settings)):
2688
2296
clients_data[client_name] = client_settings[client_name]
2690
# Create all client objects
2691
for client_name, client in clients_data.items():
2298
# Create clients all clients
2299
for client_name, client in clients_data.iteritems():
2692
2300
tcp_server.clients[client_name] = client_class(
2695
server_settings = server_settings)
2301
name = client_name, settings = client)
2697
2303
if not tcp_server.clients:
2698
2304
logger.warning("No clients defined")
2701
if pidfile is not None:
2705
pidfile.write("{}\n".format(pid).encode("utf-8"))
2707
logger.error("Could not write to file %r with PID %d",
2310
pidfile.write(str(pid) + "\n".encode("utf-8"))
2313
logger.error("Could not write to file %r with PID %d",
2316
# "pidfile" was never created
2710
2318
del pidfilename
2319
signal.signal(signal.SIGINT, signal.SIG_IGN)
2712
2321
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2713
2322
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2717
@alternate_dbus_interfaces(
2718
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2719
class MandosDBusService(DBusObjectWithProperties):
2325
class MandosDBusService(dbus.service.Object):
2720
2326
"""A D-Bus proxy object"""
2722
2327
def __init__(self):
2723
2328
dbus.service.Object.__init__(self, bus, "/")
2725
2329
_interface = "se.recompile.Mandos"
2727
@dbus_interface_annotations(_interface)
2730
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2733
2331
@dbus.service.signal(_interface, signature="o")
2734
2332
def ClientAdded(self, objpath):