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:'
189
174
def password_encode(self, password):
190
175
# Passphrase can not be empty and can not contain newlines or
191
176
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
177
return b"mandos" + binascii.hexlify(password)
200
179
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
193
self.gnupg.passphrase = None
216
194
return ciphertext
218
196
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
210
self.gnupg.passphrase = None
234
211
return decrypted_plaintext
237
214
class AvahiError(Exception):
238
215
def __init__(self, value, *args, **kwargs):
239
216
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
217
super(AvahiError, self).__init__(value, *args, **kwargs)
218
def __unicode__(self):
219
return unicode(repr(self.value))
244
221
class AvahiServiceError(AvahiError):
248
224
class AvahiGroupError(AvahiError):
297
266
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
269
"""Derived from the Avahi example code"""
301
270
if self.rename_count >= self.max_renames:
302
271
logger.critical("No suitable Zeroconf service name found"
303
272
" after %i retries, exiting.",
304
273
self.rename_count)
305
274
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
275
self.name = unicode(self.server
276
.GetAlternativeServiceName(self.name))
309
277
logger.info("Changing Zeroconf service name to %r ...",
315
282
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)
283
logger.critical("D-Bus Exception", exc_info=error)
286
self.rename_count += 1
325
288
def remove(self):
326
289
"""Derived from the Avahi example code"""
381
345
def server_state_changed(self, state, error=None):
382
346
"""Derived from the Avahi example code"""
383
347
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",
348
bad_states = { avahi.SERVER_INVALID:
349
"Zeroconf server invalid",
350
avahi.SERVER_REGISTERING: None,
351
avahi.SERVER_COLLISION:
352
"Zeroconf server name collision",
353
avahi.SERVER_FAILURE:
354
"Zeroconf server failure" }
390
355
if state in bad_states:
391
356
if bad_states[state] is not None:
392
357
if error is None:
422
376
follow_name_owner_changes=True),
423
377
avahi.DBUS_INTERFACE_SERVER)
424
378
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
379
self.server_state_changed)
426
380
self.server_state_changed(self.server.GetState())
429
383
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
431
385
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
386
ret = AvahiService.rename(self)
387
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
445
connection.send(func(*args, **kwargs))
394
def timedelta_to_milliseconds(td):
395
"Convert a datetime.timedelta() to milliseconds"
396
return ((td.days * 24 * 60 * 60 * 1000)
397
+ (td.seconds * 1000)
398
+ (td.microseconds // 1000))
448
401
class Client(object):
449
402
"""A representation of a client host served by this server.
496
446
"fingerprint", "host", "interval",
497
447
"last_approval_request", "last_checked_ok",
498
448
"last_enabled", "name", "timeout")
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
449
client_defaults = { "timeout": "5m",
450
"extended_timeout": "15m",
452
"checker": "fping -q -- %%(host)s",
454
"approval_delay": "0s",
455
"approval_duration": "1s",
456
"approved_by_default": "True",
460
def timeout_milliseconds(self):
461
"Return the 'timeout' attribute in milliseconds"
462
return timedelta_to_milliseconds(self.timeout)
464
def extended_timeout_milliseconds(self):
465
"Return the 'extended_timeout' attribute in milliseconds"
466
return timedelta_to_milliseconds(self.extended_timeout)
468
def interval_milliseconds(self):
469
"Return the 'interval' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.interval)
472
def approval_delay_milliseconds(self):
473
return timedelta_to_milliseconds(self.approval_delay)
512
476
def config_parser(config):
590
551
self.current_checker_command = None
591
552
self.approved = None
592
553
self.approvals_pending = 0
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
554
self.changedstate = (multiprocessing_manager
555
.Condition(multiprocessing_manager
557
self.client_structure = [attr for attr in
558
self.__dict__.iterkeys()
597
559
if not attr.startswith("_")]
598
560
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
562
for name, t in inspect.getmembers(type(self),
602
566
if not name.startswith("_"):
603
567
self.client_structure.append(name)
646
610
# and every interval from then on.
647
611
if self.checker_initiator_tag is not None:
648
612
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
613
self.checker_initiator_tag = (gobject.timeout_add
614
(self.interval_milliseconds(),
652
616
# Schedule a disable() when 'timeout' has passed
653
617
if self.disable_initiator_tag is not None:
654
618
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
619
self.disable_initiator_tag = (gobject.timeout_add
620
(self.timeout_milliseconds(),
657
622
# Also start a new checker *right now*.
658
623
self.start_checker()
660
def checker_callback(self, source, condition, connection,
625
def checker_callback(self, pid, condition, command):
662
626
"""The checker has completed, so take appropriate actions."""
663
627
self.checker_callback_tag = None
664
628
self.checker = None
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
672
631
if self.last_checker_status == 0:
673
632
logger.info("Checker for %(name)s succeeded",
675
634
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
636
logger.info("Checker for %(name)s failed",
679
639
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
640
logger.warning("Checker for %(name)s crashed?",
685
643
def checked_ok(self):
686
644
"""Assert that the client has been seen, alive and well."""
687
645
self.last_checked_ok = datetime.datetime.utcnow()
688
646
self.last_checker_status = 0
689
self.last_checker_signal = None
690
647
self.bump_timeout()
692
649
def bump_timeout(self, timeout=None):
718
676
# than 'timeout' for the client to be disabled, which is as it
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
679
# If a checker exists, make sure it is not a zombie
681
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
except (AttributeError, OSError) as error:
683
if (isinstance(error, OSError)
684
and error.errno != errno.ECHILD):
688
logger.warning("Checker was a zombie")
689
gobject.source_remove(self.checker_callback_tag)
690
self.checker_callback(pid, status,
691
self.current_checker_command)
725
692
# Start a new checker if needed
726
693
if self.checker is None:
727
694
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
695
escaped_attrs = dict(
696
(attr, re.escape(unicode(getattr(self, attr))))
698
self.runtime_expansions)
732
700
command = self.checker_command % escaped_attrs
733
701
except TypeError as error:
734
702
logger.error('Could not format string "%s"',
735
self.checker_command,
703
self.checker_command, exc_info=error)
704
return True # Try again later
705
self.current_checker_command = command
707
logger.info("Starting checker %r for %s",
709
# We don't need to redirect stdout and stderr, since
710
# in normal mode, that is already done by daemon(),
711
# and in debug mode we don't want to. (Stdin is
712
# always replaced by /dev/null.)
713
self.checker = subprocess.Popen(command,
716
except OSError as error:
717
logger.error("Failed to start subprocess",
737
return True # Try again later
738
self.current_checker_command = command
739
logger.info("Starting checker %r for %s", command,
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
748
popen_args = { "close_fds": True,
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
758
args = (pipe[1], subprocess.call, command),
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
719
self.checker_callback_tag = (gobject.child_watch_add
721
self.checker_callback,
723
# The checker may have completed before the gobject
724
# watch was added. Check for this.
725
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
gobject.source_remove(self.checker_callback_tag)
728
self.checker_callback(pid, status, command)
764
729
# Re-run this periodically if run by gobject.timeout_add
835
801
"""Decorator to annotate D-Bus methods, signals or properties
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
804
@dbus_service_property("org.example.Interface", signature="b",
806
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
"org.freedesktop.DBus.Property."
808
"EmitsChangedSignal": "false"})
843
809
def Property_dbus_property(self):
844
810
return dbus.Boolean(False)
847
812
def decorator(func):
848
813
func._dbus_annotations = annotations
854
818
class DBusPropertyException(dbus.exceptions.DBusException):
855
819
"""A base class for D-Bus property-related exceptions
821
def __unicode__(self):
822
return unicode(str(self))
860
825
class DBusPropertyAccessException(DBusPropertyException):
884
849
If called like _is_dbus_thing("method") it returns a function
885
850
suitable for use as predicate to inspect.getmembers().
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
852
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
890
855
def _get_all_dbus_things(self, thing):
891
856
"""Returns a generator of (name, attribute) pairs
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
858
return ((getattr(athing.__get__(self), "_dbus_name",
894
860
athing.__get__(self))
895
861
for cls in self.__class__.__mro__
896
862
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
899
866
def _get_dbus_property(self, interface_name, property_name):
900
867
"""Returns a bound method if one exists which is a D-Bus
901
868
property with the specified name and interface.
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
870
for cls in self.__class__.__mro__:
871
for name, value in (inspect.getmembers
873
self._is_dbus_thing("property"))):
906
874
if (value._dbus_name == property_name
907
875
and value._dbus_interface == interface_name):
908
876
return value.__get__(self)
910
878
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
879
raise DBusPropertyNotFound(self.dbus_object_path + ":"
880
+ interface_name + "."
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
883
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
884
out_signature="v")
917
885
def Get(self, interface_name, property_name):
918
886
"""Standard D-Bus property Get() method, see D-Bus standard.
1100
1057
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1058
# with the wrong interface name
1102
1059
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1060
or not attribute._dbus_interface
1061
.startswith(orig_interface_name)):
1106
1063
# Create an alternate D-Bus interface name based on
1107
1064
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1065
alt_interface = (attribute._dbus_interface
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1110
1068
interface_names.add(alt_interface)
1111
1069
# Is this a D-Bus signal?
1112
1070
if getattr(attribute, "_dbus_is_signal", False):
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1071
# Extract the original non-method function by
1073
nonmethod_func = (dict(
1117
1074
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1075
attribute.__closure__))["func"]
1122
1077
# Create a new, but exactly alike, function
1123
1078
# object, and decorate it to be a new D-Bus signal
1124
1079
# with the alternate D-Bus interface name
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1141
attribute._dbus_signature)(new_function))
1080
new_function = (dbus.service.signal
1082
attribute._dbus_signature)
1083
(types.FunctionType(
1084
nonmethod_func.func_code,
1085
nonmethod_func.func_globals,
1086
nonmethod_func.func_name,
1087
nonmethod_func.func_defaults,
1088
nonmethod_func.func_closure)))
1142
1089
# Copy annotations, if any
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1091
new_function._dbus_annotations = (
1092
dict(attribute._dbus_annotations))
1146
1093
except AttributeError:
1148
1095
# Define a creator of a function to call both the
1170
1115
# object. Decorate it to be a new D-Bus method
1171
1116
# with the alternate D-Bus interface name. Add it
1172
1117
# to the class.
1174
dbus.service.method(
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1118
attr[attrname] = (dbus.service.method
1120
attribute._dbus_in_signature,
1121
attribute._dbus_out_signature)
1123
(attribute.func_code,
1124
attribute.func_globals,
1125
attribute.func_name,
1126
attribute.func_defaults,
1127
attribute.func_closure)))
1183
1128
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1130
attr[attrname]._dbus_annotations = (
1131
dict(attribute._dbus_annotations))
1187
1132
except AttributeError:
1189
1134
# Is this a D-Bus property?
1192
1137
# object, and decorate it to be a new D-Bus
1193
1138
# property with the alternate D-Bus interface
1194
1139
# name. Add it to the class.
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1140
attr[attrname] = (dbus_service_property
1142
attribute._dbus_signature,
1143
attribute._dbus_access,
1145
._dbus_get_args_options
1148
(attribute.func_code,
1149
attribute.func_globals,
1150
attribute.func_name,
1151
attribute.func_defaults,
1152
attribute.func_closure)))
1206
1153
# Copy annotations, if any
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1155
attr[attrname]._dbus_annotations = (
1156
dict(attribute._dbus_annotations))
1210
1157
except AttributeError:
1212
1159
# Is this a D-Bus interface?
1215
1162
# object. Decorate it to be a new D-Bus interface
1216
1163
# with the alternate D-Bus interface name. Add it
1217
1164
# to the class.
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1165
attr[attrname] = (dbus_interface_annotations
1168
(attribute.func_code,
1169
attribute.func_globals,
1170
attribute.func_name,
1171
attribute.func_defaults,
1172
attribute.func_closure)))
1226
1174
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1175
iname="_AlternateDBusNames_interface_annotation{0}"
1228
1176
for interface_name in interface_names:
1230
1177
@dbus_interface_annotations(interface_name)
1231
1178
def func(self):
1232
1179
return { "org.freedesktop.DBus.Deprecated":
1234
1181
# Find an unused name
1235
1182
for aname in (iname.format(i)
1236
1183
for i in itertools.count()):
1269
1213
Client.__init__(self, *args, **kwargs)
1270
1214
# Only now, when this client is initialized, can it show up on
1272
client_object_name = str(self.name).translate(
1216
client_object_name = unicode(self.name).translate(
1273
1217
{ord("."): ord("_"),
1274
1218
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1219
self.dbus_object_path = (dbus.ObjectPath
1220
("/clients/" + client_object_name))
1277
1221
DBusObjectWithProperties.__init__(self, self.bus,
1278
1222
self.dbus_object_path)
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1284
_interface=_interface):
1224
def notifychangeproperty(transform_func,
1225
dbus_name, type_func=lambda x: x,
1285
1227
""" Modify a variable so that it's a property which announces
1286
1228
its changes to DBus.
1292
1234
to the D-Bus. Default: no transform
1293
1235
variant_level: D-Bus variant level. Default: 1
1295
attrname = "_{}".format(dbus_name)
1237
attrname = "_{0}".format(dbus_name)
1297
1238
def setter(self, value):
1298
1239
if hasattr(self, "dbus_object_path"):
1299
1240
if (not hasattr(self, attrname) or
1300
1241
type_func(getattr(self, attrname, None))
1301
1242
!= type_func(value)):
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1307
dbus_value = transform_func(
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1312
self.PropertiesChanged(
1314
dbus.Dictionary({ dbus.String(dbus_name):
1243
dbus_value = transform_func(type_func(value),
1246
self.PropertyChanged(dbus.String(dbus_name),
1317
1248
setattr(self, attrname, value)
1319
1250
return property(lambda self: getattr(self, attrname), setter)
1336
1267
datetime_to_dbus, "LastApprovalRequest")
1337
1268
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1269
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1270
approval_delay = notifychangeproperty(dbus.UInt64,
1273
timedelta_to_milliseconds)
1342
1274
approval_duration = notifychangeproperty(
1343
1275
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1276
type_func = timedelta_to_milliseconds)
1345
1277
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1278
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1280
timedelta_to_milliseconds)
1349
1281
extended_timeout = notifychangeproperty(
1350
1282
dbus.UInt64, "ExtendedTimeout",
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1283
type_func = timedelta_to_milliseconds)
1284
interval = notifychangeproperty(dbus.UInt64,
1287
timedelta_to_milliseconds)
1355
1288
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1359
1290
del notifychangeproperty
1367
1298
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1299
Client.__del__(self, *args, **kwargs)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1375
exitstatus = self.last_checker_status
1301
def checker_callback(self, pid, condition, command,
1303
self.checker_callback_tag = None
1305
if os.WIFEXITED(condition):
1306
exitstatus = os.WEXITSTATUS(condition)
1377
1307
# Emit D-Bus signal
1378
1308
self.CheckerCompleted(dbus.Int16(exitstatus),
1309
dbus.Int64(condition),
1380
1310
dbus.String(command))
1382
1312
# Emit D-Bus signal
1383
1313
self.CheckerCompleted(dbus.Int16(-1),
1385
self.last_checker_signal),
1314
dbus.Int64(condition),
1386
1315
dbus.String(command))
1317
return Client.checker_callback(self, pid, condition, command,
1389
1320
def start_checker(self, *args, **kwargs):
1390
old_checker_pid = getattr(self.checker, "pid", None)
1321
old_checker = self.checker
1322
if self.checker is not None:
1323
old_checker_pid = self.checker.pid
1325
old_checker_pid = None
1391
1326
r = Client.start_checker(self, *args, **kwargs)
1392
1327
# Only if new checker process was started
1393
1328
if (self.checker is not None
1504
1444
self.approved_by_default = bool(value)
1506
1446
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1447
@dbus_service_property(_interface, signature="t",
1509
1448
access="readwrite")
1510
1449
def ApprovalDelay_dbus_property(self, value=None):
1511
1450
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1451
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1452
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1516
1454
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1455
@dbus_service_property(_interface, signature="t",
1519
1456
access="readwrite")
1520
1457
def ApprovalDuration_dbus_property(self, value=None):
1521
1458
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1459
return dbus.UInt64(timedelta_to_milliseconds(
1460
self.approval_duration))
1524
1461
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1526
1463
# Name - property
1612
1546
gobject.source_remove(self.disable_initiator_tag)
1613
self.disable_initiator_tag = gobject.timeout_add(
1614
int((self.expires - now).total_seconds() * 1000),
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1617
1552
# ExtendedTimeout - property
1618
@dbus_service_property(_interface,
1553
@dbus_service_property(_interface, signature="t",
1620
1554
access="readwrite")
1621
1555
def ExtendedTimeout_dbus_property(self, value=None):
1622
1556
if value is None: # get
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1557
return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1558
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1627
1560
# Interval - property
1628
@dbus_service_property(_interface,
1561
@dbus_service_property(_interface, signature="t",
1630
1562
access="readwrite")
1631
1563
def Interval_dbus_property(self, value=None):
1632
1564
if value is None: # get
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1565
return dbus.UInt64(self.interval_milliseconds())
1634
1566
self.interval = datetime.timedelta(0, 0, 0, value)
1635
1567
if getattr(self, "checker_initiator_tag", None) is None:
1637
1569
if self.enabled:
1638
1570
# Reschedule checker run
1639
1571
gobject.source_remove(self.checker_initiator_tag)
1640
self.checker_initiator_tag = gobject.timeout_add(
1641
value, self.start_checker)
1642
self.start_checker() # Start one now, too
1572
self.checker_initiator_tag = (gobject.timeout_add
1573
(value, self.start_checker))
1574
self.start_checker() # Start one now, too
1644
1576
# Checker - property
1645
@dbus_service_property(_interface,
1577
@dbus_service_property(_interface, signature="s",
1647
1578
access="readwrite")
1648
1579
def Checker_dbus_property(self, value=None):
1649
1580
if value is None: # get
1650
1581
return dbus.String(self.checker_command)
1651
self.checker_command = str(value)
1582
self.checker_command = unicode(value)
1653
1584
# CheckerRunning - property
1654
@dbus_service_property(_interface,
1585
@dbus_service_property(_interface, signature="b",
1656
1586
access="readwrite")
1657
1587
def CheckerRunning_dbus_property(self, value=None):
1658
1588
if value is None: # get
1883
1814
def fingerprint(openpgp):
1884
1815
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1816
# New GnuTLS "datum" with the OpenPGP public key
1886
datum = gnutls.library.types.gnutls_datum_t(
1887
ctypes.cast(ctypes.c_char_p(openpgp),
1888
ctypes.POINTER(ctypes.c_ubyte)),
1889
ctypes.c_uint(len(openpgp)))
1817
datum = (gnutls.library.types
1818
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1821
ctypes.c_uint(len(openpgp))))
1890
1822
# New empty GnuTLS certificate
1891
1823
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1824
(gnutls.library.functions
1825
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1826
# Import the OpenPGP public key into the certificate
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1827
(gnutls.library.functions
1828
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1829
gnutls.library.constants
1830
.GNUTLS_OPENPGP_FMT_RAW))
1898
1831
# Verify the self signature in the key
1899
1832
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1833
(gnutls.library.functions
1834
.gnutls_openpgp_crt_verify_self(crt, 0,
1835
ctypes.byref(crtverify)))
1902
1836
if crtverify.value != 0:
1903
1837
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1838
raise (gnutls.errors.CertificateSecurityError
1906
1840
# New buffer for the fingerprint
1907
1841
buf = ctypes.create_string_buffer(20)
1908
1842
buf_len = ctypes.c_size_t()
1909
1843
# Get the fingerprint from the certificate into the buffer
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1844
(gnutls.library.functions
1845
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1846
ctypes.byref(buf_len)))
1912
1847
# Deinit the certificate
1913
1848
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1849
# Convert the buffer to a Python bytestring
2016
1946
self.interface)
2019
self.socket.setsockopt(
2020
socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
(self.interface + "\0").encode("utf-8"))
1949
self.socket.setsockopt(socket.SOL_SOCKET,
2022
1953
except socket.error as error:
2023
1954
if error.errno == errno.EPERM:
2024
logger.error("No permission to bind to"
2025
" interface %s", self.interface)
1955
logger.error("No permission to"
1956
" bind to interface %s",
2026
1958
elif error.errno == errno.ENOPROTOOPT:
2027
1959
logger.error("SO_BINDTODEVICE not available;"
2028
1960
" cannot bind to interface %s",
2029
1961
self.interface)
2030
1962
elif error.errno == errno.ENODEV:
2031
logger.error("Interface %s does not exist,"
2032
" cannot bind", self.interface)
1963
logger.error("Interface %s does not"
1964
" exist, cannot bind",
2035
1968
# Only bind(2) the socket if we really need to.
2092
2020
def add_pipe(self, parent_pipe, proc):
2093
2021
# Call "handle_ipc" for both data and EOF events
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2097
functools.partial(self.handle_ipc,
2098
parent_pipe = parent_pipe,
2022
gobject.io_add_watch(parent_pipe.fileno(),
2023
gobject.IO_IN | gobject.IO_HUP,
2024
functools.partial(self.handle_ipc,
2101
def handle_ipc(self, source, condition,
2104
client_object=None):
2029
def handle_ipc(self, source, condition, parent_pipe=None,
2030
proc = None, client_object=None):
2105
2031
# error, or the other end of multiprocessing.Pipe has closed
2106
2032
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2033
# Wait for other process to exit
2170
def rfc3339_duration_to_delta(duration):
2171
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2173
>>> rfc3339_duration_to_delta("P7D")
2174
datetime.timedelta(7)
2175
>>> rfc3339_duration_to_delta("PT60S")
2176
datetime.timedelta(0, 60)
2177
>>> rfc3339_duration_to_delta("PT60M")
2178
datetime.timedelta(0, 3600)
2179
>>> rfc3339_duration_to_delta("PT24H")
2180
datetime.timedelta(1)
2181
>>> rfc3339_duration_to_delta("P1W")
2182
datetime.timedelta(7)
2183
>>> rfc3339_duration_to_delta("PT5M30S")
2184
datetime.timedelta(0, 330)
2185
>>> rfc3339_duration_to_delta("P1DT3M20S")
2186
datetime.timedelta(1, 200)
2189
# Parsing an RFC 3339 duration with regular expressions is not
2190
# possible - there would have to be multiple places for the same
2191
# values, like seconds. The current code, while more esoteric, is
2192
# cleaner without depending on a parsing library. If Python had a
2193
# built-in library for parsing we would use it, but we'd like to
2194
# avoid excessive use of external libraries.
2196
# 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
2202
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
token_end = Token(re.compile(r"$"), None, frozenset())
2205
token_second = Token(re.compile(r"(\d+)S"),
2206
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2208
token_minute = Token(re.compile(r"(\d+)M"),
2209
datetime.timedelta(minutes=1),
2210
frozenset((token_second, token_end)))
2211
token_hour = Token(re.compile(r"(\d+)H"),
2212
datetime.timedelta(hours=1),
2213
frozenset((token_minute, token_end)))
2214
token_time = Token(re.compile(r"T"),
2216
frozenset((token_hour, token_minute,
2218
token_day = Token(re.compile(r"(\d+)D"),
2219
datetime.timedelta(days=1),
2220
frozenset((token_time, token_end)))
2221
token_month = Token(re.compile(r"(\d+)M"),
2222
datetime.timedelta(weeks=4),
2223
frozenset((token_day, token_end)))
2224
token_year = Token(re.compile(r"(\d+)Y"),
2225
datetime.timedelta(weeks=52),
2226
frozenset((token_month, token_end)))
2227
token_week = Token(re.compile(r"(\d+)W"),
2228
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2230
token_duration = Token(re.compile(r"P"), None,
2231
frozenset((token_year, token_month,
2232
token_day, token_time,
2234
# Define starting values
2235
value = datetime.timedelta() # Value so far
2237
followers = frozenset((token_duration, )) # Following valid tokens
2238
s = duration # String left to parse
2239
# Loop until end token is found
2240
while found_token is not token_end:
2241
# Search for any currently valid tokens
2242
for token in followers:
2243
match = token.regexp.match(s)
2244
if match is not None:
2246
if token.value is not None:
2247
# Value found, parse digits
2248
factor = int(match.group(1), 10)
2249
# Add to value so far
2250
value += factor * token.value
2251
# Strip token from string
2252
s = token.regexp.sub("", s, 1)
2255
# Set valid next tokens
2256
followers = found_token.followers
2259
# No currently valid tokens were found
2260
raise ValueError("Invalid RFC 3339 duration: {!r}"
2266
2096
def string_to_delta(interval):
2267
2097
"""Parse a string and return a datetime.timedelta
2366
2191
parser.add_argument("--no-dbus", action="store_false",
2367
2192
dest="use_dbus", help="Do not provide D-Bus"
2368
" system bus interface", default=None)
2193
" system bus interface")
2369
2194
parser.add_argument("--no-ipv6", action="store_false",
2370
dest="use_ipv6", help="Do not use IPv6",
2195
dest="use_ipv6", help="Do not use IPv6")
2372
2196
parser.add_argument("--no-restore", action="store_false",
2373
2197
dest="restore", help="Do not restore stored"
2374
" state", default=None)
2375
2199
parser.add_argument("--socket", type=int,
2376
2200
help="Specify a file descriptor to a network"
2377
2201
" socket to use instead of creating one")
2378
2202
parser.add_argument("--statedir", metavar="DIR",
2379
2203
help="Directory to save/restore state in")
2380
parser.add_argument("--foreground", action="store_true",
2381
help="Run in foreground", default=None)
2382
parser.add_argument("--no-zeroconf", action="store_false",
2383
dest="zeroconf", help="Do not use Zeroconf",
2386
2205
options = parser.parse_args()
2388
2207
if options.check:
2390
fail_count, test_count = doctest.testmod()
2391
sys.exit(os.EX_OK if fail_count == 0 else 1)
2393
2212
# Default values for config file for server-global settings
2394
2213
server_defaults = { "interface": "",
2397
2216
"debug": "False",
2399
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2400
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2218
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2401
2219
"servicename": "Mandos",
2402
2220
"use_dbus": "True",
2403
2221
"use_ipv6": "True",
2404
2222
"debuglevel": "",
2405
2223
"restore": "True",
2407
"statedir": "/var/lib/mandos",
2408
"foreground": "False",
2225
"statedir": "/var/lib/mandos"
2412
2228
# Parse config file for server-global settings
2413
2229
server_config = configparser.SafeConfigParser(server_defaults)
2414
2230
del server_defaults
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2231
server_config.read(os.path.join(options.configdir,
2416
2233
# Convert the SafeConfigParser object to a dict
2417
2234
server_settings = server_config.defaults()
2418
2235
# Use the appropriate methods on the non-string config options
2419
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2236
for option in ("debug", "use_dbus", "use_ipv6"):
2420
2237
server_settings[option] = server_config.getboolean("DEFAULT",
2422
2239
if server_settings["port"]:
2436
2253
# Override the settings from the config file with command line
2437
2254
# options, if set.
2438
2255
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2256
"priority", "servicename", "configdir",
2257
"use_dbus", "use_ipv6", "debuglevel", "restore",
2258
"statedir", "socket"):
2442
2259
value = getattr(options, option)
2443
2260
if value is not None:
2444
2261
server_settings[option] = value
2446
2263
# Force all strings to be unicode
2447
2264
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2451
# Force all boolean options to be boolean
2452
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
"foreground", "zeroconf"):
2454
server_settings[option] = bool(server_settings[option])
2455
# Debug implies foreground
2456
if server_settings["debug"]:
2457
server_settings["foreground"] = True
2265
if type(server_settings[option]) is str:
2266
server_settings[option] = unicode(server_settings[option])
2458
2267
# Now we have our good server settings in "server_settings"
2460
2269
##################################################################
2462
if (not server_settings["zeroconf"]
2463
and not (server_settings["port"]
2464
or server_settings["socket"] != "")):
2465
parser.error("Needs port or socket to work without Zeroconf")
2467
2271
# For convenience
2468
2272
debug = server_settings["debug"]
2469
2273
debuglevel = server_settings["debuglevel"]
2498
2301
global mandos_dbus_service
2499
2302
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"],
2513
pidfilename = "/run/mandos.pid"
2514
if not os.path.isdir("/run/."):
2515
pidfilename = "/var/run/mandos.pid"
2304
tcp_server = MandosServer((server_settings["address"],
2305
server_settings["port"]),
2307
interface=(server_settings["interface"]
2311
server_settings["priority"],
2313
socketfd=(server_settings["socket"]
2316
pidfilename = "/var/run/mandos.pid"
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2318
pidfile = open(pidfilename, "w")
2519
2319
except IOError as e:
2520
2320
logger.error("Could not open file %r", pidfilename,
2577
2375
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:
2376
bus, do_not_queue=True)
2377
old_bus_name = (dbus.service.BusName
2378
("se.bsnet.fukt.Mandos", bus,
2380
except dbus.exceptions.NameExistsException as e:
2584
2381
logger.error("Disabling D-Bus:", exc_info=e)
2585
2382
use_dbus = False
2586
2383
server_settings["use_dbus"] = False
2587
2384
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"))
2385
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2386
service = AvahiServiceToSyslog(name =
2387
server_settings["servicename"],
2388
servicetype = "_mandos._tcp",
2389
protocol = protocol, bus = bus)
2390
if server_settings["interface"]:
2391
service.interface = (if_nametoindex
2392
(str(server_settings["interface"])))
2599
2394
global multiprocessing_manager
2600
2395
multiprocessing_manager = multiprocessing.Manager()
2607
2402
old_client_settings = {}
2608
2403
clients_data = {}
2610
# This is used to redirect stdout and stderr for checker processes
2612
wnull = open(os.devnull, "w") # A writable /dev/null
2613
# Only used if server is running in foreground but not in debug
2615
if debug or not foreground:
2618
2405
# Get client data and settings from last running state.
2619
2406
if server_settings["restore"]:
2621
2408
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2409
clients_data, old_client_settings = (pickle.load
2624
2411
os.remove(stored_state_path)
2625
2412
except IOError as e:
2626
2413
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2414
logger.warning("Could not load persistent state: {0}"
2415
.format(os.strerror(e.errno)))
2630
2417
logger.critical("Could not load persistent state:",
2633
2420
except EOFError as e:
2634
2421
logger.warning("Could not load persistent state: "
2422
"EOFError:", exc_info=e)
2638
2424
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2640
# Skip removed clients
2641
if client_name not in client_settings:
2425
for client_name, client in clients_data.iteritems():
2644
2426
# Decide which value to use after restoring saved state.
2645
2427
# We have three different values: Old config file,
2646
2428
# new config file, and saved state.
2667
2449
if datetime.datetime.utcnow() >= client["expires"]:
2668
2450
if not client["last_checked_ok"]:
2669
2451
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2452
"disabling client {0} - Client never "
2453
"performed a successful checker"
2454
.format(client_name))
2673
2455
client["enabled"] = False
2674
2456
elif client["last_checker_status"] != 0:
2675
2457
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2458
"disabling client {0} - Client "
2459
"last checker failed with error code {1}"
2460
.format(client_name,
2461
client["last_checker_status"]))
2681
2462
client["enabled"] = False
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2464
client["expires"] = (datetime.datetime
2466
+ client["timeout"])
2686
2467
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2468
" keeping {0} enabled"
2469
.format(client_name))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2471
client["secret"] = (
2472
pgp.decrypt(client["encrypted_secret"],
2473
client_settings[client_name]
2693
2475
except PGPError:
2694
2476
# 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]
2477
logger.debug("Failed to decrypt {0} old secret"
2478
.format(client_name))
2479
client["secret"] = (
2480
client_settings[client_name]["secret"])
2700
2482
# Add/remove clients based on new changes made to config
2701
2483
for client_name in (set(old_client_settings)
2706
2488
clients_data[client_name] = client_settings[client_name]
2708
2490
# Create all client objects
2709
for client_name, client in clients_data.items():
2491
for client_name, client in clients_data.iteritems():
2710
2492
tcp_server.clients[client_name] = client_class(
2713
server_settings = server_settings)
2493
name = client_name, settings = client)
2715
2495
if not tcp_server.clients:
2716
2496
logger.warning("No clients defined")
2719
if pidfile is not None:
2723
print(pid, file=pidfile)
2725
logger.error("Could not write to file %r with PID %d",
2502
pidfile.write(str(pid) + "\n".encode("utf-8"))
2505
logger.error("Could not write to file %r with PID %d",
2508
# "pidfile" was never created
2728
2510
del pidfilename
2730
2512
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2731
2513
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2516
@alternate_dbus_interfaces({"se.recompile.Mandos":
2517
"se.bsnet.fukt.Mandos"})
2737
2518
class MandosDBusService(DBusObjectWithProperties):
2738
2519
"""A D-Bus proxy object"""
2740
2520
def __init__(self):
2741
2521
dbus.service.Object.__init__(self, bus, "/")
2743
2522
_interface = "se.recompile.Mandos"
2745
2524
@dbus_interface_annotations(_interface)
2746
2525
def _foo(self):
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2526
return { "org.freedesktop.DBus.Property"
2527
".EmitsChangedSignal":
2751
2530
@dbus.service.signal(_interface, signature="o")
2752
2531
def ClientAdded(self, objpath):
2835
2613
del client_settings[client.name]["secret"]
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2616
with (tempfile.NamedTemporaryFile
2617
(mode='wb', suffix=".pickle", prefix='clients-',
2618
dir=os.path.dirname(stored_state_path),
2619
delete=False)) as stored_state:
2844
2620
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2621
tempname=stored_state.name
2846
2622
os.rename(tempname, stored_state_path)
2847
2623
except (IOError, OSError) as e: