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()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
116
103
except (OSError, AttributeError):
118
104
def if_nametoindex(interface):
119
105
"Get an interface index the hard way, i.e. using fcntl()"
120
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
107
with contextlib.closing(socket.socket()) as s:
122
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
125
113
return interface_index
128
116
def initlogger(debug, level=logging.WARNING):
129
117
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
119
syslogger.setFormatter(logging.Formatter
136
120
('Mandos [%(process)d]: %(levelname)s:'
297
273
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
276
"""Derived from the Avahi example code"""
301
277
if self.rename_count >= self.max_renames:
302
278
logger.critical("No suitable Zeroconf service name found"
303
279
" after %i retries, exiting.",
304
280
self.rename_count)
305
281
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
309
284
logger.info("Changing Zeroconf service name to %r ...",
315
289
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)
290
logger.critical("D-Bus Exception", exc_info=error)
293
self.rename_count += 1
325
295
def remove(self):
326
296
"""Derived from the Avahi example code"""
381
352
def server_state_changed(self, state, error=None):
382
353
"""Derived from the Avahi example code"""
383
354
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",
355
bad_states = { avahi.SERVER_INVALID:
356
"Zeroconf server invalid",
357
avahi.SERVER_REGISTERING: None,
358
avahi.SERVER_COLLISION:
359
"Zeroconf server name collision",
360
avahi.SERVER_FAILURE:
361
"Zeroconf server failure" }
390
362
if state in bad_states:
391
363
if bad_states[state] is not None:
392
364
if error is None:
422
383
follow_name_owner_changes=True),
423
384
avahi.DBUS_INTERFACE_SERVER)
424
385
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
386
self.server_state_changed)
426
387
self.server_state_changed(self.server.GetState())
429
390
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
431
392
"""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'
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(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))
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
448
408
class Client(object):
449
409
"""A representation of a client host served by this server.
496
454
"fingerprint", "host", "interval",
497
455
"last_approval_request", "last_checked_ok",
498
456
"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",
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
460
"checker": "fping -q -- %%(host)s",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
464
"approved_by_default": "True",
468
def timeout_milliseconds(self):
469
"Return the 'timeout' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.timeout)
472
def extended_timeout_milliseconds(self):
473
"Return the 'extended_timeout' attribute in milliseconds"
474
return timedelta_to_milliseconds(self.extended_timeout)
476
def interval_milliseconds(self):
477
"Return the 'interval' attribute in milliseconds"
478
return timedelta_to_milliseconds(self.interval)
480
def approval_delay_milliseconds(self):
481
return timedelta_to_milliseconds(self.approval_delay)
512
484
def config_parser(config):
590
562
self.current_checker_command = None
591
563
self.approved = None
592
564
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()
565
self.changedstate = (multiprocessing_manager
566
.Condition(multiprocessing_manager
568
self.client_structure = [attr for attr in
569
self.__dict__.iterkeys()
597
570
if not attr.startswith("_")]
598
571
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
573
for name, t in inspect.getmembers(type(self),
602
577
if not name.startswith("_"):
603
578
self.client_structure.append(name)
646
621
# and every interval from then on.
647
622
if self.checker_initiator_tag is not None:
648
623
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
652
627
# Schedule a disable() when 'timeout' has passed
653
628
if self.disable_initiator_tag is not None:
654
629
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
657
633
# Also start a new checker *right now*.
658
634
self.start_checker()
660
def checker_callback(self, source, condition, connection,
636
def checker_callback(self, pid, condition, command):
662
637
"""The checker has completed, so take appropriate actions."""
663
638
self.checker_callback_tag = None
664
639
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
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
672
642
if self.last_checker_status == 0:
673
643
logger.info("Checker for %(name)s succeeded",
675
645
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
647
logger.info("Checker for %(name)s failed",
679
650
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
651
logger.warning("Checker for %(name)s crashed?",
685
654
def checked_ok(self):
686
655
"""Assert that the client has been seen, alive and well."""
687
656
self.last_checked_ok = datetime.datetime.utcnow()
688
657
self.last_checker_status = 0
689
self.last_checker_signal = None
690
658
self.bump_timeout()
692
660
def bump_timeout(self, timeout=None):
718
687
# 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")
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except (AttributeError, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
699
logger.warning("Checker was a zombie")
700
gobject.source_remove(self.checker_callback_tag)
701
self.checker_callback(pid, status,
702
self.current_checker_command)
725
703
# Start a new checker if needed
726
704
if self.checker is None:
727
705
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
732
711
command = self.checker_command % escaped_attrs
733
712
except TypeError as error:
734
713
logger.error('Could not format string "%s"',
735
self.checker_command,
714
self.checker_command, exc_info=error)
715
return True # Try again later
716
self.current_checker_command = command
718
logger.info("Starting checker %r for %s",
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
736
except OSError as error:
737
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)
740
self.checker_callback_tag = (gobject.child_watch_add
742
self.checker_callback,
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
764
758
# Re-run this periodically if run by gobject.timeout_add
835
830
"""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
833
@dbus_service_property("org.example.Interface", signature="b",
835
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
"org.freedesktop.DBus.Property."
837
"EmitsChangedSignal": "false"})
843
838
def Property_dbus_property(self):
844
839
return dbus.Boolean(False)
847
841
def decorator(func):
848
842
func._dbus_annotations = annotations
854
847
class DBusPropertyException(dbus.exceptions.DBusException):
855
848
"""A base class for D-Bus property-related exceptions
850
def __unicode__(self):
851
return unicode(str(self))
860
854
class DBusPropertyAccessException(DBusPropertyException):
884
878
If called like _is_dbus_thing("method") it returns a function
885
879
suitable for use as predicate to inspect.getmembers().
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
890
884
def _get_all_dbus_things(self, thing):
891
885
"""Returns a generator of (name, attribute) pairs
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
887
return ((getattr(athing.__get__(self), "_dbus_name",
894
889
athing.__get__(self))
895
890
for cls in self.__class__.__mro__
896
891
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
892
inspect.getmembers(cls,
893
self._is_dbus_thing(thing)))
899
895
def _get_dbus_property(self, interface_name, property_name):
900
896
"""Returns a bound method if one exists which is a D-Bus
901
897
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")):
899
for cls in self.__class__.__mro__:
900
for name, value in (inspect.getmembers
902
self._is_dbus_thing("property"))):
906
903
if (value._dbus_name == property_name
907
904
and value._dbus_interface == interface_name):
908
905
return value.__get__(self)
910
907
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
912
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
913
out_signature="v")
917
914
def Get(self, interface_name, property_name):
918
915
"""Standard D-Bus property Get() method, see D-Bus standard.
965
959
if not hasattr(value, "variant_level"):
966
960
properties[name] = value
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
962
properties[name] = type(value)(value, variant_level=
963
value.variant_level+1)
970
964
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
966
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
967
out_signature="s",
982
968
path_keyword='object_path',
1100
1086
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1087
# with the wrong interface name
1102
1088
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1089
or not attribute._dbus_interface
1090
.startswith(orig_interface_name)):
1106
1092
# Create an alternate D-Bus interface name based on
1107
1093
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1094
alt_interface = (attribute._dbus_interface
1095
.replace(orig_interface_name,
1096
alt_interface_name))
1110
1097
interface_names.add(alt_interface)
1111
1098
# Is this a D-Bus signal?
1112
1099
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(
1100
# Extract the original non-method undecorated
1101
# function by black magic
1102
nonmethod_func = (dict(
1117
1103
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1104
attribute.__closure__))["func"]
1122
1106
# Create a new, but exactly alike, function
1123
1107
# object, and decorate it to be a new D-Bus signal
1124
1108
# 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))
1109
new_function = (dbus.service.signal
1111
attribute._dbus_signature)
1112
(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)))
1142
1118
# Copy annotations, if any
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1120
new_function._dbus_annotations = (
1121
dict(attribute._dbus_annotations))
1146
1122
except AttributeError:
1148
1124
# Define a creator of a function to call both the
1170
1144
# object. Decorate it to be a new D-Bus method
1171
1145
# with the alternate D-Bus interface name. Add it
1172
1146
# 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)))
1147
attr[attrname] = (dbus.service.method
1149
attribute._dbus_in_signature,
1150
attribute._dbus_out_signature)
1152
(attribute.func_code,
1153
attribute.func_globals,
1154
attribute.func_name,
1155
attribute.func_defaults,
1156
attribute.func_closure)))
1183
1157
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1159
attr[attrname]._dbus_annotations = (
1160
dict(attribute._dbus_annotations))
1187
1161
except AttributeError:
1189
1163
# Is this a D-Bus property?
1192
1166
# object, and decorate it to be a new D-Bus
1193
1167
# property with the alternate D-Bus interface
1194
1168
# 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)))
1169
attr[attrname] = (dbus_service_property
1171
attribute._dbus_signature,
1172
attribute._dbus_access,
1174
._dbus_get_args_options
1177
(attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
1206
1182
# Copy annotations, if any
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1184
attr[attrname]._dbus_annotations = (
1185
dict(attribute._dbus_annotations))
1210
1186
except AttributeError:
1212
1188
# Is this a D-Bus interface?
1215
1191
# object. Decorate it to be a new D-Bus interface
1216
1192
# with the alternate D-Bus interface name. Add it
1217
1193
# 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)))
1194
attr[attrname] = (dbus_interface_annotations
1197
(attribute.func_code,
1198
attribute.func_globals,
1199
attribute.func_name,
1200
attribute.func_defaults,
1201
attribute.func_closure)))
1226
1203
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1204
iname="_AlternateDBusNames_interface_annotation{0}"
1228
1205
for interface_name in interface_names:
1230
1206
@dbus_interface_annotations(interface_name)
1231
1207
def func(self):
1232
1208
return { "org.freedesktop.DBus.Deprecated":
1234
1210
# Find an unused name
1235
1211
for aname in (iname.format(i)
1236
1212
for i in itertools.count()):
1269
1242
Client.__init__(self, *args, **kwargs)
1270
1243
# Only now, when this client is initialized, can it show up on
1272
client_object_name = str(self.name).translate(
1245
client_object_name = unicode(self.name).translate(
1273
1246
{ord("."): ord("_"),
1274
1247
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1248
self.dbus_object_path = (dbus.ObjectPath
1249
("/clients/" + client_object_name))
1277
1250
DBusObjectWithProperties.__init__(self, self.bus,
1278
1251
self.dbus_object_path)
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1284
_interface=_interface):
1253
def notifychangeproperty(transform_func,
1254
dbus_name, type_func=lambda x: x,
1285
1256
""" Modify a variable so that it's a property which announces
1286
1257
its changes to DBus.
1292
1263
to the D-Bus. Default: no transform
1293
1264
variant_level: D-Bus variant level. Default: 1
1295
attrname = "_{}".format(dbus_name)
1266
attrname = "_{0}".format(dbus_name)
1297
1267
def setter(self, value):
1298
1268
if hasattr(self, "dbus_object_path"):
1299
1269
if (not hasattr(self, attrname) or
1300
1270
type_func(getattr(self, attrname, None))
1301
1271
!= 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):
1272
dbus_value = transform_func(type_func(value),
1275
self.PropertyChanged(dbus.String(dbus_name),
1317
1277
setattr(self, attrname, value)
1319
1279
return property(lambda self: getattr(self, attrname), setter)
1336
1296
datetime_to_dbus, "LastApprovalRequest")
1337
1297
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1298
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1299
approval_delay = notifychangeproperty(dbus.UInt64,
1302
timedelta_to_milliseconds)
1342
1303
approval_duration = notifychangeproperty(
1343
1304
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1305
type_func = timedelta_to_milliseconds)
1345
1306
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1307
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1309
timedelta_to_milliseconds)
1349
1310
extended_timeout = notifychangeproperty(
1350
1311
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)
1312
type_func = timedelta_to_milliseconds)
1313
interval = notifychangeproperty(dbus.UInt64,
1316
timedelta_to_milliseconds)
1355
1317
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1359
1319
del notifychangeproperty
1367
1327
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1328
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
1330
def checker_callback(self, pid, condition, command,
1332
self.checker_callback_tag = None
1334
if os.WIFEXITED(condition):
1335
exitstatus = os.WEXITSTATUS(condition)
1377
1336
# Emit D-Bus signal
1378
1337
self.CheckerCompleted(dbus.Int16(exitstatus),
1338
dbus.Int64(condition),
1380
1339
dbus.String(command))
1382
1341
# Emit D-Bus signal
1383
1342
self.CheckerCompleted(dbus.Int16(-1),
1385
self.last_checker_signal),
1343
dbus.Int64(condition),
1386
1344
dbus.String(command))
1346
return Client.checker_callback(self, pid, condition, command,
1389
1349
def start_checker(self, *args, **kwargs):
1390
old_checker_pid = getattr(self.checker, "pid", None)
1350
old_checker = self.checker
1351
if self.checker is not None:
1352
old_checker_pid = self.checker.pid
1354
old_checker_pid = None
1391
1355
r = Client.start_checker(self, *args, **kwargs)
1392
1356
# Only if new checker process was started
1393
1357
if (self.checker is not None
1504
1473
self.approved_by_default = bool(value)
1506
1475
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1476
@dbus_service_property(_interface, signature="t",
1509
1477
access="readwrite")
1510
1478
def ApprovalDelay_dbus_property(self, value=None):
1511
1479
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1480
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1481
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1516
1483
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1484
@dbus_service_property(_interface, signature="t",
1519
1485
access="readwrite")
1520
1486
def ApprovalDuration_dbus_property(self, value=None):
1521
1487
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
1524
1490
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1526
1492
# Name - property
1612
1575
gobject.source_remove(self.disable_initiator_tag)
1613
self.disable_initiator_tag = gobject.timeout_add(
1614
int((self.expires - now).total_seconds() * 1000),
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
1617
1581
# ExtendedTimeout - property
1618
@dbus_service_property(_interface,
1582
@dbus_service_property(_interface, signature="t",
1620
1583
access="readwrite")
1621
1584
def ExtendedTimeout_dbus_property(self, value=None):
1622
1585
if value is None: # get
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1587
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1627
1589
# Interval - property
1628
@dbus_service_property(_interface,
1590
@dbus_service_property(_interface, signature="t",
1630
1591
access="readwrite")
1631
1592
def Interval_dbus_property(self, value=None):
1632
1593
if value is None: # get
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1594
return dbus.UInt64(self.interval_milliseconds())
1634
1595
self.interval = datetime.timedelta(0, 0, 0, value)
1635
1596
if getattr(self, "checker_initiator_tag", None) is None:
1637
1598
if self.enabled:
1638
1599
# Reschedule checker run
1639
1600
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
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
self.start_checker() # Start one now, too
1644
1605
# Checker - property
1645
@dbus_service_property(_interface,
1606
@dbus_service_property(_interface, signature="s",
1647
1607
access="readwrite")
1648
1608
def Checker_dbus_property(self, value=None):
1649
1609
if value is None: # get
1650
1610
return dbus.String(self.checker_command)
1651
self.checker_command = str(value)
1611
self.checker_command = unicode(value)
1653
1613
# CheckerRunning - property
1654
@dbus_service_property(_interface,
1614
@dbus_service_property(_interface, signature="b",
1656
1615
access="readwrite")
1657
1616
def CheckerRunning_dbus_property(self, value=None):
1658
1617
if value is None: # get
1715
1670
def handle(self):
1716
1671
with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
1672
logger.info("TCP connection from: %s",
1718
str(self.client_address))
1673
unicode(self.client_address))
1719
1674
logger.debug("Pipe FD: %d",
1720
1675
self.server.child_pipe.fileno())
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1677
session = (gnutls.connection
1678
.ClientSession(self.request,
1680
.X509Credentials()))
1725
1682
# Note: gnutls.connection.X509Credentials is really a
1726
1683
# generic GnuTLS certificate credentials object so long as
1883
1843
def fingerprint(openpgp):
1884
1844
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1845
# 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)))
1846
datum = (gnutls.library.types
1847
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
ctypes.c_uint(len(openpgp))))
1890
1851
# New empty GnuTLS certificate
1891
1852
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1855
# 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)
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
gnutls.library.constants
1859
.GNUTLS_OPENPGP_FMT_RAW))
1898
1860
# Verify the self signature in the key
1899
1861
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
1902
1865
if crtverify.value != 0:
1903
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1867
raise (gnutls.errors.CertificateSecurityError
1906
1869
# New buffer for the fingerprint
1907
1870
buf = ctypes.create_string_buffer(20)
1908
1871
buf_len = ctypes.c_size_t()
1909
1872
# 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))
1873
(gnutls.library.functions
1874
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
ctypes.byref(buf_len)))
1912
1876
# Deinit the certificate
1913
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1878
# Convert the buffer to a Python bytestring
2092
2046
def add_pipe(self, parent_pipe, proc):
2093
2047
# 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,
2048
gobject.io_add_watch(parent_pipe.fileno(),
2049
gobject.IO_IN | gobject.IO_HUP,
2050
functools.partial(self.handle_ipc,
2101
def handle_ipc(self, source, condition,
2104
client_object=None):
2055
def handle_ipc(self, source, condition, parent_pipe=None,
2056
proc = None, client_object=None):
2105
2057
# error, or the other end of multiprocessing.Pipe has closed
2106
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2059
# Wait for other process to exit
2194
2146
# avoid excessive use of external libraries.
2196
2148
# 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
2149
Token = collections.namedtuple("Token",
2150
("regexp", # To match token; if
2151
# "value" is not None,
2152
# must have a "group"
2154
"value", # datetime.timedelta or
2156
"followers")) # Tokens valid after
2202
2158
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2159
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2160
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2161
token_second = Token(re.compile(r"(\d+)S"),
2206
2162
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2163
frozenset((token_end,)))
2208
2164
token_minute = Token(re.compile(r"(\d+)M"),
2209
2165
datetime.timedelta(minutes=1),
2210
2166
frozenset((token_second, token_end)))
2226
2182
frozenset((token_month, token_end)))
2227
2183
token_week = Token(re.compile(r"(\d+)W"),
2228
2184
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2185
frozenset((token_end,)))
2230
2186
token_duration = Token(re.compile(r"P"), None,
2231
2187
frozenset((token_year, token_month,
2232
2188
token_day, token_time,
2234
2190
# Define starting values
2235
2191
value = datetime.timedelta() # Value so far
2236
2192
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2193
followers = frozenset(token_duration,) # Following valid tokens
2238
2194
s = duration # String left to parse
2239
2195
# Loop until end token is found
2240
2196
while found_token is not token_end:
2379
2335
help="Directory to save/restore state in")
2380
2336
parser.add_argument("--foreground", action="store_true",
2381
2337
help="Run in foreground", default=None)
2382
parser.add_argument("--no-zeroconf", action="store_false",
2383
dest="zeroconf", help="Do not use Zeroconf",
2386
2339
options = parser.parse_args()
2388
2341
if options.check:
2390
fail_count, test_count = doctest.testmod()
2391
sys.exit(os.EX_OK if fail_count == 0 else 1)
2393
2346
# Default values for config file for server-global settings
2394
2347
server_defaults = { "interface": "",
2436
2388
# Override the settings from the config file with command line
2437
2389
# options, if set.
2438
2390
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2391
"priority", "servicename", "configdir",
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2393
"statedir", "socket", "foreground"):
2442
2394
value = getattr(options, option)
2443
2395
if value is not None:
2444
2396
server_settings[option] = value
2446
2398
# Force all strings to be unicode
2447
2399
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2400
if type(server_settings[option]) is str:
2401
server_settings[option] = unicode(server_settings[option])
2451
2402
# Force all boolean options to be boolean
2452
2403
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
"foreground", "zeroconf"):
2454
2405
server_settings[option] = bool(server_settings[option])
2455
2406
# Debug implies foreground
2456
2407
if server_settings["debug"]:
2498
2444
global mandos_dbus_service
2499
2445
mandos_dbus_service = None
2502
if server_settings["socket"] != "":
2503
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"],
2447
tcp_server = MandosServer((server_settings["address"],
2448
server_settings["port"]),
2450
interface=(server_settings["interface"]
2454
server_settings["priority"],
2456
socketfd=(server_settings["socket"]
2512
2458
if not foreground:
2513
2459
pidfilename = "/run/mandos.pid"
2514
if not os.path.isdir("/run/."):
2515
pidfilename = "/var/run/mandos.pid"
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2462
pidfile = open(pidfilename, "w")
2519
2463
except IOError as e:
2520
2464
logger.error("Could not open file %r", pidfilename,
2577
2521
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:
2522
bus, do_not_queue=True)
2523
old_bus_name = (dbus.service.BusName
2524
("se.bsnet.fukt.Mandos", bus,
2526
except dbus.exceptions.NameExistsException as e:
2584
2527
logger.error("Disabling D-Bus:", exc_info=e)
2585
2528
use_dbus = False
2586
2529
server_settings["use_dbus"] = False
2587
2530
tcp_server.use_dbus = False
2589
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,
2595
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2531
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2532
service = AvahiServiceToSyslog(name =
2533
server_settings["servicename"],
2534
servicetype = "_mandos._tcp",
2535
protocol = protocol, bus = bus)
2536
if server_settings["interface"]:
2537
service.interface = (if_nametoindex
2538
(str(server_settings["interface"])))
2599
2540
global multiprocessing_manager
2600
2541
multiprocessing_manager = multiprocessing.Manager()
2619
2560
if server_settings["restore"]:
2621
2562
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2563
clients_data, old_client_settings = (pickle.load
2624
2565
os.remove(stored_state_path)
2625
2566
except IOError as e:
2626
2567
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2568
logger.warning("Could not load persistent state: {0}"
2569
.format(os.strerror(e.errno)))
2630
2571
logger.critical("Could not load persistent state:",
2633
2574
except EOFError as e:
2634
2575
logger.warning("Could not load persistent state: "
2576
"EOFError:", exc_info=e)
2638
2578
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2579
for client_name, client in clients_data.iteritems():
2640
2580
# Skip removed clients
2641
2581
if client_name not in client_settings:
2667
2607
if datetime.datetime.utcnow() >= client["expires"]:
2668
2608
if not client["last_checked_ok"]:
2669
2609
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2610
"disabling client {0} - Client never "
2611
"performed a successful checker"
2612
.format(client_name))
2673
2613
client["enabled"] = False
2674
2614
elif client["last_checker_status"] != 0:
2675
2615
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2616
"disabling client {0} - Client "
2617
"last checker failed with error code {1}"
2618
.format(client_name,
2619
client["last_checker_status"]))
2681
2620
client["enabled"] = False
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2622
client["expires"] = (datetime.datetime
2624
+ client["timeout"])
2686
2625
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2626
" keeping {0} enabled"
2627
.format(client_name))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2629
client["secret"] = (
2630
pgp.decrypt(client["encrypted_secret"],
2631
client_settings[client_name]
2693
2633
except PGPError:
2694
2634
# 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]
2635
logger.debug("Failed to decrypt {0} old secret"
2636
.format(client_name))
2637
client["secret"] = (
2638
client_settings[client_name]["secret"])
2700
2640
# Add/remove clients based on new changes made to config
2701
2641
for client_name in (set(old_client_settings)
2731
2670
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2673
@alternate_dbus_interfaces({"se.recompile.Mandos":
2674
"se.bsnet.fukt.Mandos"})
2737
2675
class MandosDBusService(DBusObjectWithProperties):
2738
2676
"""A D-Bus proxy object"""
2740
2677
def __init__(self):
2741
2678
dbus.service.Object.__init__(self, bus, "/")
2743
2679
_interface = "se.recompile.Mandos"
2745
2681
@dbus_interface_annotations(_interface)
2746
2682
def _foo(self):
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2683
return { "org.freedesktop.DBus.Property"
2684
".EmitsChangedSignal":
2751
2687
@dbus.service.signal(_interface, signature="o")
2752
2688
def ClientAdded(self, objpath):
2835
2771
del client_settings[client.name]["secret"]
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2774
with (tempfile.NamedTemporaryFile
2775
(mode='wb', suffix=".pickle", prefix='clients-',
2776
dir=os.path.dirname(stored_state_path),
2777
delete=False)) as stored_state:
2844
2778
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2779
tempname=stored_state.name
2846
2780
os.rename(tempname, stored_state_path)
2847
2781
except (IOError, OSError) as e: