88
101
except ImportError:
89
102
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
92
108
stored_state_file = "clients.pickle"
94
110
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
103
116
except (OSError, AttributeError):
104
118
def if_nametoindex(interface):
105
119
"Get an interface index the hard way, i.e. using fcntl()"
106
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
121
with contextlib.closing(socket.socket()) as s:
108
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
125
return interface_index
116
128
def initlogger(debug, level=logging.WARNING):
117
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
119
135
syslogger.setFormatter(logging.Formatter
120
136
('Mandos [%(process)d]: %(levelname)s:'
174
189
def password_encode(self, password):
175
190
# Passphrase can not be empty and can not contain newlines or
176
191
# NUL bytes. So we prefix it and hex encode it.
177
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"))
179
200
def encrypt(self, data, password):
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
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:
194
216
return ciphertext
196
218
def decrypt(self, data, password):
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
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:
211
234
return decrypted_plaintext
214
237
class AvahiError(Exception):
215
238
def __init__(self, value, *args, **kwargs):
216
239
self.value = value
217
super(AvahiError, self).__init__(value, *args, **kwargs)
218
def __unicode__(self):
219
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
221
244
class AvahiServiceError(AvahiError):
224
248
class AvahiGroupError(AvahiError):
266
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
269
300
"""Derived from the Avahi example code"""
270
301
if self.rename_count >= self.max_renames:
271
302
logger.critical("No suitable Zeroconf service name found"
272
303
" after %i retries, exiting.",
273
304
self.rename_count)
274
305
raise AvahiServiceError("Too many renames")
275
self.name = unicode(self.server
276
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
277
309
logger.info("Changing Zeroconf service name to %r ...",
282
315
except dbus.exceptions.DBusException as error:
283
logger.critical("D-Bus Exception", exc_info=error)
286
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)
288
325
def remove(self):
289
326
"""Derived from the Avahi example code"""
345
381
def server_state_changed(self, state, error=None):
346
382
"""Derived from the Avahi example code"""
347
383
logger.debug("Avahi server state change: %i", state)
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" }
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
355
390
if state in bad_states:
356
391
if bad_states[state] is not None:
357
392
if error is None:
376
422
follow_name_owner_changes=True),
377
423
avahi.DBUS_INTERFACE_SERVER)
378
424
self.server.connect_to_signal("StateChanged",
379
self.server_state_changed)
425
self.server_state_changed)
380
426
self.server_state_changed(self.server.GetState())
383
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
385
431
"""Add the new name to the syslog messages"""
386
ret = AvahiService.rename(self)
387
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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))
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))
401
448
class Client(object):
402
449
"""A representation of a client host served by this server.
446
496
"fingerprint", "host", "interval",
447
497
"last_approval_request", "last_checked_ok",
448
498
"last_enabled", "name", "timeout")
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)
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
476
512
def config_parser(config):
551
590
self.current_checker_command = None
552
591
self.approved = None
553
592
self.approvals_pending = 0
554
self.changedstate = (multiprocessing_manager
555
.Condition(multiprocessing_manager
557
self.client_structure = [attr for attr in
558
self.__dict__.iterkeys()
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
559
597
if not attr.startswith("_")]
560
598
self.client_structure.append("client_structure")
562
for name, t in inspect.getmembers(type(self),
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
566
602
if not name.startswith("_"):
567
603
self.client_structure.append(name)
610
646
# and every interval from then on.
611
647
if self.checker_initiator_tag is not None:
612
648
gobject.source_remove(self.checker_initiator_tag)
613
self.checker_initiator_tag = (gobject.timeout_add
614
(self.interval_milliseconds(),
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
616
652
# Schedule a disable() when 'timeout' has passed
617
653
if self.disable_initiator_tag is not None:
618
654
gobject.source_remove(self.disable_initiator_tag)
619
self.disable_initiator_tag = (gobject.timeout_add
620
(self.timeout_milliseconds(),
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
622
657
# Also start a new checker *right now*.
623
658
self.start_checker()
625
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
626
662
"""The checker has completed, so take appropriate actions."""
627
663
self.checker_callback_tag = None
628
664
self.checker = None
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
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
631
672
if self.last_checker_status == 0:
632
673
logger.info("Checker for %(name)s succeeded",
634
675
self.checked_ok()
636
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
639
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
640
681
logger.warning("Checker for %(name)s crashed?",
643
685
def checked_ok(self):
644
686
"""Assert that the client has been seen, alive and well."""
645
687
self.last_checked_ok = datetime.datetime.utcnow()
646
688
self.last_checker_status = 0
689
self.last_checker_signal = None
647
690
self.bump_timeout()
649
692
def bump_timeout(self, timeout=None):
676
718
# than 'timeout' for the client to be disabled, which is as it
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)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
692
725
# Start a new checker if needed
693
726
if self.checker is None:
694
727
# Escape attributes for the shell
695
escaped_attrs = dict(
696
(attr, re.escape(unicode(getattr(self, attr))))
698
self.runtime_expansions)
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
700
732
command = self.checker_command % escaped_attrs
701
733
except TypeError as error:
702
734
logger.error('Could not format string "%s"',
703
self.checker_command, exc_info=error)
704
return True # Try again later
735
self.checker_command,
737
return True # Try again later
705
738
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",
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)
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)
729
764
# Re-run this periodically if run by gobject.timeout_add
801
835
"""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"})
804
841
@dbus_service_property("org.example.Interface", signature="b",
806
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
"org.freedesktop.DBus.Property."
808
"EmitsChangedSignal": "false"})
809
843
def Property_dbus_property(self):
810
844
return dbus.Boolean(False)
812
847
def decorator(func):
813
848
func._dbus_annotations = annotations
818
854
class DBusPropertyException(dbus.exceptions.DBusException):
819
855
"""A base class for D-Bus property-related exceptions
821
def __unicode__(self):
822
return unicode(str(self))
825
860
class DBusPropertyAccessException(DBusPropertyException):
849
884
If called like _is_dbus_thing("method") it returns a function
850
885
suitable for use as predicate to inspect.getmembers().
852
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
855
890
def _get_all_dbus_things(self, thing):
856
891
"""Returns a generator of (name, attribute) pairs
858
return ((getattr(athing.__get__(self), "_dbus_name",
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
860
894
athing.__get__(self))
861
895
for cls in self.__class__.__mro__
862
896
for name, athing in
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
866
899
def _get_dbus_property(self, interface_name, property_name):
867
900
"""Returns a bound method if one exists which is a D-Bus
868
901
property with the specified name and interface.
870
for cls in self.__class__.__mro__:
871
for name, value in (inspect.getmembers
873
self._is_dbus_thing("property"))):
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
874
906
if (value._dbus_name == property_name
875
907
and value._dbus_interface == interface_name):
876
908
return value.__get__(self)
878
910
# No such property
879
raise DBusPropertyNotFound(self.dbus_object_path + ":"
880
+ interface_name + "."
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
883
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
884
916
out_signature="v")
885
917
def Get(self, interface_name, property_name):
886
918
"""Standard D-Bus property Get() method, see D-Bus standard.
1057
1100
# Ignore non-D-Bus attributes, and D-Bus attributes
1058
1101
# with the wrong interface name
1059
1102
if (not hasattr(attribute, "_dbus_interface")
1060
or not attribute._dbus_interface
1061
.startswith(orig_interface_name)):
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1063
1106
# Create an alternate D-Bus interface name based on
1064
1107
# the current name
1065
alt_interface = (attribute._dbus_interface
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1068
1110
interface_names.add(alt_interface)
1069
1111
# Is this a D-Bus signal?
1070
1112
if getattr(attribute, "_dbus_is_signal", False):
1071
# Extract the original non-method function by
1073
nonmethod_func = (dict(
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1074
1117
zip(attribute.func_code.co_freevars,
1075
attribute.__closure__))["func"]
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1077
1122
# Create a new, but exactly alike, function
1078
1123
# object, and decorate it to be a new D-Bus signal
1079
1124
# with the alternate D-Bus interface name
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)))
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))
1089
1142
# Copy annotations, if any
1091
new_function._dbus_annotations = (
1092
dict(attribute._dbus_annotations))
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1093
1146
except AttributeError:
1095
1148
# Define a creator of a function to call both the
1115
1170
# object. Decorate it to be a new D-Bus method
1116
1171
# with the alternate D-Bus interface name. Add it
1117
1172
# to the class.
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)))
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)))
1128
1183
# Copy annotations, if any
1130
attr[attrname]._dbus_annotations = (
1131
dict(attribute._dbus_annotations))
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1132
1187
except AttributeError:
1134
1189
# Is this a D-Bus property?
1137
1192
# object, and decorate it to be a new D-Bus
1138
1193
# property with the alternate D-Bus interface
1139
1194
# name. Add it to the class.
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)))
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)))
1153
1206
# Copy annotations, if any
1155
attr[attrname]._dbus_annotations = (
1156
dict(attribute._dbus_annotations))
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1157
1210
except AttributeError:
1159
1212
# Is this a D-Bus interface?
1162
1215
# object. Decorate it to be a new D-Bus interface
1163
1216
# with the alternate D-Bus interface name. Add it
1164
1217
# to the class.
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)))
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)))
1174
1226
# Deprecate all alternate interfaces
1175
iname="_AlternateDBusNames_interface_annotation{0}"
1227
iname="_AlternateDBusNames_interface_annotation{}"
1176
1228
for interface_name in interface_names:
1177
1230
@dbus_interface_annotations(interface_name)
1178
1231
def func(self):
1179
1232
return { "org.freedesktop.DBus.Deprecated":
1181
1234
# Find an unused name
1182
1235
for aname in (iname.format(i)
1183
1236
for i in itertools.count()):
1213
1269
Client.__init__(self, *args, **kwargs)
1214
1270
# Only now, when this client is initialized, can it show up on
1216
client_object_name = unicode(self.name).translate(
1272
client_object_name = str(self.name).translate(
1217
1273
{ord("."): ord("_"),
1218
1274
ord("-"): ord("_")})
1219
self.dbus_object_path = (dbus.ObjectPath
1220
("/clients/" + client_object_name))
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1221
1277
DBusObjectWithProperties.__init__(self, self.bus,
1222
1278
self.dbus_object_path)
1224
def notifychangeproperty(transform_func,
1225
dbus_name, type_func=lambda x: x,
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1284
_interface=_interface):
1227
1285
""" Modify a variable so that it's a property which announces
1228
1286
its changes to DBus.
1234
1292
to the D-Bus. Default: no transform
1235
1293
variant_level: D-Bus variant level. Default: 1
1237
attrname = "_{0}".format(dbus_name)
1295
attrname = "_{}".format(dbus_name)
1238
1297
def setter(self, value):
1239
1298
if hasattr(self, "dbus_object_path"):
1240
1299
if (not hasattr(self, attrname) or
1241
1300
type_func(getattr(self, attrname, None))
1242
1301
!= type_func(value)):
1243
dbus_value = transform_func(type_func(value),
1246
self.PropertyChanged(dbus.String(dbus_name),
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):
1248
1317
setattr(self, attrname, value)
1250
1319
return property(lambda self: getattr(self, attrname), setter)
1267
1336
datetime_to_dbus, "LastApprovalRequest")
1268
1337
approved_by_default = notifychangeproperty(dbus.Boolean,
1269
1338
"ApprovedByDefault")
1270
approval_delay = notifychangeproperty(dbus.UInt64,
1273
timedelta_to_milliseconds)
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1274
1342
approval_duration = notifychangeproperty(
1275
1343
dbus.UInt64, "ApprovalDuration",
1276
type_func = timedelta_to_milliseconds)
1344
type_func = lambda td: td.total_seconds() * 1000)
1277
1345
host = notifychangeproperty(dbus.String, "Host")
1278
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1280
timedelta_to_milliseconds)
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1281
1349
extended_timeout = notifychangeproperty(
1282
1350
dbus.UInt64, "ExtendedTimeout",
1283
type_func = timedelta_to_milliseconds)
1284
interval = notifychangeproperty(dbus.UInt64,
1287
timedelta_to_milliseconds)
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)
1288
1355
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1290
1359
del notifychangeproperty
1298
1367
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1299
1368
Client.__del__(self, *args, **kwargs)
1301
def checker_callback(self, pid, condition, command,
1303
self.checker_callback_tag = None
1305
if os.WIFEXITED(condition):
1306
exitstatus = os.WEXITSTATUS(condition)
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
1307
1377
# Emit D-Bus signal
1308
1378
self.CheckerCompleted(dbus.Int16(exitstatus),
1309
dbus.Int64(condition),
1310
1380
dbus.String(command))
1312
1382
# Emit D-Bus signal
1313
1383
self.CheckerCompleted(dbus.Int16(-1),
1314
dbus.Int64(condition),
1385
self.last_checker_signal),
1315
1386
dbus.String(command))
1317
return Client.checker_callback(self, pid, condition, command,
1320
1389
def start_checker(self, *args, **kwargs):
1321
old_checker = self.checker
1322
if self.checker is not None:
1323
old_checker_pid = self.checker.pid
1325
old_checker_pid = None
1390
old_checker_pid = getattr(self.checker, "pid", None)
1326
1391
r = Client.start_checker(self, *args, **kwargs)
1327
1392
# Only if new checker process was started
1328
1393
if (self.checker is not None
1444
1508
self.approved_by_default = bool(value)
1446
1510
# ApprovalDelay - property
1447
@dbus_service_property(_interface, signature="t",
1511
@dbus_service_property(_interface,
1448
1513
access="readwrite")
1449
1514
def ApprovalDelay_dbus_property(self, value=None):
1450
1515
if value is None: # get
1451
return dbus.UInt64(self.approval_delay_milliseconds())
1516
return dbus.UInt64(self.approval_delay.total_seconds()
1452
1518
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1454
1520
# ApprovalDuration - property
1455
@dbus_service_property(_interface, signature="t",
1521
@dbus_service_property(_interface,
1456
1523
access="readwrite")
1457
1524
def ApprovalDuration_dbus_property(self, value=None):
1458
1525
if value is None: # get
1459
return dbus.UInt64(timedelta_to_milliseconds(
1460
self.approval_duration))
1526
return dbus.UInt64(self.approval_duration.total_seconds()
1461
1528
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1463
1530
# Name - property
1532
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1464
1533
@dbus_service_property(_interface, signature="s", access="read")
1465
1534
def Name_dbus_property(self):
1466
1535
return dbus.String(self.name)
1468
1537
# Fingerprint - property
1539
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1469
1540
@dbus_service_property(_interface, signature="s", access="read")
1470
1541
def Fingerprint_dbus_property(self):
1471
1542
return dbus.String(self.fingerprint)
1473
1544
# Host - property
1474
@dbus_service_property(_interface, signature="s",
1545
@dbus_service_property(_interface,
1475
1547
access="readwrite")
1476
1548
def Host_dbus_property(self, value=None):
1477
1549
if value is None: # get
1478
1550
return dbus.String(self.host)
1479
self.host = unicode(value)
1551
self.host = str(value)
1481
1553
# Created - property
1555
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1482
1556
@dbus_service_property(_interface, signature="s", access="read")
1483
1557
def Created_dbus_property(self):
1484
1558
return datetime_to_dbus(self.created)
1546
1622
gobject.source_remove(self.disable_initiator_tag)
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1623
self.disable_initiator_tag = gobject.timeout_add(
1624
int((self.expires - now).total_seconds() * 1000),
1552
1627
# ExtendedTimeout - property
1553
@dbus_service_property(_interface, signature="t",
1628
@dbus_service_property(_interface,
1554
1630
access="readwrite")
1555
1631
def ExtendedTimeout_dbus_property(self, value=None):
1556
1632
if value is None: # get
1557
return dbus.UInt64(self.extended_timeout_milliseconds())
1633
return dbus.UInt64(self.extended_timeout.total_seconds()
1558
1635
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1560
1637
# Interval - property
1561
@dbus_service_property(_interface, signature="t",
1638
@dbus_service_property(_interface,
1562
1640
access="readwrite")
1563
1641
def Interval_dbus_property(self, value=None):
1564
1642
if value is None: # get
1565
return dbus.UInt64(self.interval_milliseconds())
1643
return dbus.UInt64(self.interval.total_seconds() * 1000)
1566
1644
self.interval = datetime.timedelta(0, 0, 0, value)
1567
1645
if getattr(self, "checker_initiator_tag", None) is None:
1569
1647
if self.enabled:
1570
1648
# Reschedule checker run
1571
1649
gobject.source_remove(self.checker_initiator_tag)
1572
self.checker_initiator_tag = (gobject.timeout_add
1573
(value, self.start_checker))
1574
self.start_checker() # Start one now, too
1650
self.checker_initiator_tag = gobject.timeout_add(
1651
value, self.start_checker)
1652
self.start_checker() # Start one now, too
1576
1654
# Checker - property
1577
@dbus_service_property(_interface, signature="s",
1655
@dbus_service_property(_interface,
1578
1657
access="readwrite")
1579
1658
def Checker_dbus_property(self, value=None):
1580
1659
if value is None: # get
1581
1660
return dbus.String(self.checker_command)
1582
self.checker_command = unicode(value)
1661
self.checker_command = str(value)
1584
1663
# CheckerRunning - property
1585
@dbus_service_property(_interface, signature="b",
1664
@dbus_service_property(_interface,
1586
1666
access="readwrite")
1587
1667
def CheckerRunning_dbus_property(self, value=None):
1588
1668
if value is None: # get
1814
1898
def fingerprint(openpgp):
1815
1899
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1816
1900
# New GnuTLS "datum" with the OpenPGP public key
1817
datum = (gnutls.library.types
1818
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1821
ctypes.c_uint(len(openpgp))))
1901
datum = gnutls.library.types.gnutls_datum_t(
1902
ctypes.cast(ctypes.c_char_p(openpgp),
1903
ctypes.POINTER(ctypes.c_ubyte)),
1904
ctypes.c_uint(len(openpgp)))
1822
1905
# New empty GnuTLS certificate
1823
1906
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1824
(gnutls.library.functions
1825
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1907
gnutls.library.functions.gnutls_openpgp_crt_init(
1826
1909
# Import the OpenPGP public key into the certificate
1827
(gnutls.library.functions
1828
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1829
gnutls.library.constants
1830
.GNUTLS_OPENPGP_FMT_RAW))
1910
gnutls.library.functions.gnutls_openpgp_crt_import(
1911
crt, ctypes.byref(datum),
1912
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1831
1913
# Verify the self signature in the key
1832
1914
crtverify = ctypes.c_uint()
1833
(gnutls.library.functions
1834
.gnutls_openpgp_crt_verify_self(crt, 0,
1835
ctypes.byref(crtverify)))
1915
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1916
crt, 0, ctypes.byref(crtverify))
1836
1917
if crtverify.value != 0:
1837
1918
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1838
raise (gnutls.errors.CertificateSecurityError
1919
raise gnutls.errors.CertificateSecurityError(
1840
1921
# New buffer for the fingerprint
1841
1922
buf = ctypes.create_string_buffer(20)
1842
1923
buf_len = ctypes.c_size_t()
1843
1924
# Get the fingerprint from the certificate into the buffer
1844
(gnutls.library.functions
1845
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1846
ctypes.byref(buf_len)))
1925
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1926
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1847
1927
# Deinit the certificate
1848
1928
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1849
1929
# Convert the buffer to a Python bytestring
2017
2107
def add_pipe(self, parent_pipe, proc):
2018
2108
# Call "handle_ipc" for both data and EOF events
2019
gobject.io_add_watch(parent_pipe.fileno(),
2020
gobject.IO_IN | gobject.IO_HUP,
2021
functools.partial(self.handle_ipc,
2109
gobject.io_add_watch(
2110
parent_pipe.fileno(),
2111
gobject.IO_IN | gobject.IO_HUP,
2112
functools.partial(self.handle_ipc,
2113
parent_pipe = parent_pipe,
2026
def handle_ipc(self, source, condition, parent_pipe=None,
2027
proc = None, client_object=None):
2116
def handle_ipc(self, source, condition,
2119
client_object=None):
2028
2120
# error, or the other end of multiprocessing.Pipe has closed
2029
2121
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2030
2122
# Wait for other process to exit
2185
def rfc3339_duration_to_delta(duration):
2186
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2188
>>> rfc3339_duration_to_delta("P7D")
2189
datetime.timedelta(7)
2190
>>> rfc3339_duration_to_delta("PT60S")
2191
datetime.timedelta(0, 60)
2192
>>> rfc3339_duration_to_delta("PT60M")
2193
datetime.timedelta(0, 3600)
2194
>>> rfc3339_duration_to_delta("PT24H")
2195
datetime.timedelta(1)
2196
>>> rfc3339_duration_to_delta("P1W")
2197
datetime.timedelta(7)
2198
>>> rfc3339_duration_to_delta("PT5M30S")
2199
datetime.timedelta(0, 330)
2200
>>> rfc3339_duration_to_delta("P1DT3M20S")
2201
datetime.timedelta(1, 200)
2204
# Parsing an RFC 3339 duration with regular expressions is not
2205
# possible - there would have to be multiple places for the same
2206
# values, like seconds. The current code, while more esoteric, is
2207
# cleaner without depending on a parsing library. If Python had a
2208
# built-in library for parsing we would use it, but we'd like to
2209
# avoid excessive use of external libraries.
2211
# New type for defining tokens, syntax, and semantics all-in-one
2212
Token = collections.namedtuple("Token", (
2213
"regexp", # To match token; if "value" is not None, must have
2214
# a "group" containing digits
2215
"value", # datetime.timedelta or None
2216
"followers")) # Tokens valid after this token
2217
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2218
# the "duration" ABNF definition in RFC 3339, Appendix A.
2219
token_end = Token(re.compile(r"$"), None, frozenset())
2220
token_second = Token(re.compile(r"(\d+)S"),
2221
datetime.timedelta(seconds=1),
2222
frozenset((token_end, )))
2223
token_minute = Token(re.compile(r"(\d+)M"),
2224
datetime.timedelta(minutes=1),
2225
frozenset((token_second, token_end)))
2226
token_hour = Token(re.compile(r"(\d+)H"),
2227
datetime.timedelta(hours=1),
2228
frozenset((token_minute, token_end)))
2229
token_time = Token(re.compile(r"T"),
2231
frozenset((token_hour, token_minute,
2233
token_day = Token(re.compile(r"(\d+)D"),
2234
datetime.timedelta(days=1),
2235
frozenset((token_time, token_end)))
2236
token_month = Token(re.compile(r"(\d+)M"),
2237
datetime.timedelta(weeks=4),
2238
frozenset((token_day, token_end)))
2239
token_year = Token(re.compile(r"(\d+)Y"),
2240
datetime.timedelta(weeks=52),
2241
frozenset((token_month, token_end)))
2242
token_week = Token(re.compile(r"(\d+)W"),
2243
datetime.timedelta(weeks=1),
2244
frozenset((token_end, )))
2245
token_duration = Token(re.compile(r"P"), None,
2246
frozenset((token_year, token_month,
2247
token_day, token_time,
2249
# Define starting values
2250
value = datetime.timedelta() # Value so far
2252
followers = frozenset((token_duration, )) # Following valid tokens
2253
s = duration # String left to parse
2254
# Loop until end token is found
2255
while found_token is not token_end:
2256
# Search for any currently valid tokens
2257
for token in followers:
2258
match = token.regexp.match(s)
2259
if match is not None:
2261
if token.value is not None:
2262
# Value found, parse digits
2263
factor = int(match.group(1), 10)
2264
# Add to value so far
2265
value += factor * token.value
2266
# Strip token from string
2267
s = token.regexp.sub("", s, 1)
2270
# Set valid next tokens
2271
followers = found_token.followers
2274
# No currently valid tokens were found
2275
raise ValueError("Invalid RFC 3339 duration: {!r}"
2093
2281
def string_to_delta(interval):
2094
2282
"""Parse a string and return a datetime.timedelta
2188
2381
parser.add_argument("--no-dbus", action="store_false",
2189
2382
dest="use_dbus", help="Do not provide D-Bus"
2190
" system bus interface")
2383
" system bus interface", default=None)
2191
2384
parser.add_argument("--no-ipv6", action="store_false",
2192
dest="use_ipv6", help="Do not use IPv6")
2385
dest="use_ipv6", help="Do not use IPv6",
2193
2387
parser.add_argument("--no-restore", action="store_false",
2194
2388
dest="restore", help="Do not restore stored"
2389
" state", default=None)
2196
2390
parser.add_argument("--socket", type=int,
2197
2391
help="Specify a file descriptor to a network"
2198
2392
" socket to use instead of creating one")
2199
2393
parser.add_argument("--statedir", metavar="DIR",
2200
2394
help="Directory to save/restore state in")
2201
2395
parser.add_argument("--foreground", action="store_true",
2202
help="Run in foreground")
2396
help="Run in foreground", default=None)
2397
parser.add_argument("--no-zeroconf", action="store_false",
2398
dest="zeroconf", help="Do not use Zeroconf",
2204
2401
options = parser.parse_args()
2206
2403
if options.check:
2405
fail_count, test_count = doctest.testmod()
2406
sys.exit(os.EX_OK if fail_count == 0 else 1)
2211
2408
# Default values for config file for server-global settings
2212
2409
server_defaults = { "interface": "",
2253
2451
# Override the settings from the config file with command line
2254
2452
# options, if set.
2255
2453
for option in ("interface", "address", "port", "debug",
2256
"priority", "servicename", "configdir",
2257
"use_dbus", "use_ipv6", "debuglevel", "restore",
2258
"statedir", "socket", "foreground"):
2454
"priority", "servicename", "configdir", "use_dbus",
2455
"use_ipv6", "debuglevel", "restore", "statedir",
2456
"socket", "foreground", "zeroconf"):
2259
2457
value = getattr(options, option)
2260
2458
if value is not None:
2261
2459
server_settings[option] = value
2263
2461
# Force all strings to be unicode
2264
2462
for option in server_settings.keys():
2265
if type(server_settings[option]) is str:
2266
server_settings[option] = unicode(server_settings[option])
2463
if isinstance(server_settings[option], bytes):
2464
server_settings[option] = (server_settings[option]
2466
# Force all boolean options to be boolean
2467
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2468
"foreground", "zeroconf"):
2469
server_settings[option] = bool(server_settings[option])
2267
2470
# Debug implies foreground
2268
2471
if server_settings["debug"]:
2269
2472
server_settings["foreground"] = True
2305
2513
global mandos_dbus_service
2306
2514
mandos_dbus_service = None
2308
tcp_server = MandosServer((server_settings["address"],
2309
server_settings["port"]),
2311
interface=(server_settings["interface"]
2315
server_settings["priority"],
2317
socketfd=(server_settings["socket"]
2517
if server_settings["socket"] != "":
2518
socketfd = server_settings["socket"]
2519
tcp_server = MandosServer(
2520
(server_settings["address"], server_settings["port"]),
2522
interface=(server_settings["interface"] or None),
2524
gnutls_priority=server_settings["priority"],
2319
2527
if not foreground:
2320
pidfilename = "/var/run/mandos.pid"
2528
pidfilename = "/run/mandos.pid"
2529
if not os.path.isdir("/run/."):
2530
pidfilename = "/var/run/mandos.pid"
2323
pidfile = open(pidfilename, "w")
2533
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2324
2534
except IOError as e:
2325
2535
logger.error("Could not open file %r", pidfilename,
2382
2592
bus_name = dbus.service.BusName("se.recompile.Mandos",
2383
bus, do_not_queue=True)
2384
old_bus_name = (dbus.service.BusName
2385
("se.bsnet.fukt.Mandos", bus,
2387
except dbus.exceptions.NameExistsException as e:
2595
old_bus_name = dbus.service.BusName(
2596
"se.bsnet.fukt.Mandos", bus,
2598
except dbus.exceptions.DBusException as e:
2388
2599
logger.error("Disabling D-Bus:", exc_info=e)
2389
2600
use_dbus = False
2390
2601
server_settings["use_dbus"] = False
2391
2602
tcp_server.use_dbus = False
2392
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2393
service = AvahiServiceToSyslog(name =
2394
server_settings["servicename"],
2395
servicetype = "_mandos._tcp",
2396
protocol = protocol, bus = bus)
2397
if server_settings["interface"]:
2398
service.interface = (if_nametoindex
2399
(str(server_settings["interface"])))
2604
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2605
service = AvahiServiceToSyslog(
2606
name = server_settings["servicename"],
2607
servicetype = "_mandos._tcp",
2608
protocol = protocol,
2610
if server_settings["interface"]:
2611
service.interface = if_nametoindex(
2612
server_settings["interface"].encode("utf-8"))
2401
2614
global multiprocessing_manager
2402
2615
multiprocessing_manager = multiprocessing.Manager()
2409
2622
old_client_settings = {}
2410
2623
clients_data = {}
2625
# This is used to redirect stdout and stderr for checker processes
2627
wnull = open(os.devnull, "w") # A writable /dev/null
2628
# Only used if server is running in foreground but not in debug
2630
if debug or not foreground:
2412
2633
# Get client data and settings from last running state.
2413
2634
if server_settings["restore"]:
2415
2636
with open(stored_state_path, "rb") as stored_state:
2416
clients_data, old_client_settings = (pickle.load
2637
clients_data, old_client_settings = pickle.load(
2418
2639
os.remove(stored_state_path)
2419
2640
except IOError as e:
2420
2641
if e.errno == errno.ENOENT:
2421
logger.warning("Could not load persistent state: {0}"
2422
.format(os.strerror(e.errno)))
2642
logger.warning("Could not load persistent state:"
2643
" {}".format(os.strerror(e.errno)))
2424
2645
logger.critical("Could not load persistent state:",
2427
2648
except EOFError as e:
2428
2649
logger.warning("Could not load persistent state: "
2429
"EOFError:", exc_info=e)
2431
2653
with PGPEngine() as pgp:
2432
for client_name, client in clients_data.iteritems():
2654
for client_name, client in clients_data.items():
2655
# Skip removed clients
2656
if client_name not in client_settings:
2433
2659
# Decide which value to use after restoring saved state.
2434
2660
# We have three different values: Old config file,
2435
2661
# new config file, and saved state.
2456
2682
if datetime.datetime.utcnow() >= client["expires"]:
2457
2683
if not client["last_checked_ok"]:
2458
2684
logger.warning(
2459
"disabling client {0} - Client never "
2460
"performed a successful checker"
2461
.format(client_name))
2685
"disabling client {} - Client never "
2686
"performed a successful checker".format(
2462
2688
client["enabled"] = False
2463
2689
elif client["last_checker_status"] != 0:
2464
2690
logger.warning(
2465
"disabling client {0} - Client "
2466
"last checker failed with error code {1}"
2467
.format(client_name,
2468
client["last_checker_status"]))
2691
"disabling client {} - Client last"
2692
" checker failed with error code"
2695
client["last_checker_status"]))
2469
2696
client["enabled"] = False
2471
client["expires"] = (datetime.datetime
2473
+ client["timeout"])
2698
client["expires"] = (
2699
datetime.datetime.utcnow()
2700
+ client["timeout"])
2474
2701
logger.debug("Last checker succeeded,"
2475
" keeping {0} enabled"
2476
.format(client_name))
2702
" keeping {} enabled".format(
2478
client["secret"] = (
2479
pgp.decrypt(client["encrypted_secret"],
2480
client_settings[client_name]
2705
client["secret"] = pgp.decrypt(
2706
client["encrypted_secret"],
2707
client_settings[client_name]["secret"])
2482
2708
except PGPError:
2483
2709
# If decryption fails, we use secret from new settings
2484
logger.debug("Failed to decrypt {0} old secret"
2485
.format(client_name))
2486
client["secret"] = (
2487
client_settings[client_name]["secret"])
2710
logger.debug("Failed to decrypt {} old secret".format(
2712
client["secret"] = (client_settings[client_name]
2489
2715
# Add/remove clients based on new changes made to config
2490
2716
for client_name in (set(old_client_settings)
2518
2746
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2521
@alternate_dbus_interfaces({"se.recompile.Mandos":
2522
"se.bsnet.fukt.Mandos"})
2750
@alternate_dbus_interfaces(
2751
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2523
2752
class MandosDBusService(DBusObjectWithProperties):
2524
2753
"""A D-Bus proxy object"""
2525
2755
def __init__(self):
2526
2756
dbus.service.Object.__init__(self, bus, "/")
2527
2758
_interface = "se.recompile.Mandos"
2529
2760
@dbus_interface_annotations(_interface)
2530
2761
def _foo(self):
2531
return { "org.freedesktop.DBus.Property"
2532
".EmitsChangedSignal":
2763
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2535
2766
@dbus.service.signal(_interface, signature="o")
2536
2767
def ClientAdded(self, objpath):
2618
2850
del client_settings[client.name]["secret"]
2621
with (tempfile.NamedTemporaryFile
2622
(mode='wb', suffix=".pickle", prefix='clients-',
2623
dir=os.path.dirname(stored_state_path),
2624
delete=False)) as stored_state:
2853
with tempfile.NamedTemporaryFile(
2857
dir=os.path.dirname(stored_state_path),
2858
delete=False) as stored_state:
2625
2859
pickle.dump((clients, client_settings), stored_state)
2626
tempname=stored_state.name
2860
tempname = stored_state.name
2627
2861
os.rename(tempname, stored_state_path)
2628
2862
except (IOError, OSError) as e: