176
170
def password_encode(self, password):
177
171
# Passphrase can not be empty and can not contain newlines or
178
172
# NUL bytes. So we prefix it and hex encode it.
179
encoded = b"mandos" + binascii.hexlify(password)
180
if len(encoded) > 2048:
181
# GnuPG can't handle long passwords, so encode differently
182
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
.replace(b"\n", b"\\n")
184
.replace(b"\0", b"\\x00"))
173
return b"mandos" + binascii.hexlify(password)
187
175
def encrypt(self, data, password):
188
passphrase = self.password_encode(password)
189
with tempfile.NamedTemporaryFile(
190
dir=self.tempdir) as passfile:
191
passfile.write(passphrase)
193
proc = subprocess.Popen(['gpg', '--symmetric',
197
stdin = subprocess.PIPE,
198
stdout = subprocess.PIPE,
199
stderr = subprocess.PIPE)
200
ciphertext, err = proc.communicate(input = data)
201
if proc.returncode != 0:
176
self.gnupg.passphrase = self.password_encode(password)
177
with open(os.devnull) as devnull:
179
proc = self.gnupg.run(['--symmetric'],
180
create_fhs=['stdin', 'stdout'],
181
attach_fhs={'stderr': devnull})
182
with contextlib.closing(proc.handles['stdin']) as f:
184
with contextlib.closing(proc.handles['stdout']) as f:
185
ciphertext = f.read()
189
self.gnupg.passphrase = None
203
190
return ciphertext
205
192
def decrypt(self, data, password):
206
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(
208
dir = self.tempdir) as passfile:
209
passfile.write(passphrase)
211
proc = subprocess.Popen(['gpg', '--decrypt',
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
decrypted_plaintext, err = proc.communicate(input = data)
219
if proc.returncode != 0:
193
self.gnupg.passphrase = self.password_encode(password)
194
with open(os.devnull) as devnull:
196
proc = self.gnupg.run(['--decrypt'],
197
create_fhs=['stdin', 'stdout'],
198
attach_fhs={'stderr': devnull})
199
with contextlib.closing(proc.handles['stdin'] ) as f:
201
with contextlib.closing(proc.handles['stdout']) as f:
202
decrypted_plaintext = f.read()
206
self.gnupg.passphrase = None
221
207
return decrypted_plaintext
224
211
class AvahiError(Exception):
225
212
def __init__(self, value, *args, **kwargs):
226
213
self.value = value
227
return super(AvahiError, self).__init__(value, *args,
214
super(AvahiError, self).__init__(value, *args, **kwargs)
215
def __unicode__(self):
216
return unicode(repr(self.value))
231
218
class AvahiServiceError(AvahiError):
235
221
class AvahiGroupError(AvahiError):
442
414
last_checked_ok: datetime.datetime(); (UTC) or None
443
415
last_checker_status: integer between 0 and 255 reflecting exit
444
416
status of last checker. -1 reflects crashed
445
checker, -2 means no checker completed yet.
446
418
last_enabled: datetime.datetime(); (UTC) or None
447
419
name: string; from the config file, used in log messages and
448
420
D-Bus identifiers
449
421
secret: bytestring; sent verbatim (over TLS) to client
450
422
timeout: datetime.timedelta(); How long from last_checked_ok
451
423
until this client is disabled
452
extended_timeout: extra long timeout when secret has been sent
424
extended_timeout: extra long timeout when password has been sent
453
425
runtime_expansions: Allowed attributes for runtime expansion.
454
426
expires: datetime.datetime(); time (UTC) when a client will be
455
427
disabled, or None
456
server_settings: The server_settings dict from main()
459
430
runtime_expansions = ("approval_delay", "approval_duration",
460
"created", "enabled", "expires",
461
"fingerprint", "host", "interval",
462
"last_approval_request", "last_checked_ok",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
463
433
"last_enabled", "name", "timeout")
466
"extended_timeout": "PT15M",
468
"checker": "fping -q -- %%(host)s",
470
"approval_delay": "PT0S",
471
"approval_duration": "PT1S",
472
"approved_by_default": "True",
434
client_defaults = { "timeout": "5m",
435
"extended_timeout": "15m",
437
"checker": "fping -q -- %%(host)s",
439
"approval_delay": "0s",
440
"approval_duration": "1s",
441
"approved_by_default": "True",
445
def timeout_milliseconds(self):
446
"Return the 'timeout' attribute in milliseconds"
447
return timedelta_to_milliseconds(self.timeout)
449
def extended_timeout_milliseconds(self):
450
"Return the 'extended_timeout' attribute in milliseconds"
451
return timedelta_to_milliseconds(self.extended_timeout)
453
def interval_milliseconds(self):
454
"Return the 'interval' attribute in milliseconds"
455
return timedelta_to_milliseconds(self.interval)
457
def approval_delay_milliseconds(self):
458
return timedelta_to_milliseconds(self.approval_delay)
477
461
def config_parser(config):
478
"""Construct a new dict of client settings of this form:
462
""" Construct a new dict of client settings of this form:
479
463
{ client_name: {setting_name: value, ...}, ...}
480
with exceptions for any special settings as defined above.
481
NOTE: Must be a pure function. Must return the same result
482
value given the same arguments.
464
with exceptions for any special settings as defined above"""
485
466
for client_name in config.sections():
486
467
section = dict(config.items(client_name))
519
496
client["checker_command"] = section["checker"]
520
497
client["last_approval_request"] = None
521
498
client["last_checked_ok"] = None
522
client["last_checker_status"] = -2
499
client["last_checker_status"] = None
500
if client["enabled"]:
501
client["last_enabled"] = datetime.datetime.utcnow()
502
client["expires"] = (datetime.datetime.utcnow()
505
client["last_enabled"] = None
506
client["expires"] = None
526
def __init__(self, settings, name = None, server_settings=None):
511
def __init__(self, settings, name = None):
512
"""Note: the 'checker' key in 'config' sets the
513
'checker_command' attribute and *not* the 'checker'
528
if server_settings is None:
530
self.server_settings = server_settings
531
516
# adding all client settings
532
for setting, value in settings.items():
517
for setting, value in settings.iteritems():
533
518
setattr(self, setting, value)
536
if not hasattr(self, "last_enabled"):
537
self.last_enabled = datetime.datetime.utcnow()
538
if not hasattr(self, "expires"):
539
self.expires = (datetime.datetime.utcnow()
542
self.last_enabled = None
545
520
logger.debug("Creating client %r", self.name)
521
# Uppercase and remove spaces from fingerprint for later
522
# comparison purposes with return value from the fingerprint()
546
524
logger.debug(" Fingerprint: %s", self.fingerprint)
547
self.created = settings.get("created",
548
datetime.datetime.utcnow())
525
self.created = settings.get("created", datetime.datetime.utcnow())
550
527
# attributes specific for this server instance
551
528
self.checker = None
552
529
self.checker_initiator_tag = None
690
666
self.current_checker_command)
691
667
# Start a new checker if needed
692
668
if self.checker is None:
693
# Escape attributes for the shell
695
attr: re.escape(str(getattr(self, attr)))
696
for attr in self.runtime_expansions }
698
command = self.checker_command % escaped_attrs
699
except TypeError as error:
700
logger.error('Could not format string "%s"',
701
self.checker_command,
703
return True # Try again later
670
# In case checker_command has exactly one % operator
671
command = self.checker_command % self.host
673
# Escape attributes for the shell
674
escaped_attrs = dict(
676
re.escape(unicode(str(getattr(self, attr, "")),
680
self.runtime_expansions)
683
command = self.checker_command % escaped_attrs
684
except TypeError as error:
685
logger.error('Could not format string "%s":'
686
' %s', self.checker_command, error)
687
return True # Try again later
704
688
self.current_checker_command = command
706
logger.info("Starting checker %r for %s", command,
690
logger.info("Starting checker %r for %s",
708
692
# We don't need to redirect stdout and stderr, since
709
693
# in normal mode, that is already done by daemon(),
710
694
# and in debug mode we don't want to. (Stdin is
711
695
# always replaced by /dev/null.)
712
# The exception is when not debugging but nevertheless
713
# running in the foreground; use the previously
716
if (not self.server_settings["debug"]
717
and self.server_settings["foreground"]):
718
popen_args.update({"stdout": wnull,
720
696
self.checker = subprocess.Popen(command,
725
except OSError as error:
726
logger.error("Failed to start subprocess",
729
self.checker_callback_tag = gobject.child_watch_add(
730
self.checker.pid, self.checker_callback, data=command)
731
# The checker may have completed before the gobject
732
# watch was added. Check for this.
699
self.checker_callback_tag = (gobject.child_watch_add
701
self.checker_callback,
703
# The checker may have completed before the gobject
704
# watch was added. Check for this.
734
705
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
707
gobject.source_remove(self.checker_callback_tag)
708
self.checker_callback(pid, status, command)
735
709
except OSError as error:
736
if error.errno == errno.ECHILD:
737
# This should never happen
738
logger.error("Child process vanished",
743
gobject.source_remove(self.checker_callback_tag)
744
self.checker_callback(pid, status, command)
710
logger.error("Failed to start subprocess: %s",
745
712
# Re-run this periodically if run by gobject.timeout_add
869
def _is_dbus_thing(thing):
870
"""Returns a function testing if an attribute is a D-Bus thing
872
If called like _is_dbus_thing("method") it returns a function
873
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
792
def _is_dbus_property(obj):
793
return getattr(obj, "_dbus_is_property", False)
878
def _get_all_dbus_things(self, thing):
795
def _get_all_dbus_properties(self):
879
796
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name", name),
882
athing.__get__(self))
798
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
883
799
for cls in self.__class__.__mro__
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
801
inspect.getmembers(cls, self._is_dbus_property))
887
803
def _get_dbus_property(self, interface_name, property_name):
888
804
"""Returns a bound method if one exists which is a D-Bus
889
805
property with the specified name and interface.
891
for cls in self.__class__.__mro__:
892
for name, value in inspect.getmembers(
893
cls, self._is_dbus_thing("property")):
807
for cls in self.__class__.__mro__:
808
for name, value in (inspect.getmembers
809
(cls, self._is_dbus_property)):
894
810
if (value._dbus_name == property_name
895
811
and value._dbus_interface == interface_name):
896
812
return value.__get__(self)
898
814
# No such property
899
raise DBusPropertyNotFound("{}:{}.{}".format(
900
self.dbus_object_path, interface_name, property_name))
815
raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
+ interface_name + "."
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
819
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
904
820
out_signature="v")
905
821
def Get(self, interface_name, property_name):
906
822
"""Standard D-Bus property Get() method, see D-Bus standard.
953
866
if not hasattr(value, "variant_level"):
954
867
properties[name] = value
956
properties[name] = type(value)(
957
value, variant_level = value.variant_level + 1)
869
properties[name] = type(value)(value, variant_level=
870
value.variant_level+1)
958
871
return dbus.Dictionary(properties, signature="sv")
960
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
961
def PropertiesChanged(self, interface_name, changed_properties,
962
invalidated_properties):
963
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
968
873
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
969
874
out_signature="s",
970
875
path_keyword='object_path',
971
876
connection_keyword='connection')
972
877
def Introspect(self, object_path, connection):
973
"""Overloading of standard D-Bus method.
975
Inserts property tags and interface annotation tags.
878
"""Standard D-Bus method, overloaded to insert property tags.
977
880
xmlstring = dbus.service.Object.Introspect(self, object_path,
980
883
document = xml.dom.minidom.parseString(xmlstring)
982
884
def make_tag(document, name, prop):
983
885
e = document.createElement("property")
984
886
e.setAttribute("name", name)
985
887
e.setAttribute("type", prop._dbus_signature)
986
888
e.setAttribute("access", prop._dbus_access)
989
890
for if_tag in document.getElementsByTagName("interface"):
991
891
for tag in (make_tag(document, name, prop)
993
in self._get_all_dbus_things("property")
893
in self._get_all_dbus_properties()
994
894
if prop._dbus_interface
995
895
== if_tag.getAttribute("name")):
996
896
if_tag.appendChild(tag)
997
# Add annotation tags
998
for typ in ("method", "signal", "property"):
999
for tag in if_tag.getElementsByTagName(typ):
1001
for name, prop in (self.
1002
_get_all_dbus_things(typ)):
1003
if (name == tag.getAttribute("name")
1004
and prop._dbus_interface
1005
== if_tag.getAttribute("name")):
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1008
for name, value in annots.items():
1009
ann_tag = document.createElement(
1011
ann_tag.setAttribute("name", name)
1012
ann_tag.setAttribute("value", value)
1013
tag.appendChild(ann_tag)
1014
# Add interface annotation tags
1015
for annotation, value in dict(
1016
itertools.chain.from_iterable(
1017
annotations().items()
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1020
if name == if_tag.getAttribute("name")
1022
ann_tag = document.createElement("annotation")
1023
ann_tag.setAttribute("name", annotation)
1024
ann_tag.setAttribute("value", value)
1025
if_tag.appendChild(ann_tag)
1026
897
# Add the names to the return values for the
1027
898
# "org.freedesktop.DBus.Properties" methods
1028
899
if (if_tag.getAttribute("name")
1043
914
except (AttributeError, xml.dom.DOMException,
1044
915
xml.parsers.expat.ExpatError) as error:
1045
916
logger.error("Failed to override Introspection method",
1047
918
return xmlstring
1050
def datetime_to_dbus(dt, variant_level=0):
921
def datetime_to_dbus (dt, variant_level=0):
1051
922
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1053
924
return dbus.String("", variant_level = variant_level)
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1058
"""A class decorator; applied to a subclass of
1059
dbus.service.Object, it will add alternate D-Bus attributes with
1060
interface names according to the "alt_interface_names" mapping.
1063
@alternate_dbus_interfaces({"org.example.Interface":
1064
"net.example.AlternateInterface"})
1065
class SampleDBusObject(dbus.service.Object):
1066
@dbus.service.method("org.example.Interface")
1067
def SampleDBusMethod():
1070
The above "SampleDBusMethod" on "SampleDBusObject" will be
1071
reachable via two interfaces: "org.example.Interface" and
1072
"net.example.AlternateInterface", the latter of which will have
1073
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1074
"true", unless "deprecate" is passed with a False value.
1076
This works for methods and signals, and also for D-Bus properties
1077
(from DBusObjectWithProperties) and interfaces (from the
1078
dbus_interface_annotations decorator).
925
return dbus.String(dt.isoformat(),
926
variant_level=variant_level)
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
931
"""Applied to an empty subclass of a D-Bus object, this metaclass
932
will add additional D-Bus attributes matching a certain pattern.
1082
for orig_interface_name, alt_interface_name in (
1083
alt_interface_names.items()):
1085
interface_names = set()
1086
# Go though all attributes of the class
1087
for attrname, attribute in inspect.getmembers(cls):
934
def __new__(mcs, name, bases, attr):
935
# Go through all the base classes which could have D-Bus
936
# methods, signals, or properties in them
937
for base in (b for b in bases
938
if issubclass(b, dbus.service.Object)):
939
# Go though all attributes of the base class
940
for attrname, attribute in inspect.getmembers(base):
1088
941
# Ignore non-D-Bus attributes, and D-Bus attributes
1089
942
# with the wrong interface name
1090
943
if (not hasattr(attribute, "_dbus_interface")
1091
or not attribute._dbus_interface.startswith(
1092
orig_interface_name)):
944
or not attribute._dbus_interface
945
.startswith("se.recompile.Mandos")):
1094
947
# Create an alternate D-Bus interface name based on
1095
948
# the current name
1096
alt_interface = attribute._dbus_interface.replace(
1097
orig_interface_name, alt_interface_name)
1098
interface_names.add(alt_interface)
949
alt_interface = (attribute._dbus_interface
950
.replace("se.recompile.Mandos",
951
"se.bsnet.fukt.Mandos"))
1099
952
# Is this a D-Bus signal?
1100
953
if getattr(attribute, "_dbus_is_signal", False):
1101
# Extract the original non-method undecorated
1102
# function by black magic
954
# Extract the original non-method function by
1103
956
nonmethod_func = (dict(
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
957
zip(attribute.func_code.co_freevars,
958
attribute.__closure__))["func"]
1107
960
# Create a new, but exactly alike, function
1108
961
# object, and decorate it to be a new D-Bus signal
1109
962
# with the alternate D-Bus interface name
1110
new_function = (dbus.service.signal(
1111
alt_interface, attribute._dbus_signature)
963
new_function = (dbus.service.signal
965
attribute._dbus_signature)
1112
966
(types.FunctionType(
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
1118
# Copy annotations, if any
1120
new_function._dbus_annotations = dict(
1121
attribute._dbus_annotations)
1122
except AttributeError:
967
nonmethod_func.func_code,
968
nonmethod_func.func_globals,
969
nonmethod_func.func_name,
970
nonmethod_func.func_defaults,
971
nonmethod_func.func_closure)))
1124
972
# Define a creator of a function to call both the
1125
# original and alternate functions, so both the
1126
# original and alternate signals gets sent when
1127
# the function is called
973
# old and new functions, so both the old and new
974
# signals gets sent when the function is called
1128
975
def fixscope(func1, func2):
1129
976
"""This function is a scope container to pass
1130
977
func1 and func2 to the "call_both" function
1131
978
outside of its arguments"""
1133
979
def call_both(*args, **kwargs):
1134
980
"""This function will emit two D-Bus
1135
981
signals by calling func1 and func2"""
1136
982
func1(*args, **kwargs)
1137
983
func2(*args, **kwargs)
1139
984
return call_both
1140
985
# Create the "call_both" function and add it to
1142
attr[attrname] = fixscope(attribute, new_function)
987
attr[attrname] = fixscope(attribute,
1143
989
# Is this a D-Bus method?
1144
990
elif getattr(attribute, "_dbus_is_method", False):
1145
991
# Create a new, but exactly alike, function
1146
992
# object. Decorate it to be a new D-Bus method
1147
993
# with the alternate D-Bus interface name. Add it
1150
dbus.service.method(
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1154
(types.FunctionType(attribute.func_code,
1155
attribute.func_globals,
1156
attribute.func_name,
1157
attribute.func_defaults,
1158
attribute.func_closure)))
1159
# Copy annotations, if any
1161
attr[attrname]._dbus_annotations = dict(
1162
attribute._dbus_annotations)
1163
except AttributeError:
995
attr[attrname] = (dbus.service.method
997
attribute._dbus_in_signature,
998
attribute._dbus_out_signature)
1000
(attribute.func_code,
1001
attribute.func_globals,
1002
attribute.func_name,
1003
attribute.func_defaults,
1004
attribute.func_closure)))
1165
1005
# Is this a D-Bus property?
1166
1006
elif getattr(attribute, "_dbus_is_property", False):
1167
1007
# Create a new, but exactly alike, function
1168
1008
# object, and decorate it to be a new D-Bus
1169
1009
# property with the alternate D-Bus interface
1170
1010
# name. Add it to the class.
1171
attr[attrname] = (dbus_service_property(
1172
alt_interface, attribute._dbus_signature,
1173
attribute._dbus_access,
1174
attribute._dbus_get_args_options
1176
(types.FunctionType(
1177
attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
1182
# Copy annotations, if any
1184
attr[attrname]._dbus_annotations = dict(
1185
attribute._dbus_annotations)
1186
except AttributeError:
1188
# Is this a D-Bus interface?
1189
elif getattr(attribute, "_dbus_is_interface", False):
1190
# Create a new, but exactly alike, function
1191
# object. Decorate it to be a new D-Bus interface
1192
# with the alternate D-Bus interface name. Add it
1195
dbus_interface_annotations(alt_interface)
1196
(types.FunctionType(attribute.func_code,
1197
attribute.func_globals,
1198
attribute.func_name,
1199
attribute.func_defaults,
1200
attribute.func_closure)))
1202
# Deprecate all alternate interfaces
1203
iname="_AlternateDBusNames_interface_annotation{}"
1204
for interface_name in interface_names:
1206
@dbus_interface_annotations(interface_name)
1208
return { "org.freedesktop.DBus.Deprecated":
1210
# Find an unused name
1211
for aname in (iname.format(i)
1212
for i in itertools.count()):
1213
if aname not in attr:
1217
# Replace the class with a new subclass of it with
1218
# methods, signals, etc. as created above.
1219
cls = type(b"{}Alternate".format(cls.__name__),
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1227
"se.bsnet.fukt.Mandos"})
1011
attr[attrname] = (dbus_service_property
1013
attribute._dbus_signature,
1014
attribute._dbus_access,
1016
._dbus_get_args_options
1019
(attribute.func_code,
1020
attribute.func_globals,
1021
attribute.func_name,
1022
attribute.func_defaults,
1023
attribute.func_closure)))
1024
return type.__new__(mcs, name, bases, attr)
1228
1027
class ClientDBus(Client, DBusObjectWithProperties):
1229
1028
"""A Client class using D-Bus
1301
1089
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1302
1090
last_enabled = notifychangeproperty(datetime_to_dbus,
1304
checker = notifychangeproperty(
1305
dbus.Boolean, "CheckerRunning",
1306
type_func = lambda checker: checker is not None)
1092
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
type_func = lambda checker:
1094
checker is not None)
1307
1095
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1308
1096
"LastCheckedOK")
1309
last_checker_status = notifychangeproperty(dbus.Int16,
1310
"LastCheckerStatus")
1311
1097
last_approval_request = notifychangeproperty(
1312
1098
datetime_to_dbus, "LastApprovalRequest")
1313
1099
approved_by_default = notifychangeproperty(dbus.Boolean,
1314
1100
"ApprovedByDefault")
1315
approval_delay = notifychangeproperty(
1316
dbus.UInt64, "ApprovalDelay",
1317
type_func = lambda td: td.total_seconds() * 1000)
1101
approval_delay = notifychangeproperty(dbus.UInt64,
1104
timedelta_to_milliseconds)
1318
1105
approval_duration = notifychangeproperty(
1319
1106
dbus.UInt64, "ApprovalDuration",
1320
type_func = lambda td: td.total_seconds() * 1000)
1107
type_func = timedelta_to_milliseconds)
1321
1108
host = notifychangeproperty(dbus.String, "Host")
1322
timeout = notifychangeproperty(
1323
dbus.UInt64, "Timeout",
1324
type_func = lambda td: td.total_seconds() * 1000)
1109
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1111
timedelta_to_milliseconds)
1325
1112
extended_timeout = notifychangeproperty(
1326
1113
dbus.UInt64, "ExtendedTimeout",
1327
type_func = lambda td: td.total_seconds() * 1000)
1328
interval = notifychangeproperty(
1329
dbus.UInt64, "Interval",
1330
type_func = lambda td: td.total_seconds() * 1000)
1114
type_func = timedelta_to_milliseconds)
1115
interval = notifychangeproperty(dbus.UInt64,
1118
timedelta_to_milliseconds)
1331
1119
checker_command = notifychangeproperty(dbus.String, "Checker")
1332
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1333
invalidate_only=True)
1335
1121
del notifychangeproperty
1566
1352
return datetime_to_dbus(self.last_approval_request)
1568
1354
# Timeout - property
1569
@dbus_service_property(_interface,
1355
@dbus_service_property(_interface, signature="t",
1571
1356
access="readwrite")
1572
1357
def Timeout_dbus_property(self, value=None):
1573
1358
if value is None: # get
1574
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1575
old_timeout = self.timeout
1359
return dbus.UInt64(self.timeout_milliseconds())
1576
1360
self.timeout = datetime.timedelta(0, 0, 0, value)
1577
# Reschedule disabling
1579
now = datetime.datetime.utcnow()
1580
self.expires += self.timeout - old_timeout
1581
if self.expires <= now:
1582
# The timeout has passed
1585
if (getattr(self, "disable_initiator_tag", None)
1588
gobject.source_remove(self.disable_initiator_tag)
1589
self.disable_initiator_tag = gobject.timeout_add(
1590
int((self.expires - now).total_seconds() * 1000),
1361
if getattr(self, "disable_initiator_tag", None) is None:
1363
# Reschedule timeout
1364
gobject.source_remove(self.disable_initiator_tag)
1365
self.disable_initiator_tag = None
1367
time_to_die = timedelta_to_milliseconds((self
1372
if time_to_die <= 0:
1373
# The timeout has passed
1376
self.expires = (datetime.datetime.utcnow()
1377
+ datetime.timedelta(milliseconds =
1379
self.disable_initiator_tag = (gobject.timeout_add
1380
(time_to_die, self.disable))
1593
1382
# ExtendedTimeout - property
1594
@dbus_service_property(_interface,
1383
@dbus_service_property(_interface, signature="t",
1596
1384
access="readwrite")
1597
1385
def ExtendedTimeout_dbus_property(self, value=None):
1598
1386
if value is None: # get
1599
return dbus.UInt64(self.extended_timeout.total_seconds()
1387
return dbus.UInt64(self.extended_timeout_milliseconds())
1601
1388
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1603
1390
# Interval - property
1604
@dbus_service_property(_interface,
1391
@dbus_service_property(_interface, signature="t",
1606
1392
access="readwrite")
1607
1393
def Interval_dbus_property(self, value=None):
1608
1394
if value is None: # get
1609
return dbus.UInt64(self.interval.total_seconds() * 1000)
1395
return dbus.UInt64(self.interval_milliseconds())
1610
1396
self.interval = datetime.timedelta(0, 0, 0, value)
1611
1397
if getattr(self, "checker_initiator_tag", None) is None:
1613
1399
if self.enabled:
1614
1400
# Reschedule checker run
1615
1401
gobject.source_remove(self.checker_initiator_tag)
1616
self.checker_initiator_tag = gobject.timeout_add(
1617
value, self.start_checker)
1618
self.start_checker() # Start one now, too
1402
self.checker_initiator_tag = (gobject.timeout_add
1403
(value, self.start_checker))
1404
self.start_checker() # Start one now, too
1620
1406
# Checker - property
1621
@dbus_service_property(_interface,
1407
@dbus_service_property(_interface, signature="s",
1623
1408
access="readwrite")
1624
1409
def Checker_dbus_property(self, value=None):
1625
1410
if value is None: # get
1626
1411
return dbus.String(self.checker_command)
1627
self.checker_command = str(value)
1412
self.checker_command = unicode(value)
1629
1414
# CheckerRunning - property
1630
@dbus_service_property(_interface,
1415
@dbus_service_property(_interface, signature="b",
1632
1416
access="readwrite")
1633
1417
def CheckerRunning_dbus_property(self, value=None):
1634
1418
if value is None: # get
1859
1650
def fingerprint(openpgp):
1860
1651
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1861
1652
# New GnuTLS "datum" with the OpenPGP public key
1862
datum = gnutls.library.types.gnutls_datum_t(
1863
ctypes.cast(ctypes.c_char_p(openpgp),
1864
ctypes.POINTER(ctypes.c_ubyte)),
1865
ctypes.c_uint(len(openpgp)))
1653
datum = (gnutls.library.types
1654
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1657
ctypes.c_uint(len(openpgp))))
1866
1658
# New empty GnuTLS certificate
1867
1659
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1660
(gnutls.library.functions
1661
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1870
1662
# Import the OpenPGP public key into the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1663
(gnutls.library.functions
1664
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1665
gnutls.library.constants
1666
.GNUTLS_OPENPGP_FMT_RAW))
1874
1667
# Verify the self signature in the key
1875
1668
crtverify = ctypes.c_uint()
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
1669
(gnutls.library.functions
1670
.gnutls_openpgp_crt_verify_self(crt, 0,
1671
ctypes.byref(crtverify)))
1878
1672
if crtverify.value != 0:
1879
1673
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
raise gnutls.errors.CertificateSecurityError(
1674
raise (gnutls.errors.CertificateSecurityError
1882
1676
# New buffer for the fingerprint
1883
1677
buf = ctypes.create_string_buffer(20)
1884
1678
buf_len = ctypes.c_size_t()
1885
1679
# Get the fingerprint from the certificate into the buffer
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1680
(gnutls.library.functions
1681
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1682
ctypes.byref(buf_len)))
1888
1683
# Deinit the certificate
1889
1684
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1890
1685
# Convert the buffer to a Python bytestring
1941
1735
interface: None or a network interface name (string)
1942
1736
use_ipv6: Boolean; to use IPv6 or not
1945
1738
def __init__(self, server_address, RequestHandlerClass,
1949
"""If socketfd is set, use that file descriptor instead of
1950
creating a new one with socket.socket().
1739
interface=None, use_ipv6=True):
1952
1740
self.interface = interface
1954
1742
self.address_family = socket.AF_INET6
1955
if socketfd is not None:
1956
# Save the file descriptor
1957
self.socketfd = socketfd
1958
# Save the original socket.socket() function
1959
self.socket_socket = socket.socket
1960
# To implement --socket, we monkey patch socket.socket.
1962
# (When socketserver.TCPServer is a new-style class, we
1963
# could make self.socket into a property instead of monkey
1964
# patching socket.socket.)
1966
# Create a one-time-only replacement for socket.socket()
1967
@functools.wraps(socket.socket)
1968
def socket_wrapper(*args, **kwargs):
1969
# Restore original function so subsequent calls are
1971
socket.socket = self.socket_socket
1972
del self.socket_socket
1973
# This time only, return a new socket object from the
1974
# saved file descriptor.
1975
return socket.fromfd(self.socketfd, *args, **kwargs)
1976
# Replace socket.socket() function with wrapper
1977
socket.socket = socket_wrapper
1978
# The socketserver.TCPServer.__init__ will call
1979
# socket.socket(), which might be our replacement,
1980
# socket_wrapper(), if socketfd was set.
1981
1743
socketserver.TCPServer.__init__(self, server_address,
1982
1744
RequestHandlerClass)
1984
1745
def server_bind(self):
1985
1746
"""This overrides the normal server_bind() function
1986
1747
to bind to an interface if one was specified, and also NOT to
2145
def rfc3339_duration_to_delta(duration):
2146
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2148
>>> rfc3339_duration_to_delta("P7D")
2149
datetime.timedelta(7)
2150
>>> rfc3339_duration_to_delta("PT60S")
2151
datetime.timedelta(0, 60)
2152
>>> rfc3339_duration_to_delta("PT60M")
2153
datetime.timedelta(0, 3600)
2154
>>> rfc3339_duration_to_delta("PT24H")
2155
datetime.timedelta(1)
2156
>>> rfc3339_duration_to_delta("P1W")
2157
datetime.timedelta(7)
2158
>>> rfc3339_duration_to_delta("PT5M30S")
2159
datetime.timedelta(0, 330)
2160
>>> rfc3339_duration_to_delta("P1DT3M20S")
2161
datetime.timedelta(1, 200)
2164
# Parsing an RFC 3339 duration with regular expressions is not
2165
# possible - there would have to be multiple places for the same
2166
# values, like seconds. The current code, while more esoteric, is
2167
# cleaner without depending on a parsing library. If Python had a
2168
# built-in library for parsing we would use it, but we'd like to
2169
# avoid excessive use of external libraries.
2171
# New type for defining tokens, syntax, and semantics all-in-one
2172
Token = collections.namedtuple("Token",
2173
("regexp", # To match token; if
2174
# "value" is not None,
2175
# must have a "group"
2177
"value", # datetime.timedelta or
2179
"followers")) # Tokens valid after
2181
Token = collections.namedtuple("Token", (
2182
"regexp", # To match token; if "value" is not None, must have
2183
# a "group" containing digits
2184
"value", # datetime.timedelta or None
2185
"followers")) # Tokens valid after this token
2186
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2187
# the "duration" ABNF definition in RFC 3339, Appendix A.
2188
token_end = Token(re.compile(r"$"), None, frozenset())
2189
token_second = Token(re.compile(r"(\d+)S"),
2190
datetime.timedelta(seconds=1),
2191
frozenset((token_end, )))
2192
token_minute = Token(re.compile(r"(\d+)M"),
2193
datetime.timedelta(minutes=1),
2194
frozenset((token_second, token_end)))
2195
token_hour = Token(re.compile(r"(\d+)H"),
2196
datetime.timedelta(hours=1),
2197
frozenset((token_minute, token_end)))
2198
token_time = Token(re.compile(r"T"),
2200
frozenset((token_hour, token_minute,
2202
token_day = Token(re.compile(r"(\d+)D"),
2203
datetime.timedelta(days=1),
2204
frozenset((token_time, token_end)))
2205
token_month = Token(re.compile(r"(\d+)M"),
2206
datetime.timedelta(weeks=4),
2207
frozenset((token_day, token_end)))
2208
token_year = Token(re.compile(r"(\d+)Y"),
2209
datetime.timedelta(weeks=52),
2210
frozenset((token_month, token_end)))
2211
token_week = Token(re.compile(r"(\d+)W"),
2212
datetime.timedelta(weeks=1),
2213
frozenset((token_end, )))
2214
token_duration = Token(re.compile(r"P"), None,
2215
frozenset((token_year, token_month,
2216
token_day, token_time,
2218
# Define starting values
2219
value = datetime.timedelta() # Value so far
2221
followers = frozenset((token_duration,)) # Following valid tokens
2222
s = duration # String left to parse
2223
# Loop until end token is found
2224
while found_token is not token_end:
2225
# Search for any currently valid tokens
2226
for token in followers:
2227
match = token.regexp.match(s)
2228
if match is not None:
2230
if token.value is not None:
2231
# Value found, parse digits
2232
factor = int(match.group(1), 10)
2233
# Add to value so far
2234
value += factor * token.value
2235
# Strip token from string
2236
s = token.regexp.sub("", s, 1)
2239
# Set valid next tokens
2240
followers = found_token.followers
2243
# No currently valid tokens were found
2244
raise ValueError("Invalid RFC 3339 duration")
2249
1912
def string_to_delta(interval):
2250
1913
"""Parse a string and return a datetime.timedelta
2380
2028
"debug": "False",
2382
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2383
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2030
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2384
2031
"servicename": "Mandos",
2385
2032
"use_dbus": "True",
2386
2033
"use_ipv6": "True",
2387
2034
"debuglevel": "",
2388
2035
"restore": "True",
2390
"statedir": "/var/lib/mandos",
2391
"foreground": "False",
2036
"statedir": "/var/lib/mandos"
2395
2039
# Parse config file for server-global settings
2396
2040
server_config = configparser.SafeConfigParser(server_defaults)
2397
2041
del server_defaults
2398
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2042
server_config.read(os.path.join(options.configdir,
2399
2044
# Convert the SafeConfigParser object to a dict
2400
2045
server_settings = server_config.defaults()
2401
2046
# Use the appropriate methods on the non-string config options
2402
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2047
for option in ("debug", "use_dbus", "use_ipv6"):
2403
2048
server_settings[option] = server_config.getboolean("DEFAULT",
2405
2050
if server_settings["port"]:
2406
2051
server_settings["port"] = server_config.getint("DEFAULT",
2408
if server_settings["socket"]:
2409
server_settings["socket"] = server_config.getint("DEFAULT",
2411
# Later, stdin will, and stdout and stderr might, be dup'ed
2412
# over with an opened os.devnull. But we don't want this to
2413
# happen with a supplied network socket.
2414
if 0 <= server_settings["socket"] <= 2:
2415
server_settings["socket"] = os.dup(server_settings
2417
2053
del server_config
2419
2055
# Override the settings from the config file with command line
2420
2056
# options, if set.
2421
2057
for option in ("interface", "address", "port", "debug",
2422
"priority", "servicename", "configdir", "use_dbus",
2423
"use_ipv6", "debuglevel", "restore", "statedir",
2424
"socket", "foreground", "zeroconf"):
2058
"priority", "servicename", "configdir",
2059
"use_dbus", "use_ipv6", "debuglevel", "restore",
2425
2061
value = getattr(options, option)
2426
2062
if value is not None:
2427
2063
server_settings[option] = value
2429
2065
# Force all strings to be unicode
2430
2066
for option in server_settings.keys():
2431
if isinstance(server_settings[option], bytes):
2432
server_settings[option] = (server_settings[option]
2434
# Force all boolean options to be boolean
2435
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2436
"foreground", "zeroconf"):
2437
server_settings[option] = bool(server_settings[option])
2438
# Debug implies foreground
2439
if server_settings["debug"]:
2440
server_settings["foreground"] = True
2067
if type(server_settings[option]) is str:
2068
server_settings[option] = unicode(server_settings[option])
2441
2069
# Now we have our good server settings in "server_settings"
2443
2071
##################################################################
2445
if (not server_settings["zeroconf"]
2446
and not (server_settings["port"]
2447
or server_settings["socket"] != "")):
2448
parser.error("Needs port or socket to work without Zeroconf")
2450
2073
# For convenience
2451
2074
debug = server_settings["debug"]
2452
2075
debuglevel = server_settings["debuglevel"]
2467
2088
initlogger(debug, level)
2469
2090
if server_settings["servicename"] != "Mandos":
2470
syslogger.setFormatter(
2471
logging.Formatter('Mandos ({}) [%(process)d]:'
2472
' %(levelname)s: %(message)s'.format(
2473
server_settings["servicename"])))
2091
syslogger.setFormatter(logging.Formatter
2092
('Mandos (%s) [%%(process)d]:'
2093
' %%(levelname)s: %%(message)s'
2094
% server_settings["servicename"]))
2475
2096
# Parse config file with clients
2476
client_config = configparser.SafeConfigParser(Client
2097
client_config = configparser.SafeConfigParser(Client.client_defaults)
2478
2098
client_config.read(os.path.join(server_settings["configdir"],
2479
2099
"clients.conf"))
2481
2101
global mandos_dbus_service
2482
2102
mandos_dbus_service = None
2485
if server_settings["socket"] != "":
2486
socketfd = server_settings["socket"]
2487
tcp_server = MandosServer(
2488
(server_settings["address"], server_settings["port"]),
2490
interface=(server_settings["interface"] or None),
2492
gnutls_priority=server_settings["priority"],
2496
pidfilename = "/run/mandos.pid"
2497
if not os.path.isdir("/run/."):
2498
pidfilename = "/var/run/mandos.pid"
2104
tcp_server = MandosServer((server_settings["address"],
2105
server_settings["port"]),
2107
interface=(server_settings["interface"]
2111
server_settings["priority"],
2114
pidfilename = "/var/run/mandos.pid"
2501
2116
pidfile = open(pidfilename, "w")
2502
except IOError as e:
2503
logger.error("Could not open file %r", pidfilename,
2118
logger.error("Could not open file %r", pidfilename)
2506
for name in ("_mandos", "mandos", "nobody"):
2121
uid = pwd.getpwnam("_mandos").pw_uid
2122
gid = pwd.getpwnam("_mandos").pw_gid
2508
uid = pwd.getpwnam(name).pw_uid
2509
gid = pwd.getpwnam(name).pw_gid
2125
uid = pwd.getpwnam("mandos").pw_uid
2126
gid = pwd.getpwnam("mandos").pw_gid
2511
2127
except KeyError:
2129
uid = pwd.getpwnam("nobody").pw_uid
2130
gid = pwd.getpwnam("nobody").pw_gid
2519
2137
except OSError as error:
2520
if error.errno != errno.EPERM:
2138
if error[0] != errno.EPERM:
2524
2142
# Enable all possible GnuTLS debugging
2531
2149
def debug_gnutls(level, string):
2532
2150
logger.debug("GnuTLS: %s", string[:-1])
2534
gnutls.library.functions.gnutls_global_set_log_function(
2152
(gnutls.library.functions
2153
.gnutls_global_set_log_function(debug_gnutls))
2537
2155
# Redirect stdin so all checkers get /dev/null
2538
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2539
2157
os.dup2(null, sys.stdin.fileno())
2543
2161
# Need to fork before connecting to D-Bus
2545
2163
# Close all input and output, do double fork, etc.
2548
# multiprocessing will use threads, so before we use gobject we
2549
# need to inform gobject that threads will be used.
2550
2166
gobject.threads_init()
2552
2168
global main_loop
2553
2169
# From the Avahi example code
2554
DBusGMainLoop(set_as_default=True)
2170
DBusGMainLoop(set_as_default=True )
2555
2171
main_loop = gobject.MainLoop()
2556
2172
bus = dbus.SystemBus()
2557
2173
# End of Avahi example code
2560
2176
bus_name = dbus.service.BusName("se.recompile.Mandos",
2563
old_bus_name = dbus.service.BusName(
2564
"se.bsnet.fukt.Mandos", bus,
2177
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2566
2181
except dbus.exceptions.NameExistsException as e:
2567
logger.error("Disabling D-Bus:", exc_info=e)
2182
logger.error(unicode(e) + ", disabling D-Bus")
2568
2183
use_dbus = False
2569
2184
server_settings["use_dbus"] = False
2570
2185
tcp_server.use_dbus = False
2572
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2573
service = AvahiServiceToSyslog(
2574
name = server_settings["servicename"],
2575
servicetype = "_mandos._tcp",
2576
protocol = protocol,
2578
if server_settings["interface"]:
2579
service.interface = if_nametoindex(
2580
server_settings["interface"].encode("utf-8"))
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
2582
2195
global multiprocessing_manager
2583
2196
multiprocessing_manager = multiprocessing.Manager()
2585
2198
client_class = Client
2587
client_class = functools.partial(ClientDBus, bus = bus)
2200
client_class = functools.partial(ClientDBusTransitional,
2589
2203
client_settings = Client.config_parser(client_config)
2590
2204
old_client_settings = {}
2591
2205
clients_data = {}
2593
# This is used to redirect stdout and stderr for checker processes
2595
wnull = open(os.devnull, "w") # A writable /dev/null
2596
# Only used if server is running in foreground but not in debug
2598
if debug or not foreground:
2601
2207
# Get client data and settings from last running state.
2602
2208
if server_settings["restore"]:
2604
2210
with open(stored_state_path, "rb") as stored_state:
2605
clients_data, old_client_settings = pickle.load(
2211
clients_data, old_client_settings = (pickle.load
2607
2213
os.remove(stored_state_path)
2608
2214
except IOError as e:
2609
if e.errno == errno.ENOENT:
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
2613
logger.critical("Could not load persistent state:",
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
2616
2219
except EOFError as e:
2617
2220
logger.warning("Could not load persistent state: "
2221
"EOFError: {0}".format(e))
2621
2223
with PGPEngine() as pgp:
2622
for client_name, client in clients_data.items():
2623
# Skip removed clients
2624
if client_name not in client_settings:
2224
for client_name, client in clients_data.iteritems():
2627
2225
# Decide which value to use after restoring saved state.
2628
2226
# We have three different values: Old config file,
2629
2227
# new config file, and saved state.
2634
2232
# For each value in new config, check if it
2635
2233
# differs from the old config value (Except for
2636
2234
# the "secret" attribute)
2637
if (name != "secret"
2639
old_client_settings[client_name][name])):
2235
if (name != "secret" and
2236
value != old_client_settings[client_name]
2640
2238
client[name] = value
2641
2239
except KeyError:
2644
2242
# Clients who has passed its expire date can still be
2645
2243
# enabled if its last checker was successful. Clients
2646
# whose checker succeeded before we stored its state is
2647
# assumed to have successfully run all checkers during
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
2649
2246
if client["enabled"]:
2650
2247
if datetime.datetime.utcnow() >= client["expires"]:
2651
2248
if not client["last_checked_ok"]:
2652
2249
logger.warning(
2653
"disabling client {} - Client never "
2654
"performed a successful checker".format(
2250
"disabling client {0} - Client never "
2251
"performed a successfull checker"
2252
.format(client["name"]))
2656
2253
client["enabled"] = False
2657
2254
elif client["last_checker_status"] != 0:
2658
2255
logger.warning(
2659
"disabling client {} - Client last"
2660
" checker failed with error code"
2663
client["last_checker_status"]))
2256
"disabling client {0} - Client "
2257
"last checker failed with error code {1}"
2258
.format(client["name"],
2259
client["last_checker_status"]))
2664
2260
client["enabled"] = False
2666
client["expires"] = (
2667
datetime.datetime.utcnow()
2668
+ client["timeout"])
2669
logger.debug("Last checker succeeded,"
2670
" keeping {} enabled".format(
2262
client["expires"] = (datetime.datetime
2264
+ client["timeout"])
2673
client["secret"] = pgp.decrypt(
2674
client["encrypted_secret"],
2675
client_settings[client_name]["secret"])
2267
client["secret"] = (
2268
pgp.decrypt(client["encrypted_secret"],
2269
client_settings[client_name]
2676
2271
except PGPError:
2677
2272
# If decryption fails, we use secret from new settings
2678
logger.debug("Failed to decrypt {} old secret".format(
2680
client["secret"] = (client_settings[client_name]
2273
logger.debug("Failed to decrypt {0} old secret"
2274
.format(client_name))
2275
client["secret"] = (
2276
client_settings[client_name]["secret"])
2683
2279
# Add/remove clients based on new changes made to config
2684
for client_name in (set(old_client_settings)
2685
- set(client_settings)):
2280
for client_name in set(old_client_settings) - set(client_settings):
2686
2281
del clients_data[client_name]
2687
for client_name in (set(client_settings)
2688
- set(old_client_settings)):
2282
for client_name in set(client_settings) - set(old_client_settings):
2689
2283
clients_data[client_name] = client_settings[client_name]
2691
# Create all client objects
2692
for client_name, client in clients_data.items():
2285
# Create clients all clients
2286
for client_name, client in clients_data.iteritems():
2693
2287
tcp_server.clients[client_name] = client_class(
2696
server_settings = server_settings)
2288
name = client_name, settings = client)
2698
2290
if not tcp_server.clients:
2699
2291
logger.warning("No clients defined")
2702
if pidfile is not None:
2706
pidfile.write("{}\n".format(pid).encode("utf-8"))
2708
logger.error("Could not write to file %r with PID %d",
2297
pidfile.write(str(pid) + "\n".encode("utf-8"))
2300
logger.error("Could not write to file %r with PID %d",
2303
# "pidfile" was never created
2711
2305
del pidfilename
2306
signal.signal(signal.SIGINT, signal.SIG_IGN)
2713
2308
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2714
2309
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2718
@alternate_dbus_interfaces(
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2720
class MandosDBusService(DBusObjectWithProperties):
2312
class MandosDBusService(dbus.service.Object):
2721
2313
"""A D-Bus proxy object"""
2723
2314
def __init__(self):
2724
2315
dbus.service.Object.__init__(self, bus, "/")
2726
2316
_interface = "se.recompile.Mandos"
2728
@dbus_interface_annotations(_interface)
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2734
2318
@dbus.service.signal(_interface, signature="o")
2735
2319
def ClientAdded(self, objpath):