11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 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()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
103
116
except (OSError, AttributeError):
104
118
def if_nametoindex(interface):
105
119
"Get an interface index the hard way, i.e. using fcntl()"
106
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
121
with contextlib.closing(socket.socket()) as s:
108
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
125
return interface_index
116
128
def initlogger(debug, level=logging.WARNING):
117
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
119
135
syslogger.setFormatter(logging.Formatter
120
136
('Mandos [%(process)d]: %(levelname)s:'
172
189
def password_encode(self, password):
173
190
# Passphrase can not be empty and can not contain newlines or
174
191
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
177
200
def encrypt(self, data, password):
178
201
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
181
204
passfile.write(passphrase)
183
206
proc = subprocess.Popen(['gpg', '--symmetric',
195
218
def decrypt(self, data, password):
196
219
passphrase = self.password_encode(password)
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
199
222
passfile.write(passphrase)
201
224
proc = subprocess.Popen(['gpg', '--decrypt',
215
237
class AvahiError(Exception):
216
238
def __init__(self, value, *args, **kwargs):
217
239
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
222
244
class AvahiServiceError(AvahiError):
225
248
class AvahiGroupError(AvahiError):
247
270
bus: dbus.SystemBus()
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):
274
interface = avahi.IF_UNSPEC,
282
protocol = avahi.PROTO_UNSPEC,
254
284
self.interface = interface
256
286
self.type = servicetype
267
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
270
300
"""Derived from the Avahi example code"""
271
301
if self.rename_count >= self.max_renames:
272
302
logger.critical("No suitable Zeroconf service name found"
273
303
" after %i retries, exiting.",
274
304
self.rename_count)
275
305
raise AvahiServiceError("Too many renames")
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
278
309
logger.info("Changing Zeroconf service name to %r ...",
283
315
except dbus.exceptions.DBusException as error:
284
logger.critical("D-Bus Exception", exc_info=error)
287
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)
289
325
def remove(self):
290
326
"""Derived from the Avahi example code"""
346
381
def server_state_changed(self, state, error=None):
347
382
"""Derived from the Avahi example code"""
348
383
logger.debug("Avahi server state change: %i", state)
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" }
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",
356
390
if state in bad_states:
357
391
if bad_states[state] is not None:
358
392
if error is None:
377
411
follow_name_owner_changes=True),
378
412
avahi.DBUS_INTERFACE_SERVER)
379
413
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
414
self.server_state_changed)
381
415
self.server_state_changed(self.server.GetState())
384
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
386
420
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(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))
402
428
class Client(object):
403
429
"""A representation of a client host served by this server.
448
474
"fingerprint", "host", "interval",
449
475
"last_approval_request", "last_checked_ok",
450
476
"last_enabled", "name", "timeout")
451
client_defaults = { "timeout": "PT5M",
452
"extended_timeout": "PT15M",
454
"checker": "fping -q -- %%(host)s",
456
"approval_delay": "PT0S",
457
"approval_duration": "PT1S",
458
"approved_by_default": "True",
462
def timeout_milliseconds(self):
463
"Return the 'timeout' attribute in milliseconds"
464
return timedelta_to_milliseconds(self.timeout)
466
def extended_timeout_milliseconds(self):
467
"Return the 'extended_timeout' attribute in milliseconds"
468
return timedelta_to_milliseconds(self.extended_timeout)
470
def interval_milliseconds(self):
471
"Return the 'interval' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.interval)
474
def approval_delay_milliseconds(self):
475
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",
478
490
def config_parser(config):
541
556
self.expires = None
543
558
logger.debug("Creating client %r", self.name)
544
# Uppercase and remove spaces from fingerprint for later
545
# comparison purposes with return value from the fingerprint()
547
559
logger.debug(" Fingerprint: %s", self.fingerprint)
548
560
self.created = settings.get("created",
549
561
datetime.datetime.utcnow())
556
568
self.current_checker_command = None
557
569
self.approved = None
558
570
self.approvals_pending = 0
559
self.changedstate = (multiprocessing_manager
560
.Condition(multiprocessing_manager
562
self.client_structure = [attr for attr in
563
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()
564
575
if not attr.startswith("_")]
565
576
self.client_structure.append("client_structure")
567
for name, t in inspect.getmembers(type(self),
578
for name, t in inspect.getmembers(
579
type(self), lambda obj: isinstance(obj, property)):
571
580
if not name.startswith("_"):
572
581
self.client_structure.append(name)
615
624
# and every interval from then on.
616
625
if self.checker_initiator_tag is not None:
617
626
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
627
self.checker_initiator_tag = gobject.timeout_add(
628
int(self.interval.total_seconds() * 1000),
621
630
# Schedule a disable() when 'timeout' has passed
622
631
if self.disable_initiator_tag is not None:
623
632
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
633
self.disable_initiator_tag = gobject.timeout_add(
634
int(self.timeout.total_seconds() * 1000), self.disable)
627
635
# Also start a new checker *right now*.
628
636
self.start_checker()
659
666
gobject.source_remove(self.disable_initiator_tag)
660
667
self.disable_initiator_tag = None
661
668
if getattr(self, "enabled", False):
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
669
self.disable_initiator_tag = gobject.timeout_add(
670
int(timeout.total_seconds() * 1000), self.disable)
665
671
self.expires = datetime.datetime.utcnow() + timeout
667
673
def need_approval(self):
684
690
# If a checker exists, make sure it is not a zombie
686
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
except AttributeError:
695
except OSError as error:
696
if error.errno != errno.ECHILD:
693
700
logger.warning("Checker was a zombie")
697
704
# Start a new checker if needed
698
705
if self.checker is None:
699
706
# Escape attributes for the shell
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
708
attr: re.escape(str(getattr(self, attr)))
709
for attr in self.runtime_expansions }
705
711
command = self.checker_command % escaped_attrs
706
712
except TypeError as error:
707
713
logger.error('Could not format string "%s"',
708
self.checker_command, exc_info=error)
709
return True # Try again later
714
self.checker_command,
716
return True # Try again later
710
717
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
719
logger.info("Starting checker %r for %s", command,
714
721
# We don't need to redirect stdout and stderr, since
715
722
# in normal mode, that is already done by daemon(),
716
723
# and in debug mode we don't want to. (Stdin is
725
732
"stderr": wnull })
726
733
self.checker = subprocess.Popen(command,
730
738
except OSError as error:
731
739
logger.error("Failed to start subprocess",
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
742
self.checker_callback_tag = gobject.child_watch_add(
743
self.checker.pid, self.checker_callback, data=command)
738
744
# The checker may have completed before the gobject
739
745
# watch was added. Check for this.
771
777
self.checker = None
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
780
def dbus_service_property(dbus_interface,
776
784
"""Decorators for marking methods of a DBusObjectWithProperties to
777
785
become properties on the D-Bus.
787
795
# "Set" method, so we fail early here:
788
796
if byte_arrays and signature != "ay":
789
797
raise ValueError("Byte arrays not supported for non-'ay'"
790
" signature {0!r}".format(signature))
798
" signature {!r}".format(signature))
791
800
def decorator(func):
792
801
func._dbus_is_property = True
793
802
func._dbus_interface = dbus_interface
824
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"})
827
842
@dbus_service_property("org.example.Interface", signature="b",
829
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
"org.freedesktop.DBus.Property."
831
"EmitsChangedSignal": "false"})
832
844
def Property_dbus_property(self):
833
845
return dbus.Boolean(False)
835
848
def decorator(func):
836
849
func._dbus_annotations = annotations
841
855
class DBusPropertyException(dbus.exceptions.DBusException):
842
856
"""A base class for D-Bus property-related exceptions
844
def __unicode__(self):
845
return unicode(str(self))
848
861
class DBusPropertyAccessException(DBusPropertyException):
872
885
If called like _is_dbus_thing("method") it returns a function
873
886
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
878
891
def _get_all_dbus_things(self, thing):
879
892
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name",
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
895
athing.__get__(self))
884
896
for cls in self.__class__.__mro__
885
897
for name, athing in
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
889
900
def _get_dbus_property(self, interface_name, property_name):
890
901
"""Returns a bound method if one exists which is a D-Bus
891
902
property with the specified name and interface.
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
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")):
897
907
if (value._dbus_name == property_name
898
908
and value._dbus_interface == interface_name):
899
909
return value.__get__(self)
901
911
# No such property
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
912
raise DBusPropertyNotFound("{}:{}.{}".format(
913
self.dbus_object_path, interface_name, property_name))
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
915
@dbus.service.method(dbus.PROPERTIES_IFACE,
907
917
out_signature="v")
908
918
def Get(self, interface_name, property_name):
909
919
"""Standard D-Bus property Get() method, see D-Bus standard.
927
937
# The byte_arrays option is not supported yet on
928
938
# signatures other than "ay".
929
939
if prop._dbus_signature != "ay":
940
raise ValueError("Byte arrays not supported for non-"
941
"'ay' signature {!r}"
942
.format(prop._dbus_signature))
931
943
value = dbus.ByteArray(b''.join(chr(byte)
932
944
for byte in value))
935
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
947
@dbus.service.method(dbus.PROPERTIES_IFACE,
936
949
out_signature="a{sv}")
937
950
def GetAll(self, interface_name):
938
951
"""Standard D-Bus property GetAll() method, see D-Bus
953
966
if not hasattr(value, "variant_level"):
954
967
properties[name] = value
956
properties[name] = type(value)(value, variant_level=
957
value.variant_level+1)
969
properties[name] = type(value)(
970
value, variant_level = value.variant_level + 1)
958
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
960
981
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
961
982
out_signature="s",
962
983
path_keyword='object_path',
972
993
document = xml.dom.minidom.parseString(xmlstring)
973
995
def make_tag(document, name, prop):
974
996
e = document.createElement("property")
975
997
e.setAttribute("name", name)
976
998
e.setAttribute("type", prop._dbus_signature)
977
999
e.setAttribute("access", prop._dbus_access)
979
1002
for if_tag in document.getElementsByTagName("interface"):
980
1003
# Add property tags
981
1004
for tag in (make_tag(document, name, prop)
993
1016
if (name == tag.getAttribute("name")
994
1017
and prop._dbus_interface
995
1018
== if_tag.getAttribute("name")):
996
annots.update(getattr
1000
for name, value in annots.iteritems():
1019
annots.update(getattr(
1020
prop, "_dbus_annotations", {}))
1021
for name, value in annots.items():
1001
1022
ann_tag = document.createElement(
1003
1024
ann_tag.setAttribute("name", name)
1006
1027
# Add interface annotation tags
1007
1028
for annotation, value in dict(
1008
1029
itertools.chain.from_iterable(
1009
annotations().iteritems()
1010
for name, annotations in
1011
self._get_all_dbus_things("interface")
1030
annotations().items()
1031
for name, annotations
1032
in self._get_all_dbus_things("interface")
1012
1033
if name == if_tag.getAttribute("name")
1014
1035
ann_tag = document.createElement("annotation")
1015
1036
ann_tag.setAttribute("name", annotation)
1016
1037
ann_tag.setAttribute("value", value)
1043
1064
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1045
1066
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1067
return dbus.String(dt.isoformat(), variant_level=variant_level)
1050
1070
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1080
1101
# Ignore non-D-Bus attributes, and D-Bus attributes
1081
1102
# with the wrong interface name
1082
1103
if (not hasattr(attribute, "_dbus_interface")
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1104
or not attribute._dbus_interface.startswith(
1105
orig_interface_name)):
1086
1107
# Create an alternate D-Bus interface name based on
1087
1108
# the current name
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1109
alt_interface = attribute._dbus_interface.replace(
1110
orig_interface_name, alt_interface_name)
1091
1111
interface_names.add(alt_interface)
1092
1112
# Is this a D-Bus signal?
1093
1113
if getattr(attribute, "_dbus_is_signal", False):
1094
1114
# Extract the original non-method undecorated
1095
1115
# function by black magic
1096
1116
nonmethod_func = (dict(
1097
zip(attribute.func_code.co_freevars,
1098
attribute.__closure__))["func"]
1117
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1100
1120
# Create a new, but exactly alike, function
1101
1121
# object, and decorate it to be a new D-Bus signal
1102
1122
# with the alternate D-Bus interface name
1103
new_function = (dbus.service.signal
1105
attribute._dbus_signature)
1123
new_function = (dbus.service.signal(
1124
alt_interface, attribute._dbus_signature)
1106
1125
(types.FunctionType(
1107
nonmethod_func.func_code,
1108
nonmethod_func.func_globals,
1109
nonmethod_func.func_name,
1110
nonmethod_func.func_defaults,
1111
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)))
1112
1131
# Copy annotations, if any
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1116
1135
except AttributeError:
1118
1137
# Define a creator of a function to call both the
1123
1142
"""This function is a scope container to pass
1124
1143
func1 and func2 to the "call_both" function
1125
1144
outside of its arguments"""
1126
1146
def call_both(*args, **kwargs):
1127
1147
"""This function will emit two D-Bus
1128
1148
signals by calling func1 and func2"""
1129
1149
func1(*args, **kwargs)
1130
1150
func2(*args, **kwargs)
1131
1152
return call_both
1132
1153
# Create the "call_both" function and add it to
1138
1159
# object. Decorate it to be a new D-Bus method
1139
1160
# with the alternate D-Bus interface name. Add it
1140
1161
# to the class.
1141
attr[attrname] = (dbus.service.method
1143
attribute._dbus_in_signature,
1144
attribute._dbus_out_signature)
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
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)))
1151
1172
# Copy annotations, if any
1153
attr[attrname]._dbus_annotations = (
1154
dict(attribute._dbus_annotations))
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1155
1176
except AttributeError:
1157
1178
# Is this a D-Bus property?
1160
1181
# object, and decorate it to be a new D-Bus
1161
1182
# property with the alternate D-Bus interface
1162
1183
# name. Add it to the class.
1163
attr[attrname] = (dbus_service_property
1165
attribute._dbus_signature,
1166
attribute._dbus_access,
1168
._dbus_get_args_options
1171
(attribute.func_code,
1172
attribute.func_globals,
1173
attribute.func_name,
1174
attribute.func_defaults,
1175
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)))
1176
1195
# Copy annotations, if any
1178
attr[attrname]._dbus_annotations = (
1179
dict(attribute._dbus_annotations))
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1180
1199
except AttributeError:
1182
1201
# Is this a D-Bus interface?
1185
1204
# object. Decorate it to be a new D-Bus interface
1186
1205
# with the alternate D-Bus interface name. Add it
1187
1206
# to the class.
1188
attr[attrname] = (dbus_interface_annotations
1191
(attribute.func_code,
1192
attribute.func_globals,
1193
attribute.func_name,
1194
attribute.func_defaults,
1195
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)))
1197
1215
# Deprecate all alternate interfaces
1198
iname="_AlternateDBusNames_interface_annotation{0}"
1216
iname="_AlternateDBusNames_interface_annotation{}"
1199
1217
for interface_name in interface_names:
1200
1219
@dbus_interface_annotations(interface_name)
1201
1220
def func(self):
1202
1221
return { "org.freedesktop.DBus.Deprecated":
1204
1223
# Find an unused name
1205
1224
for aname in (iname.format(i)
1206
1225
for i in itertools.count()):
1210
1229
if interface_names:
1211
1230
# Replace the class with a new subclass of it with
1212
1231
# methods, signals, etc. as created above.
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1232
cls = type(b"{}Alternate".format(cls.__name__),
1219
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
"se.bsnet.fukt.Mandos"})
1240
"se.bsnet.fukt.Mandos"})
1221
1241
class ClientDBus(Client, DBusObjectWithProperties):
1222
1242
"""A Client class using D-Bus
1236
1258
Client.__init__(self, *args, **kwargs)
1237
1259
# Only now, when this client is initialized, can it show up on
1239
client_object_name = unicode(self.name).translate(
1261
client_object_name = str(self.name).translate(
1240
1262
{ord("."): ord("_"),
1241
1263
ord("-"): ord("_")})
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1244
1266
DBusObjectWithProperties.__init__(self, self.bus,
1245
1267
self.dbus_object_path)
1247
def notifychangeproperty(transform_func,
1248
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):
1250
1274
""" Modify a variable so that it's a property which announces
1251
1275
its changes to DBus.
1257
1281
to the D-Bus. Default: no transform
1258
1282
variant_level: D-Bus variant level. Default: 1
1260
attrname = "_{0}".format(dbus_name)
1284
attrname = "_{}".format(dbus_name)
1261
1286
def setter(self, value):
1262
1287
if hasattr(self, "dbus_object_path"):
1263
1288
if (not hasattr(self, attrname) or
1264
1289
type_func(getattr(self, attrname, None))
1265
1290
!= type_func(value)):
1266
dbus_value = transform_func(type_func(value),
1269
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):
1271
1306
setattr(self, attrname, value)
1273
1308
return property(lambda self: getattr(self, attrname), setter)
1279
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1280
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1282
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1283
type_func = lambda checker:
1284
checker is not None)
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1285
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
1321
"LastCheckedOK")
1287
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1290
1325
datetime_to_dbus, "LastApprovalRequest")
1291
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1292
1327
"ApprovedByDefault")
1293
approval_delay = notifychangeproperty(dbus.UInt64,
1296
timedelta_to_milliseconds)
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1297
1331
approval_duration = notifychangeproperty(
1298
1332
dbus.UInt64, "ApprovalDuration",
1299
type_func = timedelta_to_milliseconds)
1333
type_func = lambda td: td.total_seconds() * 1000)
1300
1334
host = notifychangeproperty(dbus.String, "Host")
1301
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1303
timedelta_to_milliseconds)
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1304
1338
extended_timeout = notifychangeproperty(
1305
1339
dbus.UInt64, "ExtendedTimeout",
1306
type_func = timedelta_to_milliseconds)
1307
interval = notifychangeproperty(dbus.UInt64,
1310
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)
1311
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1313
1348
del notifychangeproperty
1341
1376
*args, **kwargs)
1343
1378
def start_checker(self, *args, **kwargs):
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1379
old_checker_pid = getattr(self.checker, "pid", None)
1349
1380
r = Client.start_checker(self, *args, **kwargs)
1350
1381
# Only if new checker process was started
1351
1382
if (self.checker is not None
1361
1392
def approve(self, value=True):
1362
1393
self.approved = value
1363
gobject.timeout_add(timedelta_to_milliseconds
1364
(self.approval_duration),
1365
self._reset_approved)
1394
gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
* 1000), self._reset_approved)
1366
1396
self.send_changedstate()
1368
1398
## D-Bus methods, signals & properties
1369
_interface = "se.recompile.Mandos.Client"
1373
@dbus_interface_annotations(_interface)
1375
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1380
1404
# CheckerCompleted - signal
1459
1484
return dbus.Boolean(bool(self.approvals_pending))
1461
1486
# ApprovedByDefault - property
1462
@dbus_service_property(_interface, signature="b",
1487
@dbus_service_property(_interface,
1463
1489
access="readwrite")
1464
1490
def ApprovedByDefault_dbus_property(self, value=None):
1465
1491
if value is None: # get
1467
1493
self.approved_by_default = bool(value)
1469
1495
# ApprovalDelay - property
1470
@dbus_service_property(_interface, signature="t",
1496
@dbus_service_property(_interface,
1471
1498
access="readwrite")
1472
1499
def ApprovalDelay_dbus_property(self, value=None):
1473
1500
if value is None: # get
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1475
1503
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1477
1505
# ApprovalDuration - property
1478
@dbus_service_property(_interface, signature="t",
1506
@dbus_service_property(_interface,
1479
1508
access="readwrite")
1480
1509
def ApprovalDuration_dbus_property(self, value=None):
1481
1510
if value is None: # get
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1484
1513
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1486
1515
# Name - property
1494
1523
return dbus.String(self.fingerprint)
1496
1525
# Host - property
1497
@dbus_service_property(_interface, signature="s",
1526
@dbus_service_property(_interface,
1498
1528
access="readwrite")
1499
1529
def Host_dbus_property(self, value=None):
1500
1530
if value is None: # get
1501
1531
return dbus.String(self.host)
1502
self.host = unicode(value)
1532
self.host = str(value)
1504
1534
# Created - property
1505
1535
@dbus_service_property(_interface, signature="s", access="read")
1532
1564
return datetime_to_dbus(self.last_checked_ok)
1534
1566
# LastCheckerStatus - property
1535
@dbus_service_property(_interface, signature="n",
1567
@dbus_service_property(_interface, signature="n", access="read")
1537
1568
def LastCheckerStatus_dbus_property(self):
1538
1569
return dbus.Int16(self.last_checker_status)
1548
1579
return datetime_to_dbus(self.last_approval_request)
1550
1581
# Timeout - property
1551
@dbus_service_property(_interface, signature="t",
1582
@dbus_service_property(_interface,
1552
1584
access="readwrite")
1553
1585
def Timeout_dbus_property(self, value=None):
1554
1586
if value is None: # get
1555
return dbus.UInt64(self.timeout_milliseconds())
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1556
1588
old_timeout = self.timeout
1557
1589
self.timeout = datetime.timedelta(0, 0, 0, value)
1558
1590
# Reschedule disabling
1569
1601
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1575
1606
# ExtendedTimeout - property
1576
@dbus_service_property(_interface, signature="t",
1607
@dbus_service_property(_interface,
1577
1609
access="readwrite")
1578
1610
def ExtendedTimeout_dbus_property(self, value=None):
1579
1611
if value is None: # get
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1581
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1583
1616
# Interval - property
1584
@dbus_service_property(_interface, signature="t",
1617
@dbus_service_property(_interface,
1585
1619
access="readwrite")
1586
1620
def Interval_dbus_property(self, value=None):
1587
1621
if value is None: # get
1588
return dbus.UInt64(self.interval_milliseconds())
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
1623
self.interval = datetime.timedelta(0, 0, 0, value)
1590
1624
if getattr(self, "checker_initiator_tag", None) is None:
1592
1626
if self.enabled:
1593
1627
# Reschedule checker run
1594
1628
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
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
1599
1633
# Checker - property
1600
@dbus_service_property(_interface, signature="s",
1634
@dbus_service_property(_interface,
1601
1636
access="readwrite")
1602
1637
def Checker_dbus_property(self, value=None):
1603
1638
if value is None: # get
1604
1639
return dbus.String(self.checker_command)
1605
self.checker_command = unicode(value)
1640
self.checker_command = str(value)
1607
1642
# CheckerRunning - property
1608
@dbus_service_property(_interface, signature="b",
1643
@dbus_service_property(_interface,
1609
1645
access="readwrite")
1610
1646
def CheckerRunning_dbus_property(self, value=None):
1611
1647
if value is None: # get
1621
1657
return self.dbus_object_path # is already a dbus.ObjectPath
1623
1659
# Secret = property
1624
@dbus_service_property(_interface, signature="ay",
1625
access="write", byte_arrays=True)
1660
@dbus_service_property(_interface,
1626
1664
def Secret_dbus_property(self, value):
1627
self.secret = str(value)
1665
self.secret = bytes(value)
1644
1682
if data[0] == 'data':
1646
1684
if data[0] == 'function':
1647
1686
def func(*args, **kwargs):
1648
1687
self._pipe.send(('funcall', name, args, kwargs))
1649
1688
return self._pipe.recv()[1]
1652
1692
def __setattr__(self, name, value):
1664
1704
def handle(self):
1665
1705
with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
1706
logger.info("TCP connection from: %s",
1667
unicode(self.client_address))
1707
str(self.client_address))
1668
1708
logger.debug("Pipe FD: %d",
1669
1709
self.server.child_pipe.fileno())
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1676
1714
# Note: gnutls.connection.X509Credentials is really a
1677
1715
# generic GnuTLS certificate credentials object so long as
1686
1724
priority = self.server.gnutls_priority
1687
1725
if priority is None:
1688
1726
priority = "NORMAL"
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
1727
gnutls.library.functions.gnutls_priority_set_direct(
1728
session._c_object, priority, None)
1693
1730
# Start communication using the Mandos protocol
1694
1731
# Get protocol number
1764
1801
#wait until timeout or approved
1765
1802
time = datetime.datetime.now()
1766
1803
client.changedstate.acquire()
1767
client.changedstate.wait(
1768
float(timedelta_to_milliseconds(delay)
1804
client.changedstate.wait(delay.total_seconds())
1770
1805
client.changedstate.release()
1771
1806
time2 = datetime.datetime.now()
1772
1807
if (time2 - time) >= delay:
1791
1826
logger.warning("gnutls send failed",
1792
1827
exc_info=error)
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
1829
logger.debug("Sent: %d, remaining: %d", sent,
1830
len(client.secret) - (sent_size
1797
1832
sent_size += sent
1799
1834
logger.info("Sending secret to %s", client.name)
1816
1851
def peer_certificate(session):
1817
1852
"Return the peer's OpenPGP certificate as a bytestring"
1818
1853
# If not an OpenPGP certificate...
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1854
if (gnutls.library.functions.gnutls_certificate_type_get(
1821
1856
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1822
1857
# ...do the normal thing
1823
1858
return session.peer_certificate
1837
1872
def fingerprint(openpgp):
1838
1873
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
1874
# New GnuTLS "datum" with the OpenPGP public key
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
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)))
1845
1879
# New empty GnuTLS certificate
1846
1880
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1849
1883
# Import the OpenPGP public key into the certificate
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.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)
1854
1887
# Verify the self signature in the key
1855
1888
crtverify = ctypes.c_uint()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1859
1891
if crtverify.value != 0:
1860
1892
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
1893
raise gnutls.errors.CertificateSecurityError(
1863
1895
# New buffer for the fingerprint
1864
1896
buf = ctypes.create_string_buffer(20)
1865
1897
buf_len = ctypes.c_size_t()
1866
1898
# Get the fingerprint from the certificate into the buffer
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1870
1901
# Deinit the certificate
1871
1902
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1872
1903
# Convert the buffer to a Python bytestring
1921
1954
interface: None or a network interface name (string)
1922
1955
use_ipv6: Boolean; to use IPv6 or not
1924
1958
def __init__(self, server_address, RequestHandlerClass,
1925
interface=None, use_ipv6=True, socketfd=None):
1926
1962
"""If socketfd is set, use that file descriptor instead of
1927
1963
creating a new one with socket.socket().
1969
2005
self.interface)
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
2008
self.socket.setsockopt(
2009
socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
(self.interface + "\0").encode("utf-8"))
1975
2011
except socket.error as error:
1976
2012
if error.errno == errno.EPERM:
1977
2013
logger.error("No permission to bind to"
1995
2031
self.server_address = (any_address,
1996
2032
self.server_address[1])
1997
2033
elif not self.server_address[1]:
1998
self.server_address = (self.server_address[0],
2034
self.server_address = (self.server_address[0], 0)
2000
2035
# if self.interface:
2001
2036
# self.server_address = (self.server_address[0],
2017
2052
Assumes a gobject.MainLoop event loop.
2019
2055
def __init__(self, server_address, RequestHandlerClass,
2020
interface=None, use_ipv6=True, clients=None,
2021
gnutls_priority=None, use_dbus=True, socketfd=None):
2059
gnutls_priority=None,
2022
2062
self.enabled = False
2023
2063
self.clients = clients
2024
2064
if self.clients is None:
2040
2081
def add_pipe(self, parent_pipe, proc):
2041
2082
# Call "handle_ipc" for both data and EOF events
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
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,
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2051
2094
# error, or the other end of multiprocessing.Pipe has closed
2052
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2053
2096
# Wait for other process to exit
2076
2119
parent_pipe.send(False)
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
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))
2087
2129
parent_pipe.send(True)
2088
2130
# remove the old hook in favor of the new above hook on
2096
2138
parent_pipe.send(('data', getattr(client_object,
2097
2139
funcname)(*args,
2100
2142
if command == 'getattr':
2101
2143
attrname = request[1]
2102
2144
if callable(client_object.__getattribute__(attrname)):
2103
parent_pipe.send(('function',))
2145
parent_pipe.send(('function', ))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2148
'data', client_object.__getattribute__(attrname)))
2108
2150
if command == 'setattr':
2109
2151
attrname = request[1]
2150
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
2152
2199
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
2200
# the "duration" ABNF definition in RFC 3339, Appendix A.
2154
2201
token_end = Token(re.compile(r"$"), None, frozenset())
2155
2202
token_second = Token(re.compile(r"(\d+)S"),
2156
2203
datetime.timedelta(seconds=1),
2157
frozenset((token_end,)))
2204
frozenset((token_end, )))
2158
2205
token_minute = Token(re.compile(r"(\d+)M"),
2159
2206
datetime.timedelta(minutes=1),
2160
2207
frozenset((token_second, token_end)))
2176
2223
frozenset((token_month, token_end)))
2177
2224
token_week = Token(re.compile(r"(\d+)W"),
2178
2225
datetime.timedelta(weeks=1),
2179
frozenset((token_end,)))
2226
frozenset((token_end, )))
2180
2227
token_duration = Token(re.compile(r"P"), None,
2181
2228
frozenset((token_year, token_month,
2182
2229
token_day, token_time,
2184
2231
# Define starting values
2185
2232
value = datetime.timedelta() # Value so far
2186
2233
found_token = None
2187
followers = frozenset(token_duration,) # Following valid tokens
2234
followers = frozenset((token_duration,)) # Following valid tokens
2188
2235
s = duration # String left to parse
2189
2236
# Loop until end token is found
2190
2237
while found_token is not token_end:
2250
2298
elif suffix == "w":
2251
2299
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2253
raise ValueError("Unknown suffix {0!r}"
2255
except (ValueError, IndexError) as e:
2301
raise ValueError("Unknown suffix {!r}".format(suffix))
2302
except IndexError as e:
2256
2303
raise ValueError(*(e.args))
2257
2304
timevalue += delta
2258
2305
return timevalue
2274
2321
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2275
2322
if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
2323
raise OSError(errno.ENODEV,
2277
"{0} not a character device"
2324
"{} not a character device"
2278
2325
.format(os.devnull))
2279
2326
os.dup2(null, sys.stdin.fileno())
2280
2327
os.dup2(null, sys.stdout.fileno())
2291
2338
parser = argparse.ArgumentParser()
2292
2339
parser.add_argument("-v", "--version", action="version",
2293
version = "%(prog)s {0}".format(version),
2340
version = "%(prog)s {}".format(version),
2294
2341
help="show version number and exit")
2295
2342
parser.add_argument("-i", "--interface", metavar="IF",
2296
2343
help="Bind to interface IF")
2329
2376
help="Directory to save/restore state in")
2330
2377
parser.add_argument("--foreground", action="store_true",
2331
2378
help="Run in foreground", default=None)
2379
parser.add_argument("--no-zeroconf", action="store_false",
2380
dest="zeroconf", help="Do not use Zeroconf",
2333
2383
options = parser.parse_args()
2335
2385
if options.check:
2387
fail_count, test_count = doctest.testmod()
2388
sys.exit(os.EX_OK if fail_count == 0 else 1)
2340
2390
# Default values for config file for server-global settings
2341
2391
server_defaults = { "interface": "",
2353
2404
"statedir": "/var/lib/mandos",
2354
2405
"foreground": "False",
2357
2409
# Parse config file for server-global settings
2358
2410
server_config = configparser.SafeConfigParser(server_defaults)
2359
2411
del server_defaults
2360
server_config.read(os.path.join(options.configdir,
2412
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2362
2413
# Convert the SafeConfigParser object to a dict
2363
2414
server_settings = server_config.defaults()
2364
2415
# Use the appropriate methods on the non-string config options
2382
2433
# Override the settings from the config file with command line
2383
2434
# options, if set.
2384
2435
for option in ("interface", "address", "port", "debug",
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2436
"priority", "servicename", "configdir", "use_dbus",
2437
"use_ipv6", "debuglevel", "restore", "statedir",
2438
"socket", "foreground", "zeroconf"):
2388
2439
value = getattr(options, option)
2389
2440
if value is not None:
2390
2441
server_settings[option] = value
2392
2443
# Force all strings to be unicode
2393
2444
for option in server_settings.keys():
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2445
if isinstance(server_settings[option], bytes):
2446
server_settings[option] = (server_settings[option]
2396
2448
# Force all boolean options to be boolean
2397
2449
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2450
"foreground", "zeroconf"):
2399
2451
server_settings[option] = bool(server_settings[option])
2400
2452
# Debug implies foreground
2401
2453
if server_settings["debug"]:
2405
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")
2407
2464
# For convenience
2408
2465
debug = server_settings["debug"]
2409
2466
debuglevel = server_settings["debuglevel"]
2423
2481
initlogger(debug, level)
2425
2483
if server_settings["servicename"] != "Mandos":
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2484
syslogger.setFormatter(
2485
logging.Formatter('Mandos ({}) [%(process)d]:'
2486
' %(levelname)s: %(message)s'.format(
2487
server_settings["servicename"])))
2432
2489
# Parse config file with clients
2433
2490
client_config = configparser.SafeConfigParser(Client
2438
2495
global mandos_dbus_service
2439
2496
mandos_dbus_service = None
2441
tcp_server = MandosServer((server_settings["address"],
2442
server_settings["port"]),
2444
interface=(server_settings["interface"]
2448
server_settings["priority"],
2450
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"],
2452
2509
if not foreground:
2453
pidfilename = "/var/run/mandos.pid"
2510
pidfilename = "/run/mandos.pid"
2511
if not os.path.isdir("/run/."):
2512
pidfilename = "/var/run/mandos.pid"
2456
pidfile = open(pidfilename, "w")
2515
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2516
except IOError as e:
2458
2517
logger.error("Could not open file %r", pidfilename,
2486
2545
def debug_gnutls(level, string):
2487
2546
logger.debug("GnuTLS: %s", string[:-1])
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
2548
gnutls.library.functions.gnutls_global_set_log_function(
2492
2551
# Redirect stdin so all checkers get /dev/null
2493
2552
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2515
2574
bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
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:
2521
2581
logger.error("Disabling D-Bus:", exc_info=e)
2522
2582
use_dbus = False
2523
2583
server_settings["use_dbus"] = False
2524
2584
tcp_server.use_dbus = False
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(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"))
2534
2596
global multiprocessing_manager
2535
2597
multiprocessing_manager = multiprocessing.Manager()
2554
2616
if server_settings["restore"]:
2556
2618
with open(stored_state_path, "rb") as stored_state:
2557
clients_data, old_client_settings = (pickle.load
2619
clients_data, old_client_settings = pickle.load(
2559
2621
os.remove(stored_state_path)
2560
2622
except IOError as e:
2561
2623
if e.errno == errno.ENOENT:
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
2624
logger.warning("Could not load persistent state:"
2625
" {}".format(os.strerror(e.errno)))
2565
2627
logger.critical("Could not load persistent state:",
2568
2630
except EOFError as e:
2569
2631
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2572
2635
with PGPEngine() as pgp:
2573
for client_name, client in clients_data.iteritems():
2636
for client_name, client in clients_data.items():
2574
2637
# Skip removed clients
2575
2638
if client_name not in client_settings:
2601
2664
if datetime.datetime.utcnow() >= client["expires"]:
2602
2665
if not client["last_checked_ok"]:
2603
2666
logger.warning(
2604
"disabling client {0} - Client never "
2605
"performed a successful checker"
2606
.format(client_name))
2667
"disabling client {} - Client never "
2668
"performed a successful checker".format(
2607
2670
client["enabled"] = False
2608
2671
elif client["last_checker_status"] != 0:
2609
2672
logger.warning(
2610
"disabling client {0} - Client "
2611
"last checker failed with error code {1}"
2612
.format(client_name,
2613
client["last_checker_status"]))
2673
"disabling client {} - Client last"
2674
" checker failed with error code"
2677
client["last_checker_status"]))
2614
2678
client["enabled"] = False
2616
client["expires"] = (datetime.datetime
2618
+ client["timeout"])
2680
client["expires"] = (
2681
datetime.datetime.utcnow()
2682
+ client["timeout"])
2619
2683
logger.debug("Last checker succeeded,"
2620
" keeping {0} enabled"
2621
.format(client_name))
2684
" keeping {} enabled".format(
2623
client["secret"] = (
2624
pgp.decrypt(client["encrypted_secret"],
2625
client_settings[client_name]
2687
client["secret"] = pgp.decrypt(
2688
client["encrypted_secret"],
2689
client_settings[client_name]["secret"])
2627
2690
except PGPError:
2628
2691
# If decryption fails, we use secret from new settings
2629
logger.debug("Failed to decrypt {0} old secret"
2630
.format(client_name))
2631
client["secret"] = (
2632
client_settings[client_name]["secret"])
2692
logger.debug("Failed to decrypt {} old secret".format(
2694
client["secret"] = (client_settings[client_name]
2634
2697
# Add/remove clients based on new changes made to config
2635
2698
for client_name in (set(old_client_settings)
2640
2703
clients_data[client_name] = client_settings[client_name]
2642
2705
# Create all client objects
2643
for client_name, client in clients_data.iteritems():
2706
for client_name, client in clients_data.items():
2644
2707
tcp_server.clients[client_name] = client_class(
2645
name = client_name, settings = client,
2646
2710
server_settings = server_settings)
2648
2712
if not tcp_server.clients:
2664
2728
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2732
@alternate_dbus_interfaces(
2733
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2669
2734
class MandosDBusService(DBusObjectWithProperties):
2670
2735
"""A D-Bus proxy object"""
2671
2737
def __init__(self):
2672
2738
dbus.service.Object.__init__(self, bus, "/")
2673
2740
_interface = "se.recompile.Mandos"
2675
2742
@dbus_interface_annotations(_interface)
2676
2743
def _foo(self):
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2745
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2681
2748
@dbus.service.signal(_interface, signature="o")
2682
2749
def ClientAdded(self, objpath):
2705
2771
def GetAllClientsWithProperties(self):
2707
2773
return dbus.Dictionary(
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
2774
{ c.dbus_object_path: c.GetAll("")
2775
for c in tcp_server.clients.itervalues() },
2710
2776
signature="oa{sv}")
2712
2778
@dbus.service.method(_interface, in_signature="o")
2750
2817
# A list of attributes that can not be pickled
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
2819
exclude = { "bus", "changedstate", "secret",
2820
"checker", "server_settings" }
2821
for name, typ in inspect.getmembers(dbus.service
2756
2823
exclude.add(name)
2758
2825
client_dict["encrypted_secret"] = (client
2765
2832
del client_settings[client.name]["secret"]
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2835
with tempfile.NamedTemporaryFile(
2839
dir=os.path.dirname(stored_state_path),
2840
delete=False) as stored_state:
2772
2841
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
2842
tempname = stored_state.name
2774
2843
os.rename(tempname, stored_state_path)
2775
2844
except (IOError, OSError) as e:
2779
2848
except NameError:
2781
2850
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
logger.warning("Could not save persistent state: {0}"
2851
logger.warning("Could not save persistent state: {}"
2783
2852
.format(os.strerror(e.errno)))
2785
2854
logger.warning("Could not save persistent state:",
2789
2858
# Delete all clients, and settings from config
2790
2859
while tcp_server.clients:
2814
2882
tcp_server.server_activate()
2816
2884
# Find out what port we got
2817
service.port = tcp_server.socket.getsockname()[1]
2886
service.port = tcp_server.socket.getsockname()[1]
2819
2888
logger.info("Now listening on address %r, port %d,"
2820
2889
" flowinfo %d, scope_id %d",
2826
2895
#service.interface = tcp_server.socket.getsockname()[3]
2829
# From the Avahi example code
2832
except dbus.exceptions.DBusException as error:
2833
logger.critical("D-Bus Exception", exc_info=error)
2836
# 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
2838
2908
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2839
2909
lambda *args, **kwargs: