11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
14
# Copyright © 2008-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 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
88
except ImportError:
89
89
SO_BINDTODEVICE = None
91
if sys.version_info.major == 2:
95
92
stored_state_file = "clients.pickle"
97
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
101
if_nametoindex = ctypes.cdll.LoadLibrary(
102
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
103
103
except (OSError, AttributeError):
105
104
def if_nametoindex(interface):
106
105
"Get an interface index the hard way, i.e. using fcntl()"
107
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
107
with contextlib.closing(socket.socket()) as s:
109
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
112
113
return interface_index
115
116
def initlogger(debug, level=logging.WARNING):
116
117
"""init logger and add loglevel"""
119
syslogger = (logging.handlers.SysLogHandler(
120
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = "/dev/log"))
122
119
syslogger.setFormatter(logging.Formatter
123
120
('Mandos [%(process)d]: %(levelname)s:'
176
172
def password_encode(self, password):
177
173
# Passphrase can not be empty and can not contain newlines or
178
174
# NUL bytes. So we prefix it and hex encode it.
179
encoded = b"mandos" + binascii.hexlify(password)
180
if len(encoded) > 2048:
181
# GnuPG can't handle long passwords, so encode differently
182
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
.replace(b"\n", b"\\n")
184
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
187
177
def encrypt(self, data, password):
188
178
passphrase = self.password_encode(password)
189
with tempfile.NamedTemporaryFile(
190
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
191
181
passfile.write(passphrase)
193
183
proc = subprocess.Popen(['gpg', '--symmetric',
205
195
def decrypt(self, data, password):
206
196
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(
208
dir = self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
209
199
passfile.write(passphrase)
211
201
proc = subprocess.Popen(['gpg', '--decrypt',
224
215
class AvahiError(Exception):
225
216
def __init__(self, value, *args, **kwargs):
226
217
self.value = value
227
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
231
222
class AvahiServiceError(AvahiError):
235
225
class AvahiGroupError(AvahiError):
257
247
bus: dbus.SystemBus()
261
interface = avahi.IF_UNSPEC,
269
protocol = avahi.PROTO_UNSPEC,
250
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
servicetype = None, port = None, TXT = None,
252
domain = "", host = "", max_renames = 32768,
253
protocol = avahi.PROTO_UNSPEC, bus = None):
271
254
self.interface = interface
273
256
self.type = servicetype
284
267
self.entry_group_state_changed_match = None
286
def rename(self, remove=True):
287
270
"""Derived from the Avahi example code"""
288
271
if self.rename_count >= self.max_renames:
289
272
logger.critical("No suitable Zeroconf service name found"
290
273
" after %i retries, exiting.",
291
274
self.rename_count)
292
275
raise AvahiServiceError("Too many renames")
294
self.server.GetAlternativeServiceName(self.name))
295
self.rename_count += 1
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
296
278
logger.info("Changing Zeroconf service name to %r ...",
302
283
except dbus.exceptions.DBusException as error:
303
if (error.get_dbus_name()
304
== "org.freedesktop.Avahi.CollisionError"):
305
logger.info("Local Zeroconf service name collision.")
306
return self.rename(remove=False)
308
logger.critical("D-Bus Exception", exc_info=error)
284
logger.critical("D-Bus Exception", exc_info=error)
287
self.rename_count += 1
312
289
def remove(self):
313
290
"""Derived from the Avahi example code"""
368
346
def server_state_changed(self, state, error=None):
369
347
"""Derived from the Avahi example code"""
370
348
logger.debug("Avahi server state change: %i", state)
372
avahi.SERVER_INVALID: "Zeroconf server invalid",
373
avahi.SERVER_REGISTERING: None,
374
avahi.SERVER_COLLISION: "Zeroconf server name collision",
375
avahi.SERVER_FAILURE: "Zeroconf server failure",
349
bad_states = { avahi.SERVER_INVALID:
350
"Zeroconf server invalid",
351
avahi.SERVER_REGISTERING: None,
352
avahi.SERVER_COLLISION:
353
"Zeroconf server name collision",
354
avahi.SERVER_FAILURE:
355
"Zeroconf server failure" }
377
356
if state in bad_states:
378
357
if bad_states[state] is not None:
379
358
if error is None:
398
377
follow_name_owner_changes=True),
399
378
avahi.DBUS_INTERFACE_SERVER)
400
379
self.server.connect_to_signal("StateChanged",
401
self.server_state_changed)
380
self.server_state_changed)
402
381
self.server_state_changed(self.server.GetState())
405
384
class AvahiServiceToSyslog(AvahiService):
406
def rename(self, *args, **kwargs):
407
386
"""Add the new name to the syslog messages"""
408
ret = AvahiService.rename(self, *args, **kwargs)
409
syslogger.setFormatter(logging.Formatter(
410
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
415
402
class Client(object):
416
403
"""A representation of a client host served by this server.
461
448
"fingerprint", "host", "interval",
462
449
"last_approval_request", "last_checked_ok",
463
450
"last_enabled", "name", "timeout")
466
"extended_timeout": "PT15M",
468
"checker": "fping -q -- %%(host)s",
470
"approval_delay": "PT0S",
471
"approval_duration": "PT1S",
472
"approved_by_default": "True",
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)
477
478
def config_parser(config):
543
541
self.expires = None
545
543
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()
546
547
logger.debug(" Fingerprint: %s", self.fingerprint)
547
548
self.created = settings.get("created",
548
549
datetime.datetime.utcnow())
555
556
self.current_checker_command = None
556
557
self.approved = None
557
558
self.approvals_pending = 0
558
self.changedstate = multiprocessing_manager.Condition(
559
multiprocessing_manager.Lock())
560
self.client_structure = [attr
561
for attr in self.__dict__.iterkeys()
559
self.changedstate = (multiprocessing_manager
560
.Condition(multiprocessing_manager
562
self.client_structure = [attr for attr in
563
self.__dict__.iterkeys()
562
564
if not attr.startswith("_")]
563
565
self.client_structure.append("client_structure")
565
for name, t in inspect.getmembers(
566
type(self), lambda obj: isinstance(obj, property)):
567
for name, t in inspect.getmembers(type(self),
567
571
if not name.startswith("_"):
568
572
self.client_structure.append(name)
611
615
# and every interval from then on.
612
616
if self.checker_initiator_tag is not None:
613
617
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = gobject.timeout_add(
615
int(self.interval.total_seconds() * 1000),
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
617
621
# Schedule a disable() when 'timeout' has passed
618
622
if self.disable_initiator_tag is not None:
619
623
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = gobject.timeout_add(
621
int(self.timeout.total_seconds() * 1000), self.disable)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
622
627
# Also start a new checker *right now*.
623
628
self.start_checker()
653
659
gobject.source_remove(self.disable_initiator_tag)
654
660
self.disable_initiator_tag = None
655
661
if getattr(self, "enabled", False):
656
self.disable_initiator_tag = gobject.timeout_add(
657
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
658
665
self.expires = datetime.datetime.utcnow() + timeout
660
667
def need_approval(self):
677
684
# If a checker exists, make sure it is not a zombie
679
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
680
except AttributeError:
682
except OSError as error:
683
if error.errno != errno.ECHILD:
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
687
693
logger.warning("Checker was a zombie")
691
697
# Start a new checker if needed
692
698
if self.checker is None:
693
699
# Escape attributes for the shell
695
attr: re.escape(str(getattr(self, attr)))
696
for attr in self.runtime_expansions }
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
698
705
command = self.checker_command % escaped_attrs
699
706
except TypeError as error:
700
707
logger.error('Could not format string "%s"',
701
self.checker_command,
703
return True # Try again later
708
self.checker_command, exc_info=error)
709
return True # Try again later
704
710
self.current_checker_command = command
706
logger.info("Starting checker %r for %s", command,
712
logger.info("Starting checker %r for %s",
708
714
# We don't need to redirect stdout and stderr, since
709
715
# in normal mode, that is already done by daemon(),
710
716
# and in debug mode we don't want to. (Stdin is
719
725
"stderr": wnull })
720
726
self.checker = subprocess.Popen(command,
725
730
except OSError as error:
726
731
logger.error("Failed to start subprocess",
729
self.checker_callback_tag = gobject.child_watch_add(
730
self.checker.pid, self.checker_callback, data=command)
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
731
738
# The checker may have completed before the gobject
732
739
# watch was added. Check for this.
764
771
self.checker = None
767
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
771
776
"""Decorators for marking methods of a DBusObjectWithProperties to
772
777
become properties on the D-Bus.
782
787
# "Set" method, so we fail early here:
783
788
if byte_arrays and signature != "ay":
784
789
raise ValueError("Byte arrays not supported for non-'ay'"
785
" signature {!r}".format(signature))
790
" signature {0!r}".format(signature))
787
791
def decorator(func):
788
792
func._dbus_is_property = True
789
793
func._dbus_interface = dbus_interface
823
824
"""Decorator to annotate D-Bus methods, signals or properties
826
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
827
"org.freedesktop.DBus.Property."
828
"EmitsChangedSignal": "false"})
829
827
@dbus_service_property("org.example.Interface", signature="b",
829
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
"org.freedesktop.DBus.Property."
831
"EmitsChangedSignal": "false"})
831
832
def Property_dbus_property(self):
832
833
return dbus.Boolean(False)
835
835
def decorator(func):
836
836
func._dbus_annotations = annotations
842
841
class DBusPropertyException(dbus.exceptions.DBusException):
843
842
"""A base class for D-Bus property-related exceptions
844
def __unicode__(self):
845
return unicode(str(self))
848
848
class DBusPropertyAccessException(DBusPropertyException):
872
872
If called like _is_dbus_thing("method") it returns a function
873
873
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
878
878
def _get_all_dbus_things(self, thing):
879
879
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
882
883
athing.__get__(self))
883
884
for cls in self.__class__.__mro__
884
885
for name, athing in
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
887
889
def _get_dbus_property(self, interface_name, property_name):
888
890
"""Returns a bound method if one exists which is a D-Bus
889
891
property with the specified name and interface.
891
for cls in self.__class__.__mro__:
892
for name, value in inspect.getmembers(
893
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
894
897
if (value._dbus_name == property_name
895
898
and value._dbus_interface == interface_name):
896
899
return value.__get__(self)
898
901
# No such property
899
raise DBusPropertyNotFound("{}:{}.{}".format(
900
self.dbus_object_path, interface_name, property_name))
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
904
907
out_signature="v")
905
908
def Get(self, interface_name, property_name):
906
909
"""Standard D-Bus property Get() method, see D-Bus standard.
924
927
# The byte_arrays option is not supported yet on
925
928
# signatures other than "ay".
926
929
if prop._dbus_signature != "ay":
927
raise ValueError("Byte arrays not supported for non-"
928
"'ay' signature {!r}"
929
.format(prop._dbus_signature))
930
931
value = dbus.ByteArray(b''.join(chr(byte)
931
932
for byte in value))
934
@dbus.service.method(dbus.PROPERTIES_IFACE,
935
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
936
936
out_signature="a{sv}")
937
937
def GetAll(self, interface_name):
938
938
"""Standard D-Bus property GetAll() method, see D-Bus
953
953
if not hasattr(value, "variant_level"):
954
954
properties[name] = value
956
properties[name] = type(value)(
957
value, variant_level = value.variant_level + 1)
956
properties[name] = type(value)(value, variant_level=
957
value.variant_level+1)
958
958
return dbus.Dictionary(properties, signature="sv")
960
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
961
def PropertiesChanged(self, interface_name, changed_properties,
962
invalidated_properties):
963
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
968
960
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
969
961
out_signature="s",
970
962
path_keyword='object_path',
980
972
document = xml.dom.minidom.parseString(xmlstring)
982
973
def make_tag(document, name, prop):
983
974
e = document.createElement("property")
984
975
e.setAttribute("name", name)
985
976
e.setAttribute("type", prop._dbus_signature)
986
977
e.setAttribute("access", prop._dbus_access)
989
979
for if_tag in document.getElementsByTagName("interface"):
990
980
# Add property tags
991
981
for tag in (make_tag(document, name, prop)
1003
993
if (name == tag.getAttribute("name")
1004
994
and prop._dbus_interface
1005
995
== if_tag.getAttribute("name")):
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1008
for name, value in annots.items():
996
annots.update(getattr
1000
for name, value in annots.iteritems():
1009
1001
ann_tag = document.createElement(
1011
1003
ann_tag.setAttribute("name", name)
1014
1006
# Add interface annotation tags
1015
1007
for annotation, value in dict(
1016
1008
itertools.chain.from_iterable(
1017
annotations().items()
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1009
annotations().iteritems()
1010
for name, annotations in
1011
self._get_all_dbus_things("interface")
1020
1012
if name == if_tag.getAttribute("name")
1022
1014
ann_tag = document.createElement("annotation")
1023
1015
ann_tag.setAttribute("name", annotation)
1024
1016
ann_tag.setAttribute("value", value)
1051
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1045
return dbus.String("", variant_level = variant_level)
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1057
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1088
1080
# Ignore non-D-Bus attributes, and D-Bus attributes
1089
1081
# with the wrong interface name
1090
1082
if (not hasattr(attribute, "_dbus_interface")
1091
or not attribute._dbus_interface.startswith(
1092
orig_interface_name)):
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1094
1086
# Create an alternate D-Bus interface name based on
1095
1087
# the current name
1096
alt_interface = attribute._dbus_interface.replace(
1097
orig_interface_name, alt_interface_name)
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1098
1091
interface_names.add(alt_interface)
1099
1092
# Is this a D-Bus signal?
1100
1093
if getattr(attribute, "_dbus_is_signal", False):
1101
1094
# Extract the original non-method undecorated
1102
1095
# function by black magic
1103
1096
nonmethod_func = (dict(
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
1097
zip(attribute.func_code.co_freevars,
1098
attribute.__closure__))["func"]
1107
1100
# Create a new, but exactly alike, function
1108
1101
# object, and decorate it to be a new D-Bus signal
1109
1102
# with the alternate D-Bus interface name
1110
new_function = (dbus.service.signal(
1111
alt_interface, attribute._dbus_signature)
1103
new_function = (dbus.service.signal
1105
attribute._dbus_signature)
1112
1106
(types.FunctionType(
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
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)))
1118
1112
# Copy annotations, if any
1120
new_function._dbus_annotations = dict(
1121
attribute._dbus_annotations)
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1122
1116
except AttributeError:
1124
1118
# Define a creator of a function to call both the
1129
1123
"""This function is a scope container to pass
1130
1124
func1 and func2 to the "call_both" function
1131
1125
outside of its arguments"""
1133
1126
def call_both(*args, **kwargs):
1134
1127
"""This function will emit two D-Bus
1135
1128
signals by calling func1 and func2"""
1136
1129
func1(*args, **kwargs)
1137
1130
func2(*args, **kwargs)
1139
1131
return call_both
1140
1132
# Create the "call_both" function and add it to
1146
1138
# object. Decorate it to be a new D-Bus method
1147
1139
# with the alternate D-Bus interface name. Add it
1148
1140
# to the class.
1150
dbus.service.method(
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1154
(types.FunctionType(attribute.func_code,
1155
attribute.func_globals,
1156
attribute.func_name,
1157
attribute.func_defaults,
1158
attribute.func_closure)))
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)))
1159
1151
# Copy annotations, if any
1161
attr[attrname]._dbus_annotations = dict(
1162
attribute._dbus_annotations)
1153
attr[attrname]._dbus_annotations = (
1154
dict(attribute._dbus_annotations))
1163
1155
except AttributeError:
1165
1157
# Is this a D-Bus property?
1168
1160
# object, and decorate it to be a new D-Bus
1169
1161
# property with the alternate D-Bus interface
1170
1162
# name. Add it to the class.
1171
attr[attrname] = (dbus_service_property(
1172
alt_interface, attribute._dbus_signature,
1173
attribute._dbus_access,
1174
attribute._dbus_get_args_options
1176
(types.FunctionType(
1177
attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
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)))
1182
1176
# Copy annotations, if any
1184
attr[attrname]._dbus_annotations = dict(
1185
attribute._dbus_annotations)
1178
attr[attrname]._dbus_annotations = (
1179
dict(attribute._dbus_annotations))
1186
1180
except AttributeError:
1188
1182
# Is this a D-Bus interface?
1191
1185
# object. Decorate it to be a new D-Bus interface
1192
1186
# with the alternate D-Bus interface name. Add it
1193
1187
# to the class.
1195
dbus_interface_annotations(alt_interface)
1196
(types.FunctionType(attribute.func_code,
1197
attribute.func_globals,
1198
attribute.func_name,
1199
attribute.func_defaults,
1200
attribute.func_closure)))
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)))
1202
1197
# Deprecate all alternate interfaces
1203
iname="_AlternateDBusNames_interface_annotation{}"
1198
iname="_AlternateDBusNames_interface_annotation{0}"
1204
1199
for interface_name in interface_names:
1206
1200
@dbus_interface_annotations(interface_name)
1207
1201
def func(self):
1208
1202
return { "org.freedesktop.DBus.Deprecated":
1210
1204
# Find an unused name
1211
1205
for aname in (iname.format(i)
1212
1206
for i in itertools.count()):
1216
1210
if interface_names:
1217
1211
# Replace the class with a new subclass of it with
1218
1212
# methods, signals, etc. as created above.
1219
cls = type(b"{}Alternate".format(cls.__name__),
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1226
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
1227
"se.bsnet.fukt.Mandos"})
1220
"se.bsnet.fukt.Mandos"})
1228
1221
class ClientDBus(Client, DBusObjectWithProperties):
1229
1222
"""A Client class using D-Bus
1245
1236
Client.__init__(self, *args, **kwargs)
1246
1237
# Only now, when this client is initialized, can it show up on
1248
client_object_name = str(self.name).translate(
1239
client_object_name = unicode(self.name).translate(
1249
1240
{ord("."): ord("_"),
1250
1241
ord("-"): ord("_")})
1251
self.dbus_object_path = dbus.ObjectPath(
1252
"/clients/" + client_object_name)
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1253
1244
DBusObjectWithProperties.__init__(self, self.bus,
1254
1245
self.dbus_object_path)
1256
def notifychangeproperty(transform_func, dbus_name,
1257
type_func=lambda x: x,
1259
invalidate_only=False,
1260
_interface=_interface):
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1261
1250
""" Modify a variable so that it's a property which announces
1262
1251
its changes to DBus.
1268
1257
to the D-Bus. Default: no transform
1269
1258
variant_level: D-Bus variant level. Default: 1
1271
attrname = "_{}".format(dbus_name)
1260
attrname = "_{0}".format(dbus_name)
1273
1261
def setter(self, value):
1274
1262
if hasattr(self, "dbus_object_path"):
1275
1263
if (not hasattr(self, attrname) or
1276
1264
type_func(getattr(self, attrname, None))
1277
1265
!= type_func(value)):
1279
self.PropertiesChanged(
1280
_interface, dbus.Dictionary(),
1281
dbus.Array((dbus_name, )))
1283
dbus_value = transform_func(
1285
variant_level = variant_level)
1286
self.PropertyChanged(dbus.String(dbus_name),
1288
self.PropertiesChanged(
1290
dbus.Dictionary({ dbus.String(dbus_name):
1266
dbus_value = transform_func(type_func(value),
1269
self.PropertyChanged(dbus.String(dbus_name),
1293
1271
setattr(self, attrname, value)
1295
1273
return property(lambda self: getattr(self, attrname), setter)
1301
1279
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1302
1280
last_enabled = notifychangeproperty(datetime_to_dbus,
1304
checker = notifychangeproperty(
1305
dbus.Boolean, "CheckerRunning",
1306
type_func = lambda checker: checker is not None)
1282
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1283
type_func = lambda checker:
1284
checker is not None)
1307
1285
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1308
1286
"LastCheckedOK")
1309
1287
last_checker_status = notifychangeproperty(dbus.Int16,
1312
1290
datetime_to_dbus, "LastApprovalRequest")
1313
1291
approved_by_default = notifychangeproperty(dbus.Boolean,
1314
1292
"ApprovedByDefault")
1315
approval_delay = notifychangeproperty(
1316
dbus.UInt64, "ApprovalDelay",
1317
type_func = lambda td: td.total_seconds() * 1000)
1293
approval_delay = notifychangeproperty(dbus.UInt64,
1296
timedelta_to_milliseconds)
1318
1297
approval_duration = notifychangeproperty(
1319
1298
dbus.UInt64, "ApprovalDuration",
1320
type_func = lambda td: td.total_seconds() * 1000)
1299
type_func = timedelta_to_milliseconds)
1321
1300
host = notifychangeproperty(dbus.String, "Host")
1322
timeout = notifychangeproperty(
1323
dbus.UInt64, "Timeout",
1324
type_func = lambda td: td.total_seconds() * 1000)
1301
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1303
timedelta_to_milliseconds)
1325
1304
extended_timeout = notifychangeproperty(
1326
1305
dbus.UInt64, "ExtendedTimeout",
1327
type_func = lambda td: td.total_seconds() * 1000)
1328
interval = notifychangeproperty(
1329
dbus.UInt64, "Interval",
1330
type_func = lambda td: td.total_seconds() * 1000)
1306
type_func = timedelta_to_milliseconds)
1307
interval = notifychangeproperty(dbus.UInt64,
1310
timedelta_to_milliseconds)
1331
1311
checker_command = notifychangeproperty(dbus.String, "Checker")
1332
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1333
invalidate_only=True)
1335
1313
del notifychangeproperty
1363
1341
*args, **kwargs)
1365
1343
def start_checker(self, *args, **kwargs):
1366
old_checker_pid = getattr(self.checker, "pid", None)
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1367
1349
r = Client.start_checker(self, *args, **kwargs)
1368
1350
# Only if new checker process was started
1369
1351
if (self.checker is not None
1379
1361
def approve(self, value=True):
1380
1362
self.approved = value
1381
gobject.timeout_add(int(self.approval_duration.total_seconds()
1382
* 1000), self._reset_approved)
1363
gobject.timeout_add(timedelta_to_milliseconds
1364
(self.approval_duration),
1365
self._reset_approved)
1383
1366
self.send_changedstate()
1385
1368
## D-Bus methods, signals & properties
1369
_interface = "se.recompile.Mandos.Client"
1373
@dbus_interface_annotations(_interface)
1375
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1391
1380
# CheckerCompleted - signal
1471
1459
return dbus.Boolean(bool(self.approvals_pending))
1473
1461
# ApprovedByDefault - property
1474
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
1476
1463
access="readwrite")
1477
1464
def ApprovedByDefault_dbus_property(self, value=None):
1478
1465
if value is None: # get
1480
1467
self.approved_by_default = bool(value)
1482
1469
# ApprovalDelay - property
1483
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
1485
1471
access="readwrite")
1486
1472
def ApprovalDelay_dbus_property(self, value=None):
1487
1473
if value is None: # get
1488
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1490
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1492
1477
# ApprovalDuration - property
1493
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
1495
1479
access="readwrite")
1496
1480
def ApprovalDuration_dbus_property(self, value=None):
1497
1481
if value is None: # get
1498
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1500
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1502
1486
# Name - property
1510
1494
return dbus.String(self.fingerprint)
1512
1496
# Host - property
1513
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
1515
1498
access="readwrite")
1516
1499
def Host_dbus_property(self, value=None):
1517
1500
if value is None: # get
1518
1501
return dbus.String(self.host)
1519
self.host = str(value)
1502
self.host = unicode(value)
1521
1504
# Created - property
1522
1505
@dbus_service_property(_interface, signature="s", access="read")
1551
1532
return datetime_to_dbus(self.last_checked_ok)
1553
1534
# LastCheckerStatus - property
1554
@dbus_service_property(_interface, signature="n", access="read")
1535
@dbus_service_property(_interface, signature="n",
1555
1537
def LastCheckerStatus_dbus_property(self):
1556
1538
return dbus.Int16(self.last_checker_status)
1566
1548
return datetime_to_dbus(self.last_approval_request)
1568
1550
# Timeout - property
1569
@dbus_service_property(_interface,
1551
@dbus_service_property(_interface, signature="t",
1571
1552
access="readwrite")
1572
1553
def Timeout_dbus_property(self, value=None):
1573
1554
if value is None: # get
1574
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1555
return dbus.UInt64(self.timeout_milliseconds())
1575
1556
old_timeout = self.timeout
1576
1557
self.timeout = datetime.timedelta(0, 0, 0, value)
1577
1558
# Reschedule disabling
1588
1569
gobject.source_remove(self.disable_initiator_tag)
1589
self.disable_initiator_tag = gobject.timeout_add(
1590
int((self.expires - now).total_seconds() * 1000),
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
1593
1575
# ExtendedTimeout - property
1594
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
1596
1577
access="readwrite")
1597
1578
def ExtendedTimeout_dbus_property(self, value=None):
1598
1579
if value is None: # get
1599
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
1601
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1603
1583
# Interval - property
1604
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
1606
1585
access="readwrite")
1607
1586
def Interval_dbus_property(self, value=None):
1608
1587
if value is None: # get
1609
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
1610
1589
self.interval = datetime.timedelta(0, 0, 0, value)
1611
1590
if getattr(self, "checker_initiator_tag", None) is None:
1613
1592
if self.enabled:
1614
1593
# Reschedule checker run
1615
1594
gobject.source_remove(self.checker_initiator_tag)
1616
self.checker_initiator_tag = gobject.timeout_add(
1617
value, self.start_checker)
1618
self.start_checker() # Start one now, too
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
1620
1599
# Checker - property
1621
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
1623
1601
access="readwrite")
1624
1602
def Checker_dbus_property(self, value=None):
1625
1603
if value is None: # get
1626
1604
return dbus.String(self.checker_command)
1627
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
1629
1607
# CheckerRunning - property
1630
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
1632
1609
access="readwrite")
1633
1610
def CheckerRunning_dbus_property(self, value=None):
1634
1611
if value is None: # get
1644
1621
return self.dbus_object_path # is already a dbus.ObjectPath
1646
1623
# Secret = property
1647
@dbus_service_property(_interface,
1624
@dbus_service_property(_interface, signature="ay",
1625
access="write", byte_arrays=True)
1651
1626
def Secret_dbus_property(self, value):
1652
self.secret = bytes(value)
1627
self.secret = str(value)
1669
1644
if data[0] == 'data':
1671
1646
if data[0] == 'function':
1673
1647
def func(*args, **kwargs):
1674
1648
self._pipe.send(('funcall', name, args, kwargs))
1675
1649
return self._pipe.recv()[1]
1679
1652
def __setattr__(self, name, value):
1691
1664
def handle(self):
1692
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
1693
1666
logger.info("TCP connection from: %s",
1694
str(self.client_address))
1667
unicode(self.client_address))
1695
1668
logger.debug("Pipe FD: %d",
1696
1669
self.server.child_pipe.fileno())
1698
session = gnutls.connection.ClientSession(
1699
self.request, gnutls.connection .X509Credentials())
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1701
1676
# Note: gnutls.connection.X509Credentials is really a
1702
1677
# generic GnuTLS certificate credentials object so long as
1711
1686
priority = self.server.gnutls_priority
1712
1687
if priority is None:
1713
1688
priority = "NORMAL"
1714
gnutls.library.functions.gnutls_priority_set_direct(
1715
session._c_object, priority, None)
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
1717
1693
# Start communication using the Mandos protocol
1718
1694
# Get protocol number
1788
1764
#wait until timeout or approved
1789
1765
time = datetime.datetime.now()
1790
1766
client.changedstate.acquire()
1791
client.changedstate.wait(delay.total_seconds())
1767
client.changedstate.wait(
1768
float(timedelta_to_milliseconds(delay)
1792
1770
client.changedstate.release()
1793
1771
time2 = datetime.datetime.now()
1794
1772
if (time2 - time) >= delay:
1813
1791
logger.warning("gnutls send failed",
1814
1792
exc_info=error)
1816
logger.debug("Sent: %d, remaining: %d", sent,
1817
len(client.secret) - (sent_size
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
1819
1797
sent_size += sent
1821
1799
logger.info("Sending secret to %s", client.name)
1838
1816
def peer_certificate(session):
1839
1817
"Return the peer's OpenPGP certificate as a bytestring"
1840
1818
# If not an OpenPGP certificate...
1841
if (gnutls.library.functions.gnutls_certificate_type_get(
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1843
1821
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1844
1822
# ...do the normal thing
1845
1823
return session.peer_certificate
1859
1837
def fingerprint(openpgp):
1860
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1861
1839
# New GnuTLS "datum" with the OpenPGP public key
1862
datum = gnutls.library.types.gnutls_datum_t(
1863
ctypes.cast(ctypes.c_char_p(openpgp),
1864
ctypes.POINTER(ctypes.c_ubyte)),
1865
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
1866
1845
# New empty GnuTLS certificate
1867
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1870
1849
# Import the OpenPGP public key into the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
1874
1854
# Verify the self signature in the key
1875
1855
crtverify = ctypes.c_uint()
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
1878
1859
if crtverify.value != 0:
1879
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
raise gnutls.errors.CertificateSecurityError(
1861
raise (gnutls.errors.CertificateSecurityError
1882
1863
# New buffer for the fingerprint
1883
1864
buf = ctypes.create_string_buffer(20)
1884
1865
buf_len = ctypes.c_size_t()
1885
1866
# Get the fingerprint from the certificate into the buffer
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
1888
1870
# Deinit the certificate
1889
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1890
1872
# Convert the buffer to a Python bytestring
1941
1921
interface: None or a network interface name (string)
1942
1922
use_ipv6: Boolean; to use IPv6 or not
1945
1924
def __init__(self, server_address, RequestHandlerClass,
1925
interface=None, use_ipv6=True, socketfd=None):
1949
1926
"""If socketfd is set, use that file descriptor instead of
1950
1927
creating a new one with socket.socket().
1992
1969
self.interface)
1995
self.socket.setsockopt(
1996
socket.SOL_SOCKET, SO_BINDTODEVICE,
1997
(self.interface + "\0").encode("utf-8"))
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
1998
1975
except socket.error as error:
1999
1976
if error.errno == errno.EPERM:
2000
1977
logger.error("No permission to bind to"
2018
1995
self.server_address = (any_address,
2019
1996
self.server_address[1])
2020
1997
elif not self.server_address[1]:
2021
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2022
2000
# if self.interface:
2023
2001
# self.server_address = (self.server_address[0],
2039
2017
Assumes a gobject.MainLoop event loop.
2042
2019
def __init__(self, server_address, RequestHandlerClass,
2046
gnutls_priority=None,
2020
interface=None, use_ipv6=True, clients=None,
2021
gnutls_priority=None, use_dbus=True, socketfd=None):
2049
2022
self.enabled = False
2050
2023
self.clients = clients
2051
2024
if self.clients is None:
2068
2040
def add_pipe(self, parent_pipe, proc):
2069
2041
# Call "handle_ipc" for both data and EOF events
2070
gobject.io_add_watch(
2071
parent_pipe.fileno(),
2072
gobject.IO_IN | gobject.IO_HUP,
2073
functools.partial(self.handle_ipc,
2074
parent_pipe = parent_pipe,
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
functools.partial(self.handle_ipc,
2077
def handle_ipc(self, source, condition,
2080
client_object=None):
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2081
2051
# error, or the other end of multiprocessing.Pipe has closed
2082
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2083
2053
# Wait for other process to exit
2106
2076
parent_pipe.send(False)
2109
gobject.io_add_watch(
2110
parent_pipe.fileno(),
2111
gobject.IO_IN | gobject.IO_HUP,
2112
functools.partial(self.handle_ipc,
2113
parent_pipe = parent_pipe,
2115
client_object = client))
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2116
2087
parent_pipe.send(True)
2117
2088
# remove the old hook in favor of the new above hook on
2125
2096
parent_pipe.send(('data', getattr(client_object,
2126
2097
funcname)(*args,
2129
2100
if command == 'getattr':
2130
2101
attrname = request[1]
2131
2102
if callable(client_object.__getattribute__(attrname)):
2132
parent_pipe.send(('function', ))
2103
parent_pipe.send(('function',))
2135
'data', client_object.__getattribute__(attrname)))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2137
2108
if command == 'setattr':
2138
2109
attrname = request[1]
2179
2150
"followers")) # Tokens valid after
2181
Token = collections.namedtuple("Token", (
2182
"regexp", # To match token; if "value" is not None, must have
2183
# a "group" containing digits
2184
"value", # datetime.timedelta or None
2185
"followers")) # Tokens valid after this token
2186
2152
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2187
2153
# the "duration" ABNF definition in RFC 3339, Appendix A.
2188
2154
token_end = Token(re.compile(r"$"), None, frozenset())
2189
2155
token_second = Token(re.compile(r"(\d+)S"),
2190
2156
datetime.timedelta(seconds=1),
2191
frozenset((token_end, )))
2157
frozenset((token_end,)))
2192
2158
token_minute = Token(re.compile(r"(\d+)M"),
2193
2159
datetime.timedelta(minutes=1),
2194
2160
frozenset((token_second, token_end)))
2210
2176
frozenset((token_month, token_end)))
2211
2177
token_week = Token(re.compile(r"(\d+)W"),
2212
2178
datetime.timedelta(weeks=1),
2213
frozenset((token_end, )))
2179
frozenset((token_end,)))
2214
2180
token_duration = Token(re.compile(r"P"), None,
2215
2181
frozenset((token_year, token_month,
2216
2182
token_day, token_time,
2218
2184
# Define starting values
2219
2185
value = datetime.timedelta() # Value so far
2220
2186
found_token = None
2221
followers = frozenset((token_duration,)) # Following valid tokens
2187
followers = frozenset(token_duration,) # Following valid tokens
2222
2188
s = duration # String left to parse
2223
2189
# Loop until end token is found
2224
2190
while found_token is not token_end:
2284
2250
elif suffix == "w":
2285
2251
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2287
raise ValueError("Unknown suffix {!r}".format(suffix))
2288
except IndexError as e:
2253
raise ValueError("Unknown suffix {0!r}"
2255
except (ValueError, IndexError) as e:
2289
2256
raise ValueError(*(e.args))
2290
2257
timevalue += delta
2291
2258
return timevalue
2307
2274
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2308
2275
if not stat.S_ISCHR(os.fstat(null).st_mode):
2309
2276
raise OSError(errno.ENODEV,
2310
"{} not a character device"
2277
"{0} not a character device"
2311
2278
.format(os.devnull))
2312
2279
os.dup2(null, sys.stdin.fileno())
2313
2280
os.dup2(null, sys.stdout.fileno())
2324
2291
parser = argparse.ArgumentParser()
2325
2292
parser.add_argument("-v", "--version", action="version",
2326
version = "%(prog)s {}".format(version),
2293
version = "%(prog)s {0}".format(version),
2327
2294
help="show version number and exit")
2328
2295
parser.add_argument("-i", "--interface", metavar="IF",
2329
2296
help="Bind to interface IF")
2362
2329
help="Directory to save/restore state in")
2363
2330
parser.add_argument("--foreground", action="store_true",
2364
2331
help="Run in foreground", default=None)
2365
parser.add_argument("--no-zeroconf", action="store_false",
2366
dest="zeroconf", help="Do not use Zeroconf",
2369
2333
options = parser.parse_args()
2371
2335
if options.check:
2373
fail_count, test_count = doctest.testmod()
2374
sys.exit(os.EX_OK if fail_count == 0 else 1)
2376
2340
# Default values for config file for server-global settings
2377
2341
server_defaults = { "interface": "",
2390
2353
"statedir": "/var/lib/mandos",
2391
2354
"foreground": "False",
2395
2357
# Parse config file for server-global settings
2396
2358
server_config = configparser.SafeConfigParser(server_defaults)
2397
2359
del server_defaults
2398
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2360
server_config.read(os.path.join(options.configdir,
2399
2362
# Convert the SafeConfigParser object to a dict
2400
2363
server_settings = server_config.defaults()
2401
2364
# Use the appropriate methods on the non-string config options
2419
2382
# Override the settings from the config file with command line
2420
2383
# options, if set.
2421
2384
for option in ("interface", "address", "port", "debug",
2422
"priority", "servicename", "configdir", "use_dbus",
2423
"use_ipv6", "debuglevel", "restore", "statedir",
2424
"socket", "foreground", "zeroconf"):
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2425
2388
value = getattr(options, option)
2426
2389
if value is not None:
2427
2390
server_settings[option] = value
2429
2392
# Force all strings to be unicode
2430
2393
for option in server_settings.keys():
2431
if isinstance(server_settings[option], bytes):
2432
server_settings[option] = (server_settings[option]
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2434
2396
# Force all boolean options to be boolean
2435
2397
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2436
"foreground", "zeroconf"):
2437
2399
server_settings[option] = bool(server_settings[option])
2438
2400
# Debug implies foreground
2439
2401
if server_settings["debug"]:
2443
2405
##################################################################
2445
if (not server_settings["zeroconf"]
2446
and not (server_settings["port"]
2447
or server_settings["socket"] != "")):
2448
parser.error("Needs port or socket to work without Zeroconf")
2450
2407
# For convenience
2451
2408
debug = server_settings["debug"]
2452
2409
debuglevel = server_settings["debuglevel"]
2467
2423
initlogger(debug, level)
2469
2425
if server_settings["servicename"] != "Mandos":
2470
syslogger.setFormatter(
2471
logging.Formatter('Mandos ({}) [%(process)d]:'
2472
' %(levelname)s: %(message)s'.format(
2473
server_settings["servicename"])))
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2475
2432
# Parse config file with clients
2476
2433
client_config = configparser.SafeConfigParser(Client
2481
2438
global mandos_dbus_service
2482
2439
mandos_dbus_service = None
2485
if server_settings["socket"] != "":
2486
socketfd = server_settings["socket"]
2487
tcp_server = MandosServer(
2488
(server_settings["address"], server_settings["port"]),
2490
interface=(server_settings["interface"] or None),
2492
gnutls_priority=server_settings["priority"],
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"]
2495
2452
if not foreground:
2496
2453
pidfilename = "/run/mandos.pid"
2497
if not os.path.isdir("/run/."):
2498
pidfilename = "/var/run/mandos.pid"
2501
2456
pidfile = open(pidfilename, "w")
2531
2486
def debug_gnutls(level, string):
2532
2487
logger.debug("GnuTLS: %s", string[:-1])
2534
gnutls.library.functions.gnutls_global_set_log_function(
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
2537
2492
# Redirect stdin so all checkers get /dev/null
2538
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2560
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
2563
old_bus_name = dbus.service.BusName(
2564
"se.bsnet.fukt.Mandos", bus,
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2566
2520
except dbus.exceptions.NameExistsException as e:
2567
2521
logger.error("Disabling D-Bus:", exc_info=e)
2568
2522
use_dbus = False
2569
2523
server_settings["use_dbus"] = False
2570
2524
tcp_server.use_dbus = False
2572
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2573
service = AvahiServiceToSyslog(
2574
name = server_settings["servicename"],
2575
servicetype = "_mandos._tcp",
2576
protocol = protocol,
2578
if server_settings["interface"]:
2579
service.interface = if_nametoindex(
2580
server_settings["interface"].encode("utf-8"))
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"])))
2582
2534
global multiprocessing_manager
2583
2535
multiprocessing_manager = multiprocessing.Manager()
2602
2554
if server_settings["restore"]:
2604
2556
with open(stored_state_path, "rb") as stored_state:
2605
clients_data, old_client_settings = pickle.load(
2557
clients_data, old_client_settings = (pickle.load
2607
2559
os.remove(stored_state_path)
2608
2560
except IOError as e:
2609
2561
if e.errno == errno.ENOENT:
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
2613
2565
logger.critical("Could not load persistent state:",
2616
2568
except EOFError as e:
2617
2569
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2621
2572
with PGPEngine() as pgp:
2622
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
2623
2574
# Skip removed clients
2624
2575
if client_name not in client_settings:
2650
2601
if datetime.datetime.utcnow() >= client["expires"]:
2651
2602
if not client["last_checked_ok"]:
2652
2603
logger.warning(
2653
"disabling client {} - Client never "
2654
"performed a successful checker".format(
2604
"disabling client {0} - Client never "
2605
"performed a successful checker"
2606
.format(client_name))
2656
2607
client["enabled"] = False
2657
2608
elif client["last_checker_status"] != 0:
2658
2609
logger.warning(
2659
"disabling client {} - Client last"
2660
" checker failed with error code"
2663
client["last_checker_status"]))
2610
"disabling client {0} - Client "
2611
"last checker failed with error code {1}"
2612
.format(client_name,
2613
client["last_checker_status"]))
2664
2614
client["enabled"] = False
2666
client["expires"] = (
2667
datetime.datetime.utcnow()
2668
+ client["timeout"])
2616
client["expires"] = (datetime.datetime
2618
+ client["timeout"])
2669
2619
logger.debug("Last checker succeeded,"
2670
" keeping {} enabled".format(
2620
" keeping {0} enabled"
2621
.format(client_name))
2673
client["secret"] = pgp.decrypt(
2674
client["encrypted_secret"],
2675
client_settings[client_name]["secret"])
2623
client["secret"] = (
2624
pgp.decrypt(client["encrypted_secret"],
2625
client_settings[client_name]
2676
2627
except PGPError:
2677
2628
# If decryption fails, we use secret from new settings
2678
logger.debug("Failed to decrypt {} old secret".format(
2680
client["secret"] = (client_settings[client_name]
2629
logger.debug("Failed to decrypt {0} old secret"
2630
.format(client_name))
2631
client["secret"] = (
2632
client_settings[client_name]["secret"])
2683
2634
# Add/remove clients based on new changes made to config
2684
2635
for client_name in (set(old_client_settings)
2689
2640
clients_data[client_name] = client_settings[client_name]
2691
2642
# Create all client objects
2692
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
2693
2644
tcp_server.clients[client_name] = client_class(
2645
name = client_name, settings = client,
2696
2646
server_settings = server_settings)
2698
2648
if not tcp_server.clients:
2714
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2718
@alternate_dbus_interfaces(
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2720
2669
class MandosDBusService(DBusObjectWithProperties):
2721
2670
"""A D-Bus proxy object"""
2723
2671
def __init__(self):
2724
2672
dbus.service.Object.__init__(self, bus, "/")
2726
2673
_interface = "se.recompile.Mandos"
2728
2675
@dbus_interface_annotations(_interface)
2729
2676
def _foo(self):
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2734
2681
@dbus.service.signal(_interface, signature="o")
2735
2682
def ClientAdded(self, objpath):
2757
2705
def GetAllClientsWithProperties(self):
2759
2707
return dbus.Dictionary(
2760
{ c.dbus_object_path: c.GetAll("")
2761
for c in tcp_server.clients.itervalues() },
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
2762
2710
signature="oa{sv}")
2764
2712
@dbus.service.method(_interface, in_signature="o")
2803
2750
# A list of attributes that can not be pickled
2805
exclude = { "bus", "changedstate", "secret",
2806
"checker", "server_settings" }
2807
for name, typ in inspect.getmembers(dbus.service
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
2809
2756
exclude.add(name)
2811
2758
client_dict["encrypted_secret"] = (client
2818
2765
del client_settings[client.name]["secret"]
2821
with tempfile.NamedTemporaryFile(
2825
dir=os.path.dirname(stored_state_path),
2826
delete=False) as stored_state:
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:
2827
2772
pickle.dump((clients, client_settings), stored_state)
2828
tempname = stored_state.name
2773
tempname=stored_state.name
2829
2774
os.rename(tempname, stored_state_path)
2830
2775
except (IOError, OSError) as e:
2834
2779
except NameError:
2836
2781
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2837
logger.warning("Could not save persistent state: {}"
2782
logger.warning("Could not save persistent state: {0}"
2838
2783
.format(os.strerror(e.errno)))
2840
2785
logger.warning("Could not save persistent state:",
2844
2789
# Delete all clients, and settings from config
2845
2790
while tcp_server.clients:
2868
2814
tcp_server.server_activate()
2870
2816
# Find out what port we got
2872
service.port = tcp_server.socket.getsockname()[1]
2817
service.port = tcp_server.socket.getsockname()[1]
2874
2819
logger.info("Now listening on address %r, port %d,"
2875
2820
" flowinfo %d, scope_id %d",
2881
2826
#service.interface = tcp_server.socket.getsockname()[3]
2885
# From the Avahi example code
2888
except dbus.exceptions.DBusException as error:
2889
logger.critical("D-Bus Exception", exc_info=error)
2892
# End of Avahi example code
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
2894
2838
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2895
2839
lambda *args, **kwargs: