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'
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))
428
402
class Client(object):
429
403
"""A representation of a client host served by this server.
474
447
"fingerprint", "host", "interval",
475
448
"last_approval_request", "last_checked_ok",
476
449
"last_enabled", "name", "timeout")
479
"extended_timeout": "PT15M",
481
"checker": "fping -q -- %%(host)s",
483
"approval_delay": "PT0S",
484
"approval_duration": "PT1S",
485
"approved_by_default": "True",
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)
490
477
def config_parser(config):
539
def __init__(self, settings, name = None, server_settings=None):
523
def __init__(self, settings, name = None):
541
if server_settings is None:
543
self.server_settings = server_settings
544
525
# adding all client settings
545
for setting, value in settings.items():
526
for setting, value in settings.iteritems():
546
527
setattr(self, setting, value)
568
552
self.current_checker_command = None
569
553
self.approved = None
570
554
self.approvals_pending = 0
571
self.changedstate = multiprocessing_manager.Condition(
572
multiprocessing_manager.Lock())
573
self.client_structure = [attr
574
for attr in self.__dict__.iterkeys()
555
self.changedstate = (multiprocessing_manager
556
.Condition(multiprocessing_manager
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
575
560
if not attr.startswith("_")]
576
561
self.client_structure.append("client_structure")
578
for name, t in inspect.getmembers(
579
type(self), lambda obj: isinstance(obj, property)):
563
for name, t in inspect.getmembers(type(self),
580
567
if not name.startswith("_"):
581
568
self.client_structure.append(name)
624
611
# and every interval from then on.
625
612
if self.checker_initiator_tag is not None:
626
613
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = gobject.timeout_add(
628
int(self.interval.total_seconds() * 1000),
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
630
617
# Schedule a disable() when 'timeout' has passed
631
618
if self.disable_initiator_tag is not None:
632
619
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = gobject.timeout_add(
634
int(self.timeout.total_seconds() * 1000), self.disable)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
635
623
# Also start a new checker *right now*.
636
624
self.start_checker()
666
655
gobject.source_remove(self.disable_initiator_tag)
667
656
self.disable_initiator_tag = None
668
657
if getattr(self, "enabled", False):
669
self.disable_initiator_tag = gobject.timeout_add(
670
int(timeout.total_seconds() * 1000), self.disable)
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
671
661
self.expires = datetime.datetime.utcnow() + timeout
673
663
def need_approval(self):
704
693
# Start a new checker if needed
705
694
if self.checker is None:
706
695
# Escape attributes for the shell
708
attr: re.escape(str(getattr(self, attr)))
709
for attr in self.runtime_expansions }
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
711
701
command = self.checker_command % escaped_attrs
712
702
except TypeError as error:
713
703
logger.error('Could not format string "%s"',
714
self.checker_command,
716
return True # Try again later
704
self.checker_command, exc_info=error)
705
return True # Try again later
717
706
self.current_checker_command = command
719
logger.info("Starting checker %r for %s", command,
708
logger.info("Starting checker %r for %s",
721
710
# We don't need to redirect stdout and stderr, since
722
711
# in normal mode, that is already done by daemon(),
723
712
# and in debug mode we don't want to. (Stdin is
724
713
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
714
self.checker = subprocess.Popen(command,
738
717
except OSError as error:
739
718
logger.error("Failed to start subprocess",
742
self.checker_callback_tag = gobject.child_watch_add(
743
self.checker.pid, self.checker_callback, data=command)
720
self.checker_callback_tag = (gobject.child_watch_add
722
self.checker_callback,
744
724
# The checker may have completed before the gobject
745
725
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
726
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
756
728
gobject.source_remove(self.checker_callback_tag)
757
729
self.checker_callback(pid, status, command)
836
802
"""Decorator to annotate D-Bus methods, signals or properties
839
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
842
805
@dbus_service_property("org.example.Interface", signature="b",
807
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
"org.freedesktop.DBus.Property."
809
"EmitsChangedSignal": "false"})
844
810
def Property_dbus_property(self):
845
811
return dbus.Boolean(False)
848
813
def decorator(func):
849
814
func._dbus_annotations = annotations
855
819
class DBusPropertyException(dbus.exceptions.DBusException):
856
820
"""A base class for D-Bus property-related exceptions
822
def __unicode__(self):
823
return unicode(str(self))
861
826
class DBusPropertyAccessException(DBusPropertyException):
885
850
If called like _is_dbus_thing("method") it returns a function
886
851
suitable for use as predicate to inspect.getmembers().
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
853
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
891
856
def _get_all_dbus_things(self, thing):
892
857
"""Returns a generator of (name, attribute) pairs
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
859
return ((getattr(athing.__get__(self), "_dbus_name",
895
861
athing.__get__(self))
896
862
for cls in self.__class__.__mro__
897
863
for name, athing in
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
864
inspect.getmembers(cls,
865
self._is_dbus_thing(thing)))
900
867
def _get_dbus_property(self, interface_name, property_name):
901
868
"""Returns a bound method if one exists which is a D-Bus
902
869
property with the specified name and interface.
904
for cls in self.__class__.__mro__:
905
for name, value in inspect.getmembers(
906
cls, self._is_dbus_thing("property")):
871
for cls in self.__class__.__mro__:
872
for name, value in (inspect.getmembers
874
self._is_dbus_thing("property"))):
907
875
if (value._dbus_name == property_name
908
876
and value._dbus_interface == interface_name):
909
877
return value.__get__(self)
911
879
# No such property
912
raise DBusPropertyNotFound("{}:{}.{}".format(
913
self.dbus_object_path, interface_name, property_name))
880
raise DBusPropertyNotFound(self.dbus_object_path + ":"
881
+ interface_name + "."
915
@dbus.service.method(dbus.PROPERTIES_IFACE,
884
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
917
885
out_signature="v")
918
886
def Get(self, interface_name, property_name):
919
887
"""Standard D-Bus property Get() method, see D-Bus standard.
937
905
# The byte_arrays option is not supported yet on
938
906
# signatures other than "ay".
939
907
if prop._dbus_signature != "ay":
940
raise ValueError("Byte arrays not supported for non-"
941
"'ay' signature {!r}"
942
.format(prop._dbus_signature))
943
909
value = dbus.ByteArray(b''.join(chr(byte)
944
910
for byte in value))
947
@dbus.service.method(dbus.PROPERTIES_IFACE,
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
949
914
out_signature="a{sv}")
950
915
def GetAll(self, interface_name):
951
916
"""Standard D-Bus property GetAll() method, see D-Bus
966
931
if not hasattr(value, "variant_level"):
967
932
properties[name] = value
969
properties[name] = type(value)(
970
value, variant_level = value.variant_level + 1)
934
properties[name] = type(value)(value, variant_level=
935
value.variant_level+1)
971
936
return dbus.Dictionary(properties, signature="sv")
973
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
974
def PropertiesChanged(self, interface_name, changed_properties,
975
invalidated_properties):
976
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
981
938
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
982
939
out_signature="s",
983
940
path_keyword='object_path',
993
950
document = xml.dom.minidom.parseString(xmlstring)
995
951
def make_tag(document, name, prop):
996
952
e = document.createElement("property")
997
953
e.setAttribute("name", name)
998
954
e.setAttribute("type", prop._dbus_signature)
999
955
e.setAttribute("access", prop._dbus_access)
1002
957
for if_tag in document.getElementsByTagName("interface"):
1003
958
# Add property tags
1004
959
for tag in (make_tag(document, name, prop)
1027
984
# Add interface annotation tags
1028
985
for annotation, value in dict(
1029
986
itertools.chain.from_iterable(
1030
annotations().items()
1031
for name, annotations
1032
in self._get_all_dbus_things("interface")
987
annotations().iteritems()
988
for name, annotations in
989
self._get_all_dbus_things("interface")
1033
990
if name == if_tag.getAttribute("name")
1035
992
ann_tag = document.createElement("annotation")
1036
993
ann_tag.setAttribute("name", annotation)
1037
994
ann_tag.setAttribute("value", value)
1101
1058
# Ignore non-D-Bus attributes, and D-Bus attributes
1102
1059
# with the wrong interface name
1103
1060
if (not hasattr(attribute, "_dbus_interface")
1104
or not attribute._dbus_interface.startswith(
1105
orig_interface_name)):
1061
or not attribute._dbus_interface
1062
.startswith(orig_interface_name)):
1107
1064
# Create an alternate D-Bus interface name based on
1108
1065
# the current name
1109
alt_interface = attribute._dbus_interface.replace(
1110
orig_interface_name, alt_interface_name)
1066
alt_interface = (attribute._dbus_interface
1067
.replace(orig_interface_name,
1068
alt_interface_name))
1111
1069
interface_names.add(alt_interface)
1112
1070
# Is this a D-Bus signal?
1113
1071
if getattr(attribute, "_dbus_is_signal", False):
1114
if sys.version == 2:
1115
# Extract the original non-method undecorated
1116
# function by black magic
1117
nonmethod_func = (dict(
1072
# Extract the original non-method function by
1074
nonmethod_func = (dict(
1118
1075
zip(attribute.func_code.co_freevars,
1119
attribute.__closure__))
1120
["func"].cell_contents)
1122
nonmethod_func = attribute
1076
attribute.__closure__))["func"]
1123
1078
# Create a new, but exactly alike, function
1124
1079
# object, and decorate it to be a new D-Bus signal
1125
1080
# with the alternate D-Bus interface name
1126
if sys.version == 2:
1127
new_function = types.FunctionType(
1128
nonmethod_func.func_code,
1129
nonmethod_func.func_globals,
1130
nonmethod_func.func_name,
1131
nonmethod_func.func_defaults,
1132
nonmethod_func.func_closure)
1134
new_function = types.FunctionType(
1135
nonmethod_func.__code__,
1136
nonmethod_func.__globals__,
1137
nonmethod_func.__name__,
1138
nonmethod_func.__defaults__,
1139
nonmethod_func.__closure__)
1140
new_function = (dbus.service.signal(
1142
attribute._dbus_signature)(new_function))
1081
new_function = (dbus.service.signal
1083
attribute._dbus_signature)
1084
(types.FunctionType(
1085
nonmethod_func.func_code,
1086
nonmethod_func.func_globals,
1087
nonmethod_func.func_name,
1088
nonmethod_func.func_defaults,
1089
nonmethod_func.func_closure)))
1143
1090
# Copy annotations, if any
1145
new_function._dbus_annotations = dict(
1146
attribute._dbus_annotations)
1092
new_function._dbus_annotations = (
1093
dict(attribute._dbus_annotations))
1147
1094
except AttributeError:
1149
1096
# Define a creator of a function to call both the
1171
1116
# object. Decorate it to be a new D-Bus method
1172
1117
# with the alternate D-Bus interface name. Add it
1173
1118
# to the class.
1175
dbus.service.method(
1177
attribute._dbus_in_signature,
1178
attribute._dbus_out_signature)
1179
(types.FunctionType(attribute.func_code,
1180
attribute.func_globals,
1181
attribute.func_name,
1182
attribute.func_defaults,
1183
attribute.func_closure)))
1119
attr[attrname] = (dbus.service.method
1121
attribute._dbus_in_signature,
1122
attribute._dbus_out_signature)
1124
(attribute.func_code,
1125
attribute.func_globals,
1126
attribute.func_name,
1127
attribute.func_defaults,
1128
attribute.func_closure)))
1184
1129
# Copy annotations, if any
1186
attr[attrname]._dbus_annotations = dict(
1187
attribute._dbus_annotations)
1131
attr[attrname]._dbus_annotations = (
1132
dict(attribute._dbus_annotations))
1188
1133
except AttributeError:
1190
1135
# Is this a D-Bus property?
1193
1138
# object, and decorate it to be a new D-Bus
1194
1139
# property with the alternate D-Bus interface
1195
1140
# name. Add it to the class.
1196
attr[attrname] = (dbus_service_property(
1197
alt_interface, attribute._dbus_signature,
1198
attribute._dbus_access,
1199
attribute._dbus_get_args_options
1201
(types.FunctionType(
1202
attribute.func_code,
1203
attribute.func_globals,
1204
attribute.func_name,
1205
attribute.func_defaults,
1206
attribute.func_closure)))
1141
attr[attrname] = (dbus_service_property
1143
attribute._dbus_signature,
1144
attribute._dbus_access,
1146
._dbus_get_args_options
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1207
1154
# Copy annotations, if any
1209
attr[attrname]._dbus_annotations = dict(
1210
attribute._dbus_annotations)
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1211
1158
except AttributeError:
1213
1160
# Is this a D-Bus interface?
1216
1163
# object. Decorate it to be a new D-Bus interface
1217
1164
# with the alternate D-Bus interface name. Add it
1218
1165
# to the class.
1220
dbus_interface_annotations(alt_interface)
1221
(types.FunctionType(attribute.func_code,
1222
attribute.func_globals,
1223
attribute.func_name,
1224
attribute.func_defaults,
1225
attribute.func_closure)))
1166
attr[attrname] = (dbus_interface_annotations
1169
(attribute.func_code,
1170
attribute.func_globals,
1171
attribute.func_name,
1172
attribute.func_defaults,
1173
attribute.func_closure)))
1227
1175
# Deprecate all alternate interfaces
1228
iname="_AlternateDBusNames_interface_annotation{}"
1176
iname="_AlternateDBusNames_interface_annotation{0}"
1229
1177
for interface_name in interface_names:
1231
1178
@dbus_interface_annotations(interface_name)
1232
1179
def func(self):
1233
1180
return { "org.freedesktop.DBus.Deprecated":
1235
1182
# Find an unused name
1236
1183
for aname in (iname.format(i)
1237
1184
for i in itertools.count()):
1270
1214
Client.__init__(self, *args, **kwargs)
1271
1215
# Only now, when this client is initialized, can it show up on
1273
client_object_name = str(self.name).translate(
1217
client_object_name = unicode(self.name).translate(
1274
1218
{ord("."): ord("_"),
1275
1219
ord("-"): ord("_")})
1276
self.dbus_object_path = dbus.ObjectPath(
1277
"/clients/" + client_object_name)
1220
self.dbus_object_path = (dbus.ObjectPath
1221
("/clients/" + client_object_name))
1278
1222
DBusObjectWithProperties.__init__(self, self.bus,
1279
1223
self.dbus_object_path)
1281
def notifychangeproperty(transform_func, dbus_name,
1282
type_func=lambda x: x,
1284
invalidate_only=False,
1285
_interface=_interface):
1225
def notifychangeproperty(transform_func,
1226
dbus_name, type_func=lambda x: x,
1286
1228
""" Modify a variable so that it's a property which announces
1287
1229
its changes to DBus.
1293
1235
to the D-Bus. Default: no transform
1294
1236
variant_level: D-Bus variant level. Default: 1
1296
attrname = "_{}".format(dbus_name)
1238
attrname = "_{0}".format(dbus_name)
1298
1239
def setter(self, value):
1299
1240
if hasattr(self, "dbus_object_path"):
1300
1241
if (not hasattr(self, attrname) or
1301
1242
type_func(getattr(self, attrname, None))
1302
1243
!= type_func(value)):
1304
self.PropertiesChanged(
1305
_interface, dbus.Dictionary(),
1306
dbus.Array((dbus_name, )))
1308
dbus_value = transform_func(
1310
variant_level = variant_level)
1311
self.PropertyChanged(dbus.String(dbus_name),
1313
self.PropertiesChanged(
1315
dbus.Dictionary({ dbus.String(dbus_name):
1244
dbus_value = transform_func(type_func(value),
1247
self.PropertyChanged(dbus.String(dbus_name),
1318
1249
setattr(self, attrname, value)
1320
1251
return property(lambda self: getattr(self, attrname), setter)
1326
1257
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1327
1258
last_enabled = notifychangeproperty(datetime_to_dbus,
1329
checker = notifychangeproperty(
1330
dbus.Boolean, "CheckerRunning",
1331
type_func = lambda checker: checker is not None)
1260
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1261
type_func = lambda checker:
1262
checker is not None)
1332
1263
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1333
1264
"LastCheckedOK")
1334
1265
last_checker_status = notifychangeproperty(dbus.Int16,
1337
1268
datetime_to_dbus, "LastApprovalRequest")
1338
1269
approved_by_default = notifychangeproperty(dbus.Boolean,
1339
1270
"ApprovedByDefault")
1340
approval_delay = notifychangeproperty(
1341
dbus.UInt64, "ApprovalDelay",
1342
type_func = lambda td: td.total_seconds() * 1000)
1271
approval_delay = notifychangeproperty(dbus.UInt64,
1274
timedelta_to_milliseconds)
1343
1275
approval_duration = notifychangeproperty(
1344
1276
dbus.UInt64, "ApprovalDuration",
1345
type_func = lambda td: td.total_seconds() * 1000)
1277
type_func = timedelta_to_milliseconds)
1346
1278
host = notifychangeproperty(dbus.String, "Host")
1347
timeout = notifychangeproperty(
1348
dbus.UInt64, "Timeout",
1349
type_func = lambda td: td.total_seconds() * 1000)
1279
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1281
timedelta_to_milliseconds)
1350
1282
extended_timeout = notifychangeproperty(
1351
1283
dbus.UInt64, "ExtendedTimeout",
1352
type_func = lambda td: td.total_seconds() * 1000)
1353
interval = notifychangeproperty(
1354
dbus.UInt64, "Interval",
1355
type_func = lambda td: td.total_seconds() * 1000)
1284
type_func = timedelta_to_milliseconds)
1285
interval = notifychangeproperty(dbus.UInt64,
1288
timedelta_to_milliseconds)
1356
1289
checker_command = notifychangeproperty(dbus.String, "Checker")
1357
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1358
invalidate_only=True)
1360
1291
del notifychangeproperty
1388
1319
*args, **kwargs)
1390
1321
def start_checker(self, *args, **kwargs):
1391
old_checker_pid = getattr(self.checker, "pid", None)
1322
old_checker = self.checker
1323
if self.checker is not None:
1324
old_checker_pid = self.checker.pid
1326
old_checker_pid = None
1392
1327
r = Client.start_checker(self, *args, **kwargs)
1393
1328
# Only if new checker process was started
1394
1329
if (self.checker is not None
1404
1339
def approve(self, value=True):
1405
1340
self.approved = value
1406
gobject.timeout_add(int(self.approval_duration.total_seconds()
1407
* 1000), self._reset_approved)
1341
gobject.timeout_add(timedelta_to_milliseconds
1342
(self.approval_duration),
1343
self._reset_approved)
1408
1344
self.send_changedstate()
1410
1346
## D-Bus methods, signals & properties
1347
_interface = "se.recompile.Mandos.Client"
1351
@dbus_interface_annotations(_interface)
1353
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1416
1358
# CheckerCompleted - signal
1505
1445
self.approved_by_default = bool(value)
1507
1447
# ApprovalDelay - property
1508
@dbus_service_property(_interface,
1448
@dbus_service_property(_interface, signature="t",
1510
1449
access="readwrite")
1511
1450
def ApprovalDelay_dbus_property(self, value=None):
1512
1451
if value is None: # get
1513
return dbus.UInt64(self.approval_delay.total_seconds()
1452
return dbus.UInt64(self.approval_delay_milliseconds())
1515
1453
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1517
1455
# ApprovalDuration - property
1518
@dbus_service_property(_interface,
1456
@dbus_service_property(_interface, signature="t",
1520
1457
access="readwrite")
1521
1458
def ApprovalDuration_dbus_property(self, value=None):
1522
1459
if value is None: # get
1523
return dbus.UInt64(self.approval_duration.total_seconds()
1460
return dbus.UInt64(timedelta_to_milliseconds(
1461
self.approval_duration))
1525
1462
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1527
1464
# Name - property
1591
1526
return datetime_to_dbus(self.last_approval_request)
1593
1528
# Timeout - property
1594
@dbus_service_property(_interface,
1529
@dbus_service_property(_interface, signature="t",
1596
1530
access="readwrite")
1597
1531
def Timeout_dbus_property(self, value=None):
1598
1532
if value is None: # get
1599
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1533
return dbus.UInt64(self.timeout_milliseconds())
1600
1534
old_timeout = self.timeout
1601
1535
self.timeout = datetime.timedelta(0, 0, 0, value)
1602
1536
# Reschedule disabling
1613
1547
gobject.source_remove(self.disable_initiator_tag)
1614
self.disable_initiator_tag = gobject.timeout_add(
1615
int((self.expires - now).total_seconds() * 1000),
1548
self.disable_initiator_tag = (
1549
gobject.timeout_add(
1550
timedelta_to_milliseconds(self.expires - now),
1618
1553
# ExtendedTimeout - property
1619
@dbus_service_property(_interface,
1554
@dbus_service_property(_interface, signature="t",
1621
1555
access="readwrite")
1622
1556
def ExtendedTimeout_dbus_property(self, value=None):
1623
1557
if value is None: # get
1624
return dbus.UInt64(self.extended_timeout.total_seconds()
1558
return dbus.UInt64(self.extended_timeout_milliseconds())
1626
1559
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1628
1561
# Interval - property
1629
@dbus_service_property(_interface,
1562
@dbus_service_property(_interface, signature="t",
1631
1563
access="readwrite")
1632
1564
def Interval_dbus_property(self, value=None):
1633
1565
if value is None: # get
1634
return dbus.UInt64(self.interval.total_seconds() * 1000)
1566
return dbus.UInt64(self.interval_milliseconds())
1635
1567
self.interval = datetime.timedelta(0, 0, 0, value)
1636
1568
if getattr(self, "checker_initiator_tag", None) is None:
1638
1570
if self.enabled:
1639
1571
# Reschedule checker run
1640
1572
gobject.source_remove(self.checker_initiator_tag)
1641
self.checker_initiator_tag = gobject.timeout_add(
1642
value, self.start_checker)
1643
self.start_checker() # Start one now, too
1573
self.checker_initiator_tag = (gobject.timeout_add
1574
(value, self.start_checker))
1575
self.start_checker() # Start one now, too
1645
1577
# Checker - property
1646
@dbus_service_property(_interface,
1578
@dbus_service_property(_interface, signature="s",
1648
1579
access="readwrite")
1649
1580
def Checker_dbus_property(self, value=None):
1650
1581
if value is None: # get
1651
1582
return dbus.String(self.checker_command)
1652
self.checker_command = str(value)
1583
self.checker_command = unicode(value)
1654
1585
# CheckerRunning - property
1655
@dbus_service_property(_interface,
1586
@dbus_service_property(_interface, signature="b",
1657
1587
access="readwrite")
1658
1588
def CheckerRunning_dbus_property(self, value=None):
1659
1589
if value is None: # get
1716
1642
def handle(self):
1717
1643
with contextlib.closing(self.server.child_pipe) as child_pipe:
1718
1644
logger.info("TCP connection from: %s",
1719
str(self.client_address))
1645
unicode(self.client_address))
1720
1646
logger.debug("Pipe FD: %d",
1721
1647
self.server.child_pipe.fileno())
1723
session = gnutls.connection.ClientSession(
1724
self.request, gnutls.connection .X509Credentials())
1649
session = (gnutls.connection
1650
.ClientSession(self.request,
1652
.X509Credentials()))
1726
1654
# Note: gnutls.connection.X509Credentials is really a
1727
1655
# generic GnuTLS certificate credentials object so long as
1884
1815
def fingerprint(openpgp):
1885
1816
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1886
1817
# New GnuTLS "datum" with the OpenPGP public key
1887
datum = gnutls.library.types.gnutls_datum_t(
1888
ctypes.cast(ctypes.c_char_p(openpgp),
1889
ctypes.POINTER(ctypes.c_ubyte)),
1890
ctypes.c_uint(len(openpgp)))
1818
datum = (gnutls.library.types
1819
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1822
ctypes.c_uint(len(openpgp))))
1891
1823
# New empty GnuTLS certificate
1892
1824
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1893
gnutls.library.functions.gnutls_openpgp_crt_init(
1825
(gnutls.library.functions
1826
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1895
1827
# Import the OpenPGP public key into the certificate
1896
gnutls.library.functions.gnutls_openpgp_crt_import(
1897
crt, ctypes.byref(datum),
1898
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1828
(gnutls.library.functions
1829
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1830
gnutls.library.constants
1831
.GNUTLS_OPENPGP_FMT_RAW))
1899
1832
# Verify the self signature in the key
1900
1833
crtverify = ctypes.c_uint()
1901
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1902
crt, 0, ctypes.byref(crtverify))
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_verify_self(crt, 0,
1836
ctypes.byref(crtverify)))
1903
1837
if crtverify.value != 0:
1904
1838
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1905
raise gnutls.errors.CertificateSecurityError(
1839
raise (gnutls.errors.CertificateSecurityError
1907
1841
# New buffer for the fingerprint
1908
1842
buf = ctypes.create_string_buffer(20)
1909
1843
buf_len = ctypes.c_size_t()
1910
1844
# Get the fingerprint from the certificate into the buffer
1911
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1912
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1845
(gnutls.library.functions
1846
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1847
ctypes.byref(buf_len)))
1913
1848
# Deinit the certificate
1914
1849
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1915
1850
# Convert the buffer to a Python bytestring
2039
1969
if self.address_family == socket.AF_INET6:
2040
1970
any_address = "::" # in6addr_any
2042
any_address = "0.0.0.0" # INADDR_ANY
1972
any_address = socket.INADDR_ANY
2043
1973
self.server_address = (any_address,
2044
1974
self.server_address[1])
2045
1975
elif not self.server_address[1]:
2046
self.server_address = (self.server_address[0], 0)
1976
self.server_address = (self.server_address[0],
2047
1978
# if self.interface:
2048
1979
# self.server_address = (self.server_address[0],
2093
2018
def add_pipe(self, parent_pipe, proc):
2094
2019
# Call "handle_ipc" for both data and EOF events
2095
gobject.io_add_watch(
2096
parent_pipe.fileno(),
2097
gobject.IO_IN | gobject.IO_HUP,
2098
functools.partial(self.handle_ipc,
2099
parent_pipe = parent_pipe,
2020
gobject.io_add_watch(parent_pipe.fileno(),
2021
gobject.IO_IN | gobject.IO_HUP,
2022
functools.partial(self.handle_ipc,
2102
def handle_ipc(self, source, condition,
2105
client_object=None):
2027
def handle_ipc(self, source, condition, parent_pipe=None,
2028
proc = None, client_object=None):
2106
2029
# error, or the other end of multiprocessing.Pipe has closed
2107
2030
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2108
2031
# Wait for other process to exit
2194
2118
# avoid excessive use of external libraries.
2196
2120
# New type for defining tokens, syntax, and semantics all-in-one
2197
Token = collections.namedtuple("Token", (
2198
"regexp", # To match token; if "value" is not None, must have
2199
# a "group" containing digits
2200
"value", # datetime.timedelta or None
2201
"followers")) # Tokens valid after this token
2121
Token = collections.namedtuple("Token",
2122
("regexp", # To match token; if
2123
# "value" is not None,
2124
# must have a "group"
2126
"value", # datetime.timedelta or
2128
"followers")) # Tokens valid after
2202
2130
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2131
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2132
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2133
token_second = Token(re.compile(r"(\d+)S"),
2206
2134
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2135
frozenset((token_end,)))
2208
2136
token_minute = Token(re.compile(r"(\d+)M"),
2209
2137
datetime.timedelta(minutes=1),
2210
2138
frozenset((token_second, token_end)))
2226
2154
frozenset((token_month, token_end)))
2227
2155
token_week = Token(re.compile(r"(\d+)W"),
2228
2156
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2157
frozenset((token_end,)))
2230
2158
token_duration = Token(re.compile(r"P"), None,
2231
2159
frozenset((token_year, token_month,
2232
2160
token_day, token_time,
2234
2162
# Define starting values
2235
2163
value = datetime.timedelta() # Value so far
2236
2164
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2165
followers = frozenset(token_duration,) # Following valid tokens
2238
2166
s = duration # String left to parse
2239
2167
# Loop until end token is found
2240
2168
while found_token is not token_end:
2341
2269
parser = argparse.ArgumentParser()
2342
2270
parser.add_argument("-v", "--version", action="version",
2343
version = "%(prog)s {}".format(version),
2271
version = "%(prog)s {0}".format(version),
2344
2272
help="show version number and exit")
2345
2273
parser.add_argument("-i", "--interface", metavar="IF",
2346
2274
help="Bind to interface IF")
2366
2294
parser.add_argument("--no-dbus", action="store_false",
2367
2295
dest="use_dbus", help="Do not provide D-Bus"
2368
" system bus interface", default=None)
2296
" system bus interface")
2369
2297
parser.add_argument("--no-ipv6", action="store_false",
2370
dest="use_ipv6", help="Do not use IPv6",
2298
dest="use_ipv6", help="Do not use IPv6")
2372
2299
parser.add_argument("--no-restore", action="store_false",
2373
2300
dest="restore", help="Do not restore stored"
2374
" state", default=None)
2375
2302
parser.add_argument("--socket", type=int,
2376
2303
help="Specify a file descriptor to a network"
2377
2304
" socket to use instead of creating one")
2378
2305
parser.add_argument("--statedir", metavar="DIR",
2379
2306
help="Directory to save/restore state in")
2380
2307
parser.add_argument("--foreground", action="store_true",
2381
help="Run in foreground", default=None)
2382
parser.add_argument("--no-zeroconf", action="store_false",
2383
dest="zeroconf", help="Do not use Zeroconf",
2308
help="Run in foreground")
2386
2310
options = parser.parse_args()
2388
2312
if options.check:
2390
fail_count, test_count = doctest.testmod()
2391
sys.exit(os.EX_OK if fail_count == 0 else 1)
2393
2317
# Default values for config file for server-global settings
2394
2318
server_defaults = { "interface": "",
2407
2330
"statedir": "/var/lib/mandos",
2408
2331
"foreground": "False",
2412
2334
# Parse config file for server-global settings
2413
2335
server_config = configparser.SafeConfigParser(server_defaults)
2414
2336
del server_defaults
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2337
server_config.read(os.path.join(options.configdir,
2416
2339
# Convert the SafeConfigParser object to a dict
2417
2340
server_settings = server_config.defaults()
2418
2341
# Use the appropriate methods on the non-string config options
2436
2359
# Override the settings from the config file with command line
2437
2360
# options, if set.
2438
2361
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2362
"priority", "servicename", "configdir",
2363
"use_dbus", "use_ipv6", "debuglevel", "restore",
2364
"statedir", "socket", "foreground"):
2442
2365
value = getattr(options, option)
2443
2366
if value is not None:
2444
2367
server_settings[option] = value
2446
2369
# Force all strings to be unicode
2447
2370
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2451
# Force all boolean options to be boolean
2452
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
"foreground", "zeroconf"):
2454
server_settings[option] = bool(server_settings[option])
2371
if type(server_settings[option]) is str:
2372
server_settings[option] = unicode(server_settings[option])
2455
2373
# Debug implies foreground
2456
2374
if server_settings["debug"]:
2457
2375
server_settings["foreground"] = True
2498
2411
global mandos_dbus_service
2499
2412
mandos_dbus_service = None
2502
if server_settings["socket"] != "":
2503
socketfd = server_settings["socket"]
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2507
interface=(server_settings["interface"] or None),
2509
gnutls_priority=server_settings["priority"],
2414
tcp_server = MandosServer((server_settings["address"],
2415
server_settings["port"]),
2417
interface=(server_settings["interface"]
2421
server_settings["priority"],
2423
socketfd=(server_settings["socket"]
2512
2425
if not foreground:
2513
pidfilename = "/run/mandos.pid"
2514
if not os.path.isdir("/run/."):
2515
pidfilename = "/var/run/mandos.pid"
2426
pidfilename = "/var/run/mandos.pid"
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2429
pidfile = open(pidfilename, "w")
2519
2430
except IOError as e:
2520
2431
logger.error("Could not open file %r", pidfilename,
2577
2488
bus_name = dbus.service.BusName("se.recompile.Mandos",
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2583
except dbus.exceptions.DBusException as e:
2489
bus, do_not_queue=True)
2490
old_bus_name = (dbus.service.BusName
2491
("se.bsnet.fukt.Mandos", bus,
2493
except dbus.exceptions.NameExistsException as e:
2584
2494
logger.error("Disabling D-Bus:", exc_info=e)
2585
2495
use_dbus = False
2586
2496
server_settings["use_dbus"] = False
2587
2497
tcp_server.use_dbus = False
2589
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2595
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2498
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2499
service = AvahiServiceToSyslog(name =
2500
server_settings["servicename"],
2501
servicetype = "_mandos._tcp",
2502
protocol = protocol, bus = bus)
2503
if server_settings["interface"]:
2504
service.interface = (if_nametoindex
2505
(str(server_settings["interface"])))
2599
2507
global multiprocessing_manager
2600
2508
multiprocessing_manager = multiprocessing.Manager()
2607
2515
old_client_settings = {}
2608
2516
clients_data = {}
2610
# This is used to redirect stdout and stderr for checker processes
2612
wnull = open(os.devnull, "w") # A writable /dev/null
2613
# Only used if server is running in foreground but not in debug
2615
if debug or not foreground:
2618
2518
# Get client data and settings from last running state.
2619
2519
if server_settings["restore"]:
2621
2521
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2522
clients_data, old_client_settings = (pickle.load
2624
2524
os.remove(stored_state_path)
2625
2525
except IOError as e:
2626
2526
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2527
logger.warning("Could not load persistent state: {0}"
2528
.format(os.strerror(e.errno)))
2630
2530
logger.critical("Could not load persistent state:",
2633
2533
except EOFError as e:
2634
2534
logger.warning("Could not load persistent state: "
2535
"EOFError:", exc_info=e)
2638
2537
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2640
# Skip removed clients
2641
if client_name not in client_settings:
2538
for client_name, client in clients_data.iteritems():
2644
2539
# Decide which value to use after restoring saved state.
2645
2540
# We have three different values: Old config file,
2646
2541
# new config file, and saved state.
2667
2562
if datetime.datetime.utcnow() >= client["expires"]:
2668
2563
if not client["last_checked_ok"]:
2669
2564
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2565
"disabling client {0} - Client never "
2566
"performed a successful checker"
2567
.format(client_name))
2673
2568
client["enabled"] = False
2674
2569
elif client["last_checker_status"] != 0:
2675
2570
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2571
"disabling client {0} - Client "
2572
"last checker failed with error code {1}"
2573
.format(client_name,
2574
client["last_checker_status"]))
2681
2575
client["enabled"] = False
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2577
client["expires"] = (datetime.datetime
2579
+ client["timeout"])
2686
2580
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2581
" keeping {0} enabled"
2582
.format(client_name))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2584
client["secret"] = (
2585
pgp.decrypt(client["encrypted_secret"],
2586
client_settings[client_name]
2693
2588
except PGPError:
2694
2589
# If decryption fails, we use secret from new settings
2695
logger.debug("Failed to decrypt {} old secret".format(
2697
client["secret"] = (client_settings[client_name]
2590
logger.debug("Failed to decrypt {0} old secret"
2591
.format(client_name))
2592
client["secret"] = (
2593
client_settings[client_name]["secret"])
2700
2595
# Add/remove clients based on new changes made to config
2701
2596
for client_name in (set(old_client_settings)
2706
2601
clients_data[client_name] = client_settings[client_name]
2708
2603
# Create all client objects
2709
for client_name, client in clients_data.items():
2604
for client_name, client in clients_data.iteritems():
2710
2605
tcp_server.clients[client_name] = client_class(
2713
server_settings = server_settings)
2606
name = client_name, settings = client)
2715
2608
if not tcp_server.clients:
2716
2609
logger.warning("No clients defined")
2718
2611
if not foreground:
2719
2612
if pidfile is not None:
2723
print(pid, file=pidfile)
2616
pidfile.write(str(pid) + "\n".encode("utf-8"))
2724
2617
except IOError:
2725
2618
logger.error("Could not write to file %r with PID %d",
2726
2619
pidfilename, pid)
2731
2624
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2627
@alternate_dbus_interfaces({"se.recompile.Mandos":
2628
"se.bsnet.fukt.Mandos"})
2737
2629
class MandosDBusService(DBusObjectWithProperties):
2738
2630
"""A D-Bus proxy object"""
2740
2631
def __init__(self):
2741
2632
dbus.service.Object.__init__(self, bus, "/")
2743
2633
_interface = "se.recompile.Mandos"
2745
2635
@dbus_interface_annotations(_interface)
2746
2636
def _foo(self):
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2637
return { "org.freedesktop.DBus.Property"
2638
".EmitsChangedSignal":
2751
2641
@dbus.service.signal(_interface, signature="o")
2752
2642
def ClientAdded(self, objpath):
2820
2709
# A list of attributes that can not be pickled
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
2824
for name, typ in inspect.getmembers(dbus.service
2711
exclude = set(("bus", "changedstate", "secret",
2713
for name, typ in (inspect.getmembers
2714
(dbus.service.Object)):
2826
2715
exclude.add(name)
2828
2717
client_dict["encrypted_secret"] = (client
2835
2724
del client_settings[client.name]["secret"]
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2727
with (tempfile.NamedTemporaryFile
2728
(mode='wb', suffix=".pickle", prefix='clients-',
2729
dir=os.path.dirname(stored_state_path),
2730
delete=False)) as stored_state:
2844
2731
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2732
tempname=stored_state.name
2846
2733
os.rename(tempname, stored_state_path)
2847
2734
except (IOError, OSError) as e:
2898
2785
#service.interface = tcp_server.socket.getsockname()[3]
2902
# From the Avahi example code
2905
except dbus.exceptions.DBusException as error:
2906
logger.critical("D-Bus Exception", exc_info=error)
2909
# End of Avahi example code
2788
# From the Avahi example code
2791
except dbus.exceptions.DBusException as error:
2792
logger.critical("D-Bus Exception", exc_info=error)
2795
# End of Avahi example code
2911
2797
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
2798
lambda *args, **kwargs: