89
101
except ImportError:
90
102
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
93
108
stored_state_file = "clients.pickle"
95
110
logger = logging.getLogger()
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
104
116
except (OSError, AttributeError):
105
118
def if_nametoindex(interface):
106
119
"Get an interface index the hard way, i.e. using fcntl()"
107
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
121
with contextlib.closing(socket.socket()) as s:
109
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(str("16s16x"),
112
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
114
125
return interface_index
117
128
def initlogger(debug, level=logging.WARNING):
118
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
120
135
syslogger.setFormatter(logging.Formatter
121
136
('Mandos [%(process)d]: %(levelname)s:'
175
189
def password_encode(self, password):
176
190
# Passphrase can not be empty and can not contain newlines or
177
191
# NUL bytes. So we prefix it and hex encode it.
178
return b"mandos" + binascii.hexlify(password)
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
180
200
def encrypt(self, data, password):
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
194
self.gnupg.passphrase = None
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
195
216
return ciphertext
197
218
def decrypt(self, data, password):
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
211
self.gnupg.passphrase = None
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
212
234
return decrypted_plaintext
215
237
class AvahiError(Exception):
216
238
def __init__(self, value, *args, **kwargs):
217
239
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
222
244
class AvahiServiceError(AvahiError):
225
248
class AvahiGroupError(AvahiError):
247
270
bus: dbus.SystemBus()
250
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
servicetype = None, port = None, TXT = None,
252
domain = "", host = "", max_renames = 32768,
253
protocol = avahi.PROTO_UNSPEC, bus = None):
274
interface = avahi.IF_UNSPEC,
282
protocol = avahi.PROTO_UNSPEC,
254
284
self.interface = interface
256
286
self.type = servicetype
267
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
270
300
"""Derived from the Avahi example code"""
271
301
if self.rename_count >= self.max_renames:
272
302
logger.critical("No suitable Zeroconf service name found"
273
303
" after %i retries, exiting.",
274
304
self.rename_count)
275
305
raise AvahiServiceError("Too many renames")
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
278
309
logger.info("Changing Zeroconf service name to %r ...",
283
315
except dbus.exceptions.DBusException as error:
284
logger.critical("D-Bus Exception", exc_info=error)
287
self.rename_count += 1
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)
289
325
def remove(self):
290
326
"""Derived from the Avahi example code"""
346
381
def server_state_changed(self, state, error=None):
347
382
"""Derived from the Avahi example code"""
348
383
logger.debug("Avahi server state change: %i", state)
349
bad_states = { avahi.SERVER_INVALID:
350
"Zeroconf server invalid",
351
avahi.SERVER_REGISTERING: None,
352
avahi.SERVER_COLLISION:
353
"Zeroconf server name collision",
354
avahi.SERVER_FAILURE:
355
"Zeroconf server failure" }
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",
356
390
if state in bad_states:
357
391
if bad_states[state] is not None:
358
392
if error is None:
377
411
follow_name_owner_changes=True),
378
412
avahi.DBUS_INTERFACE_SERVER)
379
413
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
414
self.server_state_changed)
381
415
self.server_state_changed(self.server.GetState())
384
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
386
420
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
402
428
class Client(object):
403
429
"""A representation of a client host served by this server.
447
474
"fingerprint", "host", "interval",
448
475
"last_approval_request", "last_checked_ok",
449
476
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
453
"checker": "fping -q -- %%(host)s",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
461
def timeout_milliseconds(self):
462
"Return the 'timeout' attribute in milliseconds"
463
return timedelta_to_milliseconds(self.timeout)
465
def extended_timeout_milliseconds(self):
466
"Return the 'extended_timeout' attribute in milliseconds"
467
return timedelta_to_milliseconds(self.extended_timeout)
469
def interval_milliseconds(self):
470
"Return the 'interval' attribute in milliseconds"
471
return timedelta_to_milliseconds(self.interval)
473
def approval_delay_milliseconds(self):
474
return timedelta_to_milliseconds(self.approval_delay)
479
"extended_timeout": "PT15M",
481
"checker": "fping -q -- %%(host)s",
483
"approval_delay": "PT0S",
484
"approval_duration": "PT1S",
485
"approved_by_default": "True",
477
490
def config_parser(config):
523
def __init__(self, settings, name = None):
539
def __init__(self, settings, name = None, server_settings=None):
541
if server_settings is None:
543
self.server_settings = server_settings
525
544
# adding all client settings
526
for setting, value in settings.iteritems():
545
for setting, value in settings.items():
527
546
setattr(self, setting, value)
552
568
self.current_checker_command = None
553
569
self.approved = None
554
570
self.approvals_pending = 0
555
self.changedstate = (multiprocessing_manager
556
.Condition(multiprocessing_manager
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
571
self.changedstate = multiprocessing_manager.Condition(
572
multiprocessing_manager.Lock())
573
self.client_structure = [attr
574
for attr in self.__dict__.iterkeys()
560
575
if not attr.startswith("_")]
561
576
self.client_structure.append("client_structure")
563
for name, t in inspect.getmembers(type(self),
578
for name, t in inspect.getmembers(
579
type(self), lambda obj: isinstance(obj, property)):
567
580
if not name.startswith("_"):
568
581
self.client_structure.append(name)
611
624
# and every interval from then on.
612
625
if self.checker_initiator_tag is not None:
613
626
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
627
self.checker_initiator_tag = gobject.timeout_add(
628
int(self.interval.total_seconds() * 1000),
617
630
# Schedule a disable() when 'timeout' has passed
618
631
if self.disable_initiator_tag is not None:
619
632
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
633
self.disable_initiator_tag = gobject.timeout_add(
634
int(self.timeout.total_seconds() * 1000), self.disable)
623
635
# Also start a new checker *right now*.
624
636
self.start_checker()
655
666
gobject.source_remove(self.disable_initiator_tag)
656
667
self.disable_initiator_tag = None
657
668
if getattr(self, "enabled", False):
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
669
self.disable_initiator_tag = gobject.timeout_add(
670
int(timeout.total_seconds() * 1000), self.disable)
661
671
self.expires = datetime.datetime.utcnow() + timeout
663
673
def need_approval(self):
693
704
# Start a new checker if needed
694
705
if self.checker is None:
695
706
# Escape attributes for the shell
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
708
attr: re.escape(str(getattr(self, attr)))
709
for attr in self.runtime_expansions }
701
711
command = self.checker_command % escaped_attrs
702
712
except TypeError as error:
703
713
logger.error('Could not format string "%s"',
704
self.checker_command, exc_info=error)
705
return True # Try again later
714
self.checker_command,
716
return True # Try again later
706
717
self.current_checker_command = command
708
logger.info("Starting checker %r for %s",
719
logger.info("Starting checker %r for %s", command,
710
721
# We don't need to redirect stdout and stderr, since
711
722
# in normal mode, that is already done by daemon(),
712
723
# and in debug mode we don't want to. (Stdin is
713
724
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
714
733
self.checker = subprocess.Popen(command,
717
738
except OSError as error:
718
739
logger.error("Failed to start subprocess",
720
self.checker_callback_tag = (gobject.child_watch_add
722
self.checker_callback,
742
self.checker_callback_tag = gobject.child_watch_add(
743
self.checker.pid, self.checker_callback, data=command)
724
744
# The checker may have completed before the gobject
725
745
# watch was added. Check for this.
726
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
728
756
gobject.source_remove(self.checker_callback_tag)
729
757
self.checker_callback(pid, status, command)
802
836
"""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"})
805
842
@dbus_service_property("org.example.Interface", signature="b",
807
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
"org.freedesktop.DBus.Property."
809
"EmitsChangedSignal": "false"})
810
844
def Property_dbus_property(self):
811
845
return dbus.Boolean(False)
813
848
def decorator(func):
814
849
func._dbus_annotations = annotations
819
855
class DBusPropertyException(dbus.exceptions.DBusException):
820
856
"""A base class for D-Bus property-related exceptions
822
def __unicode__(self):
823
return unicode(str(self))
826
861
class DBusPropertyAccessException(DBusPropertyException):
850
885
If called like _is_dbus_thing("method") it returns a function
851
886
suitable for use as predicate to inspect.getmembers().
853
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
856
891
def _get_all_dbus_things(self, thing):
857
892
"""Returns a generator of (name, attribute) pairs
859
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
861
895
athing.__get__(self))
862
896
for cls in self.__class__.__mro__
863
897
for name, athing in
864
inspect.getmembers(cls,
865
self._is_dbus_thing(thing)))
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
867
900
def _get_dbus_property(self, interface_name, property_name):
868
901
"""Returns a bound method if one exists which is a D-Bus
869
902
property with the specified name and interface.
871
for cls in self.__class__.__mro__:
872
for name, value in (inspect.getmembers
874
self._is_dbus_thing("property"))):
904
for cls in self.__class__.__mro__:
905
for name, value in inspect.getmembers(
906
cls, self._is_dbus_thing("property")):
875
907
if (value._dbus_name == property_name
876
908
and value._dbus_interface == interface_name):
877
909
return value.__get__(self)
879
911
# No such property
880
raise DBusPropertyNotFound(self.dbus_object_path + ":"
881
+ interface_name + "."
912
raise DBusPropertyNotFound("{}:{}.{}".format(
913
self.dbus_object_path, interface_name, property_name))
884
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
915
@dbus.service.method(dbus.PROPERTIES_IFACE,
885
917
out_signature="v")
886
918
def Get(self, interface_name, property_name):
887
919
"""Standard D-Bus property Get() method, see D-Bus standard.
905
937
# The byte_arrays option is not supported yet on
906
938
# signatures other than "ay".
907
939
if prop._dbus_signature != "ay":
940
raise ValueError("Byte arrays not supported for non-"
941
"'ay' signature {!r}"
942
.format(prop._dbus_signature))
909
943
value = dbus.ByteArray(b''.join(chr(byte)
910
944
for byte in value))
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
947
@dbus.service.method(dbus.PROPERTIES_IFACE,
914
949
out_signature="a{sv}")
915
950
def GetAll(self, interface_name):
916
951
"""Standard D-Bus property GetAll() method, see D-Bus
931
966
if not hasattr(value, "variant_level"):
932
967
properties[name] = value
934
properties[name] = type(value)(value, variant_level=
935
value.variant_level+1)
969
properties[name] = type(value)(
970
value, variant_level = value.variant_level + 1)
936
971
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
938
981
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
939
982
out_signature="s",
940
983
path_keyword='object_path',
950
993
document = xml.dom.minidom.parseString(xmlstring)
951
995
def make_tag(document, name, prop):
952
996
e = document.createElement("property")
953
997
e.setAttribute("name", name)
954
998
e.setAttribute("type", prop._dbus_signature)
955
999
e.setAttribute("access", prop._dbus_access)
957
1002
for if_tag in document.getElementsByTagName("interface"):
958
1003
# Add property tags
959
1004
for tag in (make_tag(document, name, prop)
984
1027
# Add interface annotation tags
985
1028
for annotation, value in dict(
986
1029
itertools.chain.from_iterable(
987
annotations().iteritems()
988
for name, annotations in
989
self._get_all_dbus_things("interface")
1030
annotations().items()
1031
for name, annotations
1032
in self._get_all_dbus_things("interface")
990
1033
if name == if_tag.getAttribute("name")
992
1035
ann_tag = document.createElement("annotation")
993
1036
ann_tag.setAttribute("name", annotation)
994
1037
ann_tag.setAttribute("value", value)
1058
1101
# Ignore non-D-Bus attributes, and D-Bus attributes
1059
1102
# with the wrong interface name
1060
1103
if (not hasattr(attribute, "_dbus_interface")
1061
or not attribute._dbus_interface
1062
.startswith(orig_interface_name)):
1104
or not attribute._dbus_interface.startswith(
1105
orig_interface_name)):
1064
1107
# Create an alternate D-Bus interface name based on
1065
1108
# the current name
1066
alt_interface = (attribute._dbus_interface
1067
.replace(orig_interface_name,
1068
alt_interface_name))
1109
alt_interface = attribute._dbus_interface.replace(
1110
orig_interface_name, alt_interface_name)
1069
1111
interface_names.add(alt_interface)
1070
1112
# Is this a D-Bus signal?
1071
1113
if getattr(attribute, "_dbus_is_signal", False):
1072
# Extract the original non-method function by
1114
# Extract the original non-method undecorated
1115
# function by black magic
1074
1116
nonmethod_func = (dict(
1075
zip(attribute.func_code.co_freevars,
1076
attribute.__closure__))["func"]
1117
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1078
1120
# Create a new, but exactly alike, function
1079
1121
# object, and decorate it to be a new D-Bus signal
1080
1122
# with the alternate D-Bus interface name
1081
new_function = (dbus.service.signal
1083
attribute._dbus_signature)
1123
new_function = (dbus.service.signal(
1124
alt_interface, attribute._dbus_signature)
1084
1125
(types.FunctionType(
1085
nonmethod_func.func_code,
1086
nonmethod_func.func_globals,
1087
nonmethod_func.func_name,
1088
nonmethod_func.func_defaults,
1089
nonmethod_func.func_closure)))
1126
nonmethod_func.func_code,
1127
nonmethod_func.func_globals,
1128
nonmethod_func.func_name,
1129
nonmethod_func.func_defaults,
1130
nonmethod_func.func_closure)))
1090
1131
# Copy annotations, if any
1092
new_function._dbus_annotations = (
1093
dict(attribute._dbus_annotations))
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1094
1135
except AttributeError:
1096
1137
# Define a creator of a function to call both the
1116
1159
# object. Decorate it to be a new D-Bus method
1117
1160
# with the alternate D-Bus interface name. Add it
1118
1161
# to the class.
1119
attr[attrname] = (dbus.service.method
1121
attribute._dbus_in_signature,
1122
attribute._dbus_out_signature)
1124
(attribute.func_code,
1125
attribute.func_globals,
1126
attribute.func_name,
1127
attribute.func_defaults,
1128
attribute.func_closure)))
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1129
1172
# Copy annotations, if any
1131
attr[attrname]._dbus_annotations = (
1132
dict(attribute._dbus_annotations))
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1133
1176
except AttributeError:
1135
1178
# Is this a D-Bus property?
1138
1181
# object, and decorate it to be a new D-Bus
1139
1182
# property with the alternate D-Bus interface
1140
1183
# name. Add it to the class.
1141
attr[attrname] = (dbus_service_property
1143
attribute._dbus_signature,
1144
attribute._dbus_access,
1146
._dbus_get_args_options
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1154
1195
# Copy annotations, if any
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1158
1199
except AttributeError:
1160
1201
# Is this a D-Bus interface?
1163
1204
# object. Decorate it to be a new D-Bus interface
1164
1205
# with the alternate D-Bus interface name. Add it
1165
1206
# to the class.
1166
attr[attrname] = (dbus_interface_annotations
1169
(attribute.func_code,
1170
attribute.func_globals,
1171
attribute.func_name,
1172
attribute.func_defaults,
1173
attribute.func_closure)))
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1175
1215
# Deprecate all alternate interfaces
1176
iname="_AlternateDBusNames_interface_annotation{0}"
1216
iname="_AlternateDBusNames_interface_annotation{}"
1177
1217
for interface_name in interface_names:
1178
1219
@dbus_interface_annotations(interface_name)
1179
1220
def func(self):
1180
1221
return { "org.freedesktop.DBus.Deprecated":
1182
1223
# Find an unused name
1183
1224
for aname in (iname.format(i)
1184
1225
for i in itertools.count()):
1214
1258
Client.__init__(self, *args, **kwargs)
1215
1259
# Only now, when this client is initialized, can it show up on
1217
client_object_name = unicode(self.name).translate(
1261
client_object_name = str(self.name).translate(
1218
1262
{ord("."): ord("_"),
1219
1263
ord("-"): ord("_")})
1220
self.dbus_object_path = (dbus.ObjectPath
1221
("/clients/" + client_object_name))
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1222
1266
DBusObjectWithProperties.__init__(self, self.bus,
1223
1267
self.dbus_object_path)
1225
def notifychangeproperty(transform_func,
1226
dbus_name, type_func=lambda x: x,
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1273
_interface=_interface):
1228
1274
""" Modify a variable so that it's a property which announces
1229
1275
its changes to DBus.
1235
1281
to the D-Bus. Default: no transform
1236
1282
variant_level: D-Bus variant level. Default: 1
1238
attrname = "_{0}".format(dbus_name)
1284
attrname = "_{}".format(dbus_name)
1239
1286
def setter(self, value):
1240
1287
if hasattr(self, "dbus_object_path"):
1241
1288
if (not hasattr(self, attrname) or
1242
1289
type_func(getattr(self, attrname, None))
1243
1290
!= type_func(value)):
1244
dbus_value = transform_func(type_func(value),
1247
self.PropertyChanged(dbus.String(dbus_name),
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1249
1306
setattr(self, attrname, value)
1251
1308
return property(lambda self: getattr(self, attrname), setter)
1257
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1258
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1260
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1261
type_func = lambda checker:
1262
checker is not None)
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1263
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1264
1321
"LastCheckedOK")
1265
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1268
1325
datetime_to_dbus, "LastApprovalRequest")
1269
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1270
1327
"ApprovedByDefault")
1271
approval_delay = notifychangeproperty(dbus.UInt64,
1274
timedelta_to_milliseconds)
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1275
1331
approval_duration = notifychangeproperty(
1276
1332
dbus.UInt64, "ApprovalDuration",
1277
type_func = timedelta_to_milliseconds)
1333
type_func = lambda td: td.total_seconds() * 1000)
1278
1334
host = notifychangeproperty(dbus.String, "Host")
1279
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1281
timedelta_to_milliseconds)
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1282
1338
extended_timeout = notifychangeproperty(
1283
1339
dbus.UInt64, "ExtendedTimeout",
1284
type_func = timedelta_to_milliseconds)
1285
interval = notifychangeproperty(dbus.UInt64,
1288
timedelta_to_milliseconds)
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1289
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1291
1348
del notifychangeproperty
1319
1376
*args, **kwargs)
1321
1378
def start_checker(self, *args, **kwargs):
1322
old_checker = self.checker
1323
if self.checker is not None:
1324
old_checker_pid = self.checker.pid
1326
old_checker_pid = None
1379
old_checker_pid = getattr(self.checker, "pid", None)
1327
1380
r = Client.start_checker(self, *args, **kwargs)
1328
1381
# Only if new checker process was started
1329
1382
if (self.checker is not None
1339
1392
def approve(self, value=True):
1340
1393
self.approved = value
1341
gobject.timeout_add(timedelta_to_milliseconds
1342
(self.approval_duration),
1343
self._reset_approved)
1394
gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
* 1000), self._reset_approved)
1344
1396
self.send_changedstate()
1346
1398
## D-Bus methods, signals & properties
1347
_interface = "se.recompile.Mandos.Client"
1351
@dbus_interface_annotations(_interface)
1353
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1358
1404
# CheckerCompleted - signal
1445
1493
self.approved_by_default = bool(value)
1447
1495
# ApprovalDelay - property
1448
@dbus_service_property(_interface, signature="t",
1496
@dbus_service_property(_interface,
1449
1498
access="readwrite")
1450
1499
def ApprovalDelay_dbus_property(self, value=None):
1451
1500
if value is None: # get
1452
return dbus.UInt64(self.approval_delay_milliseconds())
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1453
1503
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1455
1505
# ApprovalDuration - property
1456
@dbus_service_property(_interface, signature="t",
1506
@dbus_service_property(_interface,
1457
1508
access="readwrite")
1458
1509
def ApprovalDuration_dbus_property(self, value=None):
1459
1510
if value is None: # get
1460
return dbus.UInt64(timedelta_to_milliseconds(
1461
self.approval_duration))
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1462
1513
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1464
1515
# Name - property
1526
1579
return datetime_to_dbus(self.last_approval_request)
1528
1581
# Timeout - property
1529
@dbus_service_property(_interface, signature="t",
1582
@dbus_service_property(_interface,
1530
1584
access="readwrite")
1531
1585
def Timeout_dbus_property(self, value=None):
1532
1586
if value is None: # get
1533
return dbus.UInt64(self.timeout_milliseconds())
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1534
1588
old_timeout = self.timeout
1535
1589
self.timeout = datetime.timedelta(0, 0, 0, value)
1536
1590
# Reschedule disabling
1547
1601
gobject.source_remove(self.disable_initiator_tag)
1548
self.disable_initiator_tag = (
1549
gobject.timeout_add(
1550
timedelta_to_milliseconds(self.expires - now),
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1553
1606
# ExtendedTimeout - property
1554
@dbus_service_property(_interface, signature="t",
1607
@dbus_service_property(_interface,
1555
1609
access="readwrite")
1556
1610
def ExtendedTimeout_dbus_property(self, value=None):
1557
1611
if value is None: # get
1558
return dbus.UInt64(self.extended_timeout_milliseconds())
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1559
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1561
1616
# Interval - property
1562
@dbus_service_property(_interface, signature="t",
1617
@dbus_service_property(_interface,
1563
1619
access="readwrite")
1564
1620
def Interval_dbus_property(self, value=None):
1565
1621
if value is None: # get
1566
return dbus.UInt64(self.interval_milliseconds())
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1567
1623
self.interval = datetime.timedelta(0, 0, 0, value)
1568
1624
if getattr(self, "checker_initiator_tag", None) is None:
1570
1626
if self.enabled:
1571
1627
# Reschedule checker run
1572
1628
gobject.source_remove(self.checker_initiator_tag)
1573
self.checker_initiator_tag = (gobject.timeout_add
1574
(value, self.start_checker))
1575
self.start_checker() # Start one now, too
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1577
1633
# Checker - property
1578
@dbus_service_property(_interface, signature="s",
1634
@dbus_service_property(_interface,
1579
1636
access="readwrite")
1580
1637
def Checker_dbus_property(self, value=None):
1581
1638
if value is None: # get
1582
1639
return dbus.String(self.checker_command)
1583
self.checker_command = unicode(value)
1640
self.checker_command = str(value)
1585
1642
# CheckerRunning - property
1586
@dbus_service_property(_interface, signature="b",
1643
@dbus_service_property(_interface,
1587
1645
access="readwrite")
1588
1646
def CheckerRunning_dbus_property(self, value=None):
1589
1647
if value is None: # get
1642
1704
def handle(self):
1643
1705
with contextlib.closing(self.server.child_pipe) as child_pipe:
1644
1706
logger.info("TCP connection from: %s",
1645
unicode(self.client_address))
1707
str(self.client_address))
1646
1708
logger.debug("Pipe FD: %d",
1647
1709
self.server.child_pipe.fileno())
1649
session = (gnutls.connection
1650
.ClientSession(self.request,
1652
.X509Credentials()))
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1654
1714
# Note: gnutls.connection.X509Credentials is really a
1655
1715
# generic GnuTLS certificate credentials object so long as
1815
1872
def fingerprint(openpgp):
1816
1873
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1817
1874
# New GnuTLS "datum" with the OpenPGP public key
1818
datum = (gnutls.library.types
1819
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1822
ctypes.c_uint(len(openpgp))))
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1823
1879
# New empty GnuTLS certificate
1824
1880
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1825
(gnutls.library.functions
1826
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1827
1883
# Import the OpenPGP public key into the certificate
1828
(gnutls.library.functions
1829
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1830
gnutls.library.constants
1831
.GNUTLS_OPENPGP_FMT_RAW))
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1832
1887
# Verify the self signature in the key
1833
1888
crtverify = ctypes.c_uint()
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_verify_self(crt, 0,
1836
ctypes.byref(crtverify)))
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1837
1891
if crtverify.value != 0:
1838
1892
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1839
raise (gnutls.errors.CertificateSecurityError
1893
raise gnutls.errors.CertificateSecurityError(
1841
1895
# New buffer for the fingerprint
1842
1896
buf = ctypes.create_string_buffer(20)
1843
1897
buf_len = ctypes.c_size_t()
1844
1898
# Get the fingerprint from the certificate into the buffer
1845
(gnutls.library.functions
1846
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1847
ctypes.byref(buf_len)))
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1848
1901
# Deinit the certificate
1849
1902
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1850
1903
# Convert the buffer to a Python bytestring
1969
2027
if self.address_family == socket.AF_INET6:
1970
2028
any_address = "::" # in6addr_any
1972
any_address = socket.INADDR_ANY
2030
any_address = "0.0.0.0" # INADDR_ANY
1973
2031
self.server_address = (any_address,
1974
2032
self.server_address[1])
1975
2033
elif not self.server_address[1]:
1976
self.server_address = (self.server_address[0],
2034
self.server_address = (self.server_address[0], 0)
1978
2035
# if self.interface:
1979
2036
# self.server_address = (self.server_address[0],
2018
2081
def add_pipe(self, parent_pipe, proc):
2019
2082
# Call "handle_ipc" for both data and EOF events
2020
gobject.io_add_watch(parent_pipe.fileno(),
2021
gobject.IO_IN | gobject.IO_HUP,
2022
functools.partial(self.handle_ipc,
2083
gobject.io_add_watch(
2084
parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe = parent_pipe,
2027
def handle_ipc(self, source, condition, parent_pipe=None,
2028
proc = None, client_object=None):
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2029
2094
# error, or the other end of multiprocessing.Pipe has closed
2030
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2031
2096
# Wait for other process to exit
2118
2182
# avoid excessive use of external libraries.
2120
2184
# New type for defining tokens, syntax, and semantics all-in-one
2121
Token = collections.namedtuple("Token",
2122
("regexp", # To match token; if
2123
# "value" is not None,
2124
# must have a "group"
2126
"value", # datetime.timedelta or
2128
"followers")) # Tokens valid after
2185
Token = collections.namedtuple("Token", (
2186
"regexp", # To match token; if "value" is not None, must have
2187
# a "group" containing digits
2188
"value", # datetime.timedelta or None
2189
"followers")) # Tokens valid after this token
2130
2190
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2131
2191
# the "duration" ABNF definition in RFC 3339, Appendix A.
2132
2192
token_end = Token(re.compile(r"$"), None, frozenset())
2133
2193
token_second = Token(re.compile(r"(\d+)S"),
2134
2194
datetime.timedelta(seconds=1),
2135
frozenset((token_end,)))
2195
frozenset((token_end, )))
2136
2196
token_minute = Token(re.compile(r"(\d+)M"),
2137
2197
datetime.timedelta(minutes=1),
2138
2198
frozenset((token_second, token_end)))
2154
2214
frozenset((token_month, token_end)))
2155
2215
token_week = Token(re.compile(r"(\d+)W"),
2156
2216
datetime.timedelta(weeks=1),
2157
frozenset((token_end,)))
2217
frozenset((token_end, )))
2158
2218
token_duration = Token(re.compile(r"P"), None,
2159
2219
frozenset((token_year, token_month,
2160
2220
token_day, token_time,
2162
2222
# Define starting values
2163
2223
value = datetime.timedelta() # Value so far
2164
2224
found_token = None
2165
followers = frozenset(token_duration,) # Following valid tokens
2225
followers = frozenset((token_duration, )) # Following valid tokens
2166
2226
s = duration # String left to parse
2167
2227
# Loop until end token is found
2168
2228
while found_token is not token_end:
2269
2329
parser = argparse.ArgumentParser()
2270
2330
parser.add_argument("-v", "--version", action="version",
2271
version = "%(prog)s {0}".format(version),
2331
version = "%(prog)s {}".format(version),
2272
2332
help="show version number and exit")
2273
2333
parser.add_argument("-i", "--interface", metavar="IF",
2274
2334
help="Bind to interface IF")
2294
2354
parser.add_argument("--no-dbus", action="store_false",
2295
2355
dest="use_dbus", help="Do not provide D-Bus"
2296
" system bus interface")
2356
" system bus interface", default=None)
2297
2357
parser.add_argument("--no-ipv6", action="store_false",
2298
dest="use_ipv6", help="Do not use IPv6")
2358
dest="use_ipv6", help="Do not use IPv6",
2299
2360
parser.add_argument("--no-restore", action="store_false",
2300
2361
dest="restore", help="Do not restore stored"
2362
" state", default=None)
2302
2363
parser.add_argument("--socket", type=int,
2303
2364
help="Specify a file descriptor to a network"
2304
2365
" socket to use instead of creating one")
2305
2366
parser.add_argument("--statedir", metavar="DIR",
2306
2367
help="Directory to save/restore state in")
2307
2368
parser.add_argument("--foreground", action="store_true",
2308
help="Run in foreground")
2369
help="Run in foreground", default=None)
2370
parser.add_argument("--no-zeroconf", action="store_false",
2371
dest="zeroconf", help="Do not use Zeroconf",
2310
2374
options = parser.parse_args()
2312
2376
if options.check:
2378
fail_count, test_count = doctest.testmod()
2379
sys.exit(os.EX_OK if fail_count == 0 else 1)
2317
2381
# Default values for config file for server-global settings
2318
2382
server_defaults = { "interface": "",
2330
2395
"statedir": "/var/lib/mandos",
2331
2396
"foreground": "False",
2334
2400
# Parse config file for server-global settings
2335
2401
server_config = configparser.SafeConfigParser(server_defaults)
2336
2402
del server_defaults
2337
server_config.read(os.path.join(options.configdir,
2403
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2339
2404
# Convert the SafeConfigParser object to a dict
2340
2405
server_settings = server_config.defaults()
2341
2406
# Use the appropriate methods on the non-string config options
2359
2424
# Override the settings from the config file with command line
2360
2425
# options, if set.
2361
2426
for option in ("interface", "address", "port", "debug",
2362
"priority", "servicename", "configdir",
2363
"use_dbus", "use_ipv6", "debuglevel", "restore",
2364
"statedir", "socket", "foreground"):
2427
"priority", "servicename", "configdir", "use_dbus",
2428
"use_ipv6", "debuglevel", "restore", "statedir",
2429
"socket", "foreground", "zeroconf"):
2365
2430
value = getattr(options, option)
2366
2431
if value is not None:
2367
2432
server_settings[option] = value
2369
2434
# Force all strings to be unicode
2370
2435
for option in server_settings.keys():
2371
if type(server_settings[option]) is str:
2372
server_settings[option] = unicode(server_settings[option])
2436
if isinstance(server_settings[option], bytes):
2437
server_settings[option] = (server_settings[option]
2439
# Force all boolean options to be boolean
2440
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2441
"foreground", "zeroconf"):
2442
server_settings[option] = bool(server_settings[option])
2373
2443
# Debug implies foreground
2374
2444
if server_settings["debug"]:
2375
2445
server_settings["foreground"] = True
2411
2486
global mandos_dbus_service
2412
2487
mandos_dbus_service = None
2414
tcp_server = MandosServer((server_settings["address"],
2415
server_settings["port"]),
2417
interface=(server_settings["interface"]
2421
server_settings["priority"],
2423
socketfd=(server_settings["socket"]
2490
if server_settings["socket"] != "":
2491
socketfd = server_settings["socket"]
2492
tcp_server = MandosServer(
2493
(server_settings["address"], server_settings["port"]),
2495
interface=(server_settings["interface"] or None),
2497
gnutls_priority=server_settings["priority"],
2425
2500
if not foreground:
2426
pidfilename = "/var/run/mandos.pid"
2501
pidfilename = "/run/mandos.pid"
2502
if not os.path.isdir("/run/."):
2503
pidfilename = "/var/run/mandos.pid"
2429
pidfile = open(pidfilename, "w")
2506
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2430
2507
except IOError as e:
2431
2508
logger.error("Could not open file %r", pidfilename,
2488
2565
bus_name = dbus.service.BusName("se.recompile.Mandos",
2489
bus, do_not_queue=True)
2490
old_bus_name = (dbus.service.BusName
2491
("se.bsnet.fukt.Mandos", bus,
2493
except dbus.exceptions.NameExistsException as e:
2568
old_bus_name = dbus.service.BusName(
2569
"se.bsnet.fukt.Mandos", bus,
2571
except dbus.exceptions.DBusException as e:
2494
2572
logger.error("Disabling D-Bus:", exc_info=e)
2495
2573
use_dbus = False
2496
2574
server_settings["use_dbus"] = False
2497
2575
tcp_server.use_dbus = False
2498
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2499
service = AvahiServiceToSyslog(name =
2500
server_settings["servicename"],
2501
servicetype = "_mandos._tcp",
2502
protocol = protocol, bus = bus)
2503
if server_settings["interface"]:
2504
service.interface = (if_nametoindex
2505
(str(server_settings["interface"])))
2577
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2578
service = AvahiServiceToSyslog(
2579
name = server_settings["servicename"],
2580
servicetype = "_mandos._tcp",
2581
protocol = protocol,
2583
if server_settings["interface"]:
2584
service.interface = if_nametoindex(
2585
server_settings["interface"].encode("utf-8"))
2507
2587
global multiprocessing_manager
2508
2588
multiprocessing_manager = multiprocessing.Manager()
2515
2595
old_client_settings = {}
2516
2596
clients_data = {}
2598
# This is used to redirect stdout and stderr for checker processes
2600
wnull = open(os.devnull, "w") # A writable /dev/null
2601
# Only used if server is running in foreground but not in debug
2603
if debug or not foreground:
2518
2606
# Get client data and settings from last running state.
2519
2607
if server_settings["restore"]:
2521
2609
with open(stored_state_path, "rb") as stored_state:
2522
clients_data, old_client_settings = (pickle.load
2610
clients_data, old_client_settings = pickle.load(
2524
2612
os.remove(stored_state_path)
2525
2613
except IOError as e:
2526
2614
if e.errno == errno.ENOENT:
2527
logger.warning("Could not load persistent state: {0}"
2528
.format(os.strerror(e.errno)))
2615
logger.warning("Could not load persistent state:"
2616
" {}".format(os.strerror(e.errno)))
2530
2618
logger.critical("Could not load persistent state:",
2533
2621
except EOFError as e:
2534
2622
logger.warning("Could not load persistent state: "
2535
"EOFError:", exc_info=e)
2537
2626
with PGPEngine() as pgp:
2538
for client_name, client in clients_data.iteritems():
2627
for client_name, client in clients_data.items():
2628
# Skip removed clients
2629
if client_name not in client_settings:
2539
2632
# Decide which value to use after restoring saved state.
2540
2633
# We have three different values: Old config file,
2541
2634
# new config file, and saved state.
2562
2655
if datetime.datetime.utcnow() >= client["expires"]:
2563
2656
if not client["last_checked_ok"]:
2564
2657
logger.warning(
2565
"disabling client {0} - Client never "
2566
"performed a successful checker"
2567
.format(client_name))
2658
"disabling client {} - Client never "
2659
"performed a successful checker".format(
2568
2661
client["enabled"] = False
2569
2662
elif client["last_checker_status"] != 0:
2570
2663
logger.warning(
2571
"disabling client {0} - Client "
2572
"last checker failed with error code {1}"
2573
.format(client_name,
2574
client["last_checker_status"]))
2664
"disabling client {} - Client last"
2665
" checker failed with error code"
2668
client["last_checker_status"]))
2575
2669
client["enabled"] = False
2577
client["expires"] = (datetime.datetime
2579
+ client["timeout"])
2671
client["expires"] = (
2672
datetime.datetime.utcnow()
2673
+ client["timeout"])
2580
2674
logger.debug("Last checker succeeded,"
2581
" keeping {0} enabled"
2582
.format(client_name))
2675
" keeping {} enabled".format(
2584
client["secret"] = (
2585
pgp.decrypt(client["encrypted_secret"],
2586
client_settings[client_name]
2678
client["secret"] = pgp.decrypt(
2679
client["encrypted_secret"],
2680
client_settings[client_name]["secret"])
2588
2681
except PGPError:
2589
2682
# If decryption fails, we use secret from new settings
2590
logger.debug("Failed to decrypt {0} old secret"
2591
.format(client_name))
2592
client["secret"] = (
2593
client_settings[client_name]["secret"])
2683
logger.debug("Failed to decrypt {} old secret".format(
2685
client["secret"] = (client_settings[client_name]
2595
2688
# Add/remove clients based on new changes made to config
2596
2689
for client_name in (set(old_client_settings)
2601
2694
clients_data[client_name] = client_settings[client_name]
2603
2696
# Create all client objects
2604
for client_name, client in clients_data.iteritems():
2697
for client_name, client in clients_data.items():
2605
2698
tcp_server.clients[client_name] = client_class(
2606
name = client_name, settings = client)
2701
server_settings = server_settings)
2608
2703
if not tcp_server.clients:
2609
2704
logger.warning("No clients defined")
2611
2706
if not foreground:
2612
2707
if pidfile is not None:
2616
pidfile.write(str(pid) + "\n".encode("utf-8"))
2711
print(pid, file=pidfile)
2617
2712
except IOError:
2618
2713
logger.error("Could not write to file %r with PID %d",
2619
2714
pidfilename, pid)
2624
2719
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2627
@alternate_dbus_interfaces({"se.recompile.Mandos":
2628
"se.bsnet.fukt.Mandos"})
2723
@alternate_dbus_interfaces(
2724
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2629
2725
class MandosDBusService(DBusObjectWithProperties):
2630
2726
"""A D-Bus proxy object"""
2631
2728
def __init__(self):
2632
2729
dbus.service.Object.__init__(self, bus, "/")
2633
2731
_interface = "se.recompile.Mandos"
2635
2733
@dbus_interface_annotations(_interface)
2636
2734
def _foo(self):
2637
return { "org.freedesktop.DBus.Property"
2638
".EmitsChangedSignal":
2736
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2641
2739
@dbus.service.signal(_interface, signature="o")
2642
2740
def ClientAdded(self, objpath):
2709
2808
# A list of attributes that can not be pickled
2711
exclude = set(("bus", "changedstate", "secret",
2713
for name, typ in (inspect.getmembers
2714
(dbus.service.Object)):
2810
exclude = { "bus", "changedstate", "secret",
2811
"checker", "server_settings" }
2812
for name, typ in inspect.getmembers(dbus.service
2715
2814
exclude.add(name)
2717
2816
client_dict["encrypted_secret"] = (client
2724
2823
del client_settings[client.name]["secret"]
2727
with (tempfile.NamedTemporaryFile
2728
(mode='wb', suffix=".pickle", prefix='clients-',
2729
dir=os.path.dirname(stored_state_path),
2730
delete=False)) as stored_state:
2826
with tempfile.NamedTemporaryFile(
2830
dir=os.path.dirname(stored_state_path),
2831
delete=False) as stored_state:
2731
2832
pickle.dump((clients, client_settings), stored_state)
2732
tempname=stored_state.name
2833
tempname = stored_state.name
2733
2834
os.rename(tempname, stored_state_path)
2734
2835
except (IOError, OSError) as e:
2785
2886
#service.interface = tcp_server.socket.getsockname()[3]
2788
# From the Avahi example code
2791
except dbus.exceptions.DBusException as error:
2792
logger.critical("D-Bus Exception", exc_info=error)
2795
# End of Avahi example code
2890
# From the Avahi example code
2893
except dbus.exceptions.DBusException as error:
2894
logger.critical("D-Bus Exception", exc_info=error)
2897
# End of Avahi example code
2797
2899
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2798
2900
lambda *args, **kwargs: