11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
88
101
except ImportError:
89
102
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
92
108
stored_state_file = "clients.pickle"
94
110
logger = logging.getLogger()
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
102
118
def if_nametoindex(interface):
103
119
"Get an interface index the hard way, i.e. using fcntl()"
104
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
121
with contextlib.closing(socket.socket()) as s:
106
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
return interface_index
115
129
"""init logger and add loglevel"""
118
syslogger = (logging.handlers.SysLogHandler
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
122
135
syslogger.setFormatter(logging.Formatter
123
136
('Mandos [%(process)d]: %(levelname)s:'
186
200
def encrypt(self, data, password):
187
201
passphrase = self.password_encode(password)
188
with tempfile.NamedTemporaryFile(dir=self.tempdir
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
190
204
passfile.write(passphrase)
192
206
proc = subprocess.Popen(['gpg', '--symmetric',
204
218
def decrypt(self, data, password):
205
219
passphrase = self.password_encode(password)
206
with tempfile.NamedTemporaryFile(dir = self.tempdir
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
208
222
passfile.write(passphrase)
210
224
proc = subprocess.Popen(['gpg', '--decrypt',
224
237
class AvahiError(Exception):
225
238
def __init__(self, value, *args, **kwargs):
226
239
self.value = value
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
231
244
class AvahiServiceError(AvahiError):
234
248
class AvahiGroupError(AvahiError):
256
270
bus: dbus.SystemBus()
259
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
servicetype = None, port = None, TXT = None,
261
domain = "", host = "", max_renames = 32768,
262
protocol = avahi.PROTO_UNSPEC, bus = None):
274
interface = avahi.IF_UNSPEC,
282
protocol = avahi.PROTO_UNSPEC,
263
284
self.interface = interface
265
286
self.type = servicetype
276
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
279
300
"""Derived from the Avahi example code"""
280
301
if self.rename_count >= self.max_renames:
281
302
logger.critical("No suitable Zeroconf service name found"
282
303
" after %i retries, exiting.",
283
304
self.rename_count)
284
305
raise AvahiServiceError("Too many renames")
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
287
309
logger.info("Changing Zeroconf service name to %r ...",
292
315
except dbus.exceptions.DBusException as error:
293
logger.critical("D-Bus Exception", exc_info=error)
296
self.rename_count += 1
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
321
logger.critical("D-Bus Exception", exc_info=error)
298
325
def remove(self):
299
326
"""Derived from the Avahi example code"""
355
381
def server_state_changed(self, state, error=None):
356
382
"""Derived from the Avahi example code"""
357
383
logger.debug("Avahi server state change: %i", state)
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
365
390
if state in bad_states:
366
391
if bad_states[state] is not None:
367
392
if error is None:
386
411
follow_name_owner_changes=True),
387
412
avahi.DBUS_INTERFACE_SERVER)
388
413
self.server.connect_to_signal("StateChanged",
389
self.server_state_changed)
414
self.server_state_changed)
390
415
self.server_state_changed(self.server.GetState())
393
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
395
420
"""Add the new name to the syslog messages"""
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
411
428
class Client(object):
412
429
"""A representation of a client host served by this server.
457
474
"fingerprint", "host", "interval",
458
475
"last_approval_request", "last_checked_ok",
459
476
"last_enabled", "name", "timeout")
460
client_defaults = { "timeout": "PT5M",
461
"extended_timeout": "PT15M",
463
"checker": "fping -q -- %%(host)s",
465
"approval_delay": "PT0S",
466
"approval_duration": "PT1S",
467
"approved_by_default": "True",
471
def timeout_milliseconds(self):
472
"Return the 'timeout' attribute in milliseconds"
473
return timedelta_to_milliseconds(self.timeout)
475
def extended_timeout_milliseconds(self):
476
"Return the 'extended_timeout' attribute in milliseconds"
477
return timedelta_to_milliseconds(self.extended_timeout)
479
def interval_milliseconds(self):
480
"Return the 'interval' attribute in milliseconds"
481
return timedelta_to_milliseconds(self.interval)
483
def approval_delay_milliseconds(self):
484
return timedelta_to_milliseconds(self.approval_delay)
479
"extended_timeout": "PT15M",
481
"checker": "fping -q -- %%(host)s",
483
"approval_delay": "PT0S",
484
"approval_duration": "PT1S",
485
"approved_by_default": "True",
487
490
def config_parser(config):
550
556
self.expires = None
552
558
logger.debug("Creating client %r", self.name)
553
# Uppercase and remove spaces from fingerprint for later
554
# comparison purposes with return value from the fingerprint()
556
559
logger.debug(" Fingerprint: %s", self.fingerprint)
557
560
self.created = settings.get("created",
558
561
datetime.datetime.utcnow())
565
568
self.current_checker_command = None
566
569
self.approved = None
567
570
self.approvals_pending = 0
568
self.changedstate = (multiprocessing_manager
569
.Condition(multiprocessing_manager
571
self.client_structure = [attr for attr in
572
self.__dict__.iterkeys()
571
self.changedstate = multiprocessing_manager.Condition(
572
multiprocessing_manager.Lock())
573
self.client_structure = [attr
574
for attr in self.__dict__.iterkeys()
573
575
if not attr.startswith("_")]
574
576
self.client_structure.append("client_structure")
576
for name, t in inspect.getmembers(type(self),
578
for name, t in inspect.getmembers(
579
type(self), lambda obj: isinstance(obj, property)):
580
580
if not name.startswith("_"):
581
581
self.client_structure.append(name)
624
624
# and every interval from then on.
625
625
if self.checker_initiator_tag is not None:
626
626
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
627
self.checker_initiator_tag = gobject.timeout_add(
628
int(self.interval.total_seconds() * 1000),
630
630
# Schedule a disable() when 'timeout' has passed
631
631
if self.disable_initiator_tag is not None:
632
632
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
633
self.disable_initiator_tag = gobject.timeout_add(
634
int(self.timeout.total_seconds() * 1000), self.disable)
636
635
# Also start a new checker *right now*.
637
636
self.start_checker()
668
666
gobject.source_remove(self.disable_initiator_tag)
669
667
self.disable_initiator_tag = None
670
668
if getattr(self, "enabled", False):
671
self.disable_initiator_tag = (gobject.timeout_add
672
(timedelta_to_milliseconds
673
(timeout), self.disable))
669
self.disable_initiator_tag = gobject.timeout_add(
670
int(timeout.total_seconds() * 1000), self.disable)
674
671
self.expires = datetime.datetime.utcnow() + timeout
676
673
def need_approval(self):
707
704
# Start a new checker if needed
708
705
if self.checker is None:
709
706
# Escape attributes for the shell
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
713
self.runtime_expansions)
708
attr: re.escape(str(getattr(self, attr)))
709
for attr in self.runtime_expansions }
715
711
command = self.checker_command % escaped_attrs
716
712
except TypeError as error:
717
713
logger.error('Could not format string "%s"',
718
self.checker_command, exc_info=error)
719
return True # Try again later
714
self.checker_command,
716
return True # Try again later
720
717
self.current_checker_command = command
722
logger.info("Starting checker %r for %s",
719
logger.info("Starting checker %r for %s", command,
724
721
# We don't need to redirect stdout and stderr, since
725
722
# in normal mode, that is already done by daemon(),
726
723
# and in debug mode we don't want to. (Stdin is
735
732
"stderr": wnull })
736
733
self.checker = subprocess.Popen(command,
740
738
except OSError as error:
741
739
logger.error("Failed to start subprocess",
744
self.checker_callback_tag = (gobject.child_watch_add
746
self.checker_callback,
742
self.checker_callback_tag = gobject.child_watch_add(
743
self.checker.pid, self.checker_callback, data=command)
748
744
# The checker may have completed before the gobject
749
745
# watch was added. Check for this.
781
777
self.checker = None
784
def dbus_service_property(dbus_interface, signature="v",
785
access="readwrite", byte_arrays=False):
780
def dbus_service_property(dbus_interface,
786
784
"""Decorators for marking methods of a DBusObjectWithProperties to
787
785
become properties on the D-Bus.
797
795
# "Set" method, so we fail early here:
798
796
if byte_arrays and signature != "ay":
799
797
raise ValueError("Byte arrays not supported for non-'ay'"
800
" signature {0!r}".format(signature))
798
" signature {!r}".format(signature))
801
800
def decorator(func):
802
801
func._dbus_is_property = True
803
802
func._dbus_interface = dbus_interface
834
836
"""Decorator to annotate D-Bus methods, signals or properties
839
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
837
842
@dbus_service_property("org.example.Interface", signature="b",
839
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
842
844
def Property_dbus_property(self):
843
845
return dbus.Boolean(False)
845
848
def decorator(func):
846
849
func._dbus_annotations = annotations
851
855
class DBusPropertyException(dbus.exceptions.DBusException):
852
856
"""A base class for D-Bus property-related exceptions
854
def __unicode__(self):
855
return unicode(str(self))
858
861
class DBusPropertyAccessException(DBusPropertyException):
882
885
If called like _is_dbus_thing("method") it returns a function
883
886
suitable for use as predicate to inspect.getmembers().
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
888
891
def _get_all_dbus_things(self, thing):
889
892
"""Returns a generator of (name, attribute) pairs
891
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
893
895
athing.__get__(self))
894
896
for cls in self.__class__.__mro__
895
897
for name, athing in
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
899
900
def _get_dbus_property(self, interface_name, property_name):
900
901
"""Returns a bound method if one exists which is a D-Bus
901
902
property with the specified name and interface.
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
906
self._is_dbus_thing("property"))):
904
for cls in self.__class__.__mro__:
905
for name, value in inspect.getmembers(
906
cls, self._is_dbus_thing("property")):
907
907
if (value._dbus_name == property_name
908
908
and value._dbus_interface == interface_name):
909
909
return value.__get__(self)
911
911
# No such property
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
912
raise DBusPropertyNotFound("{}:{}.{}".format(
913
self.dbus_object_path, interface_name, property_name))
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
915
@dbus.service.method(dbus.PROPERTIES_IFACE,
917
917
out_signature="v")
918
918
def Get(self, interface_name, property_name):
919
919
"""Standard D-Bus property Get() method, see D-Bus standard.
938
938
# signatures other than "ay".
939
939
if prop._dbus_signature != "ay":
940
940
raise ValueError("Byte arrays not supported for non-"
941
"'ay' signature {0!r}"
941
"'ay' signature {!r}"
942
942
.format(prop._dbus_signature))
943
943
value = dbus.ByteArray(b''.join(chr(byte)
944
944
for byte in value))
947
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
947
@dbus.service.method(dbus.PROPERTIES_IFACE,
948
949
out_signature="a{sv}")
949
950
def GetAll(self, interface_name):
950
951
"""Standard D-Bus property GetAll() method, see D-Bus
965
966
if not hasattr(value, "variant_level"):
966
967
properties[name] = value
968
properties[name] = type(value)(value, variant_level=
969
value.variant_level+1)
969
properties[name] = type(value)(
970
value, variant_level = value.variant_level + 1)
970
971
return dbus.Dictionary(properties, signature="sv")
973
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
974
def PropertiesChanged(self, interface_name, changed_properties,
975
invalidated_properties):
976
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
972
981
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
973
982
out_signature="s",
974
983
path_keyword='object_path',
984
993
document = xml.dom.minidom.parseString(xmlstring)
985
995
def make_tag(document, name, prop):
986
996
e = document.createElement("property")
987
997
e.setAttribute("name", name)
988
998
e.setAttribute("type", prop._dbus_signature)
989
999
e.setAttribute("access", prop._dbus_access)
991
1002
for if_tag in document.getElementsByTagName("interface"):
992
1003
# Add property tags
993
1004
for tag in (make_tag(document, name, prop)
1005
1016
if (name == tag.getAttribute("name")
1006
1017
and prop._dbus_interface
1007
1018
== if_tag.getAttribute("name")):
1008
annots.update(getattr
1010
"_dbus_annotations",
1012
for name, value in annots.iteritems():
1019
annots.update(getattr(
1020
prop, "_dbus_annotations", {}))
1021
for name, value in annots.items():
1013
1022
ann_tag = document.createElement(
1015
1024
ann_tag.setAttribute("name", name)
1018
1027
# Add interface annotation tags
1019
1028
for annotation, value in dict(
1020
1029
itertools.chain.from_iterable(
1021
annotations().iteritems()
1022
for name, annotations in
1023
self._get_all_dbus_things("interface")
1030
annotations().items()
1031
for name, annotations
1032
in self._get_all_dbus_things("interface")
1024
1033
if name == if_tag.getAttribute("name")
1026
1035
ann_tag = document.createElement("annotation")
1027
1036
ann_tag.setAttribute("name", annotation)
1028
1037
ann_tag.setAttribute("value", value)
1055
1064
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1057
1066
return dbus.String("", variant_level = variant_level)
1058
return dbus.String(dt.isoformat(),
1059
variant_level=variant_level)
1067
return dbus.String(dt.isoformat(), variant_level=variant_level)
1062
1070
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1092
1101
# Ignore non-D-Bus attributes, and D-Bus attributes
1093
1102
# with the wrong interface name
1094
1103
if (not hasattr(attribute, "_dbus_interface")
1095
or not attribute._dbus_interface
1096
.startswith(orig_interface_name)):
1104
or not attribute._dbus_interface.startswith(
1105
orig_interface_name)):
1098
1107
# Create an alternate D-Bus interface name based on
1099
1108
# the current name
1100
alt_interface = (attribute._dbus_interface
1101
.replace(orig_interface_name,
1102
alt_interface_name))
1109
alt_interface = attribute._dbus_interface.replace(
1110
orig_interface_name, alt_interface_name)
1103
1111
interface_names.add(alt_interface)
1104
1112
# Is this a D-Bus signal?
1105
1113
if getattr(attribute, "_dbus_is_signal", False):
1106
1114
# Extract the original non-method undecorated
1107
1115
# function by black magic
1108
1116
nonmethod_func = (dict(
1109
zip(attribute.func_code.co_freevars,
1110
attribute.__closure__))["func"]
1117
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1112
1120
# Create a new, but exactly alike, function
1113
1121
# object, and decorate it to be a new D-Bus signal
1114
1122
# with the alternate D-Bus interface name
1115
new_function = (dbus.service.signal
1117
attribute._dbus_signature)
1123
new_function = (dbus.service.signal(
1124
alt_interface, attribute._dbus_signature)
1118
1125
(types.FunctionType(
1119
nonmethod_func.func_code,
1120
nonmethod_func.func_globals,
1121
nonmethod_func.func_name,
1122
nonmethod_func.func_defaults,
1123
nonmethod_func.func_closure)))
1126
nonmethod_func.func_code,
1127
nonmethod_func.func_globals,
1128
nonmethod_func.func_name,
1129
nonmethod_func.func_defaults,
1130
nonmethod_func.func_closure)))
1124
1131
# Copy annotations, if any
1126
new_function._dbus_annotations = (
1127
dict(attribute._dbus_annotations))
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1128
1135
except AttributeError:
1130
1137
# Define a creator of a function to call both the
1135
1142
"""This function is a scope container to pass
1136
1143
func1 and func2 to the "call_both" function
1137
1144
outside of its arguments"""
1138
1146
def call_both(*args, **kwargs):
1139
1147
"""This function will emit two D-Bus
1140
1148
signals by calling func1 and func2"""
1141
1149
func1(*args, **kwargs)
1142
1150
func2(*args, **kwargs)
1143
1152
return call_both
1144
1153
# Create the "call_both" function and add it to
1150
1159
# object. Decorate it to be a new D-Bus method
1151
1160
# with the alternate D-Bus interface name. Add it
1152
1161
# to the class.
1153
attr[attrname] = (dbus.service.method
1155
attribute._dbus_in_signature,
1156
attribute._dbus_out_signature)
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1163
1172
# Copy annotations, if any
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1167
1176
except AttributeError:
1169
1178
# Is this a D-Bus property?
1172
1181
# object, and decorate it to be a new D-Bus
1173
1182
# property with the alternate D-Bus interface
1174
1183
# name. Add it to the class.
1175
attr[attrname] = (dbus_service_property
1177
attribute._dbus_signature,
1178
attribute._dbus_access,
1180
._dbus_get_args_options
1183
(attribute.func_code,
1184
attribute.func_globals,
1185
attribute.func_name,
1186
attribute.func_defaults,
1187
attribute.func_closure)))
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1188
1195
# Copy annotations, if any
1190
attr[attrname]._dbus_annotations = (
1191
dict(attribute._dbus_annotations))
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1192
1199
except AttributeError:
1194
1201
# Is this a D-Bus interface?
1197
1204
# object. Decorate it to be a new D-Bus interface
1198
1205
# with the alternate D-Bus interface name. Add it
1199
1206
# to the class.
1200
attr[attrname] = (dbus_interface_annotations
1203
(attribute.func_code,
1204
attribute.func_globals,
1205
attribute.func_name,
1206
attribute.func_defaults,
1207
attribute.func_closure)))
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1209
1215
# Deprecate all alternate interfaces
1210
iname="_AlternateDBusNames_interface_annotation{0}"
1216
iname="_AlternateDBusNames_interface_annotation{}"
1211
1217
for interface_name in interface_names:
1212
1219
@dbus_interface_annotations(interface_name)
1213
1220
def func(self):
1214
1221
return { "org.freedesktop.DBus.Deprecated":
1216
1223
# Find an unused name
1217
1224
for aname in (iname.format(i)
1218
1225
for i in itertools.count()):
1222
1229
if interface_names:
1223
1230
# Replace the class with a new subclass of it with
1224
1231
# methods, signals, etc. as created above.
1225
cls = type(b"{0}Alternate".format(cls.__name__),
1232
cls = type(b"{}Alternate".format(cls.__name__),
1231
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1232
"se.bsnet.fukt.Mandos"})
1240
"se.bsnet.fukt.Mandos"})
1233
1241
class ClientDBus(Client, DBusObjectWithProperties):
1234
1242
"""A Client class using D-Bus
1248
1258
Client.__init__(self, *args, **kwargs)
1249
1259
# Only now, when this client is initialized, can it show up on
1251
client_object_name = unicode(self.name).translate(
1261
client_object_name = str(self.name).translate(
1252
1262
{ord("."): ord("_"),
1253
1263
ord("-"): ord("_")})
1254
self.dbus_object_path = (dbus.ObjectPath
1255
("/clients/" + client_object_name))
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1256
1266
DBusObjectWithProperties.__init__(self, self.bus,
1257
1267
self.dbus_object_path)
1259
def notifychangeproperty(transform_func,
1260
dbus_name, type_func=lambda x: x,
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1273
_interface=_interface):
1262
1274
""" Modify a variable so that it's a property which announces
1263
1275
its changes to DBus.
1269
1281
to the D-Bus. Default: no transform
1270
1282
variant_level: D-Bus variant level. Default: 1
1272
attrname = "_{0}".format(dbus_name)
1284
attrname = "_{}".format(dbus_name)
1273
1286
def setter(self, value):
1274
1287
if hasattr(self, "dbus_object_path"):
1275
1288
if (not hasattr(self, attrname) or
1276
1289
type_func(getattr(self, attrname, None))
1277
1290
!= type_func(value)):
1278
dbus_value = transform_func(type_func(value),
1281
self.PropertyChanged(dbus.String(dbus_name),
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1283
1306
setattr(self, attrname, value)
1285
1308
return property(lambda self: getattr(self, attrname), setter)
1291
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1292
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1294
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1295
type_func = lambda checker:
1296
checker is not None)
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1297
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1298
1321
"LastCheckedOK")
1299
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1302
1325
datetime_to_dbus, "LastApprovalRequest")
1303
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1304
1327
"ApprovedByDefault")
1305
approval_delay = notifychangeproperty(dbus.UInt64,
1308
timedelta_to_milliseconds)
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1309
1331
approval_duration = notifychangeproperty(
1310
1332
dbus.UInt64, "ApprovalDuration",
1311
type_func = timedelta_to_milliseconds)
1333
type_func = lambda td: td.total_seconds() * 1000)
1312
1334
host = notifychangeproperty(dbus.String, "Host")
1313
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1315
timedelta_to_milliseconds)
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1316
1338
extended_timeout = notifychangeproperty(
1317
1339
dbus.UInt64, "ExtendedTimeout",
1318
type_func = timedelta_to_milliseconds)
1319
interval = notifychangeproperty(dbus.UInt64,
1322
timedelta_to_milliseconds)
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1323
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1325
1348
del notifychangeproperty
1369
1392
def approve(self, value=True):
1370
1393
self.approved = value
1371
gobject.timeout_add(timedelta_to_milliseconds
1372
(self.approval_duration),
1373
self._reset_approved)
1394
gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
* 1000), self._reset_approved)
1374
1396
self.send_changedstate()
1376
1398
## D-Bus methods, signals & properties
1377
_interface = "se.recompile.Mandos.Client"
1381
@dbus_interface_annotations(_interface)
1383
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1388
1404
# CheckerCompleted - signal
1467
1484
return dbus.Boolean(bool(self.approvals_pending))
1469
1486
# ApprovedByDefault - property
1470
@dbus_service_property(_interface, signature="b",
1487
@dbus_service_property(_interface,
1471
1489
access="readwrite")
1472
1490
def ApprovedByDefault_dbus_property(self, value=None):
1473
1491
if value is None: # get
1475
1493
self.approved_by_default = bool(value)
1477
1495
# ApprovalDelay - property
1478
@dbus_service_property(_interface, signature="t",
1496
@dbus_service_property(_interface,
1479
1498
access="readwrite")
1480
1499
def ApprovalDelay_dbus_property(self, value=None):
1481
1500
if value is None: # get
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1483
1503
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1485
1505
# ApprovalDuration - property
1486
@dbus_service_property(_interface, signature="t",
1506
@dbus_service_property(_interface,
1487
1508
access="readwrite")
1488
1509
def ApprovalDuration_dbus_property(self, value=None):
1489
1510
if value is None: # get
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1492
1513
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1494
1515
# Name - property
1502
1523
return dbus.String(self.fingerprint)
1504
1525
# Host - property
1505
@dbus_service_property(_interface, signature="s",
1526
@dbus_service_property(_interface,
1506
1528
access="readwrite")
1507
1529
def Host_dbus_property(self, value=None):
1508
1530
if value is None: # get
1509
1531
return dbus.String(self.host)
1510
self.host = unicode(value)
1532
self.host = str(value)
1512
1534
# Created - property
1513
1535
@dbus_service_property(_interface, signature="s", access="read")
1540
1564
return datetime_to_dbus(self.last_checked_ok)
1542
1566
# LastCheckerStatus - property
1543
@dbus_service_property(_interface, signature="n",
1567
@dbus_service_property(_interface, signature="n", access="read")
1545
1568
def LastCheckerStatus_dbus_property(self):
1546
1569
return dbus.Int16(self.last_checker_status)
1556
1579
return datetime_to_dbus(self.last_approval_request)
1558
1581
# Timeout - property
1559
@dbus_service_property(_interface, signature="t",
1582
@dbus_service_property(_interface,
1560
1584
access="readwrite")
1561
1585
def Timeout_dbus_property(self, value=None):
1562
1586
if value is None: # get
1563
return dbus.UInt64(self.timeout_milliseconds())
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1564
1588
old_timeout = self.timeout
1565
1589
self.timeout = datetime.timedelta(0, 0, 0, value)
1566
1590
# Reschedule disabling
1577
1601
gobject.source_remove(self.disable_initiator_tag)
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1583
1606
# ExtendedTimeout - property
1584
@dbus_service_property(_interface, signature="t",
1607
@dbus_service_property(_interface,
1585
1609
access="readwrite")
1586
1610
def ExtendedTimeout_dbus_property(self, value=None):
1587
1611
if value is None: # get
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1589
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1591
1616
# Interval - property
1592
@dbus_service_property(_interface, signature="t",
1617
@dbus_service_property(_interface,
1593
1619
access="readwrite")
1594
1620
def Interval_dbus_property(self, value=None):
1595
1621
if value is None: # get
1596
return dbus.UInt64(self.interval_milliseconds())
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
1623
self.interval = datetime.timedelta(0, 0, 0, value)
1598
1624
if getattr(self, "checker_initiator_tag", None) is None:
1600
1626
if self.enabled:
1601
1627
# Reschedule checker run
1602
1628
gobject.source_remove(self.checker_initiator_tag)
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1607
1633
# Checker - property
1608
@dbus_service_property(_interface, signature="s",
1634
@dbus_service_property(_interface,
1609
1636
access="readwrite")
1610
1637
def Checker_dbus_property(self, value=None):
1611
1638
if value is None: # get
1612
1639
return dbus.String(self.checker_command)
1613
self.checker_command = unicode(value)
1640
self.checker_command = str(value)
1615
1642
# CheckerRunning - property
1616
@dbus_service_property(_interface, signature="b",
1643
@dbus_service_property(_interface,
1617
1645
access="readwrite")
1618
1646
def CheckerRunning_dbus_property(self, value=None):
1619
1647
if value is None: # get
1629
1657
return self.dbus_object_path # is already a dbus.ObjectPath
1631
1659
# Secret = property
1632
@dbus_service_property(_interface, signature="ay",
1633
access="write", byte_arrays=True)
1660
@dbus_service_property(_interface,
1634
1664
def Secret_dbus_property(self, value):
1635
self.secret = str(value)
1665
self.secret = bytes(value)
1652
1682
if data[0] == 'data':
1654
1684
if data[0] == 'function':
1655
1686
def func(*args, **kwargs):
1656
1687
self._pipe.send(('funcall', name, args, kwargs))
1657
1688
return self._pipe.recv()[1]
1660
1692
def __setattr__(self, name, value):
1672
1704
def handle(self):
1673
1705
with contextlib.closing(self.server.child_pipe) as child_pipe:
1674
1706
logger.info("TCP connection from: %s",
1675
unicode(self.client_address))
1707
str(self.client_address))
1676
1708
logger.debug("Pipe FD: %d",
1677
1709
self.server.child_pipe.fileno())
1679
session = (gnutls.connection
1680
.ClientSession(self.request,
1682
.X509Credentials()))
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1684
1714
# Note: gnutls.connection.X509Credentials is really a
1685
1715
# generic GnuTLS certificate credentials object so long as
1694
1724
priority = self.server.gnutls_priority
1695
1725
if priority is None:
1696
1726
priority = "NORMAL"
1697
(gnutls.library.functions
1698
.gnutls_priority_set_direct(session._c_object,
1727
gnutls.library.functions.gnutls_priority_set_direct(
1728
session._c_object, priority, None)
1701
1730
# Start communication using the Mandos protocol
1702
1731
# Get protocol number
1772
1801
#wait until timeout or approved
1773
1802
time = datetime.datetime.now()
1774
1803
client.changedstate.acquire()
1775
client.changedstate.wait(
1776
float(timedelta_to_milliseconds(delay)
1804
client.changedstate.wait(delay.total_seconds())
1778
1805
client.changedstate.release()
1779
1806
time2 = datetime.datetime.now()
1780
1807
if (time2 - time) >= delay:
1799
1826
logger.warning("gnutls send failed",
1800
1827
exc_info=error)
1802
logger.debug("Sent: %d, remaining: %d",
1803
sent, len(client.secret)
1804
- (sent_size + sent))
1829
logger.debug("Sent: %d, remaining: %d", sent,
1830
len(client.secret) - (sent_size
1805
1832
sent_size += sent
1807
1834
logger.info("Sending secret to %s", client.name)
1824
1851
def peer_certificate(session):
1825
1852
"Return the peer's OpenPGP certificate as a bytestring"
1826
1853
# If not an OpenPGP certificate...
1827
if (gnutls.library.functions
1828
.gnutls_certificate_type_get(session._c_object)
1854
if (gnutls.library.functions.gnutls_certificate_type_get(
1829
1856
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1830
1857
# ...do the normal thing
1831
1858
return session.peer_certificate
1845
1872
def fingerprint(openpgp):
1846
1873
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1847
1874
# New GnuTLS "datum" with the OpenPGP public key
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
ctypes.c_uint(len(openpgp))))
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1853
1879
# New empty GnuTLS certificate
1854
1880
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1857
1883
# Import the OpenPGP public key into the certificate
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1862
1887
# Verify the self signature in the key
1863
1888
crtverify = ctypes.c_uint()
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1867
1891
if crtverify.value != 0:
1868
1892
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1869
raise (gnutls.errors.CertificateSecurityError
1893
raise gnutls.errors.CertificateSecurityError(
1871
1895
# New buffer for the fingerprint
1872
1896
buf = ctypes.create_string_buffer(20)
1873
1897
buf_len = ctypes.c_size_t()
1874
1898
# Get the fingerprint from the certificate into the buffer
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1878
1901
# Deinit the certificate
1879
1902
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
1903
# Convert the buffer to a Python bytestring
1929
1954
interface: None or a network interface name (string)
1930
1955
use_ipv6: Boolean; to use IPv6 or not
1932
1958
def __init__(self, server_address, RequestHandlerClass,
1933
interface=None, use_ipv6=True, socketfd=None):
1934
1962
"""If socketfd is set, use that file descriptor instead of
1935
1963
creating a new one with socket.socket().
1977
2005
self.interface)
1980
self.socket.setsockopt(socket.SOL_SOCKET,
1982
str(self.interface + '\0'))
2008
self.socket.setsockopt(
2009
socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
(self.interface + "\0").encode("utf-8"))
1983
2011
except socket.error as error:
1984
2012
if error.errno == errno.EPERM:
1985
2013
logger.error("No permission to bind to"
2003
2031
self.server_address = (any_address,
2004
2032
self.server_address[1])
2005
2033
elif not self.server_address[1]:
2006
self.server_address = (self.server_address[0],
2034
self.server_address = (self.server_address[0], 0)
2008
2035
# if self.interface:
2009
2036
# self.server_address = (self.server_address[0],
2025
2052
Assumes a gobject.MainLoop event loop.
2027
2055
def __init__(self, server_address, RequestHandlerClass,
2028
interface=None, use_ipv6=True, clients=None,
2029
gnutls_priority=None, use_dbus=True, socketfd=None):
2059
gnutls_priority=None,
2030
2062
self.enabled = False
2031
2063
self.clients = clients
2032
2064
if self.clients is None:
2048
2081
def add_pipe(self, parent_pipe, proc):
2049
2082
# Call "handle_ipc" for both data and EOF events
2050
gobject.io_add_watch(parent_pipe.fileno(),
2051
gobject.IO_IN | gobject.IO_HUP,
2052
functools.partial(self.handle_ipc,
2083
gobject.io_add_watch(
2084
parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe = parent_pipe,
2057
def handle_ipc(self, source, condition, parent_pipe=None,
2058
proc = None, client_object=None):
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2059
2094
# error, or the other end of multiprocessing.Pipe has closed
2060
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2061
2096
# Wait for other process to exit
2084
2119
parent_pipe.send(False)
2087
gobject.io_add_watch(parent_pipe.fileno(),
2088
gobject.IO_IN | gobject.IO_HUP,
2089
functools.partial(self.handle_ipc,
2122
gobject.io_add_watch(
2123
parent_pipe.fileno(),
2124
gobject.IO_IN | gobject.IO_HUP,
2125
functools.partial(self.handle_ipc,
2126
parent_pipe = parent_pipe,
2128
client_object = client))
2095
2129
parent_pipe.send(True)
2096
2130
# remove the old hook in favor of the new above hook on
2104
2138
parent_pipe.send(('data', getattr(client_object,
2105
2139
funcname)(*args,
2108
2142
if command == 'getattr':
2109
2143
attrname = request[1]
2110
2144
if callable(client_object.__getattribute__(attrname)):
2111
parent_pipe.send(('function',))
2145
parent_pipe.send(('function', ))
2113
parent_pipe.send(('data', client_object
2114
.__getattribute__(attrname)))
2148
'data', client_object.__getattribute__(attrname)))
2116
2150
if command == 'setattr':
2117
2151
attrname = request[1]
2158
2192
"followers")) # Tokens valid after
2194
Token = collections.namedtuple("Token", (
2195
"regexp", # To match token; if "value" is not None, must have
2196
# a "group" containing digits
2197
"value", # datetime.timedelta or None
2198
"followers")) # Tokens valid after this token
2160
2199
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2161
2200
# the "duration" ABNF definition in RFC 3339, Appendix A.
2162
2201
token_end = Token(re.compile(r"$"), None, frozenset())
2163
2202
token_second = Token(re.compile(r"(\d+)S"),
2164
2203
datetime.timedelta(seconds=1),
2165
frozenset((token_end,)))
2204
frozenset((token_end, )))
2166
2205
token_minute = Token(re.compile(r"(\d+)M"),
2167
2206
datetime.timedelta(minutes=1),
2168
2207
frozenset((token_second, token_end)))
2184
2223
frozenset((token_month, token_end)))
2185
2224
token_week = Token(re.compile(r"(\d+)W"),
2186
2225
datetime.timedelta(weeks=1),
2187
frozenset((token_end,)))
2226
frozenset((token_end, )))
2188
2227
token_duration = Token(re.compile(r"P"), None,
2189
2228
frozenset((token_year, token_month,
2190
2229
token_day, token_time,
2192
2231
# Define starting values
2193
2232
value = datetime.timedelta() # Value so far
2194
2233
found_token = None
2195
followers = frozenset(token_duration,) # Following valid tokens
2234
followers = frozenset((token_duration,)) # Following valid tokens
2196
2235
s = duration # String left to parse
2197
2236
# Loop until end token is found
2198
2237
while found_token is not token_end:
2282
2321
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2283
2322
if not stat.S_ISCHR(os.fstat(null).st_mode):
2284
2323
raise OSError(errno.ENODEV,
2285
"{0} not a character device"
2324
"{} not a character device"
2286
2325
.format(os.devnull))
2287
2326
os.dup2(null, sys.stdin.fileno())
2288
2327
os.dup2(null, sys.stdout.fileno())
2299
2338
parser = argparse.ArgumentParser()
2300
2339
parser.add_argument("-v", "--version", action="version",
2301
version = "%(prog)s {0}".format(version),
2340
version = "%(prog)s {}".format(version),
2302
2341
help="show version number and exit")
2303
2342
parser.add_argument("-i", "--interface", metavar="IF",
2304
2343
help="Bind to interface IF")
2337
2376
help="Directory to save/restore state in")
2338
2377
parser.add_argument("--foreground", action="store_true",
2339
2378
help="Run in foreground", default=None)
2379
parser.add_argument("--no-zeroconf", action="store_false",
2380
dest="zeroconf", help="Do not use Zeroconf",
2341
2383
options = parser.parse_args()
2361
2404
"statedir": "/var/lib/mandos",
2362
2405
"foreground": "False",
2365
2409
# Parse config file for server-global settings
2366
2410
server_config = configparser.SafeConfigParser(server_defaults)
2367
2411
del server_defaults
2368
server_config.read(os.path.join(options.configdir,
2412
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2370
2413
# Convert the SafeConfigParser object to a dict
2371
2414
server_settings = server_config.defaults()
2372
2415
# Use the appropriate methods on the non-string config options
2390
2433
# Override the settings from the config file with command line
2391
2434
# options, if set.
2392
2435
for option in ("interface", "address", "port", "debug",
2393
"priority", "servicename", "configdir",
2394
"use_dbus", "use_ipv6", "debuglevel", "restore",
2395
"statedir", "socket", "foreground"):
2436
"priority", "servicename", "configdir", "use_dbus",
2437
"use_ipv6", "debuglevel", "restore", "statedir",
2438
"socket", "foreground", "zeroconf"):
2396
2439
value = getattr(options, option)
2397
2440
if value is not None:
2398
2441
server_settings[option] = value
2400
2443
# Force all strings to be unicode
2401
2444
for option in server_settings.keys():
2402
if type(server_settings[option]) is str:
2403
server_settings[option] = unicode(server_settings[option])
2445
if isinstance(server_settings[option], bytes):
2446
server_settings[option] = (server_settings[option]
2404
2448
# Force all boolean options to be boolean
2405
2449
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2450
"foreground", "zeroconf"):
2407
2451
server_settings[option] = bool(server_settings[option])
2408
2452
# Debug implies foreground
2409
2453
if server_settings["debug"]:
2413
2457
##################################################################
2459
if (not server_settings["zeroconf"]
2460
and not (server_settings["port"]
2461
or server_settings["socket"] != "")):
2462
parser.error("Needs port or socket to work without Zeroconf")
2415
2464
# For convenience
2416
2465
debug = server_settings["debug"]
2417
2466
debuglevel = server_settings["debuglevel"]
2431
2481
initlogger(debug, level)
2433
2483
if server_settings["servicename"] != "Mandos":
2434
syslogger.setFormatter(logging.Formatter
2435
('Mandos ({0}) [%(process)d]:'
2436
' %(levelname)s: %(message)s'
2437
.format(server_settings
2484
syslogger.setFormatter(
2485
logging.Formatter('Mandos ({}) [%(process)d]:'
2486
' %(levelname)s: %(message)s'.format(
2487
server_settings["servicename"])))
2440
2489
# Parse config file with clients
2441
2490
client_config = configparser.SafeConfigParser(Client
2446
2495
global mandos_dbus_service
2447
2496
mandos_dbus_service = None
2449
tcp_server = MandosServer((server_settings["address"],
2450
server_settings["port"]),
2452
interface=(server_settings["interface"]
2456
server_settings["priority"],
2458
socketfd=(server_settings["socket"]
2499
if server_settings["socket"] != "":
2500
socketfd = server_settings["socket"]
2501
tcp_server = MandosServer(
2502
(server_settings["address"], server_settings["port"]),
2504
interface=(server_settings["interface"] or None),
2506
gnutls_priority=server_settings["priority"],
2460
2509
if not foreground:
2461
2510
pidfilename = "/run/mandos.pid"
2462
2511
if not os.path.isdir("/run/."):
2463
2512
pidfilename = "/var/run/mandos.pid"
2466
pidfile = open(pidfilename, "w")
2515
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2467
2516
except IOError as e:
2468
2517
logger.error("Could not open file %r", pidfilename,
2496
2545
def debug_gnutls(level, string):
2497
2546
logger.debug("GnuTLS: %s", string[:-1])
2499
(gnutls.library.functions
2500
.gnutls_global_set_log_function(debug_gnutls))
2548
gnutls.library.functions.gnutls_global_set_log_function(
2502
2551
# Redirect stdin so all checkers get /dev/null
2503
2552
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2525
2574
bus_name = dbus.service.BusName("se.recompile.Mandos",
2526
bus, do_not_queue=True)
2527
old_bus_name = (dbus.service.BusName
2528
("se.bsnet.fukt.Mandos", bus,
2530
except dbus.exceptions.NameExistsException as e:
2577
old_bus_name = dbus.service.BusName(
2578
"se.bsnet.fukt.Mandos", bus,
2580
except dbus.exceptions.DBusException as e:
2531
2581
logger.error("Disabling D-Bus:", exc_info=e)
2532
2582
use_dbus = False
2533
2583
server_settings["use_dbus"] = False
2534
2584
tcp_server.use_dbus = False
2535
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2536
service = AvahiServiceToSyslog(name =
2537
server_settings["servicename"],
2538
servicetype = "_mandos._tcp",
2539
protocol = protocol, bus = bus)
2540
if server_settings["interface"]:
2541
service.interface = (if_nametoindex
2542
(str(server_settings["interface"])))
2586
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2587
service = AvahiServiceToSyslog(
2588
name = server_settings["servicename"],
2589
servicetype = "_mandos._tcp",
2590
protocol = protocol,
2592
if server_settings["interface"]:
2593
service.interface = if_nametoindex(
2594
server_settings["interface"].encode("utf-8"))
2544
2596
global multiprocessing_manager
2545
2597
multiprocessing_manager = multiprocessing.Manager()
2564
2616
if server_settings["restore"]:
2566
2618
with open(stored_state_path, "rb") as stored_state:
2567
clients_data, old_client_settings = (pickle.load
2619
clients_data, old_client_settings = pickle.load(
2569
2621
os.remove(stored_state_path)
2570
2622
except IOError as e:
2571
2623
if e.errno == errno.ENOENT:
2572
logger.warning("Could not load persistent state: {0}"
2573
.format(os.strerror(e.errno)))
2624
logger.warning("Could not load persistent state:"
2625
" {}".format(os.strerror(e.errno)))
2575
2627
logger.critical("Could not load persistent state:",
2578
2630
except EOFError as e:
2579
2631
logger.warning("Could not load persistent state: "
2580
"EOFError:", exc_info=e)
2582
2635
with PGPEngine() as pgp:
2583
for client_name, client in clients_data.iteritems():
2636
for client_name, client in clients_data.items():
2584
2637
# Skip removed clients
2585
2638
if client_name not in client_settings:
2611
2664
if datetime.datetime.utcnow() >= client["expires"]:
2612
2665
if not client["last_checked_ok"]:
2613
2666
logger.warning(
2614
"disabling client {0} - Client never "
2615
"performed a successful checker"
2616
.format(client_name))
2667
"disabling client {} - Client never "
2668
"performed a successful checker".format(
2617
2670
client["enabled"] = False
2618
2671
elif client["last_checker_status"] != 0:
2619
2672
logger.warning(
2620
"disabling client {0} - Client "
2621
"last checker failed with error code {1}"
2622
.format(client_name,
2623
client["last_checker_status"]))
2673
"disabling client {} - Client last"
2674
" checker failed with error code"
2677
client["last_checker_status"]))
2624
2678
client["enabled"] = False
2626
client["expires"] = (datetime.datetime
2628
+ client["timeout"])
2680
client["expires"] = (
2681
datetime.datetime.utcnow()
2682
+ client["timeout"])
2629
2683
logger.debug("Last checker succeeded,"
2630
" keeping {0} enabled"
2631
.format(client_name))
2684
" keeping {} enabled".format(
2633
client["secret"] = (
2634
pgp.decrypt(client["encrypted_secret"],
2635
client_settings[client_name]
2687
client["secret"] = pgp.decrypt(
2688
client["encrypted_secret"],
2689
client_settings[client_name]["secret"])
2637
2690
except PGPError:
2638
2691
# If decryption fails, we use secret from new settings
2639
logger.debug("Failed to decrypt {0} old secret"
2640
.format(client_name))
2641
client["secret"] = (
2642
client_settings[client_name]["secret"])
2692
logger.debug("Failed to decrypt {} old secret".format(
2694
client["secret"] = (client_settings[client_name]
2644
2697
# Add/remove clients based on new changes made to config
2645
2698
for client_name in (set(old_client_settings)
2650
2703
clients_data[client_name] = client_settings[client_name]
2652
2705
# Create all client objects
2653
for client_name, client in clients_data.iteritems():
2706
for client_name, client in clients_data.items():
2654
2707
tcp_server.clients[client_name] = client_class(
2655
name = client_name, settings = client,
2656
2710
server_settings = server_settings)
2658
2712
if not tcp_server.clients:
2674
2728
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2677
@alternate_dbus_interfaces({"se.recompile.Mandos":
2678
"se.bsnet.fukt.Mandos"})
2732
@alternate_dbus_interfaces(
2733
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2679
2734
class MandosDBusService(DBusObjectWithProperties):
2680
2735
"""A D-Bus proxy object"""
2681
2737
def __init__(self):
2682
2738
dbus.service.Object.__init__(self, bus, "/")
2683
2740
_interface = "se.recompile.Mandos"
2685
2742
@dbus_interface_annotations(_interface)
2686
2743
def _foo(self):
2687
return { "org.freedesktop.DBus.Property"
2688
".EmitsChangedSignal":
2745
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2691
2748
@dbus.service.signal(_interface, signature="o")
2692
2749
def ClientAdded(self, objpath):
2715
2771
def GetAllClientsWithProperties(self):
2717
2773
return dbus.Dictionary(
2718
((c.dbus_object_path, c.GetAll(""))
2719
for c in tcp_server.clients.itervalues()),
2774
{ c.dbus_object_path: c.GetAll("")
2775
for c in tcp_server.clients.itervalues() },
2720
2776
signature="oa{sv}")
2722
2778
@dbus.service.method(_interface, in_signature="o")
2760
2817
# A list of attributes that can not be pickled
2762
exclude = set(("bus", "changedstate", "secret",
2763
"checker", "server_settings"))
2764
for name, typ in (inspect.getmembers
2765
(dbus.service.Object)):
2819
exclude = { "bus", "changedstate", "secret",
2820
"checker", "server_settings" }
2821
for name, typ in inspect.getmembers(dbus.service
2766
2823
exclude.add(name)
2768
2825
client_dict["encrypted_secret"] = (client
2775
2832
del client_settings[client.name]["secret"]
2778
with (tempfile.NamedTemporaryFile
2779
(mode='wb', suffix=".pickle", prefix='clients-',
2780
dir=os.path.dirname(stored_state_path),
2781
delete=False)) as stored_state:
2835
with tempfile.NamedTemporaryFile(
2839
dir=os.path.dirname(stored_state_path),
2840
delete=False) as stored_state:
2782
2841
pickle.dump((clients, client_settings), stored_state)
2783
tempname=stored_state.name
2842
tempname = stored_state.name
2784
2843
os.rename(tempname, stored_state_path)
2785
2844
except (IOError, OSError) as e:
2824
2882
tcp_server.server_activate()
2826
2884
# Find out what port we got
2827
service.port = tcp_server.socket.getsockname()[1]
2886
service.port = tcp_server.socket.getsockname()[1]
2829
2888
logger.info("Now listening on address %r, port %d,"
2830
2889
" flowinfo %d, scope_id %d",
2836
2895
#service.interface = tcp_server.socket.getsockname()[3]
2839
# From the Avahi example code
2842
except dbus.exceptions.DBusException as error:
2843
logger.critical("D-Bus Exception", exc_info=error)
2846
# End of Avahi example code
2899
# From the Avahi example code
2902
except dbus.exceptions.DBusException as error:
2903
logger.critical("D-Bus Exception", exc_info=error)
2906
# End of Avahi example code
2848
2908
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2849
2909
lambda *args, **kwargs: