88
101
except ImportError:
89
102
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
92
108
stored_state_file = "clients.pickle"
94
110
logger = logging.getLogger()
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
102
118
def if_nametoindex(interface):
103
119
"Get an interface index the hard way, i.e. using fcntl()"
104
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
121
with contextlib.closing(socket.socket()) as s:
106
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
return interface_index
276
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
279
300
"""Derived from the Avahi example code"""
280
301
if self.rename_count >= self.max_renames:
281
302
logger.critical("No suitable Zeroconf service name found"
282
303
" after %i retries, exiting.",
283
304
self.rename_count)
284
305
raise AvahiServiceError("Too many renames")
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
287
309
logger.info("Changing Zeroconf service name to %r ...",
292
315
except dbus.exceptions.DBusException as error:
293
logger.critical("D-Bus Exception", exc_info=error)
296
self.rename_count += 1
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
321
logger.critical("D-Bus Exception", exc_info=error)
298
325
def remove(self):
299
326
"""Derived from the Avahi example code"""
355
381
def server_state_changed(self, state, error=None):
356
382
"""Derived from the Avahi example code"""
357
383
logger.debug("Avahi server state change: %i", state)
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
365
390
if state in bad_states:
366
391
if bad_states[state] is not None:
367
392
if error is None:
386
411
follow_name_owner_changes=True),
387
412
avahi.DBUS_INTERFACE_SERVER)
388
413
self.server.connect_to_signal("StateChanged",
389
self.server_state_changed)
414
self.server_state_changed)
390
415
self.server_state_changed(self.server.GetState())
393
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
395
420
"""Add the new name to the syslog messages"""
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
427
def call_pipe(connection, # : multiprocessing.Connection
428
func, *args, **kwargs):
429
"""This function is meant to be called by multiprocessing.Process
431
This function runs func(*args, **kwargs), and writes the resulting
432
return value on the provided multiprocessing.Connection.
434
connection.send(func(*args, **kwargs))
411
437
class Client(object):
412
438
"""A representation of a client host served by this server.
457
485
"fingerprint", "host", "interval",
458
486
"last_approval_request", "last_checked_ok",
459
487
"last_enabled", "name", "timeout")
460
client_defaults = { "timeout": "PT5M",
461
"extended_timeout": "PT15M",
463
"checker": "fping -q -- %%(host)s",
465
"approval_delay": "PT0S",
466
"approval_duration": "PT1S",
467
"approved_by_default": "True",
471
def timeout_milliseconds(self):
472
"Return the 'timeout' attribute in milliseconds"
473
return timedelta_to_milliseconds(self.timeout)
475
def extended_timeout_milliseconds(self):
476
"Return the 'extended_timeout' attribute in milliseconds"
477
return timedelta_to_milliseconds(self.extended_timeout)
479
def interval_milliseconds(self):
480
"Return the 'interval' attribute in milliseconds"
481
return timedelta_to_milliseconds(self.interval)
483
def approval_delay_milliseconds(self):
484
return timedelta_to_milliseconds(self.approval_delay)
490
"extended_timeout": "PT15M",
492
"checker": "fping -q -- %%(host)s",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"approved_by_default": "True",
487
501
def config_parser(config):
565
579
self.current_checker_command = None
566
580
self.approved = None
567
581
self.approvals_pending = 0
568
self.changedstate = (multiprocessing_manager
569
.Condition(multiprocessing_manager
571
self.client_structure = [attr for attr in
572
self.__dict__.iterkeys()
582
self.changedstate = multiprocessing_manager.Condition(
583
multiprocessing_manager.Lock())
584
self.client_structure = [attr
585
for attr in self.__dict__.iterkeys()
573
586
if not attr.startswith("_")]
574
587
self.client_structure.append("client_structure")
576
for name, t in inspect.getmembers(type(self),
589
for name, t in inspect.getmembers(
590
type(self), lambda obj: isinstance(obj, property)):
580
591
if not name.startswith("_"):
581
592
self.client_structure.append(name)
624
635
# and every interval from then on.
625
636
if self.checker_initiator_tag is not None:
626
637
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
630
641
# Schedule a disable() when 'timeout' has passed
631
642
if self.disable_initiator_tag is not None:
632
643
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
636
646
# Also start a new checker *right now*.
637
647
self.start_checker()
639
def checker_callback(self, pid, condition, command):
649
def checker_callback(self, source, condition, connection,
640
651
"""The checker has completed, so take appropriate actions."""
641
652
self.checker_callback_tag = None
642
653
self.checker = None
643
if os.WIFEXITED(condition):
644
self.last_checker_status = os.WEXITSTATUS(condition)
654
# Read return code from connection (see call_pipe)
655
returncode = connection.recv()
659
self.last_checker_status = returncode
660
self.last_checker_signal = None
645
661
if self.last_checker_status == 0:
646
662
logger.info("Checker for %(name)s succeeded",
648
664
self.checked_ok()
650
logger.info("Checker for %(name)s failed",
666
logger.info("Checker for %(name)s failed", vars(self))
653
668
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
654
670
logger.warning("Checker for %(name)s crashed?",
657
674
def checked_ok(self):
658
675
"""Assert that the client has been seen, alive and well."""
659
676
self.last_checked_ok = datetime.datetime.utcnow()
660
677
self.last_checker_status = 0
678
self.last_checker_signal = None
661
679
self.bump_timeout()
663
681
def bump_timeout(self, timeout=None):
690
707
# than 'timeout' for the client to be disabled, which is as it
693
# If a checker exists, make sure it is not a zombie
695
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
except AttributeError:
698
except OSError as error:
699
if error.errno != errno.ECHILD:
703
logger.warning("Checker was a zombie")
704
gobject.source_remove(self.checker_callback_tag)
705
self.checker_callback(pid, status,
706
self.current_checker_command)
710
if self.checker is not None and not self.checker.is_alive():
711
logger.warning("Checker was not alive; joining")
707
714
# Start a new checker if needed
708
715
if self.checker is None:
709
716
# Escape attributes for the shell
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
713
self.runtime_expansions)
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
715
721
command = self.checker_command % escaped_attrs
716
722
except TypeError as error:
717
723
logger.error('Could not format string "%s"',
718
self.checker_command, exc_info=error)
719
return True # Try again later
724
self.checker_command,
726
return True # Try again later
720
727
self.current_checker_command = command
722
logger.info("Starting checker %r for %s",
724
# We don't need to redirect stdout and stderr, since
725
# in normal mode, that is already done by daemon(),
726
# and in debug mode we don't want to. (Stdin is
727
# always replaced by /dev/null.)
728
# The exception is when not debugging but nevertheless
729
# running in the foreground; use the previously
732
if (not self.server_settings["debug"]
733
and self.server_settings["foreground"]):
734
popen_args.update({"stdout": wnull,
736
self.checker = subprocess.Popen(command,
740
except OSError as error:
741
logger.error("Failed to start subprocess",
744
self.checker_callback_tag = (gobject.child_watch_add
746
self.checker_callback,
748
# The checker may have completed before the gobject
749
# watch was added. Check for this.
751
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
752
except OSError as error:
753
if error.errno == errno.ECHILD:
754
# This should never happen
755
logger.error("Child process vanished",
760
gobject.source_remove(self.checker_callback_tag)
761
self.checker_callback(pid, status, command)
728
logger.info("Starting checker %r for %s", command,
730
# We don't need to redirect stdout and stderr, since
731
# in normal mode, that is already done by daemon(),
732
# and in debug mode we don't want to. (Stdin is
733
# always replaced by /dev/null.)
734
# The exception is when not debugging but nevertheless
735
# running in the foreground; use the previously
737
popen_args = { "close_fds": True,
740
if (not self.server_settings["debug"]
741
and self.server_settings["foreground"]):
742
popen_args.update({"stdout": wnull,
744
pipe = multiprocessing.Pipe(duplex = False)
745
self.checker = multiprocessing.Process(
747
args = (pipe[1], subprocess.call, command),
750
self.checker_callback_tag = gobject.io_add_watch(
751
pipe[0].fileno(), gobject.IO_IN,
752
self.checker_callback, pipe[0], command)
762
753
# Re-run this periodically if run by gobject.timeout_add
770
761
if getattr(self, "checker", None) is None:
772
763
logger.debug("Stopping checker for %(name)s", vars(self))
774
self.checker.terminate()
776
#if self.checker.poll() is None:
777
# self.checker.kill()
778
except OSError as error:
779
if error.errno != errno.ESRCH: # No such process
764
self.checker.terminate()
781
765
self.checker = None
784
def dbus_service_property(dbus_interface, signature="v",
785
access="readwrite", byte_arrays=False):
768
def dbus_service_property(dbus_interface,
786
772
"""Decorators for marking methods of a DBusObjectWithProperties to
787
773
become properties on the D-Bus.
834
824
"""Decorator to annotate D-Bus methods, signals or properties
827
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
828
"org.freedesktop.DBus.Property."
829
"EmitsChangedSignal": "false"})
837
830
@dbus_service_property("org.example.Interface", signature="b",
839
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
842
832
def Property_dbus_property(self):
843
833
return dbus.Boolean(False)
845
836
def decorator(func):
846
837
func._dbus_annotations = annotations
851
843
class DBusPropertyException(dbus.exceptions.DBusException):
852
844
"""A base class for D-Bus property-related exceptions
854
def __unicode__(self):
855
return unicode(str(self))
858
849
class DBusPropertyAccessException(DBusPropertyException):
882
873
If called like _is_dbus_thing("method") it returns a function
883
874
suitable for use as predicate to inspect.getmembers().
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
876
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
888
879
def _get_all_dbus_things(self, thing):
889
880
"""Returns a generator of (name, attribute) pairs
891
return ((getattr(athing.__get__(self), "_dbus_name",
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
893
883
athing.__get__(self))
894
884
for cls in self.__class__.__mro__
895
885
for name, athing in
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
899
888
def _get_dbus_property(self, interface_name, property_name):
900
889
"""Returns a bound method if one exists which is a D-Bus
901
890
property with the specified name and interface.
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
906
self._is_dbus_thing("property"))):
892
for cls in self.__class__.__mro__:
893
for name, value in inspect.getmembers(
894
cls, self._is_dbus_thing("property")):
907
895
if (value._dbus_name == property_name
908
896
and value._dbus_interface == interface_name):
909
897
return value.__get__(self)
911
899
# No such property
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
917
905
out_signature="v")
918
906
def Get(self, interface_name, property_name):
919
907
"""Standard D-Bus property Get() method, see D-Bus standard.
965
954
if not hasattr(value, "variant_level"):
966
955
properties[name] = value
968
properties[name] = type(value)(value, variant_level=
969
value.variant_level+1)
957
properties[name] = type(value)(
958
value, variant_level = value.variant_level + 1)
970
959
return dbus.Dictionary(properties, signature="sv")
961
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
def PropertiesChanged(self, interface_name, changed_properties,
963
invalidated_properties):
964
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
972
969
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
973
970
out_signature="s",
974
971
path_keyword='object_path',
1092
1089
# Ignore non-D-Bus attributes, and D-Bus attributes
1093
1090
# with the wrong interface name
1094
1091
if (not hasattr(attribute, "_dbus_interface")
1095
or not attribute._dbus_interface
1096
.startswith(orig_interface_name)):
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
1098
1095
# Create an alternate D-Bus interface name based on
1099
1096
# the current name
1100
alt_interface = (attribute._dbus_interface
1101
.replace(orig_interface_name,
1102
alt_interface_name))
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1103
1099
interface_names.add(alt_interface)
1104
1100
# Is this a D-Bus signal?
1105
1101
if getattr(attribute, "_dbus_is_signal", False):
1106
# Extract the original non-method undecorated
1107
# function by black magic
1108
nonmethod_func = (dict(
1102
if sys.version_info.major == 2:
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1109
1106
zip(attribute.func_code.co_freevars,
1110
attribute.__closure__))["func"]
1107
attribute.__closure__))
1108
["func"].cell_contents)
1110
nonmethod_func = attribute
1112
1111
# Create a new, but exactly alike, function
1113
1112
# object, and decorate it to be a new D-Bus signal
1114
1113
# with the alternate D-Bus interface name
1115
new_function = (dbus.service.signal
1117
attribute._dbus_signature)
1118
(types.FunctionType(
1119
nonmethod_func.func_code,
1120
nonmethod_func.func_globals,
1121
nonmethod_func.func_name,
1122
nonmethod_func.func_defaults,
1123
nonmethod_func.func_closure)))
1114
if sys.version_info.major == 2:
1115
new_function = types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)
1122
new_function = types.FunctionType(
1123
nonmethod_func.__code__,
1124
nonmethod_func.__globals__,
1125
nonmethod_func.__name__,
1126
nonmethod_func.__defaults__,
1127
nonmethod_func.__closure__)
1128
new_function = (dbus.service.signal(
1130
attribute._dbus_signature)(new_function))
1124
1131
# Copy annotations, if any
1126
new_function._dbus_annotations = (
1127
dict(attribute._dbus_annotations))
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1128
1135
except AttributeError:
1130
1137
# Define a creator of a function to call both the
1150
1159
# object. Decorate it to be a new D-Bus method
1151
1160
# with the alternate D-Bus interface name. Add it
1152
1161
# to the class.
1153
attr[attrname] = (dbus.service.method
1155
attribute._dbus_in_signature,
1156
attribute._dbus_out_signature)
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1163
1172
# Copy annotations, if any
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1167
1176
except AttributeError:
1169
1178
# Is this a D-Bus property?
1172
1181
# object, and decorate it to be a new D-Bus
1173
1182
# property with the alternate D-Bus interface
1174
1183
# name. Add it to the class.
1175
attr[attrname] = (dbus_service_property
1177
attribute._dbus_signature,
1178
attribute._dbus_access,
1180
._dbus_get_args_options
1183
(attribute.func_code,
1184
attribute.func_globals,
1185
attribute.func_name,
1186
attribute.func_defaults,
1187
attribute.func_closure)))
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1188
1195
# Copy annotations, if any
1190
attr[attrname]._dbus_annotations = (
1191
dict(attribute._dbus_annotations))
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1192
1199
except AttributeError:
1194
1201
# Is this a D-Bus interface?
1197
1204
# object. Decorate it to be a new D-Bus interface
1198
1205
# with the alternate D-Bus interface name. Add it
1199
1206
# to the class.
1200
attr[attrname] = (dbus_interface_annotations
1203
(attribute.func_code,
1204
attribute.func_globals,
1205
attribute.func_name,
1206
attribute.func_defaults,
1207
attribute.func_closure)))
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1209
1215
# Deprecate all alternate interfaces
1210
iname="_AlternateDBusNames_interface_annotation{0}"
1216
iname="_AlternateDBusNames_interface_annotation{}"
1211
1217
for interface_name in interface_names:
1212
1219
@dbus_interface_annotations(interface_name)
1213
1220
def func(self):
1214
1221
return { "org.freedesktop.DBus.Deprecated":
1216
1223
# Find an unused name
1217
1224
for aname in (iname.format(i)
1218
1225
for i in itertools.count()):
1248
1258
Client.__init__(self, *args, **kwargs)
1249
1259
# Only now, when this client is initialized, can it show up on
1251
client_object_name = unicode(self.name).translate(
1261
client_object_name = str(self.name).translate(
1252
1262
{ord("."): ord("_"),
1253
1263
ord("-"): ord("_")})
1254
self.dbus_object_path = (dbus.ObjectPath
1255
("/clients/" + client_object_name))
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1256
1266
DBusObjectWithProperties.__init__(self, self.bus,
1257
1267
self.dbus_object_path)
1259
def notifychangeproperty(transform_func,
1260
dbus_name, type_func=lambda x: x,
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1273
_interface=_interface):
1262
1274
""" Modify a variable so that it's a property which announces
1263
1275
its changes to DBus.
1269
1281
to the D-Bus. Default: no transform
1270
1282
variant_level: D-Bus variant level. Default: 1
1272
attrname = "_{0}".format(dbus_name)
1284
attrname = "_{}".format(dbus_name)
1273
1286
def setter(self, value):
1274
1287
if hasattr(self, "dbus_object_path"):
1275
1288
if (not hasattr(self, attrname) or
1276
1289
type_func(getattr(self, attrname, None))
1277
1290
!= type_func(value)):
1278
dbus_value = transform_func(type_func(value),
1281
self.PropertyChanged(dbus.String(dbus_name),
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1283
1306
setattr(self, attrname, value)
1285
1308
return property(lambda self: getattr(self, attrname), setter)
1291
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1292
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1294
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1295
type_func = lambda checker:
1296
checker is not None)
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1297
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1298
1321
"LastCheckedOK")
1299
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1302
1325
datetime_to_dbus, "LastApprovalRequest")
1303
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1304
1327
"ApprovedByDefault")
1305
approval_delay = notifychangeproperty(dbus.UInt64,
1308
timedelta_to_milliseconds)
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1309
1331
approval_duration = notifychangeproperty(
1310
1332
dbus.UInt64, "ApprovalDuration",
1311
type_func = timedelta_to_milliseconds)
1333
type_func = lambda td: td.total_seconds() * 1000)
1312
1334
host = notifychangeproperty(dbus.String, "Host")
1313
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1315
timedelta_to_milliseconds)
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1316
1338
extended_timeout = notifychangeproperty(
1317
1339
dbus.UInt64, "ExtendedTimeout",
1318
type_func = timedelta_to_milliseconds)
1319
interval = notifychangeproperty(dbus.UInt64,
1322
timedelta_to_milliseconds)
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1323
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1325
1348
del notifychangeproperty
1333
1356
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1334
1357
Client.__del__(self, *args, **kwargs)
1336
def checker_callback(self, pid, condition, command,
1338
self.checker_callback_tag = None
1340
if os.WIFEXITED(condition):
1341
exitstatus = os.WEXITSTATUS(condition)
1359
def checker_callback(self, source, condition,
1360
connection, command, *args, **kwargs):
1361
ret = Client.checker_callback(self, source, condition,
1362
connection, command, *args,
1364
exitstatus = self.last_checker_status
1342
1366
# Emit D-Bus signal
1343
1367
self.CheckerCompleted(dbus.Int16(exitstatus),
1344
dbus.Int64(condition),
1345
1369
dbus.String(command))
1347
1371
# Emit D-Bus signal
1348
1372
self.CheckerCompleted(dbus.Int16(-1),
1349
dbus.Int64(condition),
1374
self.last_checker_signal),
1350
1375
dbus.String(command))
1352
return Client.checker_callback(self, pid, condition, command,
1355
1378
def start_checker(self, *args, **kwargs):
1356
1379
old_checker_pid = getattr(self.checker, "pid", None)
1475
1493
self.approved_by_default = bool(value)
1477
1495
# ApprovalDelay - property
1478
@dbus_service_property(_interface, signature="t",
1496
@dbus_service_property(_interface,
1479
1498
access="readwrite")
1480
1499
def ApprovalDelay_dbus_property(self, value=None):
1481
1500
if value is None: # get
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1483
1503
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1485
1505
# ApprovalDuration - property
1486
@dbus_service_property(_interface, signature="t",
1506
@dbus_service_property(_interface,
1487
1508
access="readwrite")
1488
1509
def ApprovalDuration_dbus_property(self, value=None):
1489
1510
if value is None: # get
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1492
1513
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1494
1515
# Name - property
1577
1601
gobject.source_remove(self.disable_initiator_tag)
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1583
1606
# ExtendedTimeout - property
1584
@dbus_service_property(_interface, signature="t",
1607
@dbus_service_property(_interface,
1585
1609
access="readwrite")
1586
1610
def ExtendedTimeout_dbus_property(self, value=None):
1587
1611
if value is None: # get
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1589
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1591
1616
# Interval - property
1592
@dbus_service_property(_interface, signature="t",
1617
@dbus_service_property(_interface,
1593
1619
access="readwrite")
1594
1620
def Interval_dbus_property(self, value=None):
1595
1621
if value is None: # get
1596
return dbus.UInt64(self.interval_milliseconds())
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
1623
self.interval = datetime.timedelta(0, 0, 0, value)
1598
1624
if getattr(self, "checker_initiator_tag", None) is None:
1600
1626
if self.enabled:
1601
1627
# Reschedule checker run
1602
1628
gobject.source_remove(self.checker_initiator_tag)
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1607
1633
# Checker - property
1608
@dbus_service_property(_interface, signature="s",
1634
@dbus_service_property(_interface,
1609
1636
access="readwrite")
1610
1637
def Checker_dbus_property(self, value=None):
1611
1638
if value is None: # get
1612
1639
return dbus.String(self.checker_command)
1613
self.checker_command = unicode(value)
1640
self.checker_command = str(value)
1615
1642
# CheckerRunning - property
1616
@dbus_service_property(_interface, signature="b",
1643
@dbus_service_property(_interface,
1617
1645
access="readwrite")
1618
1646
def CheckerRunning_dbus_property(self, value=None):
1619
1647
if value is None: # get
1672
1704
def handle(self):
1673
1705
with contextlib.closing(self.server.child_pipe) as child_pipe:
1674
1706
logger.info("TCP connection from: %s",
1675
unicode(self.client_address))
1707
str(self.client_address))
1676
1708
logger.debug("Pipe FD: %d",
1677
1709
self.server.child_pipe.fileno())
1679
session = (gnutls.connection
1680
.ClientSession(self.request,
1682
.X509Credentials()))
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1684
1714
# Note: gnutls.connection.X509Credentials is really a
1685
1715
# generic GnuTLS certificate credentials object so long as
1845
1872
def fingerprint(openpgp):
1846
1873
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1847
1874
# New GnuTLS "datum" with the OpenPGP public key
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
ctypes.c_uint(len(openpgp))))
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1853
1879
# New empty GnuTLS certificate
1854
1880
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1857
1883
# Import the OpenPGP public key into the certificate
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1862
1887
# Verify the self signature in the key
1863
1888
crtverify = ctypes.c_uint()
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1867
1891
if crtverify.value != 0:
1868
1892
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1869
raise (gnutls.errors.CertificateSecurityError
1893
raise gnutls.errors.CertificateSecurityError(
1871
1895
# New buffer for the fingerprint
1872
1896
buf = ctypes.create_string_buffer(20)
1873
1897
buf_len = ctypes.c_size_t()
1874
1898
# Get the fingerprint from the certificate into the buffer
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1878
1901
# Deinit the certificate
1879
1902
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
1903
# Convert the buffer to a Python bytestring
2048
2081
def add_pipe(self, parent_pipe, proc):
2049
2082
# Call "handle_ipc" for both data and EOF events
2050
gobject.io_add_watch(parent_pipe.fileno(),
2051
gobject.IO_IN | gobject.IO_HUP,
2052
functools.partial(self.handle_ipc,
2083
gobject.io_add_watch(
2084
parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe = parent_pipe,
2057
def handle_ipc(self, source, condition, parent_pipe=None,
2058
proc = None, client_object=None):
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2059
2094
# error, or the other end of multiprocessing.Pipe has closed
2060
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2061
2096
# Wait for other process to exit
2148
2183
# avoid excessive use of external libraries.
2150
2185
# New type for defining tokens, syntax, and semantics all-in-one
2151
Token = collections.namedtuple("Token",
2152
("regexp", # To match token; if
2153
# "value" is not None,
2154
# must have a "group"
2156
"value", # datetime.timedelta or
2158
"followers")) # Tokens valid after
2186
Token = collections.namedtuple("Token", (
2187
"regexp", # To match token; if "value" is not None, must have
2188
# a "group" containing digits
2189
"value", # datetime.timedelta or None
2190
"followers")) # Tokens valid after this token
2160
2191
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2161
2192
# the "duration" ABNF definition in RFC 3339, Appendix A.
2162
2193
token_end = Token(re.compile(r"$"), None, frozenset())
2163
2194
token_second = Token(re.compile(r"(\d+)S"),
2164
2195
datetime.timedelta(seconds=1),
2165
frozenset((token_end,)))
2196
frozenset((token_end, )))
2166
2197
token_minute = Token(re.compile(r"(\d+)M"),
2167
2198
datetime.timedelta(minutes=1),
2168
2199
frozenset((token_second, token_end)))
2184
2215
frozenset((token_month, token_end)))
2185
2216
token_week = Token(re.compile(r"(\d+)W"),
2186
2217
datetime.timedelta(weeks=1),
2187
frozenset((token_end,)))
2218
frozenset((token_end, )))
2188
2219
token_duration = Token(re.compile(r"P"), None,
2189
2220
frozenset((token_year, token_month,
2190
2221
token_day, token_time,
2192
2223
# Define starting values
2193
2224
value = datetime.timedelta() # Value so far
2194
2225
found_token = None
2195
followers = frozenset(token_duration,) # Following valid tokens
2226
followers = frozenset((token_duration, )) # Following valid tokens
2196
2227
s = duration # String left to parse
2197
2228
# Loop until end token is found
2198
2229
while found_token is not token_end:
2394
2425
# Override the settings from the config file with command line
2395
2426
# options, if set.
2396
2427
for option in ("interface", "address", "port", "debug",
2397
"priority", "servicename", "configdir",
2398
"use_dbus", "use_ipv6", "debuglevel", "restore",
2399
"statedir", "socket", "foreground", "zeroconf"):
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
2400
2431
value = getattr(options, option)
2401
2432
if value is not None:
2402
2433
server_settings[option] = value
2404
2435
# Force all strings to be unicode
2405
2436
for option in server_settings.keys():
2406
if type(server_settings[option]) is str:
2407
server_settings[option] = unicode(server_settings[option])
2437
if isinstance(server_settings[option], bytes):
2438
server_settings[option] = (server_settings[option]
2408
2440
# Force all boolean options to be boolean
2409
2441
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2410
2442
"foreground", "zeroconf"):
2460
2490
socketfd = None
2461
2491
if server_settings["socket"] != "":
2462
2492
socketfd = server_settings["socket"]
2463
tcp_server = MandosServer((server_settings["address"],
2464
server_settings["port"]),
2466
interface=(server_settings["interface"]
2470
server_settings["priority"],
2493
tcp_server = MandosServer(
2494
(server_settings["address"], server_settings["port"]),
2496
interface=(server_settings["interface"] or None),
2498
gnutls_priority=server_settings["priority"],
2473
2501
if not foreground:
2474
2502
pidfilename = "/run/mandos.pid"
2475
2503
if not os.path.isdir("/run/."):
2476
2504
pidfilename = "/var/run/mandos.pid"
2479
pidfile = open(pidfilename, "w")
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2480
2508
except IOError as e:
2481
2509
logger.error("Could not open file %r", pidfilename,
2538
2566
bus_name = dbus.service.BusName("se.recompile.Mandos",
2539
bus, do_not_queue=True)
2540
old_bus_name = (dbus.service.BusName
2541
("se.bsnet.fukt.Mandos", bus,
2543
except dbus.exceptions.NameExistsException as e:
2569
old_bus_name = dbus.service.BusName(
2570
"se.bsnet.fukt.Mandos", bus,
2572
except dbus.exceptions.DBusException as e:
2544
2573
logger.error("Disabling D-Bus:", exc_info=e)
2545
2574
use_dbus = False
2546
2575
server_settings["use_dbus"] = False
2547
2576
tcp_server.use_dbus = False
2549
2578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2550
service = AvahiServiceToSyslog(name =
2551
server_settings["servicename"],
2552
servicetype = "_mandos._tcp",
2553
protocol = protocol, bus = bus)
2579
service = AvahiServiceToSyslog(
2580
name = server_settings["servicename"],
2581
servicetype = "_mandos._tcp",
2582
protocol = protocol,
2554
2584
if server_settings["interface"]:
2555
service.interface = (if_nametoindex
2556
(str(server_settings["interface"])))
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
2558
2588
global multiprocessing_manager
2559
2589
multiprocessing_manager = multiprocessing.Manager()
2578
2608
if server_settings["restore"]:
2580
2610
with open(stored_state_path, "rb") as stored_state:
2581
clients_data, old_client_settings = (pickle.load
2611
clients_data, old_client_settings = pickle.load(
2583
2613
os.remove(stored_state_path)
2584
2614
except IOError as e:
2585
2615
if e.errno == errno.ENOENT:
2586
logger.warning("Could not load persistent state: {0}"
2587
.format(os.strerror(e.errno)))
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2589
2619
logger.critical("Could not load persistent state:",
2592
2622
except EOFError as e:
2593
2623
logger.warning("Could not load persistent state: "
2594
"EOFError:", exc_info=e)
2596
2627
with PGPEngine() as pgp:
2597
for client_name, client in clients_data.iteritems():
2628
for client_name, client in clients_data.items():
2598
2629
# Skip removed clients
2599
2630
if client_name not in client_settings:
2625
2656
if datetime.datetime.utcnow() >= client["expires"]:
2626
2657
if not client["last_checked_ok"]:
2627
2658
logger.warning(
2628
"disabling client {0} - Client never "
2629
"performed a successful checker"
2630
.format(client_name))
2659
"disabling client {} - Client never "
2660
"performed a successful checker".format(
2631
2662
client["enabled"] = False
2632
2663
elif client["last_checker_status"] != 0:
2633
2664
logger.warning(
2634
"disabling client {0} - Client "
2635
"last checker failed with error code {1}"
2636
.format(client_name,
2637
client["last_checker_status"]))
2665
"disabling client {} - Client last"
2666
" checker failed with error code"
2669
client["last_checker_status"]))
2638
2670
client["enabled"] = False
2640
client["expires"] = (datetime.datetime
2642
+ client["timeout"])
2672
client["expires"] = (
2673
datetime.datetime.utcnow()
2674
+ client["timeout"])
2643
2675
logger.debug("Last checker succeeded,"
2644
" keeping {0} enabled"
2645
.format(client_name))
2676
" keeping {} enabled".format(
2647
client["secret"] = (
2648
pgp.decrypt(client["encrypted_secret"],
2649
client_settings[client_name]
2679
client["secret"] = pgp.decrypt(
2680
client["encrypted_secret"],
2681
client_settings[client_name]["secret"])
2651
2682
except PGPError:
2652
2683
# If decryption fails, we use secret from new settings
2653
logger.debug("Failed to decrypt {0} old secret"
2654
.format(client_name))
2655
client["secret"] = (
2656
client_settings[client_name]["secret"])
2684
logger.debug("Failed to decrypt {} old secret".format(
2686
client["secret"] = (client_settings[client_name]
2658
2689
# Add/remove clients based on new changes made to config
2659
2690
for client_name in (set(old_client_settings)
2688
2720
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2691
@alternate_dbus_interfaces({"se.recompile.Mandos":
2692
"se.bsnet.fukt.Mandos"})
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2693
2726
class MandosDBusService(DBusObjectWithProperties):
2694
2727
"""A D-Bus proxy object"""
2695
2729
def __init__(self):
2696
2730
dbus.service.Object.__init__(self, bus, "/")
2697
2732
_interface = "se.recompile.Mandos"
2699
2734
@dbus_interface_annotations(_interface)
2700
2735
def _foo(self):
2701
return { "org.freedesktop.DBus.Property"
2702
".EmitsChangedSignal":
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2705
2740
@dbus.service.signal(_interface, signature="o")
2706
2741
def ClientAdded(self, objpath):
2775
2809
# A list of attributes that can not be pickled
2777
exclude = set(("bus", "changedstate", "secret",
2778
"checker", "server_settings"))
2779
for name, typ in (inspect.getmembers
2780
(dbus.service.Object)):
2811
exclude = { "bus", "changedstate", "secret",
2812
"checker", "server_settings" }
2813
for name, typ in inspect.getmembers(dbus.service
2781
2815
exclude.add(name)
2783
2817
client_dict["encrypted_secret"] = (client
2790
2824
del client_settings[client.name]["secret"]
2793
with (tempfile.NamedTemporaryFile
2794
(mode='wb', suffix=".pickle", prefix='clients-',
2795
dir=os.path.dirname(stored_state_path),
2796
delete=False)) as stored_state:
2827
with tempfile.NamedTemporaryFile(
2831
dir=os.path.dirname(stored_state_path),
2832
delete=False) as stored_state:
2797
2833
pickle.dump((clients, client_settings), stored_state)
2798
tempname=stored_state.name
2834
tempname = stored_state.name
2799
2835
os.rename(tempname, stored_state_path)
2800
2836
except (IOError, OSError) as e: