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-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 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()
101
if_nametoindex = ctypes.cdll.LoadLibrary(
102
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
103
101
except (OSError, AttributeError):
105
102
def if_nametoindex(interface):
106
103
"Get an interface index the hard way, i.e. using fcntl()"
107
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
105
with contextlib.closing(socket.socket()) as s:
109
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
112
111
return interface_index
115
114
def initlogger(debug, level=logging.WARNING):
116
115
"""init logger and add loglevel"""
119
syslogger = (logging.handlers.SysLogHandler(
120
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = "/dev/log"))
117
syslogger = (logging.handlers.SysLogHandler
119
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
122
121
syslogger.setFormatter(logging.Formatter
123
122
('Mandos [%(process)d]: %(levelname)s:'
187
185
def encrypt(self, data, password):
188
186
passphrase = self.password_encode(password)
189
with tempfile.NamedTemporaryFile(
190
dir=self.tempdir) as passfile:
187
with tempfile.NamedTemporaryFile(dir=self.tempdir
191
189
passfile.write(passphrase)
193
191
proc = subprocess.Popen(['gpg', '--symmetric',
205
203
def decrypt(self, data, password):
206
204
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(
208
dir = self.tempdir) as passfile:
205
with tempfile.NamedTemporaryFile(dir = self.tempdir
209
207
passfile.write(passphrase)
211
209
proc = subprocess.Popen(['gpg', '--decrypt',
224
223
class AvahiError(Exception):
225
224
def __init__(self, value, *args, **kwargs):
226
225
self.value = value
227
return super(AvahiError, self).__init__(value, *args,
226
super(AvahiError, self).__init__(value, *args, **kwargs)
227
def __unicode__(self):
228
return unicode(repr(self.value))
231
230
class AvahiServiceError(AvahiError):
235
233
class AvahiGroupError(AvahiError):
257
255
bus: dbus.SystemBus()
261
interface = avahi.IF_UNSPEC,
269
protocol = avahi.PROTO_UNSPEC,
258
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
259
servicetype = None, port = None, TXT = None,
260
domain = "", host = "", max_renames = 32768,
261
protocol = avahi.PROTO_UNSPEC, bus = None):
271
262
self.interface = interface
273
264
self.type = servicetype
284
275
self.entry_group_state_changed_match = None
286
def rename(self, remove=True):
287
278
"""Derived from the Avahi example code"""
288
279
if self.rename_count >= self.max_renames:
289
280
logger.critical("No suitable Zeroconf service name found"
290
281
" after %i retries, exiting.",
291
282
self.rename_count)
292
283
raise AvahiServiceError("Too many renames")
294
self.server.GetAlternativeServiceName(self.name))
295
self.rename_count += 1
284
self.name = unicode(self.server
285
.GetAlternativeServiceName(self.name))
296
286
logger.info("Changing Zeroconf service name to %r ...",
302
291
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)
292
logger.critical("D-Bus Exception", exc_info=error)
295
self.rename_count += 1
312
297
def remove(self):
313
298
"""Derived from the Avahi example code"""
368
354
def server_state_changed(self, state, error=None):
369
355
"""Derived from the Avahi example code"""
370
356
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",
357
bad_states = { avahi.SERVER_INVALID:
358
"Zeroconf server invalid",
359
avahi.SERVER_REGISTERING: None,
360
avahi.SERVER_COLLISION:
361
"Zeroconf server name collision",
362
avahi.SERVER_FAILURE:
363
"Zeroconf server failure" }
377
364
if state in bad_states:
378
365
if bad_states[state] is not None:
379
366
if error is None:
398
385
follow_name_owner_changes=True),
399
386
avahi.DBUS_INTERFACE_SERVER)
400
387
self.server.connect_to_signal("StateChanged",
401
self.server_state_changed)
388
self.server_state_changed)
402
389
self.server_state_changed(self.server.GetState())
405
392
class AvahiServiceToSyslog(AvahiService):
406
def rename(self, *args, **kwargs):
407
394
"""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'
395
ret = AvahiService.rename(self)
396
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
398
' %(levelname)s: %(message)s'
403
def timedelta_to_milliseconds(td):
404
"Convert a datetime.timedelta() to milliseconds"
405
return ((td.days * 24 * 60 * 60 * 1000)
406
+ (td.seconds * 1000)
407
+ (td.microseconds // 1000))
415
410
class Client(object):
416
411
"""A representation of a client host served by this server.
461
456
"fingerprint", "host", "interval",
462
457
"last_approval_request", "last_checked_ok",
463
458
"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",
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
462
"checker": "fping -q -- %%(host)s",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
466
"approved_by_default": "True",
470
def timeout_milliseconds(self):
471
"Return the 'timeout' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.timeout)
474
def extended_timeout_milliseconds(self):
475
"Return the 'extended_timeout' attribute in milliseconds"
476
return timedelta_to_milliseconds(self.extended_timeout)
478
def interval_milliseconds(self):
479
"Return the 'interval' attribute in milliseconds"
480
return timedelta_to_milliseconds(self.interval)
482
def approval_delay_milliseconds(self):
483
return timedelta_to_milliseconds(self.approval_delay)
477
486
def config_parser(config):
543
549
self.expires = None
545
551
logger.debug("Creating client %r", self.name)
552
# Uppercase and remove spaces from fingerprint for later
553
# comparison purposes with return value from the fingerprint()
546
555
logger.debug(" Fingerprint: %s", self.fingerprint)
547
556
self.created = settings.get("created",
548
557
datetime.datetime.utcnow())
555
564
self.current_checker_command = None
556
565
self.approved = None
557
566
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()
567
self.changedstate = (multiprocessing_manager
568
.Condition(multiprocessing_manager
570
self.client_structure = [attr for attr in
571
self.__dict__.iterkeys()
562
572
if not attr.startswith("_")]
563
573
self.client_structure.append("client_structure")
565
for name, t in inspect.getmembers(
566
type(self), lambda obj: isinstance(obj, property)):
575
for name, t in inspect.getmembers(type(self),
567
579
if not name.startswith("_"):
568
580
self.client_structure.append(name)
611
623
# and every interval from then on.
612
624
if self.checker_initiator_tag is not None:
613
625
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = gobject.timeout_add(
615
int(self.interval.total_seconds() * 1000),
626
self.checker_initiator_tag = (gobject.timeout_add
627
(self.interval_milliseconds(),
617
629
# Schedule a disable() when 'timeout' has passed
618
630
if self.disable_initiator_tag is not None:
619
631
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = gobject.timeout_add(
621
int(self.timeout.total_seconds() * 1000), self.disable)
632
self.disable_initiator_tag = (gobject.timeout_add
633
(self.timeout_milliseconds(),
622
635
# Also start a new checker *right now*.
623
636
self.start_checker()
653
667
gobject.source_remove(self.disable_initiator_tag)
654
668
self.disable_initiator_tag = None
655
669
if getattr(self, "enabled", False):
656
self.disable_initiator_tag = gobject.timeout_add(
657
int(timeout.total_seconds() * 1000), self.disable)
670
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
658
673
self.expires = datetime.datetime.utcnow() + timeout
660
675
def need_approval(self):
691
706
# Start a new checker if needed
692
707
if self.checker is None:
693
708
# Escape attributes for the shell
695
attr: re.escape(str(getattr(self, attr)))
696
for attr in self.runtime_expansions }
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
712
self.runtime_expansions)
698
714
command = self.checker_command % escaped_attrs
699
715
except TypeError as error:
700
716
logger.error('Could not format string "%s"',
701
self.checker_command,
703
return True # Try again later
717
self.checker_command, exc_info=error)
718
return True # Try again later
704
719
self.current_checker_command = command
706
logger.info("Starting checker %r for %s", command,
721
logger.info("Starting checker %r for %s",
708
723
# We don't need to redirect stdout and stderr, since
709
724
# in normal mode, that is already done by daemon(),
710
725
# and in debug mode we don't want to. (Stdin is
719
734
"stderr": wnull })
720
735
self.checker = subprocess.Popen(command,
725
739
except OSError as error:
726
740
logger.error("Failed to start subprocess",
729
self.checker_callback_tag = gobject.child_watch_add(
730
self.checker.pid, self.checker_callback, data=command)
743
self.checker_callback_tag = (gobject.child_watch_add
745
self.checker_callback,
731
747
# The checker may have completed before the gobject
732
748
# watch was added. Check for this.
764
780
self.checker = None
767
def dbus_service_property(dbus_interface,
783
def dbus_service_property(dbus_interface, signature="v",
784
access="readwrite", byte_arrays=False):
771
785
"""Decorators for marking methods of a DBusObjectWithProperties to
772
786
become properties on the D-Bus.
782
796
# "Set" method, so we fail early here:
783
797
if byte_arrays and signature != "ay":
784
798
raise ValueError("Byte arrays not supported for non-'ay'"
785
" signature {!r}".format(signature))
799
" signature {0!r}".format(signature))
787
800
def decorator(func):
788
801
func._dbus_is_property = True
789
802
func._dbus_interface = dbus_interface
823
833
"""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
836
@dbus_service_property("org.example.Interface", signature="b",
838
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
831
841
def Property_dbus_property(self):
832
842
return dbus.Boolean(False)
835
844
def decorator(func):
836
845
func._dbus_annotations = annotations
842
850
class DBusPropertyException(dbus.exceptions.DBusException):
843
851
"""A base class for D-Bus property-related exceptions
853
def __unicode__(self):
854
return unicode(str(self))
848
857
class DBusPropertyAccessException(DBusPropertyException):
872
881
If called like _is_dbus_thing("method") it returns a function
873
882
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
878
887
def _get_all_dbus_things(self, thing):
879
888
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name", name),
890
return ((getattr(athing.__get__(self), "_dbus_name",
882
892
athing.__get__(self))
883
893
for cls in self.__class__.__mro__
884
894
for name, athing in
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
895
inspect.getmembers(cls,
896
self._is_dbus_thing(thing)))
887
898
def _get_dbus_property(self, interface_name, property_name):
888
899
"""Returns a bound method if one exists which is a D-Bus
889
900
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")):
902
for cls in self.__class__.__mro__:
903
for name, value in (inspect.getmembers
905
self._is_dbus_thing("property"))):
894
906
if (value._dbus_name == property_name
895
907
and value._dbus_interface == interface_name):
896
908
return value.__get__(self)
898
910
# No such property
899
raise DBusPropertyNotFound("{}:{}.{}".format(
900
self.dbus_object_path, interface_name, property_name))
911
raise DBusPropertyNotFound(self.dbus_object_path + ":"
912
+ interface_name + "."
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
915
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
904
916
out_signature="v")
905
917
def Get(self, interface_name, property_name):
906
918
"""Standard D-Bus property Get() method, see D-Bus standard.
925
937
# signatures other than "ay".
926
938
if prop._dbus_signature != "ay":
927
939
raise ValueError("Byte arrays not supported for non-"
928
"'ay' signature {!r}"
940
"'ay' signature {0!r}"
929
941
.format(prop._dbus_signature))
930
942
value = dbus.ByteArray(b''.join(chr(byte)
931
943
for byte in value))
934
@dbus.service.method(dbus.PROPERTIES_IFACE,
946
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
936
947
out_signature="a{sv}")
937
948
def GetAll(self, interface_name):
938
949
"""Standard D-Bus property GetAll() method, see D-Bus
953
964
if not hasattr(value, "variant_level"):
954
965
properties[name] = value
956
properties[name] = type(value)(
957
value, variant_level = value.variant_level + 1)
967
properties[name] = type(value)(value, variant_level=
968
value.variant_level+1)
958
969
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
971
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
969
972
out_signature="s",
970
973
path_keyword='object_path',
980
983
document = xml.dom.minidom.parseString(xmlstring)
982
984
def make_tag(document, name, prop):
983
985
e = document.createElement("property")
984
986
e.setAttribute("name", name)
985
987
e.setAttribute("type", prop._dbus_signature)
986
988
e.setAttribute("access", prop._dbus_access)
989
990
for if_tag in document.getElementsByTagName("interface"):
990
991
# Add property tags
991
992
for tag in (make_tag(document, name, prop)
1003
1004
if (name == tag.getAttribute("name")
1004
1005
and prop._dbus_interface
1005
1006
== if_tag.getAttribute("name")):
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1008
for name, value in annots.items():
1007
annots.update(getattr
1009
"_dbus_annotations",
1011
for name, value in annots.iteritems():
1009
1012
ann_tag = document.createElement(
1011
1014
ann_tag.setAttribute("name", name)
1014
1017
# Add interface annotation tags
1015
1018
for annotation, value in dict(
1016
1019
itertools.chain.from_iterable(
1017
annotations().items()
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1020
annotations().iteritems()
1021
for name, annotations in
1022
self._get_all_dbus_things("interface")
1020
1023
if name == if_tag.getAttribute("name")
1022
1025
ann_tag = document.createElement("annotation")
1023
1026
ann_tag.setAttribute("name", annotation)
1024
1027
ann_tag.setAttribute("value", value)
1051
1054
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1056
return dbus.String("", variant_level = variant_level)
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
return dbus.String(dt.isoformat(),
1058
variant_level=variant_level)
1057
1061
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1088
1091
# Ignore non-D-Bus attributes, and D-Bus attributes
1089
1092
# with the wrong interface name
1090
1093
if (not hasattr(attribute, "_dbus_interface")
1091
or not attribute._dbus_interface.startswith(
1092
orig_interface_name)):
1094
or not attribute._dbus_interface
1095
.startswith(orig_interface_name)):
1094
1097
# Create an alternate D-Bus interface name based on
1095
1098
# the current name
1096
alt_interface = attribute._dbus_interface.replace(
1097
orig_interface_name, alt_interface_name)
1099
alt_interface = (attribute._dbus_interface
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1098
1102
interface_names.add(alt_interface)
1099
1103
# Is this a D-Bus signal?
1100
1104
if getattr(attribute, "_dbus_is_signal", False):
1101
1105
# Extract the original non-method undecorated
1102
1106
# function by black magic
1103
1107
nonmethod_func = (dict(
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
1108
zip(attribute.func_code.co_freevars,
1109
attribute.__closure__))["func"]
1107
1111
# Create a new, but exactly alike, function
1108
1112
# object, and decorate it to be a new D-Bus signal
1109
1113
# with the alternate D-Bus interface name
1110
new_function = (dbus.service.signal(
1111
alt_interface, attribute._dbus_signature)
1114
new_function = (dbus.service.signal
1116
attribute._dbus_signature)
1112
1117
(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)))
1118
nonmethod_func.func_code,
1119
nonmethod_func.func_globals,
1120
nonmethod_func.func_name,
1121
nonmethod_func.func_defaults,
1122
nonmethod_func.func_closure)))
1118
1123
# Copy annotations, if any
1120
new_function._dbus_annotations = dict(
1121
attribute._dbus_annotations)
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1122
1127
except AttributeError:
1124
1129
# Define a creator of a function to call both the
1129
1134
"""This function is a scope container to pass
1130
1135
func1 and func2 to the "call_both" function
1131
1136
outside of its arguments"""
1133
1137
def call_both(*args, **kwargs):
1134
1138
"""This function will emit two D-Bus
1135
1139
signals by calling func1 and func2"""
1136
1140
func1(*args, **kwargs)
1137
1141
func2(*args, **kwargs)
1139
1142
return call_both
1140
1143
# Create the "call_both" function and add it to
1146
1149
# object. Decorate it to be a new D-Bus method
1147
1150
# with the alternate D-Bus interface name. Add it
1148
1151
# 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)))
1152
attr[attrname] = (dbus.service.method
1154
attribute._dbus_in_signature,
1155
attribute._dbus_out_signature)
1157
(attribute.func_code,
1158
attribute.func_globals,
1159
attribute.func_name,
1160
attribute.func_defaults,
1161
attribute.func_closure)))
1159
1162
# Copy annotations, if any
1161
attr[attrname]._dbus_annotations = dict(
1162
attribute._dbus_annotations)
1164
attr[attrname]._dbus_annotations = (
1165
dict(attribute._dbus_annotations))
1163
1166
except AttributeError:
1165
1168
# Is this a D-Bus property?
1168
1171
# object, and decorate it to be a new D-Bus
1169
1172
# property with the alternate D-Bus interface
1170
1173
# 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)))
1174
attr[attrname] = (dbus_service_property
1176
attribute._dbus_signature,
1177
attribute._dbus_access,
1179
._dbus_get_args_options
1182
(attribute.func_code,
1183
attribute.func_globals,
1184
attribute.func_name,
1185
attribute.func_defaults,
1186
attribute.func_closure)))
1182
1187
# Copy annotations, if any
1184
attr[attrname]._dbus_annotations = dict(
1185
attribute._dbus_annotations)
1189
attr[attrname]._dbus_annotations = (
1190
dict(attribute._dbus_annotations))
1186
1191
except AttributeError:
1188
1193
# Is this a D-Bus interface?
1191
1196
# object. Decorate it to be a new D-Bus interface
1192
1197
# with the alternate D-Bus interface name. Add it
1193
1198
# 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)))
1199
attr[attrname] = (dbus_interface_annotations
1202
(attribute.func_code,
1203
attribute.func_globals,
1204
attribute.func_name,
1205
attribute.func_defaults,
1206
attribute.func_closure)))
1202
1208
# Deprecate all alternate interfaces
1203
iname="_AlternateDBusNames_interface_annotation{}"
1209
iname="_AlternateDBusNames_interface_annotation{0}"
1204
1210
for interface_name in interface_names:
1206
1211
@dbus_interface_annotations(interface_name)
1207
1212
def func(self):
1208
1213
return { "org.freedesktop.DBus.Deprecated":
1210
1215
# Find an unused name
1211
1216
for aname in (iname.format(i)
1212
1217
for i in itertools.count()):
1216
1221
if interface_names:
1217
1222
# Replace the class with a new subclass of it with
1218
1223
# methods, signals, etc. as created above.
1219
cls = type(b"{}Alternate".format(cls.__name__),
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1226
1230
@alternate_dbus_interfaces({"se.recompile.Mandos":
1227
"se.bsnet.fukt.Mandos"})
1231
"se.bsnet.fukt.Mandos"})
1228
1232
class ClientDBus(Client, DBusObjectWithProperties):
1229
1233
"""A Client class using D-Bus
1245
1247
Client.__init__(self, *args, **kwargs)
1246
1248
# Only now, when this client is initialized, can it show up on
1248
client_object_name = str(self.name).translate(
1250
client_object_name = unicode(self.name).translate(
1249
1251
{ord("."): ord("_"),
1250
1252
ord("-"): ord("_")})
1251
self.dbus_object_path = dbus.ObjectPath(
1252
"/clients/" + client_object_name)
1253
self.dbus_object_path = (dbus.ObjectPath
1254
("/clients/" + client_object_name))
1253
1255
DBusObjectWithProperties.__init__(self, self.bus,
1254
1256
self.dbus_object_path)
1256
def notifychangeproperty(transform_func, dbus_name,
1257
type_func=lambda x: x,
1259
invalidate_only=False,
1260
_interface=_interface):
1258
def notifychangeproperty(transform_func,
1259
dbus_name, type_func=lambda x: x,
1261
1261
""" Modify a variable so that it's a property which announces
1262
1262
its changes to DBus.
1268
1268
to the D-Bus. Default: no transform
1269
1269
variant_level: D-Bus variant level. Default: 1
1271
attrname = "_{}".format(dbus_name)
1271
attrname = "_{0}".format(dbus_name)
1273
1272
def setter(self, value):
1274
1273
if hasattr(self, "dbus_object_path"):
1275
1274
if (not hasattr(self, attrname) or
1276
1275
type_func(getattr(self, attrname, None))
1277
1276
!= 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):
1277
dbus_value = transform_func(type_func(value),
1280
self.PropertyChanged(dbus.String(dbus_name),
1293
1282
setattr(self, attrname, value)
1295
1284
return property(lambda self: getattr(self, attrname), setter)
1301
1290
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1302
1291
last_enabled = notifychangeproperty(datetime_to_dbus,
1304
checker = notifychangeproperty(
1305
dbus.Boolean, "CheckerRunning",
1306
type_func = lambda checker: checker is not None)
1293
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1294
type_func = lambda checker:
1295
checker is not None)
1307
1296
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1308
1297
"LastCheckedOK")
1309
1298
last_checker_status = notifychangeproperty(dbus.Int16,
1312
1301
datetime_to_dbus, "LastApprovalRequest")
1313
1302
approved_by_default = notifychangeproperty(dbus.Boolean,
1314
1303
"ApprovedByDefault")
1315
approval_delay = notifychangeproperty(
1316
dbus.UInt64, "ApprovalDelay",
1317
type_func = lambda td: td.total_seconds() * 1000)
1304
approval_delay = notifychangeproperty(dbus.UInt64,
1307
timedelta_to_milliseconds)
1318
1308
approval_duration = notifychangeproperty(
1319
1309
dbus.UInt64, "ApprovalDuration",
1320
type_func = lambda td: td.total_seconds() * 1000)
1310
type_func = timedelta_to_milliseconds)
1321
1311
host = notifychangeproperty(dbus.String, "Host")
1322
timeout = notifychangeproperty(
1323
dbus.UInt64, "Timeout",
1324
type_func = lambda td: td.total_seconds() * 1000)
1312
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1314
timedelta_to_milliseconds)
1325
1315
extended_timeout = notifychangeproperty(
1326
1316
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)
1317
type_func = timedelta_to_milliseconds)
1318
interval = notifychangeproperty(dbus.UInt64,
1321
timedelta_to_milliseconds)
1331
1322
checker_command = notifychangeproperty(dbus.String, "Checker")
1332
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1333
invalidate_only=True)
1335
1324
del notifychangeproperty
1379
1368
def approve(self, value=True):
1380
1369
self.approved = value
1381
gobject.timeout_add(int(self.approval_duration.total_seconds()
1382
* 1000), self._reset_approved)
1370
gobject.timeout_add(timedelta_to_milliseconds
1371
(self.approval_duration),
1372
self._reset_approved)
1383
1373
self.send_changedstate()
1385
1375
## D-Bus methods, signals & properties
1376
_interface = "se.recompile.Mandos.Client"
1380
@dbus_interface_annotations(_interface)
1382
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1391
1387
# CheckerCompleted - signal
1471
1466
return dbus.Boolean(bool(self.approvals_pending))
1473
1468
# ApprovedByDefault - property
1474
@dbus_service_property(_interface,
1469
@dbus_service_property(_interface, signature="b",
1476
1470
access="readwrite")
1477
1471
def ApprovedByDefault_dbus_property(self, value=None):
1478
1472
if value is None: # get
1480
1474
self.approved_by_default = bool(value)
1482
1476
# ApprovalDelay - property
1483
@dbus_service_property(_interface,
1477
@dbus_service_property(_interface, signature="t",
1485
1478
access="readwrite")
1486
1479
def ApprovalDelay_dbus_property(self, value=None):
1487
1480
if value is None: # get
1488
return dbus.UInt64(self.approval_delay.total_seconds()
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1490
1482
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1492
1484
# ApprovalDuration - property
1493
@dbus_service_property(_interface,
1485
@dbus_service_property(_interface, signature="t",
1495
1486
access="readwrite")
1496
1487
def ApprovalDuration_dbus_property(self, value=None):
1497
1488
if value is None: # get
1498
return dbus.UInt64(self.approval_duration.total_seconds()
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1500
1491
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1502
1493
# Name - property
1510
1501
return dbus.String(self.fingerprint)
1512
1503
# Host - property
1513
@dbus_service_property(_interface,
1504
@dbus_service_property(_interface, signature="s",
1515
1505
access="readwrite")
1516
1506
def Host_dbus_property(self, value=None):
1517
1507
if value is None: # get
1518
1508
return dbus.String(self.host)
1519
self.host = str(value)
1509
self.host = unicode(value)
1521
1511
# Created - property
1522
1512
@dbus_service_property(_interface, signature="s", access="read")
1551
1539
return datetime_to_dbus(self.last_checked_ok)
1553
1541
# LastCheckerStatus - property
1554
@dbus_service_property(_interface, signature="n", access="read")
1542
@dbus_service_property(_interface, signature="n",
1555
1544
def LastCheckerStatus_dbus_property(self):
1556
1545
return dbus.Int16(self.last_checker_status)
1566
1555
return datetime_to_dbus(self.last_approval_request)
1568
1557
# Timeout - property
1569
@dbus_service_property(_interface,
1558
@dbus_service_property(_interface, signature="t",
1571
1559
access="readwrite")
1572
1560
def Timeout_dbus_property(self, value=None):
1573
1561
if value is None: # get
1574
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1562
return dbus.UInt64(self.timeout_milliseconds())
1575
1563
old_timeout = self.timeout
1576
1564
self.timeout = datetime.timedelta(0, 0, 0, value)
1577
1565
# Reschedule disabling
1588
1576
gobject.source_remove(self.disable_initiator_tag)
1589
self.disable_initiator_tag = gobject.timeout_add(
1590
int((self.expires - now).total_seconds() * 1000),
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1593
1582
# ExtendedTimeout - property
1594
@dbus_service_property(_interface,
1583
@dbus_service_property(_interface, signature="t",
1596
1584
access="readwrite")
1597
1585
def ExtendedTimeout_dbus_property(self, value=None):
1598
1586
if value is None: # get
1599
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
1601
1588
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1603
1590
# Interval - property
1604
@dbus_service_property(_interface,
1591
@dbus_service_property(_interface, signature="t",
1606
1592
access="readwrite")
1607
1593
def Interval_dbus_property(self, value=None):
1608
1594
if value is None: # get
1609
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
return dbus.UInt64(self.interval_milliseconds())
1610
1596
self.interval = datetime.timedelta(0, 0, 0, value)
1611
1597
if getattr(self, "checker_initiator_tag", None) is None:
1613
1599
if self.enabled:
1614
1600
# Reschedule checker run
1615
1601
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
1602
self.checker_initiator_tag = (gobject.timeout_add
1603
(value, self.start_checker))
1604
self.start_checker() # Start one now, too
1620
1606
# Checker - property
1621
@dbus_service_property(_interface,
1607
@dbus_service_property(_interface, signature="s",
1623
1608
access="readwrite")
1624
1609
def Checker_dbus_property(self, value=None):
1625
1610
if value is None: # get
1626
1611
return dbus.String(self.checker_command)
1627
self.checker_command = str(value)
1612
self.checker_command = unicode(value)
1629
1614
# CheckerRunning - property
1630
@dbus_service_property(_interface,
1615
@dbus_service_property(_interface, signature="b",
1632
1616
access="readwrite")
1633
1617
def CheckerRunning_dbus_property(self, value=None):
1634
1618
if value is None: # get
1644
1628
return self.dbus_object_path # is already a dbus.ObjectPath
1646
1630
# Secret = property
1647
@dbus_service_property(_interface,
1631
@dbus_service_property(_interface, signature="ay",
1632
access="write", byte_arrays=True)
1651
1633
def Secret_dbus_property(self, value):
1652
self.secret = bytes(value)
1634
self.secret = str(value)
1669
1651
if data[0] == 'data':
1671
1653
if data[0] == 'function':
1673
1654
def func(*args, **kwargs):
1674
1655
self._pipe.send(('funcall', name, args, kwargs))
1675
1656
return self._pipe.recv()[1]
1679
1659
def __setattr__(self, name, value):
1691
1671
def handle(self):
1692
1672
with contextlib.closing(self.server.child_pipe) as child_pipe:
1693
1673
logger.info("TCP connection from: %s",
1694
str(self.client_address))
1674
unicode(self.client_address))
1695
1675
logger.debug("Pipe FD: %d",
1696
1676
self.server.child_pipe.fileno())
1698
session = gnutls.connection.ClientSession(
1699
self.request, gnutls.connection .X509Credentials())
1678
session = (gnutls.connection
1679
.ClientSession(self.request,
1681
.X509Credentials()))
1701
1683
# Note: gnutls.connection.X509Credentials is really a
1702
1684
# generic GnuTLS certificate credentials object so long as
1711
1693
priority = self.server.gnutls_priority
1712
1694
if priority is None:
1713
1695
priority = "NORMAL"
1714
gnutls.library.functions.gnutls_priority_set_direct(
1715
session._c_object, priority, None)
1696
(gnutls.library.functions
1697
.gnutls_priority_set_direct(session._c_object,
1717
1700
# Start communication using the Mandos protocol
1718
1701
# Get protocol number
1788
1771
#wait until timeout or approved
1789
1772
time = datetime.datetime.now()
1790
1773
client.changedstate.acquire()
1791
client.changedstate.wait(delay.total_seconds())
1774
client.changedstate.wait(
1775
float(timedelta_to_milliseconds(delay)
1792
1777
client.changedstate.release()
1793
1778
time2 = datetime.datetime.now()
1794
1779
if (time2 - time) >= delay:
1813
1798
logger.warning("gnutls send failed",
1814
1799
exc_info=error)
1816
logger.debug("Sent: %d, remaining: %d", sent,
1817
len(client.secret) - (sent_size
1801
logger.debug("Sent: %d, remaining: %d",
1802
sent, len(client.secret)
1803
- (sent_size + sent))
1819
1804
sent_size += sent
1821
1806
logger.info("Sending secret to %s", client.name)
1838
1823
def peer_certificate(session):
1839
1824
"Return the peer's OpenPGP certificate as a bytestring"
1840
1825
# If not an OpenPGP certificate...
1841
if (gnutls.library.functions.gnutls_certificate_type_get(
1826
if (gnutls.library.functions
1827
.gnutls_certificate_type_get(session._c_object)
1843
1828
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1844
1829
# ...do the normal thing
1845
1830
return session.peer_certificate
1859
1844
def fingerprint(openpgp):
1860
1845
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1861
1846
# 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)))
1847
datum = (gnutls.library.types
1848
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1851
ctypes.c_uint(len(openpgp))))
1866
1852
# New empty GnuTLS certificate
1867
1853
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1870
1856
# 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)
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1859
gnutls.library.constants
1860
.GNUTLS_OPENPGP_FMT_RAW))
1874
1861
# Verify the self signature in the key
1875
1862
crtverify = ctypes.c_uint()
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
1863
(gnutls.library.functions
1864
.gnutls_openpgp_crt_verify_self(crt, 0,
1865
ctypes.byref(crtverify)))
1878
1866
if crtverify.value != 0:
1879
1867
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
raise gnutls.errors.CertificateSecurityError(
1868
raise (gnutls.errors.CertificateSecurityError
1882
1870
# New buffer for the fingerprint
1883
1871
buf = ctypes.create_string_buffer(20)
1884
1872
buf_len = ctypes.c_size_t()
1885
1873
# 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))
1874
(gnutls.library.functions
1875
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1876
ctypes.byref(buf_len)))
1888
1877
# Deinit the certificate
1889
1878
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1890
1879
# Convert the buffer to a Python bytestring
1941
1928
interface: None or a network interface name (string)
1942
1929
use_ipv6: Boolean; to use IPv6 or not
1945
1931
def __init__(self, server_address, RequestHandlerClass,
1932
interface=None, use_ipv6=True, socketfd=None):
1949
1933
"""If socketfd is set, use that file descriptor instead of
1950
1934
creating a new one with socket.socket().
1992
1976
self.interface)
1995
self.socket.setsockopt(
1996
socket.SOL_SOCKET, SO_BINDTODEVICE,
1997
(self.interface + "\0").encode("utf-8"))
1979
self.socket.setsockopt(socket.SOL_SOCKET,
1981
str(self.interface + '\0'))
1998
1982
except socket.error as error:
1999
1983
if error.errno == errno.EPERM:
2000
1984
logger.error("No permission to bind to"
2018
2002
self.server_address = (any_address,
2019
2003
self.server_address[1])
2020
2004
elif not self.server_address[1]:
2021
self.server_address = (self.server_address[0], 0)
2005
self.server_address = (self.server_address[0],
2022
2007
# if self.interface:
2023
2008
# self.server_address = (self.server_address[0],
2039
2024
Assumes a gobject.MainLoop event loop.
2042
2026
def __init__(self, server_address, RequestHandlerClass,
2046
gnutls_priority=None,
2027
interface=None, use_ipv6=True, clients=None,
2028
gnutls_priority=None, use_dbus=True, socketfd=None):
2049
2029
self.enabled = False
2050
2030
self.clients = clients
2051
2031
if self.clients is None:
2068
2047
def add_pipe(self, parent_pipe, proc):
2069
2048
# 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,
2049
gobject.io_add_watch(parent_pipe.fileno(),
2050
gobject.IO_IN | gobject.IO_HUP,
2051
functools.partial(self.handle_ipc,
2077
def handle_ipc(self, source, condition,
2080
client_object=None):
2056
def handle_ipc(self, source, condition, parent_pipe=None,
2057
proc = None, client_object=None):
2081
2058
# error, or the other end of multiprocessing.Pipe has closed
2082
2059
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2083
2060
# Wait for other process to exit
2106
2083
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))
2086
gobject.io_add_watch(parent_pipe.fileno(),
2087
gobject.IO_IN | gobject.IO_HUP,
2088
functools.partial(self.handle_ipc,
2116
2094
parent_pipe.send(True)
2117
2095
# remove the old hook in favor of the new above hook on
2125
2103
parent_pipe.send(('data', getattr(client_object,
2126
2104
funcname)(*args,
2129
2107
if command == 'getattr':
2130
2108
attrname = request[1]
2131
2109
if callable(client_object.__getattribute__(attrname)):
2132
parent_pipe.send(('function', ))
2110
parent_pipe.send(('function',))
2135
'data', client_object.__getattribute__(attrname)))
2112
parent_pipe.send(('data', client_object
2113
.__getattribute__(attrname)))
2137
2115
if command == 'setattr':
2138
2116
attrname = request[1]
2179
2157
"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
2159
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2187
2160
# the "duration" ABNF definition in RFC 3339, Appendix A.
2188
2161
token_end = Token(re.compile(r"$"), None, frozenset())
2189
2162
token_second = Token(re.compile(r"(\d+)S"),
2190
2163
datetime.timedelta(seconds=1),
2191
frozenset((token_end, )))
2164
frozenset((token_end,)))
2192
2165
token_minute = Token(re.compile(r"(\d+)M"),
2193
2166
datetime.timedelta(minutes=1),
2194
2167
frozenset((token_second, token_end)))
2210
2183
frozenset((token_month, token_end)))
2211
2184
token_week = Token(re.compile(r"(\d+)W"),
2212
2185
datetime.timedelta(weeks=1),
2213
frozenset((token_end, )))
2186
frozenset((token_end,)))
2214
2187
token_duration = Token(re.compile(r"P"), None,
2215
2188
frozenset((token_year, token_month,
2216
2189
token_day, token_time,
2218
2191
# Define starting values
2219
2192
value = datetime.timedelta() # Value so far
2220
2193
found_token = None
2221
followers = frozenset((token_duration,)) # Following valid tokens
2194
followers = frozenset(token_duration,) # Following valid tokens
2222
2195
s = duration # String left to parse
2223
2196
# Loop until end token is found
2224
2197
while found_token is not token_end:
2307
2281
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2308
2282
if not stat.S_ISCHR(os.fstat(null).st_mode):
2309
2283
raise OSError(errno.ENODEV,
2310
"{} not a character device"
2284
"{0} not a character device"
2311
2285
.format(os.devnull))
2312
2286
os.dup2(null, sys.stdin.fileno())
2313
2287
os.dup2(null, sys.stdout.fileno())
2324
2298
parser = argparse.ArgumentParser()
2325
2299
parser.add_argument("-v", "--version", action="version",
2326
version = "%(prog)s {}".format(version),
2300
version = "%(prog)s {0}".format(version),
2327
2301
help="show version number and exit")
2328
2302
parser.add_argument("-i", "--interface", metavar="IF",
2329
2303
help="Bind to interface IF")
2362
2336
help="Directory to save/restore state in")
2363
2337
parser.add_argument("--foreground", action="store_true",
2364
2338
help="Run in foreground", default=None)
2365
parser.add_argument("--no-zeroconf", action="store_false",
2366
dest="zeroconf", help="Do not use Zeroconf",
2369
2340
options = parser.parse_args()
2390
2360
"statedir": "/var/lib/mandos",
2391
2361
"foreground": "False",
2395
2364
# Parse config file for server-global settings
2396
2365
server_config = configparser.SafeConfigParser(server_defaults)
2397
2366
del server_defaults
2398
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2367
server_config.read(os.path.join(options.configdir,
2399
2369
# Convert the SafeConfigParser object to a dict
2400
2370
server_settings = server_config.defaults()
2401
2371
# Use the appropriate methods on the non-string config options
2419
2389
# Override the settings from the config file with command line
2420
2390
# options, if set.
2421
2391
for option in ("interface", "address", "port", "debug",
2422
"priority", "servicename", "configdir", "use_dbus",
2423
"use_ipv6", "debuglevel", "restore", "statedir",
2424
"socket", "foreground", "zeroconf"):
2392
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2425
2395
value = getattr(options, option)
2426
2396
if value is not None:
2427
2397
server_settings[option] = value
2429
2399
# Force all strings to be unicode
2430
2400
for option in server_settings.keys():
2431
if isinstance(server_settings[option], bytes):
2432
server_settings[option] = (server_settings[option]
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2434
2403
# Force all boolean options to be boolean
2435
2404
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2436
"foreground", "zeroconf"):
2437
2406
server_settings[option] = bool(server_settings[option])
2438
2407
# Debug implies foreground
2439
2408
if server_settings["debug"]:
2443
2412
##################################################################
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
2414
# For convenience
2451
2415
debug = server_settings["debug"]
2452
2416
debuglevel = server_settings["debuglevel"]
2467
2430
initlogger(debug, level)
2469
2432
if server_settings["servicename"] != "Mandos":
2470
syslogger.setFormatter(
2471
logging.Formatter('Mandos ({}) [%(process)d]:'
2472
' %(levelname)s: %(message)s'.format(
2473
server_settings["servicename"])))
2433
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2435
' %(levelname)s: %(message)s'
2436
.format(server_settings
2475
2439
# Parse config file with clients
2476
2440
client_config = configparser.SafeConfigParser(Client
2481
2445
global mandos_dbus_service
2482
2446
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"],
2448
tcp_server = MandosServer((server_settings["address"],
2449
server_settings["port"]),
2451
interface=(server_settings["interface"]
2455
server_settings["priority"],
2457
socketfd=(server_settings["socket"]
2495
2459
if not foreground:
2496
2460
pidfilename = "/run/mandos.pid"
2497
2461
if not os.path.isdir("/run/."):
2531
2495
def debug_gnutls(level, string):
2532
2496
logger.debug("GnuTLS: %s", string[:-1])
2534
gnutls.library.functions.gnutls_global_set_log_function(
2498
(gnutls.library.functions
2499
.gnutls_global_set_log_function(debug_gnutls))
2537
2501
# Redirect stdin so all checkers get /dev/null
2538
2502
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2560
2524
bus_name = dbus.service.BusName("se.recompile.Mandos",
2563
old_bus_name = dbus.service.BusName(
2564
"se.bsnet.fukt.Mandos", bus,
2525
bus, do_not_queue=True)
2526
old_bus_name = (dbus.service.BusName
2527
("se.bsnet.fukt.Mandos", bus,
2566
2529
except dbus.exceptions.NameExistsException as e:
2567
2530
logger.error("Disabling D-Bus:", exc_info=e)
2568
2531
use_dbus = False
2569
2532
server_settings["use_dbus"] = False
2570
2533
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"))
2534
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2535
service = AvahiServiceToSyslog(name =
2536
server_settings["servicename"],
2537
servicetype = "_mandos._tcp",
2538
protocol = protocol, bus = bus)
2539
if server_settings["interface"]:
2540
service.interface = (if_nametoindex
2541
(str(server_settings["interface"])))
2582
2543
global multiprocessing_manager
2583
2544
multiprocessing_manager = multiprocessing.Manager()
2602
2563
if server_settings["restore"]:
2604
2565
with open(stored_state_path, "rb") as stored_state:
2605
clients_data, old_client_settings = pickle.load(
2566
clients_data, old_client_settings = (pickle.load
2607
2568
os.remove(stored_state_path)
2608
2569
except IOError as e:
2609
2570
if e.errno == errno.ENOENT:
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
2613
2574
logger.critical("Could not load persistent state:",
2616
2577
except EOFError as e:
2617
2578
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
2621
2581
with PGPEngine() as pgp:
2622
for client_name, client in clients_data.items():
2582
for client_name, client in clients_data.iteritems():
2623
2583
# Skip removed clients
2624
2584
if client_name not in client_settings:
2650
2610
if datetime.datetime.utcnow() >= client["expires"]:
2651
2611
if not client["last_checked_ok"]:
2652
2612
logger.warning(
2653
"disabling client {} - Client never "
2654
"performed a successful checker".format(
2613
"disabling client {0} - Client never "
2614
"performed a successful checker"
2615
.format(client_name))
2656
2616
client["enabled"] = False
2657
2617
elif client["last_checker_status"] != 0:
2658
2618
logger.warning(
2659
"disabling client {} - Client last"
2660
" checker failed with error code"
2663
client["last_checker_status"]))
2619
"disabling client {0} - Client "
2620
"last checker failed with error code {1}"
2621
.format(client_name,
2622
client["last_checker_status"]))
2664
2623
client["enabled"] = False
2666
client["expires"] = (
2667
datetime.datetime.utcnow()
2668
+ client["timeout"])
2625
client["expires"] = (datetime.datetime
2627
+ client["timeout"])
2669
2628
logger.debug("Last checker succeeded,"
2670
" keeping {} enabled".format(
2629
" keeping {0} enabled"
2630
.format(client_name))
2673
client["secret"] = pgp.decrypt(
2674
client["encrypted_secret"],
2675
client_settings[client_name]["secret"])
2632
client["secret"] = (
2633
pgp.decrypt(client["encrypted_secret"],
2634
client_settings[client_name]
2676
2636
except PGPError:
2677
2637
# 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]
2638
logger.debug("Failed to decrypt {0} old secret"
2639
.format(client_name))
2640
client["secret"] = (
2641
client_settings[client_name]["secret"])
2683
2643
# Add/remove clients based on new changes made to config
2684
2644
for client_name in (set(old_client_settings)
2689
2649
clients_data[client_name] = client_settings[client_name]
2691
2651
# Create all client objects
2692
for client_name, client in clients_data.items():
2652
for client_name, client in clients_data.iteritems():
2693
2653
tcp_server.clients[client_name] = client_class(
2654
name = client_name, settings = client,
2696
2655
server_settings = server_settings)
2698
2657
if not tcp_server.clients:
2714
2673
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2718
@alternate_dbus_interfaces(
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2720
2678
class MandosDBusService(DBusObjectWithProperties):
2721
2679
"""A D-Bus proxy object"""
2723
2680
def __init__(self):
2724
2681
dbus.service.Object.__init__(self, bus, "/")
2726
2682
_interface = "se.recompile.Mandos"
2728
2684
@dbus_interface_annotations(_interface)
2729
2685
def _foo(self):
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2686
return { "org.freedesktop.DBus.Property"
2687
".EmitsChangedSignal":
2734
2690
@dbus.service.signal(_interface, signature="o")
2735
2691
def ClientAdded(self, objpath):
2757
2714
def GetAllClientsWithProperties(self):
2759
2716
return dbus.Dictionary(
2760
{ c.dbus_object_path: c.GetAll("")
2761
for c in tcp_server.clients.itervalues() },
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
2762
2719
signature="oa{sv}")
2764
2721
@dbus.service.method(_interface, in_signature="o")
2803
2759
# 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
2761
exclude = set(("bus", "changedstate", "secret",
2762
"checker", "server_settings"))
2763
for name, typ in (inspect.getmembers
2764
(dbus.service.Object)):
2809
2765
exclude.add(name)
2811
2767
client_dict["encrypted_secret"] = (client
2818
2774
del client_settings[client.name]["secret"]
2821
with tempfile.NamedTemporaryFile(
2825
dir=os.path.dirname(stored_state_path),
2826
delete=False) as stored_state:
2777
with (tempfile.NamedTemporaryFile
2778
(mode='wb', suffix=".pickle", prefix='clients-',
2779
dir=os.path.dirname(stored_state_path),
2780
delete=False)) as stored_state:
2827
2781
pickle.dump((clients, client_settings), stored_state)
2828
tempname = stored_state.name
2782
tempname=stored_state.name
2829
2783
os.rename(tempname, stored_state_path)
2830
2784
except (IOError, OSError) as e:
2868
2823
tcp_server.server_activate()
2870
2825
# Find out what port we got
2872
service.port = tcp_server.socket.getsockname()[1]
2826
service.port = tcp_server.socket.getsockname()[1]
2874
2828
logger.info("Now listening on address %r, port %d,"
2875
2829
" flowinfo %d, scope_id %d",
2881
2835
#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
2838
# From the Avahi example code
2841
except dbus.exceptions.DBusException as error:
2842
logger.critical("D-Bus Exception", exc_info=error)
2845
# End of Avahi example code
2894
2847
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2895
2848
lambda *args, **kwargs: