101
88
except ImportError:
102
89
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
108
92
stored_state_file = "clients.pickle"
110
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
116
103
except (OSError, AttributeError):
118
104
def if_nametoindex(interface):
119
105
"Get an interface index the hard way, i.e. using fcntl()"
120
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
107
with contextlib.closing(socket.socket()) as s:
122
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
125
113
return interface_index
128
116
def initlogger(debug, level=logging.WARNING):
129
117
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
119
syslogger.setFormatter(logging.Formatter
136
120
('Mandos [%(process)d]: %(levelname)s:'
200
183
def encrypt(self, data, password):
201
184
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
204
187
passfile.write(passphrase)
206
189
proc = subprocess.Popen(['gpg', '--symmetric',
218
201
def decrypt(self, data, password):
219
202
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
222
205
passfile.write(passphrase)
224
207
proc = subprocess.Popen(['gpg', '--decrypt',
237
221
class AvahiError(Exception):
238
222
def __init__(self, value, *args, **kwargs):
239
223
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
244
228
class AvahiServiceError(AvahiError):
248
231
class AvahiGroupError(AvahiError):
270
253
bus: dbus.SystemBus()
274
interface = avahi.IF_UNSPEC,
282
protocol = avahi.PROTO_UNSPEC,
256
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
servicetype = None, port = None, TXT = None,
258
domain = "", host = "", max_renames = 32768,
259
protocol = avahi.PROTO_UNSPEC, bus = None):
284
260
self.interface = interface
286
262
self.type = servicetype
297
273
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
276
"""Derived from the Avahi example code"""
301
277
if self.rename_count >= self.max_renames:
302
278
logger.critical("No suitable Zeroconf service name found"
303
279
" after %i retries, exiting.",
304
280
self.rename_count)
305
281
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
309
284
logger.info("Changing Zeroconf service name to %r ...",
315
289
except dbus.exceptions.DBusException as error:
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
321
logger.critical("D-Bus Exception", exc_info=error)
290
logger.critical("D-Bus Exception", exc_info=error)
293
self.rename_count += 1
325
295
def remove(self):
326
296
"""Derived from the Avahi example code"""
381
352
def server_state_changed(self, state, error=None):
382
353
"""Derived from the Avahi example code"""
383
354
logger.debug("Avahi server state change: %i", state)
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
355
bad_states = { avahi.SERVER_INVALID:
356
"Zeroconf server invalid",
357
avahi.SERVER_REGISTERING: None,
358
avahi.SERVER_COLLISION:
359
"Zeroconf server name collision",
360
avahi.SERVER_FAILURE:
361
"Zeroconf server failure" }
390
362
if state in bad_states:
391
363
if bad_states[state] is not None:
392
364
if error is None:
411
383
follow_name_owner_changes=True),
412
384
avahi.DBUS_INTERFACE_SERVER)
413
385
self.server.connect_to_signal("StateChanged",
414
self.server_state_changed)
386
self.server_state_changed)
415
387
self.server_state_changed(self.server.GetState())
418
390
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
420
392
"""Add the new name to the syslog messages"""
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
428
408
class Client(object):
429
409
"""A representation of a client host served by this server.
474
454
"fingerprint", "host", "interval",
475
455
"last_approval_request", "last_checked_ok",
476
456
"last_enabled", "name", "timeout")
479
"extended_timeout": "PT15M",
481
"checker": "fping -q -- %%(host)s",
483
"approval_delay": "PT0S",
484
"approval_duration": "PT1S",
485
"approved_by_default": "True",
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
460
"checker": "fping -q -- %%(host)s",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
464
"approved_by_default": "True",
468
def timeout_milliseconds(self):
469
"Return the 'timeout' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.timeout)
472
def extended_timeout_milliseconds(self):
473
"Return the 'extended_timeout' attribute in milliseconds"
474
return timedelta_to_milliseconds(self.extended_timeout)
476
def interval_milliseconds(self):
477
"Return the 'interval' attribute in milliseconds"
478
return timedelta_to_milliseconds(self.interval)
480
def approval_delay_milliseconds(self):
481
return timedelta_to_milliseconds(self.approval_delay)
490
484
def config_parser(config):
568
562
self.current_checker_command = None
569
563
self.approved = None
570
564
self.approvals_pending = 0
571
self.changedstate = multiprocessing_manager.Condition(
572
multiprocessing_manager.Lock())
573
self.client_structure = [attr
574
for attr in self.__dict__.iterkeys()
565
self.changedstate = (multiprocessing_manager
566
.Condition(multiprocessing_manager
568
self.client_structure = [attr for attr in
569
self.__dict__.iterkeys()
575
570
if not attr.startswith("_")]
576
571
self.client_structure.append("client_structure")
578
for name, t in inspect.getmembers(
579
type(self), lambda obj: isinstance(obj, property)):
573
for name, t in inspect.getmembers(type(self),
580
577
if not name.startswith("_"):
581
578
self.client_structure.append(name)
624
621
# and every interval from then on.
625
622
if self.checker_initiator_tag is not None:
626
623
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = gobject.timeout_add(
628
int(self.interval.total_seconds() * 1000),
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
630
627
# Schedule a disable() when 'timeout' has passed
631
628
if self.disable_initiator_tag is not None:
632
629
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = gobject.timeout_add(
634
int(self.timeout.total_seconds() * 1000), self.disable)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
635
633
# Also start a new checker *right now*.
636
634
self.start_checker()
666
665
gobject.source_remove(self.disable_initiator_tag)
667
666
self.disable_initiator_tag = None
668
667
if getattr(self, "enabled", False):
669
self.disable_initiator_tag = gobject.timeout_add(
670
int(timeout.total_seconds() * 1000), self.disable)
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
671
671
self.expires = datetime.datetime.utcnow() + timeout
673
673
def need_approval(self):
704
704
# Start a new checker if needed
705
705
if self.checker is None:
706
706
# Escape attributes for the shell
708
attr: re.escape(str(getattr(self, attr)))
709
for attr in self.runtime_expansions }
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
711
712
command = self.checker_command % escaped_attrs
712
713
except TypeError as error:
713
714
logger.error('Could not format string "%s"',
714
self.checker_command,
716
return True # Try again later
715
self.checker_command, exc_info=error)
716
return True # Try again later
717
717
self.current_checker_command = command
719
logger.info("Starting checker %r for %s", command,
719
logger.info("Starting checker %r for %s",
721
721
# We don't need to redirect stdout and stderr, since
722
722
# in normal mode, that is already done by daemon(),
723
723
# and in debug mode we don't want to. (Stdin is
732
732
"stderr": wnull })
733
733
self.checker = subprocess.Popen(command,
738
737
except OSError as error:
739
738
logger.error("Failed to start subprocess",
742
self.checker_callback_tag = gobject.child_watch_add(
743
self.checker.pid, self.checker_callback, data=command)
741
self.checker_callback_tag = (gobject.child_watch_add
743
self.checker_callback,
744
745
# The checker may have completed before the gobject
745
746
# watch was added. Check for this.
836
831
"""Decorator to annotate D-Bus methods, signals or properties
839
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
842
834
@dbus_service_property("org.example.Interface", signature="b",
836
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
"org.freedesktop.DBus.Property."
838
"EmitsChangedSignal": "false"})
844
839
def Property_dbus_property(self):
845
840
return dbus.Boolean(False)
848
842
def decorator(func):
849
843
func._dbus_annotations = annotations
855
848
class DBusPropertyException(dbus.exceptions.DBusException):
856
849
"""A base class for D-Bus property-related exceptions
851
def __unicode__(self):
852
return unicode(str(self))
861
855
class DBusPropertyAccessException(DBusPropertyException):
885
879
If called like _is_dbus_thing("method") it returns a function
886
880
suitable for use as predicate to inspect.getmembers().
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
891
885
def _get_all_dbus_things(self, thing):
892
886
"""Returns a generator of (name, attribute) pairs
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
888
return ((getattr(athing.__get__(self), "_dbus_name",
895
890
athing.__get__(self))
896
891
for cls in self.__class__.__mro__
897
892
for name, athing in
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
900
896
def _get_dbus_property(self, interface_name, property_name):
901
897
"""Returns a bound method if one exists which is a D-Bus
902
898
property with the specified name and interface.
904
for cls in self.__class__.__mro__:
905
for name, value in inspect.getmembers(
906
cls, self._is_dbus_thing("property")):
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
903
self._is_dbus_thing("property"))):
907
904
if (value._dbus_name == property_name
908
905
and value._dbus_interface == interface_name):
909
906
return value.__get__(self)
911
908
# No such property
912
raise DBusPropertyNotFound("{}:{}.{}".format(
913
self.dbus_object_path, interface_name, property_name))
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
915
@dbus.service.method(dbus.PROPERTIES_IFACE,
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
917
914
out_signature="v")
918
915
def Get(self, interface_name, property_name):
919
916
"""Standard D-Bus property Get() method, see D-Bus standard.
938
935
# signatures other than "ay".
939
936
if prop._dbus_signature != "ay":
940
937
raise ValueError("Byte arrays not supported for non-"
941
"'ay' signature {!r}"
938
"'ay' signature {0!r}"
942
939
.format(prop._dbus_signature))
943
940
value = dbus.ByteArray(b''.join(chr(byte)
944
941
for byte in value))
947
@dbus.service.method(dbus.PROPERTIES_IFACE,
944
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
949
945
out_signature="a{sv}")
950
946
def GetAll(self, interface_name):
951
947
"""Standard D-Bus property GetAll() method, see D-Bus
966
962
if not hasattr(value, "variant_level"):
967
963
properties[name] = value
969
properties[name] = type(value)(
970
value, variant_level = value.variant_level + 1)
965
properties[name] = type(value)(value, variant_level=
966
value.variant_level+1)
971
967
return dbus.Dictionary(properties, signature="sv")
973
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
974
def PropertiesChanged(self, interface_name, changed_properties,
975
invalidated_properties):
976
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
981
969
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
982
970
out_signature="s",
983
971
path_keyword='object_path',
993
981
document = xml.dom.minidom.parseString(xmlstring)
995
982
def make_tag(document, name, prop):
996
983
e = document.createElement("property")
997
984
e.setAttribute("name", name)
998
985
e.setAttribute("type", prop._dbus_signature)
999
986
e.setAttribute("access", prop._dbus_access)
1002
988
for if_tag in document.getElementsByTagName("interface"):
1003
989
# Add property tags
1004
990
for tag in (make_tag(document, name, prop)
1016
1002
if (name == tag.getAttribute("name")
1017
1003
and prop._dbus_interface
1018
1004
== if_tag.getAttribute("name")):
1019
annots.update(getattr(
1020
prop, "_dbus_annotations", {}))
1021
for name, value in annots.items():
1005
annots.update(getattr
1007
"_dbus_annotations",
1009
for name, value in annots.iteritems():
1022
1010
ann_tag = document.createElement(
1024
1012
ann_tag.setAttribute("name", name)
1027
1015
# Add interface annotation tags
1028
1016
for annotation, value in dict(
1029
1017
itertools.chain.from_iterable(
1030
annotations().items()
1031
for name, annotations
1032
in self._get_all_dbus_things("interface")
1018
annotations().iteritems()
1019
for name, annotations in
1020
self._get_all_dbus_things("interface")
1033
1021
if name == if_tag.getAttribute("name")
1035
1023
ann_tag = document.createElement("annotation")
1036
1024
ann_tag.setAttribute("name", annotation)
1037
1025
ann_tag.setAttribute("value", value)
1101
1089
# Ignore non-D-Bus attributes, and D-Bus attributes
1102
1090
# with the wrong interface name
1103
1091
if (not hasattr(attribute, "_dbus_interface")
1104
or not attribute._dbus_interface.startswith(
1105
orig_interface_name)):
1092
or not attribute._dbus_interface
1093
.startswith(orig_interface_name)):
1107
1095
# Create an alternate D-Bus interface name based on
1108
1096
# the current name
1109
alt_interface = attribute._dbus_interface.replace(
1110
orig_interface_name, alt_interface_name)
1097
alt_interface = (attribute._dbus_interface
1098
.replace(orig_interface_name,
1099
alt_interface_name))
1111
1100
interface_names.add(alt_interface)
1112
1101
# Is this a D-Bus signal?
1113
1102
if getattr(attribute, "_dbus_is_signal", False):
1114
if sys.version == 2:
1115
# Extract the original non-method undecorated
1116
# function by black magic
1117
nonmethod_func = (dict(
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1118
1106
zip(attribute.func_code.co_freevars,
1119
attribute.__closure__))
1120
["func"].cell_contents)
1122
nonmethod_func = attribute
1107
attribute.__closure__))["func"]
1123
1109
# Create a new, but exactly alike, function
1124
1110
# object, and decorate it to be a new D-Bus signal
1125
1111
# with the alternate D-Bus interface name
1126
if sys.version == 2:
1127
new_function = types.FunctionType(
1128
nonmethod_func.func_code,
1129
nonmethod_func.func_globals,
1130
nonmethod_func.func_name,
1131
nonmethod_func.func_defaults,
1132
nonmethod_func.func_closure)
1134
new_function = types.FunctionType(
1135
nonmethod_func.__code__,
1136
nonmethod_func.__globals__,
1137
nonmethod_func.__name__,
1138
nonmethod_func.__defaults__,
1139
nonmethod_func.__closure__)
1140
new_function = (dbus.service.signal(
1142
attribute._dbus_signature)(new_function))
1112
new_function = (dbus.service.signal
1114
attribute._dbus_signature)
1115
(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)))
1143
1121
# Copy annotations, if any
1145
new_function._dbus_annotations = dict(
1146
attribute._dbus_annotations)
1123
new_function._dbus_annotations = (
1124
dict(attribute._dbus_annotations))
1147
1125
except AttributeError:
1149
1127
# Define a creator of a function to call both the
1171
1147
# object. Decorate it to be a new D-Bus method
1172
1148
# with the alternate D-Bus interface name. Add it
1173
1149
# to the class.
1175
dbus.service.method(
1177
attribute._dbus_in_signature,
1178
attribute._dbus_out_signature)
1179
(types.FunctionType(attribute.func_code,
1180
attribute.func_globals,
1181
attribute.func_name,
1182
attribute.func_defaults,
1183
attribute.func_closure)))
1150
attr[attrname] = (dbus.service.method
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1155
(attribute.func_code,
1156
attribute.func_globals,
1157
attribute.func_name,
1158
attribute.func_defaults,
1159
attribute.func_closure)))
1184
1160
# Copy annotations, if any
1186
attr[attrname]._dbus_annotations = dict(
1187
attribute._dbus_annotations)
1162
attr[attrname]._dbus_annotations = (
1163
dict(attribute._dbus_annotations))
1188
1164
except AttributeError:
1190
1166
# Is this a D-Bus property?
1193
1169
# object, and decorate it to be a new D-Bus
1194
1170
# property with the alternate D-Bus interface
1195
1171
# name. Add it to the class.
1196
attr[attrname] = (dbus_service_property(
1197
alt_interface, attribute._dbus_signature,
1198
attribute._dbus_access,
1199
attribute._dbus_get_args_options
1201
(types.FunctionType(
1202
attribute.func_code,
1203
attribute.func_globals,
1204
attribute.func_name,
1205
attribute.func_defaults,
1206
attribute.func_closure)))
1172
attr[attrname] = (dbus_service_property
1174
attribute._dbus_signature,
1175
attribute._dbus_access,
1177
._dbus_get_args_options
1180
(attribute.func_code,
1181
attribute.func_globals,
1182
attribute.func_name,
1183
attribute.func_defaults,
1184
attribute.func_closure)))
1207
1185
# Copy annotations, if any
1209
attr[attrname]._dbus_annotations = dict(
1210
attribute._dbus_annotations)
1187
attr[attrname]._dbus_annotations = (
1188
dict(attribute._dbus_annotations))
1211
1189
except AttributeError:
1213
1191
# Is this a D-Bus interface?
1216
1194
# object. Decorate it to be a new D-Bus interface
1217
1195
# with the alternate D-Bus interface name. Add it
1218
1196
# to the class.
1220
dbus_interface_annotations(alt_interface)
1221
(types.FunctionType(attribute.func_code,
1222
attribute.func_globals,
1223
attribute.func_name,
1224
attribute.func_defaults,
1225
attribute.func_closure)))
1197
attr[attrname] = (dbus_interface_annotations
1200
(attribute.func_code,
1201
attribute.func_globals,
1202
attribute.func_name,
1203
attribute.func_defaults,
1204
attribute.func_closure)))
1227
1206
# Deprecate all alternate interfaces
1228
iname="_AlternateDBusNames_interface_annotation{}"
1207
iname="_AlternateDBusNames_interface_annotation{0}"
1229
1208
for interface_name in interface_names:
1231
1209
@dbus_interface_annotations(interface_name)
1232
1210
def func(self):
1233
1211
return { "org.freedesktop.DBus.Deprecated":
1235
1213
# Find an unused name
1236
1214
for aname in (iname.format(i)
1237
1215
for i in itertools.count()):
1241
1219
if interface_names:
1242
1220
# Replace the class with a new subclass of it with
1243
1221
# methods, signals, etc. as created above.
1244
cls = type(b"{}Alternate".format(cls.__name__),
1222
cls = type(b"{0}Alternate".format(cls.__name__),
1251
1228
@alternate_dbus_interfaces({"se.recompile.Mandos":
1252
"se.bsnet.fukt.Mandos"})
1229
"se.bsnet.fukt.Mandos"})
1253
1230
class ClientDBus(Client, DBusObjectWithProperties):
1254
1231
"""A Client class using D-Bus
1270
1245
Client.__init__(self, *args, **kwargs)
1271
1246
# Only now, when this client is initialized, can it show up on
1273
client_object_name = str(self.name).translate(
1248
client_object_name = unicode(self.name).translate(
1274
1249
{ord("."): ord("_"),
1275
1250
ord("-"): ord("_")})
1276
self.dbus_object_path = dbus.ObjectPath(
1277
"/clients/" + client_object_name)
1251
self.dbus_object_path = (dbus.ObjectPath
1252
("/clients/" + client_object_name))
1278
1253
DBusObjectWithProperties.__init__(self, self.bus,
1279
1254
self.dbus_object_path)
1281
def notifychangeproperty(transform_func, dbus_name,
1282
type_func=lambda x: x,
1284
invalidate_only=False,
1285
_interface=_interface):
1256
def notifychangeproperty(transform_func,
1257
dbus_name, type_func=lambda x: x,
1286
1259
""" Modify a variable so that it's a property which announces
1287
1260
its changes to DBus.
1293
1266
to the D-Bus. Default: no transform
1294
1267
variant_level: D-Bus variant level. Default: 1
1296
attrname = "_{}".format(dbus_name)
1269
attrname = "_{0}".format(dbus_name)
1298
1270
def setter(self, value):
1299
1271
if hasattr(self, "dbus_object_path"):
1300
1272
if (not hasattr(self, attrname) or
1301
1273
type_func(getattr(self, attrname, None))
1302
1274
!= type_func(value)):
1304
self.PropertiesChanged(
1305
_interface, dbus.Dictionary(),
1306
dbus.Array((dbus_name, )))
1308
dbus_value = transform_func(
1310
variant_level = variant_level)
1311
self.PropertyChanged(dbus.String(dbus_name),
1313
self.PropertiesChanged(
1315
dbus.Dictionary({ dbus.String(dbus_name):
1275
dbus_value = transform_func(type_func(value),
1278
self.PropertyChanged(dbus.String(dbus_name),
1318
1280
setattr(self, attrname, value)
1320
1282
return property(lambda self: getattr(self, attrname), setter)
1326
1288
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1327
1289
last_enabled = notifychangeproperty(datetime_to_dbus,
1329
checker = notifychangeproperty(
1330
dbus.Boolean, "CheckerRunning",
1331
type_func = lambda checker: checker is not None)
1291
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1292
type_func = lambda checker:
1293
checker is not None)
1332
1294
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1333
1295
"LastCheckedOK")
1334
1296
last_checker_status = notifychangeproperty(dbus.Int16,
1337
1299
datetime_to_dbus, "LastApprovalRequest")
1338
1300
approved_by_default = notifychangeproperty(dbus.Boolean,
1339
1301
"ApprovedByDefault")
1340
approval_delay = notifychangeproperty(
1341
dbus.UInt64, "ApprovalDelay",
1342
type_func = lambda td: td.total_seconds() * 1000)
1302
approval_delay = notifychangeproperty(dbus.UInt64,
1305
timedelta_to_milliseconds)
1343
1306
approval_duration = notifychangeproperty(
1344
1307
dbus.UInt64, "ApprovalDuration",
1345
type_func = lambda td: td.total_seconds() * 1000)
1308
type_func = timedelta_to_milliseconds)
1346
1309
host = notifychangeproperty(dbus.String, "Host")
1347
timeout = notifychangeproperty(
1348
dbus.UInt64, "Timeout",
1349
type_func = lambda td: td.total_seconds() * 1000)
1310
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1312
timedelta_to_milliseconds)
1350
1313
extended_timeout = notifychangeproperty(
1351
1314
dbus.UInt64, "ExtendedTimeout",
1352
type_func = lambda td: td.total_seconds() * 1000)
1353
interval = notifychangeproperty(
1354
dbus.UInt64, "Interval",
1355
type_func = lambda td: td.total_seconds() * 1000)
1315
type_func = timedelta_to_milliseconds)
1316
interval = notifychangeproperty(dbus.UInt64,
1319
timedelta_to_milliseconds)
1356
1320
checker_command = notifychangeproperty(dbus.String, "Checker")
1357
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1358
invalidate_only=True)
1360
1322
del notifychangeproperty
1388
1350
*args, **kwargs)
1390
1352
def start_checker(self, *args, **kwargs):
1391
old_checker_pid = getattr(self.checker, "pid", None)
1353
old_checker = self.checker
1354
if self.checker is not None:
1355
old_checker_pid = self.checker.pid
1357
old_checker_pid = None
1392
1358
r = Client.start_checker(self, *args, **kwargs)
1393
1359
# Only if new checker process was started
1394
1360
if (self.checker is not None
1404
1370
def approve(self, value=True):
1405
1371
self.approved = value
1406
gobject.timeout_add(int(self.approval_duration.total_seconds()
1407
* 1000), self._reset_approved)
1372
gobject.timeout_add(timedelta_to_milliseconds
1373
(self.approval_duration),
1374
self._reset_approved)
1408
1375
self.send_changedstate()
1410
1377
## D-Bus methods, signals & properties
1378
_interface = "se.recompile.Mandos.Client"
1382
@dbus_interface_annotations(_interface)
1384
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1416
1389
# CheckerCompleted - signal
1505
1476
self.approved_by_default = bool(value)
1507
1478
# ApprovalDelay - property
1508
@dbus_service_property(_interface,
1479
@dbus_service_property(_interface, signature="t",
1510
1480
access="readwrite")
1511
1481
def ApprovalDelay_dbus_property(self, value=None):
1512
1482
if value is None: # get
1513
return dbus.UInt64(self.approval_delay.total_seconds()
1483
return dbus.UInt64(self.approval_delay_milliseconds())
1515
1484
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1517
1486
# ApprovalDuration - property
1518
@dbus_service_property(_interface,
1487
@dbus_service_property(_interface, signature="t",
1520
1488
access="readwrite")
1521
1489
def ApprovalDuration_dbus_property(self, value=None):
1522
1490
if value is None: # get
1523
return dbus.UInt64(self.approval_duration.total_seconds()
1491
return dbus.UInt64(timedelta_to_milliseconds(
1492
self.approval_duration))
1525
1493
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1527
1495
# Name - property
1535
1503
return dbus.String(self.fingerprint)
1537
1505
# Host - property
1538
@dbus_service_property(_interface,
1506
@dbus_service_property(_interface, signature="s",
1540
1507
access="readwrite")
1541
1508
def Host_dbus_property(self, value=None):
1542
1509
if value is None: # get
1543
1510
return dbus.String(self.host)
1544
self.host = str(value)
1511
self.host = unicode(value)
1546
1513
# Created - property
1547
1514
@dbus_service_property(_interface, signature="s", access="read")
1591
1557
return datetime_to_dbus(self.last_approval_request)
1593
1559
# Timeout - property
1594
@dbus_service_property(_interface,
1560
@dbus_service_property(_interface, signature="t",
1596
1561
access="readwrite")
1597
1562
def Timeout_dbus_property(self, value=None):
1598
1563
if value is None: # get
1599
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1564
return dbus.UInt64(self.timeout_milliseconds())
1600
1565
old_timeout = self.timeout
1601
1566
self.timeout = datetime.timedelta(0, 0, 0, value)
1602
1567
# Reschedule disabling
1613
1578
gobject.source_remove(self.disable_initiator_tag)
1614
self.disable_initiator_tag = gobject.timeout_add(
1615
int((self.expires - now).total_seconds() * 1000),
1579
self.disable_initiator_tag = (
1580
gobject.timeout_add(
1581
timedelta_to_milliseconds(self.expires - now),
1618
1584
# ExtendedTimeout - property
1619
@dbus_service_property(_interface,
1585
@dbus_service_property(_interface, signature="t",
1621
1586
access="readwrite")
1622
1587
def ExtendedTimeout_dbus_property(self, value=None):
1623
1588
if value is None: # get
1624
return dbus.UInt64(self.extended_timeout.total_seconds()
1589
return dbus.UInt64(self.extended_timeout_milliseconds())
1626
1590
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1628
1592
# Interval - property
1629
@dbus_service_property(_interface,
1593
@dbus_service_property(_interface, signature="t",
1631
1594
access="readwrite")
1632
1595
def Interval_dbus_property(self, value=None):
1633
1596
if value is None: # get
1634
return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
return dbus.UInt64(self.interval_milliseconds())
1635
1598
self.interval = datetime.timedelta(0, 0, 0, value)
1636
1599
if getattr(self, "checker_initiator_tag", None) is None:
1638
1601
if self.enabled:
1639
1602
# Reschedule checker run
1640
1603
gobject.source_remove(self.checker_initiator_tag)
1641
self.checker_initiator_tag = gobject.timeout_add(
1642
value, self.start_checker)
1643
self.start_checker() # Start one now, too
1604
self.checker_initiator_tag = (gobject.timeout_add
1605
(value, self.start_checker))
1606
self.start_checker() # Start one now, too
1645
1608
# Checker - property
1646
@dbus_service_property(_interface,
1609
@dbus_service_property(_interface, signature="s",
1648
1610
access="readwrite")
1649
1611
def Checker_dbus_property(self, value=None):
1650
1612
if value is None: # get
1651
1613
return dbus.String(self.checker_command)
1652
self.checker_command = str(value)
1614
self.checker_command = unicode(value)
1654
1616
# CheckerRunning - property
1655
@dbus_service_property(_interface,
1617
@dbus_service_property(_interface, signature="b",
1657
1618
access="readwrite")
1658
1619
def CheckerRunning_dbus_property(self, value=None):
1659
1620
if value is None: # get
1669
1630
return self.dbus_object_path # is already a dbus.ObjectPath
1671
1632
# Secret = property
1672
@dbus_service_property(_interface,
1633
@dbus_service_property(_interface, signature="ay",
1634
access="write", byte_arrays=True)
1676
1635
def Secret_dbus_property(self, value):
1677
self.secret = bytes(value)
1636
self.secret = str(value)
1716
1673
def handle(self):
1717
1674
with contextlib.closing(self.server.child_pipe) as child_pipe:
1718
1675
logger.info("TCP connection from: %s",
1719
str(self.client_address))
1676
unicode(self.client_address))
1720
1677
logger.debug("Pipe FD: %d",
1721
1678
self.server.child_pipe.fileno())
1723
session = gnutls.connection.ClientSession(
1724
self.request, gnutls.connection .X509Credentials())
1680
session = (gnutls.connection
1681
.ClientSession(self.request,
1683
.X509Credentials()))
1726
1685
# Note: gnutls.connection.X509Credentials is really a
1727
1686
# generic GnuTLS certificate credentials object so long as
1813
1773
#wait until timeout or approved
1814
1774
time = datetime.datetime.now()
1815
1775
client.changedstate.acquire()
1816
client.changedstate.wait(delay.total_seconds())
1776
client.changedstate.wait(
1777
float(timedelta_to_milliseconds(delay)
1817
1779
client.changedstate.release()
1818
1780
time2 = datetime.datetime.now()
1819
1781
if (time2 - time) >= delay:
1863
1825
def peer_certificate(session):
1864
1826
"Return the peer's OpenPGP certificate as a bytestring"
1865
1827
# If not an OpenPGP certificate...
1866
if (gnutls.library.functions.gnutls_certificate_type_get(
1828
if (gnutls.library.functions
1829
.gnutls_certificate_type_get(session._c_object)
1868
1830
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1869
1831
# ...do the normal thing
1870
1832
return session.peer_certificate
1884
1846
def fingerprint(openpgp):
1885
1847
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1886
1848
# New GnuTLS "datum" with the OpenPGP public key
1887
datum = gnutls.library.types.gnutls_datum_t(
1888
ctypes.cast(ctypes.c_char_p(openpgp),
1889
ctypes.POINTER(ctypes.c_ubyte)),
1890
ctypes.c_uint(len(openpgp)))
1849
datum = (gnutls.library.types
1850
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1853
ctypes.c_uint(len(openpgp))))
1891
1854
# New empty GnuTLS certificate
1892
1855
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1893
gnutls.library.functions.gnutls_openpgp_crt_init(
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1895
1858
# Import the OpenPGP public key into the certificate
1896
gnutls.library.functions.gnutls_openpgp_crt_import(
1897
crt, ctypes.byref(datum),
1898
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1859
(gnutls.library.functions
1860
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1861
gnutls.library.constants
1862
.GNUTLS_OPENPGP_FMT_RAW))
1899
1863
# Verify the self signature in the key
1900
1864
crtverify = ctypes.c_uint()
1901
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1902
crt, 0, ctypes.byref(crtverify))
1865
(gnutls.library.functions
1866
.gnutls_openpgp_crt_verify_self(crt, 0,
1867
ctypes.byref(crtverify)))
1903
1868
if crtverify.value != 0:
1904
1869
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1905
raise gnutls.errors.CertificateSecurityError(
1870
raise (gnutls.errors.CertificateSecurityError
1907
1872
# New buffer for the fingerprint
1908
1873
buf = ctypes.create_string_buffer(20)
1909
1874
buf_len = ctypes.c_size_t()
1910
1875
# Get the fingerprint from the certificate into the buffer
1911
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1912
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1876
(gnutls.library.functions
1877
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1878
ctypes.byref(buf_len)))
1913
1879
# Deinit the certificate
1914
1880
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1915
1881
# Convert the buffer to a Python bytestring
1966
1930
interface: None or a network interface name (string)
1967
1931
use_ipv6: Boolean; to use IPv6 or not
1970
1933
def __init__(self, server_address, RequestHandlerClass,
1934
interface=None, use_ipv6=True, socketfd=None):
1974
1935
"""If socketfd is set, use that file descriptor instead of
1975
1936
creating a new one with socket.socket().
2017
1978
self.interface)
2020
self.socket.setsockopt(
2021
socket.SOL_SOCKET, SO_BINDTODEVICE,
2022
(self.interface + "\0").encode("utf-8"))
1981
self.socket.setsockopt(socket.SOL_SOCKET,
1983
str(self.interface + '\0'))
2023
1984
except socket.error as error:
2024
1985
if error.errno == errno.EPERM:
2025
1986
logger.error("No permission to bind to"
2093
2049
def add_pipe(self, parent_pipe, proc):
2094
2050
# Call "handle_ipc" for both data and EOF events
2095
gobject.io_add_watch(
2096
parent_pipe.fileno(),
2097
gobject.IO_IN | gobject.IO_HUP,
2098
functools.partial(self.handle_ipc,
2099
parent_pipe = parent_pipe,
2051
gobject.io_add_watch(parent_pipe.fileno(),
2052
gobject.IO_IN | gobject.IO_HUP,
2053
functools.partial(self.handle_ipc,
2102
def handle_ipc(self, source, condition,
2105
client_object=None):
2058
def handle_ipc(self, source, condition, parent_pipe=None,
2059
proc = None, client_object=None):
2106
2060
# error, or the other end of multiprocessing.Pipe has closed
2107
2061
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2108
2062
# Wait for other process to exit
2131
2085
parent_pipe.send(False)
2134
gobject.io_add_watch(
2135
parent_pipe.fileno(),
2136
gobject.IO_IN | gobject.IO_HUP,
2137
functools.partial(self.handle_ipc,
2138
parent_pipe = parent_pipe,
2140
client_object = client))
2088
gobject.io_add_watch(parent_pipe.fileno(),
2089
gobject.IO_IN | gobject.IO_HUP,
2090
functools.partial(self.handle_ipc,
2141
2096
parent_pipe.send(True)
2142
2097
# remove the old hook in favor of the new above hook on
2150
2105
parent_pipe.send(('data', getattr(client_object,
2151
2106
funcname)(*args,
2154
2109
if command == 'getattr':
2155
2110
attrname = request[1]
2156
2111
if callable(client_object.__getattribute__(attrname)):
2157
parent_pipe.send(('function', ))
2112
parent_pipe.send(('function',))
2160
'data', client_object.__getattribute__(attrname)))
2114
parent_pipe.send(('data', client_object
2115
.__getattribute__(attrname)))
2162
2117
if command == 'setattr':
2163
2118
attrname = request[1]
2194
2149
# avoid excessive use of external libraries.
2196
2151
# New type for defining tokens, syntax, and semantics all-in-one
2197
Token = collections.namedtuple("Token", (
2198
"regexp", # To match token; if "value" is not None, must have
2199
# a "group" containing digits
2200
"value", # datetime.timedelta or None
2201
"followers")) # Tokens valid after this token
2152
Token = collections.namedtuple("Token",
2153
("regexp", # To match token; if
2154
# "value" is not None,
2155
# must have a "group"
2157
"value", # datetime.timedelta or
2159
"followers")) # Tokens valid after
2202
2161
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2162
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2163
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2164
token_second = Token(re.compile(r"(\d+)S"),
2206
2165
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2166
frozenset((token_end,)))
2208
2167
token_minute = Token(re.compile(r"(\d+)M"),
2209
2168
datetime.timedelta(minutes=1),
2210
2169
frozenset((token_second, token_end)))
2226
2185
frozenset((token_month, token_end)))
2227
2186
token_week = Token(re.compile(r"(\d+)W"),
2228
2187
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2188
frozenset((token_end,)))
2230
2189
token_duration = Token(re.compile(r"P"), None,
2231
2190
frozenset((token_year, token_month,
2232
2191
token_day, token_time,
2234
2193
# Define starting values
2235
2194
value = datetime.timedelta() # Value so far
2236
2195
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2196
followers = frozenset(token_duration,) # Following valid tokens
2238
2197
s = duration # String left to parse
2239
2198
# Loop until end token is found
2240
2199
while found_token is not token_end:
2324
2283
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2325
2284
if not stat.S_ISCHR(os.fstat(null).st_mode):
2326
2285
raise OSError(errno.ENODEV,
2327
"{} not a character device"
2286
"{0} not a character device"
2328
2287
.format(os.devnull))
2329
2288
os.dup2(null, sys.stdin.fileno())
2330
2289
os.dup2(null, sys.stdout.fileno())
2341
2300
parser = argparse.ArgumentParser()
2342
2301
parser.add_argument("-v", "--version", action="version",
2343
version = "%(prog)s {}".format(version),
2302
version = "%(prog)s {0}".format(version),
2344
2303
help="show version number and exit")
2345
2304
parser.add_argument("-i", "--interface", metavar="IF",
2346
2305
help="Bind to interface IF")
2379
2338
help="Directory to save/restore state in")
2380
2339
parser.add_argument("--foreground", action="store_true",
2381
2340
help="Run in foreground", default=None)
2382
parser.add_argument("--no-zeroconf", action="store_false",
2383
dest="zeroconf", help="Do not use Zeroconf",
2386
2342
options = parser.parse_args()
2407
2362
"statedir": "/var/lib/mandos",
2408
2363
"foreground": "False",
2412
2366
# Parse config file for server-global settings
2413
2367
server_config = configparser.SafeConfigParser(server_defaults)
2414
2368
del server_defaults
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2369
server_config.read(os.path.join(options.configdir,
2416
2371
# Convert the SafeConfigParser object to a dict
2417
2372
server_settings = server_config.defaults()
2418
2373
# Use the appropriate methods on the non-string config options
2436
2391
# Override the settings from the config file with command line
2437
2392
# options, if set.
2438
2393
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2394
"priority", "servicename", "configdir",
2395
"use_dbus", "use_ipv6", "debuglevel", "restore",
2396
"statedir", "socket", "foreground"):
2442
2397
value = getattr(options, option)
2443
2398
if value is not None:
2444
2399
server_settings[option] = value
2446
2401
# Force all strings to be unicode
2447
2402
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2403
if type(server_settings[option]) is str:
2404
server_settings[option] = unicode(server_settings[option])
2451
2405
# Force all boolean options to be boolean
2452
2406
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
"foreground", "zeroconf"):
2454
2408
server_settings[option] = bool(server_settings[option])
2455
2409
# Debug implies foreground
2456
2410
if server_settings["debug"]:
2484
2432
initlogger(debug, level)
2486
2434
if server_settings["servicename"] != "Mandos":
2487
syslogger.setFormatter(
2488
logging.Formatter('Mandos ({}) [%(process)d]:'
2489
' %(levelname)s: %(message)s'.format(
2490
server_settings["servicename"])))
2435
syslogger.setFormatter(logging.Formatter
2436
('Mandos ({0}) [%(process)d]:'
2437
' %(levelname)s: %(message)s'
2438
.format(server_settings
2492
2441
# Parse config file with clients
2493
2442
client_config = configparser.SafeConfigParser(Client
2498
2447
global mandos_dbus_service
2499
2448
mandos_dbus_service = None
2502
if server_settings["socket"] != "":
2503
socketfd = server_settings["socket"]
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2507
interface=(server_settings["interface"] or None),
2509
gnutls_priority=server_settings["priority"],
2450
tcp_server = MandosServer((server_settings["address"],
2451
server_settings["port"]),
2453
interface=(server_settings["interface"]
2457
server_settings["priority"],
2459
socketfd=(server_settings["socket"]
2512
2461
if not foreground:
2513
2462
pidfilename = "/run/mandos.pid"
2514
2463
if not os.path.isdir("/run/."):
2515
2464
pidfilename = "/var/run/mandos.pid"
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2467
pidfile = open(pidfilename, "w")
2519
2468
except IOError as e:
2520
2469
logger.error("Could not open file %r", pidfilename,
2548
2497
def debug_gnutls(level, string):
2549
2498
logger.debug("GnuTLS: %s", string[:-1])
2551
gnutls.library.functions.gnutls_global_set_log_function(
2500
(gnutls.library.functions
2501
.gnutls_global_set_log_function(debug_gnutls))
2554
2503
# Redirect stdin so all checkers get /dev/null
2555
2504
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2577
2526
bus_name = dbus.service.BusName("se.recompile.Mandos",
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2583
except dbus.exceptions.DBusException as e:
2527
bus, do_not_queue=True)
2528
old_bus_name = (dbus.service.BusName
2529
("se.bsnet.fukt.Mandos", bus,
2531
except dbus.exceptions.NameExistsException as e:
2584
2532
logger.error("Disabling D-Bus:", exc_info=e)
2585
2533
use_dbus = False
2586
2534
server_settings["use_dbus"] = False
2587
2535
tcp_server.use_dbus = False
2589
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2595
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2536
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
service = AvahiServiceToSyslog(name =
2538
server_settings["servicename"],
2539
servicetype = "_mandos._tcp",
2540
protocol = protocol, bus = bus)
2541
if server_settings["interface"]:
2542
service.interface = (if_nametoindex
2543
(str(server_settings["interface"])))
2599
2545
global multiprocessing_manager
2600
2546
multiprocessing_manager = multiprocessing.Manager()
2619
2565
if server_settings["restore"]:
2621
2567
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2568
clients_data, old_client_settings = (pickle.load
2624
2570
os.remove(stored_state_path)
2625
2571
except IOError as e:
2626
2572
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2573
logger.warning("Could not load persistent state: {0}"
2574
.format(os.strerror(e.errno)))
2630
2576
logger.critical("Could not load persistent state:",
2633
2579
except EOFError as e:
2634
2580
logger.warning("Could not load persistent state: "
2581
"EOFError:", exc_info=e)
2638
2583
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2584
for client_name, client in clients_data.iteritems():
2640
2585
# Skip removed clients
2641
2586
if client_name not in client_settings:
2667
2612
if datetime.datetime.utcnow() >= client["expires"]:
2668
2613
if not client["last_checked_ok"]:
2669
2614
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2615
"disabling client {0} - Client never "
2616
"performed a successful checker"
2617
.format(client_name))
2673
2618
client["enabled"] = False
2674
2619
elif client["last_checker_status"] != 0:
2675
2620
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2621
"disabling client {0} - Client "
2622
"last checker failed with error code {1}"
2623
.format(client_name,
2624
client["last_checker_status"]))
2681
2625
client["enabled"] = False
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2627
client["expires"] = (datetime.datetime
2629
+ client["timeout"])
2686
2630
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2631
" keeping {0} enabled"
2632
.format(client_name))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2634
client["secret"] = (
2635
pgp.decrypt(client["encrypted_secret"],
2636
client_settings[client_name]
2693
2638
except PGPError:
2694
2639
# If decryption fails, we use secret from new settings
2695
logger.debug("Failed to decrypt {} old secret".format(
2697
client["secret"] = (client_settings[client_name]
2640
logger.debug("Failed to decrypt {0} old secret"
2641
.format(client_name))
2642
client["secret"] = (
2643
client_settings[client_name]["secret"])
2700
2645
# Add/remove clients based on new changes made to config
2701
2646
for client_name in (set(old_client_settings)
2706
2651
clients_data[client_name] = client_settings[client_name]
2708
2653
# Create all client objects
2709
for client_name, client in clients_data.items():
2654
for client_name, client in clients_data.iteritems():
2710
2655
tcp_server.clients[client_name] = client_class(
2656
name = client_name, settings = client,
2713
2657
server_settings = server_settings)
2715
2659
if not tcp_server.clients:
2731
2675
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2678
@alternate_dbus_interfaces({"se.recompile.Mandos":
2679
"se.bsnet.fukt.Mandos"})
2737
2680
class MandosDBusService(DBusObjectWithProperties):
2738
2681
"""A D-Bus proxy object"""
2740
2682
def __init__(self):
2741
2683
dbus.service.Object.__init__(self, bus, "/")
2743
2684
_interface = "se.recompile.Mandos"
2745
2686
@dbus_interface_annotations(_interface)
2746
2687
def _foo(self):
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2688
return { "org.freedesktop.DBus.Property"
2689
".EmitsChangedSignal":
2751
2692
@dbus.service.signal(_interface, signature="o")
2752
2693
def ClientAdded(self, objpath):
2820
2761
# A list of attributes that can not be pickled
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
2824
for name, typ in inspect.getmembers(dbus.service
2763
exclude = set(("bus", "changedstate", "secret",
2764
"checker", "server_settings"))
2765
for name, typ in (inspect.getmembers
2766
(dbus.service.Object)):
2826
2767
exclude.add(name)
2828
2769
client_dict["encrypted_secret"] = (client
2835
2776
del client_settings[client.name]["secret"]
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2779
with (tempfile.NamedTemporaryFile
2780
(mode='wb', suffix=".pickle", prefix='clients-',
2781
dir=os.path.dirname(stored_state_path),
2782
delete=False)) as stored_state:
2844
2783
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2784
tempname=stored_state.name
2846
2785
os.rename(tempname, stored_state_path)
2847
2786
except (IOError, OSError) as e:
2898
2837
#service.interface = tcp_server.socket.getsockname()[3]
2902
# From the Avahi example code
2905
except dbus.exceptions.DBusException as error:
2906
logger.critical("D-Bus Exception", exc_info=error)
2909
# End of Avahi example code
2840
# From the Avahi example code
2843
except dbus.exceptions.DBusException as error:
2844
logger.critical("D-Bus Exception", exc_info=error)
2847
# End of Avahi example code
2911
2849
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
2850
lambda *args, **kwargs: