189
171
def password_encode(self, password):
190
172
# Passphrase can not be empty and can not contain newlines or
191
173
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
174
return b"mandos" + binascii.hexlify(password)
200
176
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
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
216
191
return ciphertext
218
193
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
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
234
208
return decrypted_plaintext
237
212
class AvahiError(Exception):
238
213
def __init__(self, value, *args, **kwargs):
239
214
self.value = value
240
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))
244
219
class AvahiServiceError(AvahiError):
248
222
class AvahiGroupError(AvahiError):
477
426
runtime_expansions: Allowed attributes for runtime expansion.
478
427
expires: datetime.datetime(); time (UTC) when a client will be
479
428
disabled, or None
480
server_settings: The server_settings dict from main()
483
431
runtime_expansions = ("approval_delay", "approval_duration",
484
"created", "enabled", "expires",
485
"fingerprint", "host", "interval",
486
"last_approval_request", "last_checked_ok",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
487
434
"last_enabled", "name", "timeout")
490
"extended_timeout": "PT15M",
492
"checker": "fping -q -- %%(host)s",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"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)
501
462
def config_parser(config):
502
463
"""Construct a new dict of client settings of this form:
633
598
def init_checker(self):
634
599
# Schedule a new checker to be started an 'interval' from now,
635
600
# and every interval from then on.
636
if self.checker_initiator_tag is not None:
637
gobject.source_remove(self.checker_initiator_tag)
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
641
604
# Schedule a disable() when 'timeout' has passed
642
if self.disable_initiator_tag is not None:
643
gobject.source_remove(self.disable_initiator_tag)
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
646
608
# Also start a new checker *right now*.
647
609
self.start_checker()
649
def checker_callback(self, source, condition, connection,
611
def checker_callback(self, pid, condition, command):
651
612
"""The checker has completed, so take appropriate actions."""
652
613
self.checker_callback_tag = None
653
614
self.checker = None
654
# Read return code from connection (see call_pipe)
655
returncode = connection.recv()
659
self.last_checker_status = returncode
660
self.last_checker_signal = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
661
617
if self.last_checker_status == 0:
662
618
logger.info("Checker for %(name)s succeeded",
664
620
self.checked_ok()
666
logger.info("Checker for %(name)s failed", vars(self))
622
logger.info("Checker for %(name)s failed",
668
625
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
670
626
logger.warning("Checker for %(name)s crashed?",
674
def checked_ok(self):
675
"""Assert that the client has been seen, alive and well."""
676
self.last_checked_ok = datetime.datetime.utcnow()
677
self.last_checker_status = 0
678
self.last_checker_signal = None
681
def bump_timeout(self, timeout=None):
682
"""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,
683
635
if timeout is None:
684
636
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
685
638
if self.disable_initiator_tag is not None:
686
639
gobject.source_remove(self.disable_initiator_tag)
687
self.disable_initiator_tag = None
688
640
if getattr(self, "enabled", False):
689
self.disable_initiator_tag = gobject.timeout_add(
690
int(timeout.total_seconds() * 1000), self.disable)
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
691
644
self.expires = datetime.datetime.utcnow() + timeout
693
646
def need_approval(self):
699
652
If a checker already exists, leave it running and do
701
654
# The reason for not killing a running checker is that if we
702
# did that, and if a checker (for some reason) started running
703
# slowly and taking more than 'interval' time, then the client
704
# would inevitably timeout, since no checker would get a
705
# 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
706
659
# checkers alone, the checker would have to take more time
707
660
# than 'timeout' for the client to be disabled, which is as it
710
if self.checker is not None and not self.checker.is_alive():
711
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)
714
676
# Start a new checker if needed
715
677
if self.checker is None:
716
# Escape attributes for the shell
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
721
command = self.checker_command % escaped_attrs
722
except TypeError as error:
723
logger.error('Could not format string "%s"',
724
self.checker_command,
726
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
727
697
self.current_checker_command = command
728
logger.info("Starting checker %r for %s", command,
730
# We don't need to redirect stdout and stderr, since
731
# in normal mode, that is already done by daemon(),
732
# and in debug mode we don't want to. (Stdin is
733
# always replaced by /dev/null.)
734
# The exception is when not debugging but nevertheless
735
# running in the foreground; use the previously
737
popen_args = { "close_fds": True,
740
if (not self.server_settings["debug"]
741
and self.server_settings["foreground"]):
742
popen_args.update({"stdout": wnull,
744
pipe = multiprocessing.Pipe(duplex = False)
745
self.checker = multiprocessing.Process(
747
args = (pipe[1], subprocess.call, command),
750
self.checker_callback_tag = gobject.io_add_watch(
751
pipe[0].fileno(), gobject.IO_IN,
752
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",
753
721
# Re-run this periodically if run by gobject.timeout_add
870
def _is_dbus_thing(thing):
871
"""Returns a function testing if an attribute is a D-Bus thing
873
If called like _is_dbus_thing("method") it returns a function
874
suitable for use as predicate to inspect.getmembers().
876
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
879
def _get_all_dbus_things(self, thing):
804
def _get_all_dbus_properties(self):
880
805
"""Returns a generator of (name, attribute) pairs
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
athing.__get__(self))
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
808
for cls in self.__class__.__mro__
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
810
inspect.getmembers(cls, self._is_dbus_property))
888
812
def _get_dbus_property(self, interface_name, property_name):
889
813
"""Returns a bound method if one exists which is a D-Bus
890
814
property with the specified name and interface.
892
for cls in self.__class__.__mro__:
893
for name, value in inspect.getmembers(
894
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)):
895
819
if (value._dbus_name == property_name
896
820
and value._dbus_interface == interface_name):
897
821
return value.__get__(self)
899
823
# No such property
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
829
out_signature="v")
906
830
def Get(self, interface_name, property_name):
907
831
"""Standard D-Bus property Get() method, see D-Bus standard.
954
875
if not hasattr(value, "variant_level"):
955
876
properties[name] = value
957
properties[name] = type(value)(
958
value, variant_level = value.variant_level + 1)
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
959
880
return dbus.Dictionary(properties, signature="sv")
961
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
def PropertiesChanged(self, interface_name, changed_properties,
963
invalidated_properties):
964
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
969
882
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
883
out_signature="s",
971
884
path_keyword='object_path',
972
885
connection_keyword='connection')
973
886
def Introspect(self, object_path, connection):
974
"""Overloading of standard D-Bus method.
976
Inserts property tags and interface annotation tags.
887
"""Standard D-Bus method, overloaded to insert property tags.
978
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
981
892
document = xml.dom.minidom.parseString(xmlstring)
983
893
def make_tag(document, name, prop):
984
894
e = document.createElement("property")
985
895
e.setAttribute("name", name)
986
896
e.setAttribute("type", prop._dbus_signature)
987
897
e.setAttribute("access", prop._dbus_access)
990
899
for if_tag in document.getElementsByTagName("interface"):
992
900
for tag in (make_tag(document, name, prop)
994
in self._get_all_dbus_things("property")
902
in self._get_all_dbus_properties()
995
903
if prop._dbus_interface
996
904
== if_tag.getAttribute("name")):
997
905
if_tag.appendChild(tag)
998
# Add annotation tags
999
for typ in ("method", "signal", "property"):
1000
for tag in if_tag.getElementsByTagName(typ):
1002
for name, prop in (self.
1003
_get_all_dbus_things(typ)):
1004
if (name == tag.getAttribute("name")
1005
and prop._dbus_interface
1006
== if_tag.getAttribute("name")):
1007
annots.update(getattr(
1008
prop, "_dbus_annotations", {}))
1009
for name, value in annots.items():
1010
ann_tag = document.createElement(
1012
ann_tag.setAttribute("name", name)
1013
ann_tag.setAttribute("value", value)
1014
tag.appendChild(ann_tag)
1015
# Add interface annotation tags
1016
for annotation, value in dict(
1017
itertools.chain.from_iterable(
1018
annotations().items()
1019
for name, annotations
1020
in self._get_all_dbus_things("interface")
1021
if name == if_tag.getAttribute("name")
1023
ann_tag = document.createElement("annotation")
1024
ann_tag.setAttribute("name", annotation)
1025
ann_tag.setAttribute("value", value)
1026
if_tag.appendChild(ann_tag)
1027
906
# Add the names to the return values for the
1028
907
# "org.freedesktop.DBus.Properties" methods
1029
908
if (if_tag.getAttribute("name")
1044
923
except (AttributeError, xml.dom.DOMException,
1045
924
xml.parsers.expat.ExpatError) as error:
1046
925
logger.error("Failed to override Introspection method",
1048
927
return xmlstring
1051
def datetime_to_dbus(dt, variant_level=0):
930
def datetime_to_dbus (dt, variant_level=0):
1052
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1054
933
return dbus.String("", variant_level = variant_level)
1055
return dbus.String(dt.isoformat(), variant_level=variant_level)
1058
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1059
"""A class decorator; applied to a subclass of
1060
dbus.service.Object, it will add alternate D-Bus attributes with
1061
interface names according to the "alt_interface_names" mapping.
1064
@alternate_dbus_interfaces({"org.example.Interface":
1065
"net.example.AlternateInterface"})
1066
class SampleDBusObject(dbus.service.Object):
1067
@dbus.service.method("org.example.Interface")
1068
def SampleDBusMethod():
1071
The above "SampleDBusMethod" on "SampleDBusObject" will be
1072
reachable via two interfaces: "org.example.Interface" and
1073
"net.example.AlternateInterface", the latter of which will have
1074
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1075
"true", unless "deprecate" is passed with a False value.
1077
This works for methods and signals, and also for D-Bus properties
1078
(from DBusObjectWithProperties) and interfaces (from the
1079
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.
1083
for orig_interface_name, alt_interface_name in (
1084
alt_interface_names.items()):
1086
interface_names = set()
1087
# Go though all attributes of the class
1088
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):
1089
950
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
951
# with the wrong interface name
1091
952
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1095
956
# Create an alternate D-Bus interface name based on
1096
957
# the current name
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1099
interface_names.add(alt_interface)
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1100
961
# Is this a D-Bus signal?
1101
962
if getattr(attribute, "_dbus_is_signal", False):
1102
if sys.version_info.major == 2:
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
1106
966
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))
1108
["func"].cell_contents)
1110
nonmethod_func = attribute
967
attribute.__closure__))["func"]
1111
969
# Create a new, but exactly alike, function
1112
970
# object, and decorate it to be a new D-Bus signal
1113
971
# with the alternate D-Bus interface name
1114
if sys.version_info.major == 2:
1115
new_function = types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)
1122
new_function = types.FunctionType(
1123
nonmethod_func.__code__,
1124
nonmethod_func.__globals__,
1125
nonmethod_func.__name__,
1126
nonmethod_func.__defaults__,
1127
nonmethod_func.__closure__)
1128
new_function = (dbus.service.signal(
1130
attribute._dbus_signature)(new_function))
1131
# Copy annotations, if any
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1135
except AttributeError:
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
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)))
1137
981
# Define a creator of a function to call both the
1138
# original and alternate functions, so both the
1139
# original and alternate signals gets sent when
1140
# the function is called
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1141
984
def fixscope(func1, func2):
1142
985
"""This function is a scope container to pass
1143
986
func1 and func2 to the "call_both" function
1144
987
outside of its arguments"""
1146
988
def call_both(*args, **kwargs):
1147
989
"""This function will emit two D-Bus
1148
990
signals by calling func1 and func2"""
1149
991
func1(*args, **kwargs)
1150
992
func2(*args, **kwargs)
1152
993
return call_both
1153
994
# Create the "call_both" function and add it to
1155
attr[attrname] = fixscope(attribute, new_function)
996
attr[attrname] = fixscope(attribute,
1156
998
# Is this a D-Bus method?
1157
999
elif getattr(attribute, "_dbus_is_method", False):
1158
1000
# Create a new, but exactly alike, function
1159
1001
# object. Decorate it to be a new D-Bus method
1160
1002
# with the alternate D-Bus interface name. Add it
1161
1003
# to the class.
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1172
# Copy annotations, if any
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1176
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)))
1178
1014
# Is this a D-Bus property?
1179
1015
elif getattr(attribute, "_dbus_is_property", False):
1180
1016
# Create a new, but exactly alike, function
1181
1017
# object, and decorate it to be a new D-Bus
1182
1018
# property with the alternate D-Bus interface
1183
1019
# name. Add it to the class.
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1195
# Copy annotations, if any
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1199
except AttributeError:
1201
# Is this a D-Bus interface?
1202
elif getattr(attribute, "_dbus_is_interface", False):
1203
# Create a new, but exactly alike, function
1204
# object. Decorate it to be a new D-Bus interface
1205
# with the alternate D-Bus interface name. Add it
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1215
# Deprecate all alternate interfaces
1216
iname="_AlternateDBusNames_interface_annotation{}"
1217
for interface_name in interface_names:
1219
@dbus_interface_annotations(interface_name)
1221
return { "org.freedesktop.DBus.Deprecated":
1223
# Find an unused name
1224
for aname in (iname.format(i)
1225
for i in itertools.count()):
1226
if aname not in attr:
1230
# Replace the class with a new subclass of it with
1231
# methods, signals, etc. as created above.
1232
cls = type(b"{}Alternate".format(cls.__name__),
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
"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)
1241
1036
class ClientDBus(Client, DBusObjectWithProperties):
1242
1037
"""A Client class using D-Bus
1314
1095
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1096
last_enabled = notifychangeproperty(datetime_to_dbus,
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1098
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1099
type_func = lambda checker:
1100
checker is not None)
1320
1101
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1102
"LastCheckedOK")
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1323
"LastCheckerStatus")
1324
1103
last_approval_request = notifychangeproperty(
1325
1104
datetime_to_dbus, "LastApprovalRequest")
1326
1105
approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1106
"ApprovedByDefault")
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1107
approval_delay = notifychangeproperty(dbus.UInt64,
1110
timedelta_to_milliseconds)
1331
1111
approval_duration = notifychangeproperty(
1332
1112
dbus.UInt64, "ApprovalDuration",
1333
type_func = lambda td: td.total_seconds() * 1000)
1113
type_func = timedelta_to_milliseconds)
1334
1114
host = notifychangeproperty(dbus.String, "Host")
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1115
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1117
timedelta_to_milliseconds)
1338
1118
extended_timeout = notifychangeproperty(
1339
1119
dbus.UInt64, "ExtendedTimeout",
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1120
type_func = timedelta_to_milliseconds)
1121
interval = notifychangeproperty(dbus.UInt64,
1124
timedelta_to_milliseconds)
1344
1125
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1348
1127
del notifychangeproperty
1356
1135
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1136
Client.__del__(self, *args, **kwargs)
1359
def checker_callback(self, source, condition,
1360
connection, command, *args, **kwargs):
1361
ret = Client.checker_callback(self, source, condition,
1362
connection, command, *args,
1364
exitstatus = self.last_checker_status
1138
def checker_callback(self, pid, condition, command,
1140
self.checker_callback_tag = None
1142
if os.WIFEXITED(condition):
1143
exitstatus = os.WEXITSTATUS(condition)
1366
1144
# Emit D-Bus signal
1367
1145
self.CheckerCompleted(dbus.Int16(exitstatus),
1146
dbus.Int64(condition),
1369
1147
dbus.String(command))
1371
1149
# Emit D-Bus signal
1372
1150
self.CheckerCompleted(dbus.Int16(-1),
1374
self.last_checker_signal),
1151
dbus.Int64(condition),
1375
1152
dbus.String(command))
1154
return Client.checker_callback(self, pid, condition, command,
1378
1157
def start_checker(self, *args, **kwargs):
1379
old_checker_pid = getattr(self.checker, "pid", None)
1158
old_checker = self.checker
1159
if self.checker is not None:
1160
old_checker_pid = self.checker.pid
1162
old_checker_pid = None
1380
1163
r = Client.start_checker(self, *args, **kwargs)
1381
1164
# Only if new checker process was started
1382
1165
if (self.checker is not None
1579
1358
return datetime_to_dbus(self.last_approval_request)
1581
1360
# Timeout - property
1582
@dbus_service_property(_interface,
1361
@dbus_service_property(_interface, signature="t",
1584
1362
access="readwrite")
1585
1363
def Timeout_dbus_property(self, value=None):
1586
1364
if value is None: # get
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1588
old_timeout = self.timeout
1365
return dbus.UInt64(self.timeout_milliseconds())
1589
1366
self.timeout = datetime.timedelta(0, 0, 0, value)
1590
# Reschedule disabling
1367
# Reschedule timeout
1591
1368
if self.enabled:
1592
1369
now = datetime.datetime.utcnow()
1593
self.expires += self.timeout - old_timeout
1594
if self.expires <= now:
1370
time_to_die = timedelta_to_milliseconds(
1371
(self.last_checked_ok + self.timeout) - now)
1372
if time_to_die <= 0:
1595
1373
# The timeout has passed
1376
self.expires = (now +
1377
datetime.timedelta(milliseconds =
1598
1379
if (getattr(self, "disable_initiator_tag", None)
1601
1382
gobject.source_remove(self.disable_initiator_tag)
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1383
self.disable_initiator_tag = (gobject.timeout_add
1606
1387
# ExtendedTimeout - property
1607
@dbus_service_property(_interface,
1388
@dbus_service_property(_interface, signature="t",
1609
1389
access="readwrite")
1610
1390
def ExtendedTimeout_dbus_property(self, value=None):
1611
1391
if value is None: # get
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1392
return dbus.UInt64(self.extended_timeout_milliseconds())
1614
1393
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1616
1395
# Interval - property
1617
@dbus_service_property(_interface,
1396
@dbus_service_property(_interface, signature="t",
1619
1397
access="readwrite")
1620
1398
def Interval_dbus_property(self, value=None):
1621
1399
if value is None: # get
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1400
return dbus.UInt64(self.interval_milliseconds())
1623
1401
self.interval = datetime.timedelta(0, 0, 0, value)
1624
1402
if getattr(self, "checker_initiator_tag", None) is None:
1626
1404
if self.enabled:
1627
1405
# Reschedule checker run
1628
1406
gobject.source_remove(self.checker_initiator_tag)
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1407
self.checker_initiator_tag = (gobject.timeout_add
1408
(value, self.start_checker))
1409
self.start_checker() # Start one now, too
1633
1411
# Checker - property
1634
@dbus_service_property(_interface,
1412
@dbus_service_property(_interface, signature="s",
1636
1413
access="readwrite")
1637
1414
def Checker_dbus_property(self, value=None):
1638
1415
if value is None: # get
1639
1416
return dbus.String(self.checker_command)
1640
self.checker_command = str(value)
1417
self.checker_command = unicode(value)
1642
1419
# CheckerRunning - property
1643
@dbus_service_property(_interface,
1420
@dbus_service_property(_interface, signature="b",
1645
1421
access="readwrite")
1646
1422
def CheckerRunning_dbus_property(self, value=None):
1647
1423
if value is None: # get
1872
1655
def fingerprint(openpgp):
1873
1656
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1657
# New GnuTLS "datum" with the OpenPGP public key
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1658
datum = (gnutls.library.types
1659
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1662
ctypes.c_uint(len(openpgp))))
1879
1663
# New empty GnuTLS certificate
1880
1664
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1665
(gnutls.library.functions
1666
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1667
# Import the OpenPGP public key into the certificate
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1668
(gnutls.library.functions
1669
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1670
gnutls.library.constants
1671
.GNUTLS_OPENPGP_FMT_RAW))
1887
1672
# Verify the self signature in the key
1888
1673
crtverify = ctypes.c_uint()
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1674
(gnutls.library.functions
1675
.gnutls_openpgp_crt_verify_self(crt, 0,
1676
ctypes.byref(crtverify)))
1891
1677
if crtverify.value != 0:
1892
1678
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
raise gnutls.errors.CertificateSecurityError(
1679
raise (gnutls.errors.CertificateSecurityError
1895
1681
# New buffer for the fingerprint
1896
1682
buf = ctypes.create_string_buffer(20)
1897
1683
buf_len = ctypes.c_size_t()
1898
1684
# Get the fingerprint from the certificate into the buffer
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1685
(gnutls.library.functions
1686
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1687
ctypes.byref(buf_len)))
1901
1688
# Deinit the certificate
1902
1689
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1690
# Convert the buffer to a Python bytestring
1954
1740
interface: None or a network interface name (string)
1955
1741
use_ipv6: Boolean; to use IPv6 or not
1958
1743
def __init__(self, server_address, RequestHandlerClass,
1962
"""If socketfd is set, use that file descriptor instead of
1963
creating a new one with socket.socket().
1744
interface=None, use_ipv6=True):
1965
1745
self.interface = interface
1967
1747
self.address_family = socket.AF_INET6
1968
if socketfd is not None:
1969
# Save the file descriptor
1970
self.socketfd = socketfd
1971
# Save the original socket.socket() function
1972
self.socket_socket = socket.socket
1973
# To implement --socket, we monkey patch socket.socket.
1975
# (When socketserver.TCPServer is a new-style class, we
1976
# could make self.socket into a property instead of monkey
1977
# patching socket.socket.)
1979
# Create a one-time-only replacement for socket.socket()
1980
@functools.wraps(socket.socket)
1981
def socket_wrapper(*args, **kwargs):
1982
# Restore original function so subsequent calls are
1984
socket.socket = self.socket_socket
1985
del self.socket_socket
1986
# This time only, return a new socket object from the
1987
# saved file descriptor.
1988
return socket.fromfd(self.socketfd, *args, **kwargs)
1989
# Replace socket.socket() function with wrapper
1990
socket.socket = socket_wrapper
1991
# The socketserver.TCPServer.__init__ will call
1992
# socket.socket(), which might be our replacement,
1993
# socket_wrapper(), if socketfd was set.
1994
1748
socketserver.TCPServer.__init__(self, server_address,
1995
1749
RequestHandlerClass)
1997
1750
def server_bind(self):
1998
1751
"""This overrides the normal server_bind() function
1999
1752
to bind to an interface if one was specified, and also NOT to
2159
def rfc3339_duration_to_delta(duration):
2160
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2162
>>> rfc3339_duration_to_delta("P7D")
2163
datetime.timedelta(7)
2164
>>> rfc3339_duration_to_delta("PT60S")
2165
datetime.timedelta(0, 60)
2166
>>> rfc3339_duration_to_delta("PT60M")
2167
datetime.timedelta(0, 3600)
2168
>>> rfc3339_duration_to_delta("PT24H")
2169
datetime.timedelta(1)
2170
>>> rfc3339_duration_to_delta("P1W")
2171
datetime.timedelta(7)
2172
>>> rfc3339_duration_to_delta("PT5M30S")
2173
datetime.timedelta(0, 330)
2174
>>> rfc3339_duration_to_delta("P1DT3M20S")
2175
datetime.timedelta(1, 200)
2178
# Parsing an RFC 3339 duration with regular expressions is not
2179
# possible - there would have to be multiple places for the same
2180
# values, like seconds. The current code, while more esoteric, is
2181
# cleaner without depending on a parsing library. If Python had a
2182
# built-in library for parsing we would use it, but we'd like to
2183
# avoid excessive use of external libraries.
2185
# New type for defining tokens, syntax, and semantics all-in-one
2186
Token = collections.namedtuple("Token", (
2187
"regexp", # To match token; if "value" is not None, must have
2188
# a "group" containing digits
2189
"value", # datetime.timedelta or None
2190
"followers")) # Tokens valid after this token
2191
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
# the "duration" ABNF definition in RFC 3339, Appendix A.
2193
token_end = Token(re.compile(r"$"), None, frozenset())
2194
token_second = Token(re.compile(r"(\d+)S"),
2195
datetime.timedelta(seconds=1),
2196
frozenset((token_end, )))
2197
token_minute = Token(re.compile(r"(\d+)M"),
2198
datetime.timedelta(minutes=1),
2199
frozenset((token_second, token_end)))
2200
token_hour = Token(re.compile(r"(\d+)H"),
2201
datetime.timedelta(hours=1),
2202
frozenset((token_minute, token_end)))
2203
token_time = Token(re.compile(r"T"),
2205
frozenset((token_hour, token_minute,
2207
token_day = Token(re.compile(r"(\d+)D"),
2208
datetime.timedelta(days=1),
2209
frozenset((token_time, token_end)))
2210
token_month = Token(re.compile(r"(\d+)M"),
2211
datetime.timedelta(weeks=4),
2212
frozenset((token_day, token_end)))
2213
token_year = Token(re.compile(r"(\d+)Y"),
2214
datetime.timedelta(weeks=52),
2215
frozenset((token_month, token_end)))
2216
token_week = Token(re.compile(r"(\d+)W"),
2217
datetime.timedelta(weeks=1),
2218
frozenset((token_end, )))
2219
token_duration = Token(re.compile(r"P"), None,
2220
frozenset((token_year, token_month,
2221
token_day, token_time,
2223
# Define starting values
2224
value = datetime.timedelta() # Value so far
2226
followers = frozenset((token_duration, )) # Following valid tokens
2227
s = duration # String left to parse
2228
# Loop until end token is found
2229
while found_token is not token_end:
2230
# Search for any currently valid tokens
2231
for token in followers:
2232
match = token.regexp.match(s)
2233
if match is not None:
2235
if token.value is not None:
2236
# Value found, parse digits
2237
factor = int(match.group(1), 10)
2238
# Add to value so far
2239
value += factor * token.value
2240
# Strip token from string
2241
s = token.regexp.sub("", s, 1)
2244
# Set valid next tokens
2245
followers = found_token.followers
2248
# No currently valid tokens were found
2249
raise ValueError("Invalid RFC 3339 duration: {!r}"
2255
1917
def string_to_delta(interval):
2256
1918
"""Parse a string and return a datetime.timedelta
2386
2033
"debug": "False",
2388
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2389
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2035
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2390
2036
"servicename": "Mandos",
2391
2037
"use_dbus": "True",
2392
2038
"use_ipv6": "True",
2393
2039
"debuglevel": "",
2394
2040
"restore": "True",
2396
"statedir": "/var/lib/mandos",
2397
"foreground": "False",
2041
"statedir": "/var/lib/mandos"
2401
2044
# Parse config file for server-global settings
2402
2045
server_config = configparser.SafeConfigParser(server_defaults)
2403
2046
del server_defaults
2404
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2047
server_config.read(os.path.join(options.configdir,
2405
2049
# Convert the SafeConfigParser object to a dict
2406
2050
server_settings = server_config.defaults()
2407
2051
# Use the appropriate methods on the non-string config options
2408
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2052
for option in ("debug", "use_dbus", "use_ipv6"):
2409
2053
server_settings[option] = server_config.getboolean("DEFAULT",
2411
2055
if server_settings["port"]:
2412
2056
server_settings["port"] = server_config.getint("DEFAULT",
2414
if server_settings["socket"]:
2415
server_settings["socket"] = server_config.getint("DEFAULT",
2417
# Later, stdin will, and stdout and stderr might, be dup'ed
2418
# over with an opened os.devnull. But we don't want this to
2419
# happen with a supplied network socket.
2420
if 0 <= server_settings["socket"] <= 2:
2421
server_settings["socket"] = os.dup(server_settings
2423
2058
del server_config
2425
2060
# Override the settings from the config file with command line
2426
2061
# options, if set.
2427
2062
for option in ("interface", "address", "port", "debug",
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
2063
"priority", "servicename", "configdir",
2064
"use_dbus", "use_ipv6", "debuglevel", "restore",
2431
2066
value = getattr(options, option)
2432
2067
if value is not None:
2433
2068
server_settings[option] = value
2435
2070
# Force all strings to be unicode
2436
2071
for option in server_settings.keys():
2437
if isinstance(server_settings[option], bytes):
2438
server_settings[option] = (server_settings[option]
2440
# Force all boolean options to be boolean
2441
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
"foreground", "zeroconf"):
2443
server_settings[option] = bool(server_settings[option])
2444
# Debug implies foreground
2445
if server_settings["debug"]:
2446
server_settings["foreground"] = True
2072
if type(server_settings[option]) is str:
2073
server_settings[option] = unicode(server_settings[option])
2447
2074
# Now we have our good server settings in "server_settings"
2449
2076
##################################################################
2451
if (not server_settings["zeroconf"]
2452
and not (server_settings["port"]
2453
or server_settings["socket"] != "")):
2454
parser.error("Needs port or socket to work without Zeroconf")
2456
2078
# For convenience
2457
2079
debug = server_settings["debug"]
2458
2080
debuglevel = server_settings["debuglevel"]
2487
2107
global mandos_dbus_service
2488
2108
mandos_dbus_service = None
2491
if server_settings["socket"] != "":
2492
socketfd = server_settings["socket"]
2493
tcp_server = MandosServer(
2494
(server_settings["address"], server_settings["port"]),
2496
interface=(server_settings["interface"] or None),
2498
gnutls_priority=server_settings["priority"],
2502
pidfilename = "/run/mandos.pid"
2503
if not os.path.isdir("/run/."):
2504
pidfilename = "/var/run/mandos.pid"
2110
tcp_server = MandosServer((server_settings["address"],
2111
server_settings["port"]),
2113
interface=(server_settings["interface"]
2117
server_settings["priority"],
2120
pidfilename = "/var/run/mandos.pid"
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2508
except IOError as e:
2509
logger.error("Could not open file %r", pidfilename,
2122
pidfile = open(pidfilename, "w")
2124
logger.error("Could not open file %r", pidfilename)
2512
for name in ("_mandos", "mandos", "nobody"):
2127
uid = pwd.getpwnam("_mandos").pw_uid
2128
gid = pwd.getpwnam("_mandos").pw_gid
2514
uid = pwd.getpwnam(name).pw_uid
2515
gid = pwd.getpwnam(name).pw_gid
2131
uid = pwd.getpwnam("mandos").pw_uid
2132
gid = pwd.getpwnam("mandos").pw_gid
2517
2133
except KeyError:
2135
uid = pwd.getpwnam("nobody").pw_uid
2136
gid = pwd.getpwnam("nobody").pw_gid
2525
2143
except OSError as error:
2526
if error.errno != errno.EPERM:
2144
if error[0] != errno.EPERM:
2530
2148
# Enable all possible GnuTLS debugging
2537
2155
def debug_gnutls(level, string):
2538
2156
logger.debug("GnuTLS: %s", string[:-1])
2540
gnutls.library.functions.gnutls_global_set_log_function(
2158
(gnutls.library.functions
2159
.gnutls_global_set_log_function(debug_gnutls))
2543
2161
# Redirect stdin so all checkers get /dev/null
2544
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2162
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2545
2163
os.dup2(null, sys.stdin.fileno())
2549
2167
# Need to fork before connecting to D-Bus
2551
2169
# Close all input and output, do double fork, etc.
2554
# multiprocessing will use threads, so before we use gobject we
2555
# need to inform gobject that threads will be used.
2556
2172
gobject.threads_init()
2558
2174
global main_loop
2559
2175
# From the Avahi example code
2560
DBusGMainLoop(set_as_default=True)
2176
DBusGMainLoop(set_as_default=True )
2561
2177
main_loop = gobject.MainLoop()
2562
2178
bus = dbus.SystemBus()
2563
2179
# End of Avahi example code
2566
2182
bus_name = dbus.service.BusName("se.recompile.Mandos",
2569
old_bus_name = dbus.service.BusName(
2570
"se.bsnet.fukt.Mandos", bus,
2572
except dbus.exceptions.DBusException as e:
2573
logger.error("Disabling D-Bus:", exc_info=e)
2183
bus, do_not_queue=True)
2184
old_bus_name = (dbus.service.BusName
2185
("se.bsnet.fukt.Mandos", bus,
2187
except dbus.exceptions.NameExistsException as e:
2188
logger.error(unicode(e) + ", disabling D-Bus")
2574
2189
use_dbus = False
2575
2190
server_settings["use_dbus"] = False
2576
2191
tcp_server.use_dbus = False
2578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
service = AvahiServiceToSyslog(
2580
name = server_settings["servicename"],
2581
servicetype = "_mandos._tcp",
2582
protocol = protocol,
2584
if server_settings["interface"]:
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
2192
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2193
service = AvahiServiceToSyslog(name =
2194
server_settings["servicename"],
2195
servicetype = "_mandos._tcp",
2196
protocol = protocol, bus = bus)
2197
if server_settings["interface"]:
2198
service.interface = (if_nametoindex
2199
(str(server_settings["interface"])))
2588
2201
global multiprocessing_manager
2589
2202
multiprocessing_manager = multiprocessing.Manager()
2591
2204
client_class = Client
2593
client_class = functools.partial(ClientDBus, bus = bus)
2206
client_class = functools.partial(ClientDBusTransitional,
2595
2209
client_settings = Client.config_parser(client_config)
2596
2210
old_client_settings = {}
2597
2211
clients_data = {}
2599
# This is used to redirect stdout and stderr for checker processes
2601
wnull = open(os.devnull, "w") # A writable /dev/null
2602
# Only used if server is running in foreground but not in debug
2604
if debug or not foreground:
2607
2213
# Get client data and settings from last running state.
2608
2214
if server_settings["restore"]:
2610
2216
with open(stored_state_path, "rb") as stored_state:
2611
clients_data, old_client_settings = pickle.load(
2217
clients_data, old_client_settings = (pickle.load
2613
2219
os.remove(stored_state_path)
2614
2220
except IOError as e:
2615
if e.errno == errno.ENOENT:
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2619
logger.critical("Could not load persistent state:",
2221
logger.warning("Could not load persistent state: {0}"
2223
if e.errno != errno.ENOENT:
2622
2225
except EOFError as e:
2623
2226
logger.warning("Could not load persistent state: "
2227
"EOFError: {0}".format(e))
2627
2229
with PGPEngine() as pgp:
2628
for client_name, client in clients_data.items():
2629
# Skip removed clients
2630
if client_name not in client_settings:
2230
for client_name, client in clients_data.iteritems():
2633
2231
# Decide which value to use after restoring saved state.
2634
2232
# We have three different values: Old config file,
2635
2233
# new config file, and saved state.
2693
2292
for client_name in (set(client_settings)
2694
2293
- set(old_client_settings)):
2695
2294
clients_data[client_name] = client_settings[client_name]
2697
2296
# Create all client objects
2698
for client_name, client in clients_data.items():
2297
for client_name, client in clients_data.iteritems():
2699
2298
tcp_server.clients[client_name] = client_class(
2702
server_settings = server_settings)
2299
name = client_name, settings = client)
2704
2301
if not tcp_server.clients:
2705
2302
logger.warning("No clients defined")
2708
if pidfile is not None:
2712
print(pid, file=pidfile)
2714
logger.error("Could not write to file %r with PID %d",
2308
pidfile.write(str(pid) + "\n".encode("utf-8"))
2311
logger.error("Could not write to file %r with PID %d",
2314
# "pidfile" was never created
2717
2316
del pidfilename
2317
signal.signal(signal.SIGINT, signal.SIG_IGN)
2719
2319
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2720
2320
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2726
class MandosDBusService(DBusObjectWithProperties):
2323
class MandosDBusService(dbus.service.Object):
2727
2324
"""A D-Bus proxy object"""
2729
2325
def __init__(self):
2730
2326
dbus.service.Object.__init__(self, bus, "/")
2732
2327
_interface = "se.recompile.Mandos"
2734
@dbus_interface_annotations(_interface)
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2740
2329
@dbus.service.signal(_interface, signature="o")
2741
2330
def ClientAdded(self, objpath):