101
88
except ImportError:
102
89
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
108
92
stored_state_file = "clients.pickle"
110
94
logger = logging.getLogger()
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
116
101
except (OSError, AttributeError):
118
102
def if_nametoindex(interface):
119
103
"Get an interface index the hard way, i.e. using fcntl()"
120
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
105
with contextlib.closing(socket.socket()) as s:
122
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
125
111
return interface_index
297
276
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
279
"""Derived from the Avahi example code"""
301
280
if self.rename_count >= self.max_renames:
302
281
logger.critical("No suitable Zeroconf service name found"
303
282
" after %i retries, exiting.",
304
283
self.rename_count)
305
284
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
309
287
logger.info("Changing Zeroconf service name to %r ...",
315
292
except dbus.exceptions.DBusException as error:
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)
293
logger.critical("D-Bus Exception", exc_info=error)
296
self.rename_count += 1
325
298
def remove(self):
326
299
"""Derived from the Avahi example code"""
381
355
def server_state_changed(self, state, error=None):
382
356
"""Derived from the Avahi example code"""
383
357
logger.debug("Avahi server state change: %i", state)
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",
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" }
390
365
if state in bad_states:
391
366
if bad_states[state] is not None:
392
367
if error is None:
422
386
follow_name_owner_changes=True),
423
387
avahi.DBUS_INTERFACE_SERVER)
424
388
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
389
self.server_state_changed)
426
390
self.server_state_changed(self.server.GetState())
429
393
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
431
395
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
445
connection.send(func(*args, **kwargs))
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))
448
411
class Client(object):
449
412
"""A representation of a client host served by this server.
496
457
"fingerprint", "host", "interval",
497
458
"last_approval_request", "last_checked_ok",
498
459
"last_enabled", "name", "timeout")
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
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)
512
487
def config_parser(config):
590
565
self.current_checker_command = None
591
566
self.approved = None
592
567
self.approvals_pending = 0
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
568
self.changedstate = (multiprocessing_manager
569
.Condition(multiprocessing_manager
571
self.client_structure = [attr for attr in
572
self.__dict__.iterkeys()
597
573
if not attr.startswith("_")]
598
574
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
576
for name, t in inspect.getmembers(type(self),
602
580
if not name.startswith("_"):
603
581
self.client_structure.append(name)
646
624
# and every interval from then on.
647
625
if self.checker_initiator_tag is not None:
648
626
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
652
630
# Schedule a disable() when 'timeout' has passed
653
631
if self.disable_initiator_tag is not None:
654
632
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
657
636
# Also start a new checker *right now*.
658
637
self.start_checker()
660
def checker_callback(self, source, condition, connection,
639
def checker_callback(self, pid, condition, command):
662
640
"""The checker has completed, so take appropriate actions."""
663
641
self.checker_callback_tag = None
664
642
self.checker = None
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
643
if os.WIFEXITED(condition):
644
self.last_checker_status = os.WEXITSTATUS(condition)
672
645
if self.last_checker_status == 0:
673
646
logger.info("Checker for %(name)s succeeded",
675
648
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
650
logger.info("Checker for %(name)s failed",
679
653
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
654
logger.warning("Checker for %(name)s crashed?",
685
657
def checked_ok(self):
686
658
"""Assert that the client has been seen, alive and well."""
687
659
self.last_checked_ok = datetime.datetime.utcnow()
688
660
self.last_checker_status = 0
689
self.last_checker_signal = None
690
661
self.bump_timeout()
692
663
def bump_timeout(self, timeout=None):
718
690
# than 'timeout' for the client to be disabled, which is as it
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
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)
725
707
# Start a new checker if needed
726
708
if self.checker is None:
727
709
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
713
self.runtime_expansions)
732
715
command = self.checker_command % escaped_attrs
733
716
except TypeError as error:
734
717
logger.error('Could not format string "%s"',
735
self.checker_command,
718
self.checker_command, exc_info=error)
719
return True # Try again later
720
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",
737
return True # Try again later
738
self.current_checker_command = command
739
logger.info("Starting checker %r for %s", command,
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
748
popen_args = { "close_fds": True,
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
758
args = (pipe[1], subprocess.call, command),
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
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)
764
762
# Re-run this periodically if run by gobject.timeout_add
835
834
"""Decorator to annotate D-Bus methods, signals or properties
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
837
@dbus_service_property("org.example.Interface", signature="b",
839
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
843
842
def Property_dbus_property(self):
844
843
return dbus.Boolean(False)
847
845
def decorator(func):
848
846
func._dbus_annotations = annotations
854
851
class DBusPropertyException(dbus.exceptions.DBusException):
855
852
"""A base class for D-Bus property-related exceptions
854
def __unicode__(self):
855
return unicode(str(self))
860
858
class DBusPropertyAccessException(DBusPropertyException):
884
882
If called like _is_dbus_thing("method") it returns a function
885
883
suitable for use as predicate to inspect.getmembers().
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
890
888
def _get_all_dbus_things(self, thing):
891
889
"""Returns a generator of (name, attribute) pairs
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
891
return ((getattr(athing.__get__(self), "_dbus_name",
894
893
athing.__get__(self))
895
894
for cls in self.__class__.__mro__
896
895
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
899
899
def _get_dbus_property(self, interface_name, property_name):
900
900
"""Returns a bound method if one exists which is a D-Bus
901
901
property with the specified name and interface.
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
906
self._is_dbus_thing("property"))):
906
907
if (value._dbus_name == property_name
907
908
and value._dbus_interface == interface_name):
908
909
return value.__get__(self)
910
911
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
917
out_signature="v")
917
918
def Get(self, interface_name, property_name):
918
919
"""Standard D-Bus property Get() method, see D-Bus standard.
965
965
if not hasattr(value, "variant_level"):
966
966
properties[name] = value
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
968
properties[name] = type(value)(value, variant_level=
969
value.variant_level+1)
970
970
return dbus.Dictionary(properties, signature="sv")
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
980
972
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
973
out_signature="s",
982
974
path_keyword='object_path',
1100
1092
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1093
# with the wrong interface name
1102
1094
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1095
or not attribute._dbus_interface
1096
.startswith(orig_interface_name)):
1106
1098
# Create an alternate D-Bus interface name based on
1107
1099
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1100
alt_interface = (attribute._dbus_interface
1101
.replace(orig_interface_name,
1102
alt_interface_name))
1110
1103
interface_names.add(alt_interface)
1111
1104
# Is this a D-Bus signal?
1112
1105
if getattr(attribute, "_dbus_is_signal", False):
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1106
# Extract the original non-method undecorated
1107
# function by black magic
1108
nonmethod_func = (dict(
1117
1109
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1110
attribute.__closure__))["func"]
1122
1112
# Create a new, but exactly alike, function
1123
1113
# object, and decorate it to be a new D-Bus signal
1124
1114
# with the alternate D-Bus interface name
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1141
attribute._dbus_signature)(new_function))
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)))
1142
1124
# Copy annotations, if any
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1126
new_function._dbus_annotations = (
1127
dict(attribute._dbus_annotations))
1146
1128
except AttributeError:
1148
1130
# Define a creator of a function to call both the
1170
1150
# object. Decorate it to be a new D-Bus method
1171
1151
# with the alternate D-Bus interface name. Add it
1172
1152
# to the class.
1174
dbus.service.method(
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
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)))
1183
1163
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1187
1167
except AttributeError:
1189
1169
# Is this a D-Bus property?
1192
1172
# object, and decorate it to be a new D-Bus
1193
1173
# property with the alternate D-Bus interface
1194
1174
# name. Add it to the class.
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
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)))
1206
1188
# Copy annotations, if any
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1190
attr[attrname]._dbus_annotations = (
1191
dict(attribute._dbus_annotations))
1210
1192
except AttributeError:
1212
1194
# Is this a D-Bus interface?
1215
1197
# object. Decorate it to be a new D-Bus interface
1216
1198
# with the alternate D-Bus interface name. Add it
1217
1199
# to the class.
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
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)))
1226
1209
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1210
iname="_AlternateDBusNames_interface_annotation{0}"
1228
1211
for interface_name in interface_names:
1230
1212
@dbus_interface_annotations(interface_name)
1231
1213
def func(self):
1232
1214
return { "org.freedesktop.DBus.Deprecated":
1234
1216
# Find an unused name
1235
1217
for aname in (iname.format(i)
1236
1218
for i in itertools.count()):
1269
1248
Client.__init__(self, *args, **kwargs)
1270
1249
# Only now, when this client is initialized, can it show up on
1272
client_object_name = str(self.name).translate(
1251
client_object_name = unicode(self.name).translate(
1273
1252
{ord("."): ord("_"),
1274
1253
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1254
self.dbus_object_path = (dbus.ObjectPath
1255
("/clients/" + client_object_name))
1277
1256
DBusObjectWithProperties.__init__(self, self.bus,
1278
1257
self.dbus_object_path)
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1284
_interface=_interface):
1259
def notifychangeproperty(transform_func,
1260
dbus_name, type_func=lambda x: x,
1285
1262
""" Modify a variable so that it's a property which announces
1286
1263
its changes to DBus.
1292
1269
to the D-Bus. Default: no transform
1293
1270
variant_level: D-Bus variant level. Default: 1
1295
attrname = "_{}".format(dbus_name)
1272
attrname = "_{0}".format(dbus_name)
1297
1273
def setter(self, value):
1298
1274
if hasattr(self, "dbus_object_path"):
1299
1275
if (not hasattr(self, attrname) or
1300
1276
type_func(getattr(self, attrname, None))
1301
1277
!= type_func(value)):
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1307
dbus_value = transform_func(
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1312
self.PropertiesChanged(
1314
dbus.Dictionary({ dbus.String(dbus_name):
1278
dbus_value = transform_func(type_func(value),
1281
self.PropertyChanged(dbus.String(dbus_name),
1317
1283
setattr(self, attrname, value)
1319
1285
return property(lambda self: getattr(self, attrname), setter)
1325
1291
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1292
last_enabled = notifychangeproperty(datetime_to_dbus,
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1294
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1295
type_func = lambda checker:
1296
checker is not None)
1331
1297
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1298
"LastCheckedOK")
1333
1299
last_checker_status = notifychangeproperty(dbus.Int16,
1336
1302
datetime_to_dbus, "LastApprovalRequest")
1337
1303
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1304
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1305
approval_delay = notifychangeproperty(dbus.UInt64,
1308
timedelta_to_milliseconds)
1342
1309
approval_duration = notifychangeproperty(
1343
1310
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1311
type_func = timedelta_to_milliseconds)
1345
1312
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1313
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1315
timedelta_to_milliseconds)
1349
1316
extended_timeout = notifychangeproperty(
1350
1317
dbus.UInt64, "ExtendedTimeout",
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1318
type_func = timedelta_to_milliseconds)
1319
interval = notifychangeproperty(dbus.UInt64,
1322
timedelta_to_milliseconds)
1355
1323
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1359
1325
del notifychangeproperty
1367
1333
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1334
Client.__del__(self, *args, **kwargs)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1375
exitstatus = self.last_checker_status
1336
def checker_callback(self, pid, condition, command,
1338
self.checker_callback_tag = None
1340
if os.WIFEXITED(condition):
1341
exitstatus = os.WEXITSTATUS(condition)
1377
1342
# Emit D-Bus signal
1378
1343
self.CheckerCompleted(dbus.Int16(exitstatus),
1344
dbus.Int64(condition),
1380
1345
dbus.String(command))
1382
1347
# Emit D-Bus signal
1383
1348
self.CheckerCompleted(dbus.Int16(-1),
1385
self.last_checker_signal),
1349
dbus.Int64(condition),
1386
1350
dbus.String(command))
1352
return Client.checker_callback(self, pid, condition, command,
1389
1355
def start_checker(self, *args, **kwargs):
1390
1356
old_checker_pid = getattr(self.checker, "pid", None)
1504
1475
self.approved_by_default = bool(value)
1506
1477
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
1509
1479
access="readwrite")
1510
1480
def ApprovalDelay_dbus_property(self, value=None):
1511
1481
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1483
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1516
1485
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1486
@dbus_service_property(_interface, signature="t",
1519
1487
access="readwrite")
1520
1488
def ApprovalDuration_dbus_property(self, value=None):
1521
1489
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1524
1492
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1526
1494
# Name - property
1612
1577
gobject.source_remove(self.disable_initiator_tag)
1613
self.disable_initiator_tag = gobject.timeout_add(
1614
int((self.expires - now).total_seconds() * 1000),
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
1617
1583
# ExtendedTimeout - property
1618
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
1620
1585
access="readwrite")
1621
1586
def ExtendedTimeout_dbus_property(self, value=None):
1622
1587
if value is None: # get
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1589
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1627
1591
# Interval - property
1628
@dbus_service_property(_interface,
1592
@dbus_service_property(_interface, signature="t",
1630
1593
access="readwrite")
1631
1594
def Interval_dbus_property(self, value=None):
1632
1595
if value is None: # get
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
return dbus.UInt64(self.interval_milliseconds())
1634
1597
self.interval = datetime.timedelta(0, 0, 0, value)
1635
1598
if getattr(self, "checker_initiator_tag", None) is None:
1637
1600
if self.enabled:
1638
1601
# Reschedule checker run
1639
1602
gobject.source_remove(self.checker_initiator_tag)
1640
self.checker_initiator_tag = gobject.timeout_add(
1641
value, self.start_checker)
1642
self.start_checker() # Start one now, too
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
1644
1607
# Checker - property
1645
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="s",
1647
1609
access="readwrite")
1648
1610
def Checker_dbus_property(self, value=None):
1649
1611
if value is None: # get
1650
1612
return dbus.String(self.checker_command)
1651
self.checker_command = str(value)
1613
self.checker_command = unicode(value)
1653
1615
# CheckerRunning - property
1654
@dbus_service_property(_interface,
1616
@dbus_service_property(_interface, signature="b",
1656
1617
access="readwrite")
1657
1618
def CheckerRunning_dbus_property(self, value=None):
1658
1619
if value is None: # get
1715
1672
def handle(self):
1716
1673
with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
1674
logger.info("TCP connection from: %s",
1718
str(self.client_address))
1675
unicode(self.client_address))
1719
1676
logger.debug("Pipe FD: %d",
1720
1677
self.server.child_pipe.fileno())
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1679
session = (gnutls.connection
1680
.ClientSession(self.request,
1682
.X509Credentials()))
1725
1684
# Note: gnutls.connection.X509Credentials is really a
1726
1685
# generic GnuTLS certificate credentials object so long as
1883
1845
def fingerprint(openpgp):
1884
1846
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1847
# New GnuTLS "datum" with the OpenPGP public key
1886
datum = gnutls.library.types.gnutls_datum_t(
1887
ctypes.cast(ctypes.c_char_p(openpgp),
1888
ctypes.POINTER(ctypes.c_ubyte)),
1889
ctypes.c_uint(len(openpgp)))
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
ctypes.c_uint(len(openpgp))))
1890
1853
# New empty GnuTLS certificate
1891
1854
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1857
# Import the OpenPGP public key into the certificate
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
1898
1862
# Verify the self signature in the key
1899
1863
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
1902
1867
if crtverify.value != 0:
1903
1868
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1869
raise (gnutls.errors.CertificateSecurityError
1906
1871
# New buffer for the fingerprint
1907
1872
buf = ctypes.create_string_buffer(20)
1908
1873
buf_len = ctypes.c_size_t()
1909
1874
# Get the fingerprint from the certificate into the buffer
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
1912
1878
# Deinit the certificate
1913
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1880
# Convert the buffer to a Python bytestring
2092
2048
def add_pipe(self, parent_pipe, proc):
2093
2049
# Call "handle_ipc" for both data and EOF events
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2097
functools.partial(self.handle_ipc,
2098
parent_pipe = parent_pipe,
2050
gobject.io_add_watch(parent_pipe.fileno(),
2051
gobject.IO_IN | gobject.IO_HUP,
2052
functools.partial(self.handle_ipc,
2101
def handle_ipc(self, source, condition,
2104
client_object=None):
2057
def handle_ipc(self, source, condition, parent_pipe=None,
2058
proc = None, client_object=None):
2105
2059
# error, or the other end of multiprocessing.Pipe has closed
2106
2060
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2061
# Wait for other process to exit
2194
2148
# avoid excessive use of external libraries.
2196
2150
# New type for defining tokens, syntax, and semantics all-in-one
2197
Token = collections.namedtuple("Token", (
2198
"regexp", # To match token; if "value" is not None, must have
2199
# a "group" containing digits
2200
"value", # datetime.timedelta or None
2201
"followers")) # Tokens valid after this token
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
2202
2160
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2161
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2162
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2163
token_second = Token(re.compile(r"(\d+)S"),
2206
2164
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2165
frozenset((token_end,)))
2208
2166
token_minute = Token(re.compile(r"(\d+)M"),
2209
2167
datetime.timedelta(minutes=1),
2210
2168
frozenset((token_second, token_end)))
2226
2184
frozenset((token_month, token_end)))
2227
2185
token_week = Token(re.compile(r"(\d+)W"),
2228
2186
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2187
frozenset((token_end,)))
2230
2188
token_duration = Token(re.compile(r"P"), None,
2231
2189
frozenset((token_year, token_month,
2232
2190
token_day, token_time,
2234
2192
# Define starting values
2235
2193
value = datetime.timedelta() # Value so far
2236
2194
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2195
followers = frozenset(token_duration,) # Following valid tokens
2238
2196
s = duration # String left to parse
2239
2197
# Loop until end token is found
2240
2198
while found_token is not token_end:
2436
2394
# Override the settings from the config file with command line
2437
2395
# options, if set.
2438
2396
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2397
"priority", "servicename", "configdir",
2398
"use_dbus", "use_ipv6", "debuglevel", "restore",
2399
"statedir", "socket", "foreground", "zeroconf"):
2442
2400
value = getattr(options, option)
2443
2401
if value is not None:
2444
2402
server_settings[option] = value
2446
2404
# Force all strings to be unicode
2447
2405
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2406
if type(server_settings[option]) is str:
2407
server_settings[option] = unicode(server_settings[option])
2451
2408
# Force all boolean options to be boolean
2452
2409
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
2410
"foreground", "zeroconf"):
2501
2460
socketfd = None
2502
2461
if server_settings["socket"] != "":
2503
2462
socketfd = server_settings["socket"]
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2507
interface=(server_settings["interface"] or None),
2509
gnutls_priority=server_settings["priority"],
2463
tcp_server = MandosServer((server_settings["address"],
2464
server_settings["port"]),
2466
interface=(server_settings["interface"]
2470
server_settings["priority"],
2512
2473
if not foreground:
2513
2474
pidfilename = "/run/mandos.pid"
2514
2475
if not os.path.isdir("/run/."):
2515
2476
pidfilename = "/var/run/mandos.pid"
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2479
pidfile = open(pidfilename, "w")
2519
2480
except IOError as e:
2520
2481
logger.error("Could not open file %r", pidfilename,
2577
2538
bus_name = dbus.service.BusName("se.recompile.Mandos",
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2583
except dbus.exceptions.DBusException as e:
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:
2584
2544
logger.error("Disabling D-Bus:", exc_info=e)
2585
2545
use_dbus = False
2586
2546
server_settings["use_dbus"] = False
2587
2547
tcp_server.use_dbus = False
2589
2549
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2550
service = AvahiServiceToSyslog(name =
2551
server_settings["servicename"],
2552
servicetype = "_mandos._tcp",
2553
protocol = protocol, bus = bus)
2595
2554
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2555
service.interface = (if_nametoindex
2556
(str(server_settings["interface"])))
2599
2558
global multiprocessing_manager
2600
2559
multiprocessing_manager = multiprocessing.Manager()
2619
2578
if server_settings["restore"]:
2621
2580
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2581
clients_data, old_client_settings = (pickle.load
2624
2583
os.remove(stored_state_path)
2625
2584
except IOError as e:
2626
2585
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2586
logger.warning("Could not load persistent state: {0}"
2587
.format(os.strerror(e.errno)))
2630
2589
logger.critical("Could not load persistent state:",
2633
2592
except EOFError as e:
2634
2593
logger.warning("Could not load persistent state: "
2594
"EOFError:", exc_info=e)
2638
2596
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2597
for client_name, client in clients_data.iteritems():
2640
2598
# Skip removed clients
2641
2599
if client_name not in client_settings:
2667
2625
if datetime.datetime.utcnow() >= client["expires"]:
2668
2626
if not client["last_checked_ok"]:
2669
2627
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2628
"disabling client {0} - Client never "
2629
"performed a successful checker"
2630
.format(client_name))
2673
2631
client["enabled"] = False
2674
2632
elif client["last_checker_status"] != 0:
2675
2633
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2634
"disabling client {0} - Client "
2635
"last checker failed with error code {1}"
2636
.format(client_name,
2637
client["last_checker_status"]))
2681
2638
client["enabled"] = False
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2640
client["expires"] = (datetime.datetime
2642
+ client["timeout"])
2686
2643
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2644
" keeping {0} enabled"
2645
.format(client_name))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2647
client["secret"] = (
2648
pgp.decrypt(client["encrypted_secret"],
2649
client_settings[client_name]
2693
2651
except PGPError:
2694
2652
# If decryption fails, we use secret from new settings
2695
logger.debug("Failed to decrypt {} old secret".format(
2697
client["secret"] = (client_settings[client_name]
2653
logger.debug("Failed to decrypt {0} old secret"
2654
.format(client_name))
2655
client["secret"] = (
2656
client_settings[client_name]["secret"])
2700
2658
# Add/remove clients based on new changes made to config
2701
2659
for client_name in (set(old_client_settings)
2731
2688
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2691
@alternate_dbus_interfaces({"se.recompile.Mandos":
2692
"se.bsnet.fukt.Mandos"})
2737
2693
class MandosDBusService(DBusObjectWithProperties):
2738
2694
"""A D-Bus proxy object"""
2740
2695
def __init__(self):
2741
2696
dbus.service.Object.__init__(self, bus, "/")
2743
2697
_interface = "se.recompile.Mandos"
2745
2699
@dbus_interface_annotations(_interface)
2746
2700
def _foo(self):
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2701
return { "org.freedesktop.DBus.Property"
2702
".EmitsChangedSignal":
2751
2705
@dbus.service.signal(_interface, signature="o")
2752
2706
def ClientAdded(self, objpath):
2835
2790
del client_settings[client.name]["secret"]
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
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:
2844
2797
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2798
tempname=stored_state.name
2846
2799
os.rename(tempname, stored_state_path)
2847
2800
except (IOError, OSError) as e: