101
89
except ImportError:
102
90
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
108
93
stored_state_file = "clients.pickle"
110
95
logger = logging.getLogger()
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
116
104
except (OSError, AttributeError):
118
105
def if_nametoindex(interface):
119
106
"Get an interface index the hard way, i.e. using fcntl()"
120
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
108
with contextlib.closing(socket.socket()) as s:
122
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
struct.pack(str("16s16x"),
112
interface_index = struct.unpack(str("I"),
125
114
return interface_index
128
117
def initlogger(debug, level=logging.WARNING):
129
118
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
120
syslogger.setFormatter(logging.Formatter
136
121
('Mandos [%(process)d]: %(levelname)s:'
189
175
def password_encode(self, password):
190
176
# Passphrase can not be empty and can not contain newlines or
191
177
# 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"))
178
return b"mandos" + binascii.hexlify(password)
200
180
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:
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
194
self.gnupg.passphrase = None
216
195
return ciphertext
218
197
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:
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
211
self.gnupg.passphrase = None
234
212
return decrypted_plaintext
237
215
class AvahiError(Exception):
238
216
def __init__(self, value, *args, **kwargs):
239
217
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
244
222
class AvahiServiceError(AvahiError):
248
225
class AvahiGroupError(AvahiError):
270
247
bus: dbus.SystemBus()
274
interface = avahi.IF_UNSPEC,
282
protocol = avahi.PROTO_UNSPEC,
250
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
servicetype = None, port = None, TXT = None,
252
domain = "", host = "", max_renames = 32768,
253
protocol = avahi.PROTO_UNSPEC, bus = None):
284
254
self.interface = interface
286
256
self.type = servicetype
297
267
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
270
"""Derived from the Avahi example code"""
301
271
if self.rename_count >= self.max_renames:
302
272
logger.critical("No suitable Zeroconf service name found"
303
273
" after %i retries, exiting.",
304
274
self.rename_count)
305
275
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
309
278
logger.info("Changing Zeroconf service name to %r ...",
315
283
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)
284
logger.critical("D-Bus Exception", exc_info=error)
287
self.rename_count += 1
325
289
def remove(self):
326
290
"""Derived from the Avahi example code"""
381
346
def server_state_changed(self, state, error=None):
382
347
"""Derived from the Avahi example code"""
383
348
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",
349
bad_states = { avahi.SERVER_INVALID:
350
"Zeroconf server invalid",
351
avahi.SERVER_REGISTERING: None,
352
avahi.SERVER_COLLISION:
353
"Zeroconf server name collision",
354
avahi.SERVER_FAILURE:
355
"Zeroconf server failure" }
390
356
if state in bad_states:
391
357
if bad_states[state] is not None:
392
358
if error is None:
411
377
follow_name_owner_changes=True),
412
378
avahi.DBUS_INTERFACE_SERVER)
413
379
self.server.connect_to_signal("StateChanged",
414
self.server_state_changed)
380
self.server_state_changed)
415
381
self.server_state_changed(self.server.GetState())
418
384
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
420
386
"""Add the new name to the syslog messages"""
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
427
def call_pipe(connection, # : multiprocessing.Connection
428
func, *args, **kwargs):
429
"""This function is meant to be called by multiprocessing.Process
431
This function runs func(*args, **kwargs), and writes the resulting
432
return value on the provided multiprocessing.Connection.
434
connection.send(func(*args, **kwargs))
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
437
402
class Client(object):
438
403
"""A representation of a client host served by this server.
485
447
"fingerprint", "host", "interval",
486
448
"last_approval_request", "last_checked_ok",
487
449
"last_enabled", "name", "timeout")
490
"extended_timeout": "PT15M",
492
"checker": "fping -q -- %%(host)s",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"approved_by_default": "True",
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
453
"checker": "fping -q -- %%(host)s",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
461
def timeout_milliseconds(self):
462
"Return the 'timeout' attribute in milliseconds"
463
return timedelta_to_milliseconds(self.timeout)
465
def extended_timeout_milliseconds(self):
466
"Return the 'extended_timeout' attribute in milliseconds"
467
return timedelta_to_milliseconds(self.extended_timeout)
469
def interval_milliseconds(self):
470
"Return the 'interval' attribute in milliseconds"
471
return timedelta_to_milliseconds(self.interval)
473
def approval_delay_milliseconds(self):
474
return timedelta_to_milliseconds(self.approval_delay)
501
477
def config_parser(config):
579
552
self.current_checker_command = None
580
553
self.approved = None
581
554
self.approvals_pending = 0
582
self.changedstate = multiprocessing_manager.Condition(
583
multiprocessing_manager.Lock())
584
self.client_structure = [attr
585
for attr in self.__dict__.iterkeys()
555
self.changedstate = (multiprocessing_manager
556
.Condition(multiprocessing_manager
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
586
560
if not attr.startswith("_")]
587
561
self.client_structure.append("client_structure")
589
for name, t in inspect.getmembers(
590
type(self), lambda obj: isinstance(obj, property)):
563
for name, t in inspect.getmembers(type(self),
591
567
if not name.startswith("_"):
592
568
self.client_structure.append(name)
635
611
# and every interval from then on.
636
612
if self.checker_initiator_tag is not None:
637
613
gobject.source_remove(self.checker_initiator_tag)
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
641
617
# Schedule a disable() when 'timeout' has passed
642
618
if self.disable_initiator_tag is not None:
643
619
gobject.source_remove(self.disable_initiator_tag)
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
646
623
# Also start a new checker *right now*.
647
624
self.start_checker()
649
def checker_callback(self, source, condition, connection,
626
def checker_callback(self, pid, condition, command):
651
627
"""The checker has completed, so take appropriate actions."""
652
628
self.checker_callback_tag = None
653
629
self.checker = None
654
# Read return code from connection (see call_pipe)
655
returncode = connection.recv()
659
self.last_checker_status = returncode
660
self.last_checker_signal = None
630
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
661
632
if self.last_checker_status == 0:
662
633
logger.info("Checker for %(name)s succeeded",
664
635
self.checked_ok()
666
logger.info("Checker for %(name)s failed", vars(self))
637
logger.info("Checker for %(name)s failed",
668
640
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
670
641
logger.warning("Checker for %(name)s crashed?",
674
644
def checked_ok(self):
675
645
"""Assert that the client has been seen, alive and well."""
676
646
self.last_checked_ok = datetime.datetime.utcnow()
677
647
self.last_checker_status = 0
678
self.last_checker_signal = None
679
648
self.bump_timeout()
681
650
def bump_timeout(self, timeout=None):
707
677
# than 'timeout' for the client to be disabled, which is as it
710
if self.checker is not None and not self.checker.is_alive():
711
logger.warning("Checker was not alive; joining")
680
# If a checker exists, make sure it is not a zombie
682
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
683
except (AttributeError, OSError) as error:
684
if (isinstance(error, OSError)
685
and error.errno != errno.ECHILD):
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
714
693
# Start a new checker if needed
715
694
if self.checker is None:
716
695
# Escape attributes for the shell
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
721
701
command = self.checker_command % escaped_attrs
722
702
except TypeError as error:
723
703
logger.error('Could not format string "%s"',
724
self.checker_command,
704
self.checker_command, exc_info=error)
705
return True # Try again later
706
self.current_checker_command = command
708
logger.info("Starting checker %r for %s",
710
# We don't need to redirect stdout and stderr, since
711
# in normal mode, that is already done by daemon(),
712
# and in debug mode we don't want to. (Stdin is
713
# always replaced by /dev/null.)
714
self.checker = subprocess.Popen(command,
717
except OSError as error:
718
logger.error("Failed to start subprocess",
726
return True # Try again later
727
self.current_checker_command = command
728
logger.info("Starting checker %r for %s", command,
730
# We don't need to redirect stdout and stderr, since
731
# in normal mode, that is already done by daemon(),
732
# and in debug mode we don't want to. (Stdin is
733
# always replaced by /dev/null.)
734
# The exception is when not debugging but nevertheless
735
# running in the foreground; use the previously
737
popen_args = { "close_fds": True,
740
if (not self.server_settings["debug"]
741
and self.server_settings["foreground"]):
742
popen_args.update({"stdout": wnull,
744
pipe = multiprocessing.Pipe(duplex = False)
745
self.checker = multiprocessing.Process(
747
args = (pipe[1], subprocess.call, command),
750
self.checker_callback_tag = gobject.io_add_watch(
751
pipe[0].fileno(), gobject.IO_IN,
752
self.checker_callback, pipe[0], command)
721
self.checker_callback_tag = (gobject.child_watch_add
723
self.checker_callback,
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
728
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
729
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
753
739
# Re-run this periodically if run by gobject.timeout_add
761
747
if getattr(self, "checker", None) is None:
763
749
logger.debug("Stopping checker for %(name)s", vars(self))
764
self.checker.terminate()
751
self.checker.terminate()
753
#if self.checker.poll() is None:
754
# self.checker.kill()
755
except OSError as error:
756
if error.errno != errno.ESRCH: # No such process
765
758
self.checker = None
768
def dbus_service_property(dbus_interface,
761
def dbus_service_property(dbus_interface, signature="v",
762
access="readwrite", byte_arrays=False):
772
763
"""Decorators for marking methods of a DBusObjectWithProperties to
773
764
become properties on the D-Bus.
824
811
"""Decorator to annotate D-Bus methods, signals or properties
827
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
828
"org.freedesktop.DBus.Property."
829
"EmitsChangedSignal": "false"})
830
814
@dbus_service_property("org.example.Interface", signature="b",
816
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
"org.freedesktop.DBus.Property."
818
"EmitsChangedSignal": "false"})
832
819
def Property_dbus_property(self):
833
820
return dbus.Boolean(False)
836
822
def decorator(func):
837
823
func._dbus_annotations = annotations
843
828
class DBusPropertyException(dbus.exceptions.DBusException):
844
829
"""A base class for D-Bus property-related exceptions
831
def __unicode__(self):
832
return unicode(str(self))
849
835
class DBusPropertyAccessException(DBusPropertyException):
873
859
If called like _is_dbus_thing("method") it returns a function
874
860
suitable for use as predicate to inspect.getmembers().
876
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
862
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
879
865
def _get_all_dbus_things(self, thing):
880
866
"""Returns a generator of (name, attribute) pairs
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
return ((getattr(athing.__get__(self), "_dbus_name",
883
870
athing.__get__(self))
884
871
for cls in self.__class__.__mro__
885
872
for name, athing in
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
888
876
def _get_dbus_property(self, interface_name, property_name):
889
877
"""Returns a bound method if one exists which is a D-Bus
890
878
property with the specified name and interface.
892
for cls in self.__class__.__mro__:
893
for name, value in inspect.getmembers(
894
cls, self._is_dbus_thing("property")):
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
883
self._is_dbus_thing("property"))):
895
884
if (value._dbus_name == property_name
896
885
and value._dbus_interface == interface_name):
897
886
return value.__get__(self)
899
888
# No such property
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
894
out_signature="v")
906
895
def Get(self, interface_name, property_name):
907
896
"""Standard D-Bus property Get() method, see D-Bus standard.
925
914
# The byte_arrays option is not supported yet on
926
915
# signatures other than "ay".
927
916
if prop._dbus_signature != "ay":
928
raise ValueError("Byte arrays not supported for non-"
929
"'ay' signature {!r}"
930
.format(prop._dbus_signature))
931
918
value = dbus.ByteArray(b''.join(chr(byte)
932
919
for byte in value))
935
@dbus.service.method(dbus.PROPERTIES_IFACE,
922
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
937
923
out_signature="a{sv}")
938
924
def GetAll(self, interface_name):
939
925
"""Standard D-Bus property GetAll() method, see D-Bus
954
940
if not hasattr(value, "variant_level"):
955
941
properties[name] = value
957
properties[name] = type(value)(
958
value, variant_level = value.variant_level + 1)
943
properties[name] = type(value)(value, variant_level=
944
value.variant_level+1)
959
945
return dbus.Dictionary(properties, signature="sv")
961
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
def PropertiesChanged(self, interface_name, changed_properties,
963
invalidated_properties):
964
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
969
947
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
948
out_signature="s",
971
949
path_keyword='object_path',
1089
1067
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
1068
# with the wrong interface name
1091
1069
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
1070
or not attribute._dbus_interface
1071
.startswith(orig_interface_name)):
1095
1073
# Create an alternate D-Bus interface name based on
1096
1074
# the current name
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1075
alt_interface = (attribute._dbus_interface
1076
.replace(orig_interface_name,
1077
alt_interface_name))
1099
1078
interface_names.add(alt_interface)
1100
1079
# Is this a D-Bus signal?
1101
1080
if getattr(attribute, "_dbus_is_signal", False):
1102
if sys.version_info.major == 2:
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1081
# Extract the original non-method undecorated
1082
# function by black magic
1083
nonmethod_func = (dict(
1106
1084
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))
1108
["func"].cell_contents)
1110
nonmethod_func = attribute
1085
attribute.__closure__))["func"]
1111
1087
# Create a new, but exactly alike, function
1112
1088
# object, and decorate it to be a new D-Bus signal
1113
1089
# with the alternate D-Bus interface name
1114
if sys.version_info.major == 2:
1115
new_function = types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)
1122
new_function = types.FunctionType(
1123
nonmethod_func.__code__,
1124
nonmethod_func.__globals__,
1125
nonmethod_func.__name__,
1126
nonmethod_func.__defaults__,
1127
nonmethod_func.__closure__)
1128
new_function = (dbus.service.signal(
1130
attribute._dbus_signature)(new_function))
1090
new_function = (dbus.service.signal
1092
attribute._dbus_signature)
1093
(types.FunctionType(
1094
nonmethod_func.func_code,
1095
nonmethod_func.func_globals,
1096
nonmethod_func.func_name,
1097
nonmethod_func.func_defaults,
1098
nonmethod_func.func_closure)))
1131
1099
# Copy annotations, if any
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1101
new_function._dbus_annotations = (
1102
dict(attribute._dbus_annotations))
1135
1103
except AttributeError:
1137
1105
# Define a creator of a function to call both the
1159
1125
# object. Decorate it to be a new D-Bus method
1160
1126
# with the alternate D-Bus interface name. Add it
1161
1127
# to the class.
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1128
attr[attrname] = (dbus.service.method
1130
attribute._dbus_in_signature,
1131
attribute._dbus_out_signature)
1133
(attribute.func_code,
1134
attribute.func_globals,
1135
attribute.func_name,
1136
attribute.func_defaults,
1137
attribute.func_closure)))
1172
1138
# Copy annotations, if any
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1140
attr[attrname]._dbus_annotations = (
1141
dict(attribute._dbus_annotations))
1176
1142
except AttributeError:
1178
1144
# Is this a D-Bus property?
1181
1147
# object, and decorate it to be a new D-Bus
1182
1148
# property with the alternate D-Bus interface
1183
1149
# name. Add it to the class.
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1150
attr[attrname] = (dbus_service_property
1152
attribute._dbus_signature,
1153
attribute._dbus_access,
1155
._dbus_get_args_options
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1195
1163
# Copy annotations, if any
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1199
1167
except AttributeError:
1201
1169
# Is this a D-Bus interface?
1204
1172
# object. Decorate it to be a new D-Bus interface
1205
1173
# with the alternate D-Bus interface name. Add it
1206
1174
# to the class.
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1175
attr[attrname] = (dbus_interface_annotations
1178
(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1215
1184
# Deprecate all alternate interfaces
1216
iname="_AlternateDBusNames_interface_annotation{}"
1185
iname="_AlternateDBusNames_interface_annotation{0}"
1217
1186
for interface_name in interface_names:
1219
1187
@dbus_interface_annotations(interface_name)
1220
1188
def func(self):
1221
1189
return { "org.freedesktop.DBus.Deprecated":
1223
1191
# Find an unused name
1224
1192
for aname in (iname.format(i)
1225
1193
for i in itertools.count()):
1258
1223
Client.__init__(self, *args, **kwargs)
1259
1224
# Only now, when this client is initialized, can it show up on
1261
client_object_name = str(self.name).translate(
1226
client_object_name = unicode(self.name).translate(
1262
1227
{ord("."): ord("_"),
1263
1228
ord("-"): ord("_")})
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1229
self.dbus_object_path = (dbus.ObjectPath
1230
("/clients/" + client_object_name))
1266
1231
DBusObjectWithProperties.__init__(self, self.bus,
1267
1232
self.dbus_object_path)
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1273
_interface=_interface):
1234
def notifychangeproperty(transform_func,
1235
dbus_name, type_func=lambda x: x,
1274
1237
""" Modify a variable so that it's a property which announces
1275
1238
its changes to DBus.
1281
1244
to the D-Bus. Default: no transform
1282
1245
variant_level: D-Bus variant level. Default: 1
1284
attrname = "_{}".format(dbus_name)
1247
attrname = "_{0}".format(dbus_name)
1286
1248
def setter(self, value):
1287
1249
if hasattr(self, "dbus_object_path"):
1288
1250
if (not hasattr(self, attrname) or
1289
1251
type_func(getattr(self, attrname, None))
1290
1252
!= type_func(value)):
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1253
dbus_value = transform_func(type_func(value),
1256
self.PropertyChanged(dbus.String(dbus_name),
1306
1258
setattr(self, attrname, value)
1308
1260
return property(lambda self: getattr(self, attrname), setter)
1314
1266
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1267
last_enabled = notifychangeproperty(datetime_to_dbus,
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1269
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1270
type_func = lambda checker:
1271
checker is not None)
1320
1272
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1273
"LastCheckedOK")
1322
1274
last_checker_status = notifychangeproperty(dbus.Int16,
1325
1277
datetime_to_dbus, "LastApprovalRequest")
1326
1278
approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1279
"ApprovedByDefault")
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1280
approval_delay = notifychangeproperty(dbus.UInt64,
1283
timedelta_to_milliseconds)
1331
1284
approval_duration = notifychangeproperty(
1332
1285
dbus.UInt64, "ApprovalDuration",
1333
type_func = lambda td: td.total_seconds() * 1000)
1286
type_func = timedelta_to_milliseconds)
1334
1287
host = notifychangeproperty(dbus.String, "Host")
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1288
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1290
timedelta_to_milliseconds)
1338
1291
extended_timeout = notifychangeproperty(
1339
1292
dbus.UInt64, "ExtendedTimeout",
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1293
type_func = timedelta_to_milliseconds)
1294
interval = notifychangeproperty(dbus.UInt64,
1297
timedelta_to_milliseconds)
1344
1298
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1348
1300
del notifychangeproperty
1356
1308
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1309
Client.__del__(self, *args, **kwargs)
1359
def checker_callback(self, source, condition,
1360
connection, command, *args, **kwargs):
1361
ret = Client.checker_callback(self, source, condition,
1362
connection, command, *args,
1364
exitstatus = self.last_checker_status
1311
def checker_callback(self, pid, condition, command,
1313
self.checker_callback_tag = None
1315
if os.WIFEXITED(condition):
1316
exitstatus = os.WEXITSTATUS(condition)
1366
1317
# Emit D-Bus signal
1367
1318
self.CheckerCompleted(dbus.Int16(exitstatus),
1319
dbus.Int64(condition),
1369
1320
dbus.String(command))
1371
1322
# Emit D-Bus signal
1372
1323
self.CheckerCompleted(dbus.Int16(-1),
1374
self.last_checker_signal),
1324
dbus.Int64(condition),
1375
1325
dbus.String(command))
1327
return Client.checker_callback(self, pid, condition, command,
1378
1330
def start_checker(self, *args, **kwargs):
1379
old_checker_pid = getattr(self.checker, "pid", None)
1331
old_checker = self.checker
1332
if self.checker is not None:
1333
old_checker_pid = self.checker.pid
1335
old_checker_pid = None
1380
1336
r = Client.start_checker(self, *args, **kwargs)
1381
1337
# Only if new checker process was started
1382
1338
if (self.checker is not None
1493
1454
self.approved_by_default = bool(value)
1495
1456
# ApprovalDelay - property
1496
@dbus_service_property(_interface,
1457
@dbus_service_property(_interface, signature="t",
1498
1458
access="readwrite")
1499
1459
def ApprovalDelay_dbus_property(self, value=None):
1500
1460
if value is None: # get
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1461
return dbus.UInt64(self.approval_delay_milliseconds())
1503
1462
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1505
1464
# ApprovalDuration - property
1506
@dbus_service_property(_interface,
1465
@dbus_service_property(_interface, signature="t",
1508
1466
access="readwrite")
1509
1467
def ApprovalDuration_dbus_property(self, value=None):
1510
1468
if value is None: # get
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1469
return dbus.UInt64(timedelta_to_milliseconds(
1470
self.approval_duration))
1513
1471
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1515
1473
# Name - property
1601
1556
gobject.source_remove(self.disable_initiator_tag)
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1557
self.disable_initiator_tag = (
1558
gobject.timeout_add(
1559
timedelta_to_milliseconds(self.expires - now),
1606
1562
# ExtendedTimeout - property
1607
@dbus_service_property(_interface,
1563
@dbus_service_property(_interface, signature="t",
1609
1564
access="readwrite")
1610
1565
def ExtendedTimeout_dbus_property(self, value=None):
1611
1566
if value is None: # get
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1567
return dbus.UInt64(self.extended_timeout_milliseconds())
1614
1568
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1616
1570
# Interval - property
1617
@dbus_service_property(_interface,
1571
@dbus_service_property(_interface, signature="t",
1619
1572
access="readwrite")
1620
1573
def Interval_dbus_property(self, value=None):
1621
1574
if value is None: # get
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1575
return dbus.UInt64(self.interval_milliseconds())
1623
1576
self.interval = datetime.timedelta(0, 0, 0, value)
1624
1577
if getattr(self, "checker_initiator_tag", None) is None:
1626
1579
if self.enabled:
1627
1580
# Reschedule checker run
1628
1581
gobject.source_remove(self.checker_initiator_tag)
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1582
self.checker_initiator_tag = (gobject.timeout_add
1583
(value, self.start_checker))
1584
self.start_checker() # Start one now, too
1633
1586
# Checker - property
1634
@dbus_service_property(_interface,
1587
@dbus_service_property(_interface, signature="s",
1636
1588
access="readwrite")
1637
1589
def Checker_dbus_property(self, value=None):
1638
1590
if value is None: # get
1639
1591
return dbus.String(self.checker_command)
1640
self.checker_command = str(value)
1592
self.checker_command = unicode(value)
1642
1594
# CheckerRunning - property
1643
@dbus_service_property(_interface,
1595
@dbus_service_property(_interface, signature="b",
1645
1596
access="readwrite")
1646
1597
def CheckerRunning_dbus_property(self, value=None):
1647
1598
if value is None: # get
1704
1651
def handle(self):
1705
1652
with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
1653
logger.info("TCP connection from: %s",
1707
str(self.client_address))
1654
unicode(self.client_address))
1708
1655
logger.debug("Pipe FD: %d",
1709
1656
self.server.child_pipe.fileno())
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1658
session = (gnutls.connection
1659
.ClientSession(self.request,
1661
.X509Credentials()))
1714
1663
# Note: gnutls.connection.X509Credentials is really a
1715
1664
# generic GnuTLS certificate credentials object so long as
1872
1824
def fingerprint(openpgp):
1873
1825
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1826
# New GnuTLS "datum" with the OpenPGP public key
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1827
datum = (gnutls.library.types
1828
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1831
ctypes.c_uint(len(openpgp))))
1879
1832
# New empty GnuTLS certificate
1880
1833
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1836
# Import the OpenPGP public key into the certificate
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1837
(gnutls.library.functions
1838
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1839
gnutls.library.constants
1840
.GNUTLS_OPENPGP_FMT_RAW))
1887
1841
# Verify the self signature in the key
1888
1842
crtverify = ctypes.c_uint()
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1843
(gnutls.library.functions
1844
.gnutls_openpgp_crt_verify_self(crt, 0,
1845
ctypes.byref(crtverify)))
1891
1846
if crtverify.value != 0:
1892
1847
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
raise gnutls.errors.CertificateSecurityError(
1848
raise (gnutls.errors.CertificateSecurityError
1895
1850
# New buffer for the fingerprint
1896
1851
buf = ctypes.create_string_buffer(20)
1897
1852
buf_len = ctypes.c_size_t()
1898
1853
# Get the fingerprint from the certificate into the buffer
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1856
ctypes.byref(buf_len)))
1901
1857
# Deinit the certificate
1902
1858
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1859
# Convert the buffer to a Python bytestring
2081
2027
def add_pipe(self, parent_pipe, proc):
2082
2028
# Call "handle_ipc" for both data and EOF events
2083
gobject.io_add_watch(
2084
parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe = parent_pipe,
2029
gobject.io_add_watch(parent_pipe.fileno(),
2030
gobject.IO_IN | gobject.IO_HUP,
2031
functools.partial(self.handle_ipc,
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2036
def handle_ipc(self, source, condition, parent_pipe=None,
2037
proc = None, client_object=None):
2094
2038
# error, or the other end of multiprocessing.Pipe has closed
2095
2039
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2096
2040
# Wait for other process to exit
2183
2127
# avoid excessive use of external libraries.
2185
2129
# New type for defining tokens, syntax, and semantics all-in-one
2186
Token = collections.namedtuple("Token", (
2187
"regexp", # To match token; if "value" is not None, must have
2188
# a "group" containing digits
2189
"value", # datetime.timedelta or None
2190
"followers")) # Tokens valid after this token
2130
Token = collections.namedtuple("Token",
2131
("regexp", # To match token; if
2132
# "value" is not None,
2133
# must have a "group"
2135
"value", # datetime.timedelta or
2137
"followers")) # Tokens valid after
2191
2139
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
2140
# the "duration" ABNF definition in RFC 3339, Appendix A.
2193
2141
token_end = Token(re.compile(r"$"), None, frozenset())
2194
2142
token_second = Token(re.compile(r"(\d+)S"),
2195
2143
datetime.timedelta(seconds=1),
2196
frozenset((token_end, )))
2144
frozenset((token_end,)))
2197
2145
token_minute = Token(re.compile(r"(\d+)M"),
2198
2146
datetime.timedelta(minutes=1),
2199
2147
frozenset((token_second, token_end)))
2215
2163
frozenset((token_month, token_end)))
2216
2164
token_week = Token(re.compile(r"(\d+)W"),
2217
2165
datetime.timedelta(weeks=1),
2218
frozenset((token_end, )))
2166
frozenset((token_end,)))
2219
2167
token_duration = Token(re.compile(r"P"), None,
2220
2168
frozenset((token_year, token_month,
2221
2169
token_day, token_time,
2223
2171
# Define starting values
2224
2172
value = datetime.timedelta() # Value so far
2225
2173
found_token = None
2226
followers = frozenset((token_duration, )) # Following valid tokens
2174
followers = frozenset(token_duration,) # Following valid tokens
2227
2175
s = duration # String left to parse
2228
2176
# Loop until end token is found
2229
2177
while found_token is not token_end:
2355
2303
parser.add_argument("--no-dbus", action="store_false",
2356
2304
dest="use_dbus", help="Do not provide D-Bus"
2357
" system bus interface", default=None)
2305
" system bus interface")
2358
2306
parser.add_argument("--no-ipv6", action="store_false",
2359
dest="use_ipv6", help="Do not use IPv6",
2307
dest="use_ipv6", help="Do not use IPv6")
2361
2308
parser.add_argument("--no-restore", action="store_false",
2362
2309
dest="restore", help="Do not restore stored"
2363
" state", default=None)
2364
2311
parser.add_argument("--socket", type=int,
2365
2312
help="Specify a file descriptor to a network"
2366
2313
" socket to use instead of creating one")
2367
2314
parser.add_argument("--statedir", metavar="DIR",
2368
2315
help="Directory to save/restore state in")
2369
2316
parser.add_argument("--foreground", action="store_true",
2370
help="Run in foreground", default=None)
2371
parser.add_argument("--no-zeroconf", action="store_false",
2372
dest="zeroconf", help="Do not use Zeroconf",
2317
help="Run in foreground")
2375
2319
options = parser.parse_args()
2377
2321
if options.check:
2379
fail_count, test_count = doctest.testmod()
2380
sys.exit(os.EX_OK if fail_count == 0 else 1)
2382
2326
# Default values for config file for server-global settings
2383
2327
server_defaults = { "interface": "",
2425
2368
# Override the settings from the config file with command line
2426
2369
# options, if set.
2427
2370
for option in ("interface", "address", "port", "debug",
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
2371
"priority", "servicename", "configdir",
2372
"use_dbus", "use_ipv6", "debuglevel", "restore",
2373
"statedir", "socket", "foreground"):
2431
2374
value = getattr(options, option)
2432
2375
if value is not None:
2433
2376
server_settings[option] = value
2435
2378
# Force all strings to be unicode
2436
2379
for option in server_settings.keys():
2437
if isinstance(server_settings[option], bytes):
2438
server_settings[option] = (server_settings[option]
2440
# Force all boolean options to be boolean
2441
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
"foreground", "zeroconf"):
2443
server_settings[option] = bool(server_settings[option])
2380
if type(server_settings[option]) is str:
2381
server_settings[option] = unicode(server_settings[option])
2444
2382
# Debug implies foreground
2445
2383
if server_settings["debug"]:
2446
2384
server_settings["foreground"] = True
2487
2420
global mandos_dbus_service
2488
2421
mandos_dbus_service = None
2491
if server_settings["socket"] != "":
2492
socketfd = server_settings["socket"]
2493
tcp_server = MandosServer(
2494
(server_settings["address"], server_settings["port"]),
2496
interface=(server_settings["interface"] or None),
2498
gnutls_priority=server_settings["priority"],
2423
tcp_server = MandosServer((server_settings["address"],
2424
server_settings["port"]),
2426
interface=(server_settings["interface"]
2430
server_settings["priority"],
2432
socketfd=(server_settings["socket"]
2501
2434
if not foreground:
2502
pidfilename = "/run/mandos.pid"
2503
if not os.path.isdir("/run/."):
2504
pidfilename = "/var/run/mandos.pid"
2435
pidfilename = "/var/run/mandos.pid"
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2438
pidfile = open(pidfilename, "w")
2508
2439
except IOError as e:
2509
2440
logger.error("Could not open file %r", pidfilename,
2566
2497
bus_name = dbus.service.BusName("se.recompile.Mandos",
2569
old_bus_name = dbus.service.BusName(
2570
"se.bsnet.fukt.Mandos", bus,
2572
except dbus.exceptions.DBusException as e:
2498
bus, do_not_queue=True)
2499
old_bus_name = (dbus.service.BusName
2500
("se.bsnet.fukt.Mandos", bus,
2502
except dbus.exceptions.NameExistsException as e:
2573
2503
logger.error("Disabling D-Bus:", exc_info=e)
2574
2504
use_dbus = False
2575
2505
server_settings["use_dbus"] = False
2576
2506
tcp_server.use_dbus = False
2578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
service = AvahiServiceToSyslog(
2580
name = server_settings["servicename"],
2581
servicetype = "_mandos._tcp",
2582
protocol = protocol,
2584
if server_settings["interface"]:
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
2507
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2508
service = AvahiServiceToSyslog(name =
2509
server_settings["servicename"],
2510
servicetype = "_mandos._tcp",
2511
protocol = protocol, bus = bus)
2512
if server_settings["interface"]:
2513
service.interface = (if_nametoindex
2514
(str(server_settings["interface"])))
2588
2516
global multiprocessing_manager
2589
2517
multiprocessing_manager = multiprocessing.Manager()
2596
2524
old_client_settings = {}
2597
2525
clients_data = {}
2599
# This is used to redirect stdout and stderr for checker processes
2601
wnull = open(os.devnull, "w") # A writable /dev/null
2602
# Only used if server is running in foreground but not in debug
2604
if debug or not foreground:
2607
2527
# Get client data and settings from last running state.
2608
2528
if server_settings["restore"]:
2610
2530
with open(stored_state_path, "rb") as stored_state:
2611
clients_data, old_client_settings = pickle.load(
2531
clients_data, old_client_settings = (pickle.load
2613
2533
os.remove(stored_state_path)
2614
2534
except IOError as e:
2615
2535
if e.errno == errno.ENOENT:
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2536
logger.warning("Could not load persistent state: {0}"
2537
.format(os.strerror(e.errno)))
2619
2539
logger.critical("Could not load persistent state:",
2622
2542
except EOFError as e:
2623
2543
logger.warning("Could not load persistent state: "
2544
"EOFError:", exc_info=e)
2627
2546
with PGPEngine() as pgp:
2628
for client_name, client in clients_data.items():
2629
# Skip removed clients
2630
if client_name not in client_settings:
2547
for client_name, client in clients_data.iteritems():
2633
2548
# Decide which value to use after restoring saved state.
2634
2549
# We have three different values: Old config file,
2635
2550
# new config file, and saved state.
2656
2571
if datetime.datetime.utcnow() >= client["expires"]:
2657
2572
if not client["last_checked_ok"]:
2658
2573
logger.warning(
2659
"disabling client {} - Client never "
2660
"performed a successful checker".format(
2574
"disabling client {0} - Client never "
2575
"performed a successful checker"
2576
.format(client_name))
2662
2577
client["enabled"] = False
2663
2578
elif client["last_checker_status"] != 0:
2664
2579
logger.warning(
2665
"disabling client {} - Client last"
2666
" checker failed with error code"
2669
client["last_checker_status"]))
2580
"disabling client {0} - Client "
2581
"last checker failed with error code {1}"
2582
.format(client_name,
2583
client["last_checker_status"]))
2670
2584
client["enabled"] = False
2672
client["expires"] = (
2673
datetime.datetime.utcnow()
2674
+ client["timeout"])
2586
client["expires"] = (datetime.datetime
2588
+ client["timeout"])
2675
2589
logger.debug("Last checker succeeded,"
2676
" keeping {} enabled".format(
2590
" keeping {0} enabled"
2591
.format(client_name))
2679
client["secret"] = pgp.decrypt(
2680
client["encrypted_secret"],
2681
client_settings[client_name]["secret"])
2593
client["secret"] = (
2594
pgp.decrypt(client["encrypted_secret"],
2595
client_settings[client_name]
2682
2597
except PGPError:
2683
2598
# If decryption fails, we use secret from new settings
2684
logger.debug("Failed to decrypt {} old secret".format(
2686
client["secret"] = (client_settings[client_name]
2599
logger.debug("Failed to decrypt {0} old secret"
2600
.format(client_name))
2601
client["secret"] = (
2602
client_settings[client_name]["secret"])
2689
2604
# Add/remove clients based on new changes made to config
2690
2605
for client_name in (set(old_client_settings)
2695
2610
clients_data[client_name] = client_settings[client_name]
2697
2612
# Create all client objects
2698
for client_name, client in clients_data.items():
2613
for client_name, client in clients_data.iteritems():
2699
2614
tcp_server.clients[client_name] = client_class(
2702
server_settings = server_settings)
2615
name = client_name, settings = client)
2704
2617
if not tcp_server.clients:
2705
2618
logger.warning("No clients defined")
2707
2620
if not foreground:
2708
2621
if pidfile is not None:
2712
print(pid, file=pidfile)
2625
pidfile.write(str(pid) + "\n".encode("utf-8"))
2713
2626
except IOError:
2714
2627
logger.error("Could not write to file %r with PID %d",
2715
2628
pidfilename, pid)
2720
2633
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2636
@alternate_dbus_interfaces({"se.recompile.Mandos":
2637
"se.bsnet.fukt.Mandos"})
2726
2638
class MandosDBusService(DBusObjectWithProperties):
2727
2639
"""A D-Bus proxy object"""
2729
2640
def __init__(self):
2730
2641
dbus.service.Object.__init__(self, bus, "/")
2732
2642
_interface = "se.recompile.Mandos"
2734
2644
@dbus_interface_annotations(_interface)
2735
2645
def _foo(self):
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2646
return { "org.freedesktop.DBus.Property"
2647
".EmitsChangedSignal":
2740
2650
@dbus.service.signal(_interface, signature="o")
2741
2651
def ClientAdded(self, objpath):
2824
2733
del client_settings[client.name]["secret"]
2827
with tempfile.NamedTemporaryFile(
2831
dir=os.path.dirname(stored_state_path),
2832
delete=False) as stored_state:
2736
with (tempfile.NamedTemporaryFile
2737
(mode='wb', suffix=".pickle", prefix='clients-',
2738
dir=os.path.dirname(stored_state_path),
2739
delete=False)) as stored_state:
2833
2740
pickle.dump((clients, client_settings), stored_state)
2834
tempname = stored_state.name
2741
tempname=stored_state.name
2835
2742
os.rename(tempname, stored_state_path)
2836
2743
except (IOError, OSError) as e:
2887
2794
#service.interface = tcp_server.socket.getsockname()[3]
2891
# From the Avahi example code
2894
except dbus.exceptions.DBusException as error:
2895
logger.critical("D-Bus Exception", exc_info=error)
2898
# End of Avahi example code
2797
# From the Avahi example code
2800
except dbus.exceptions.DBusException as error:
2801
logger.critical("D-Bus Exception", exc_info=error)
2804
# End of Avahi example code
2900
2806
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2901
2807
lambda *args, **kwargs: