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()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
103
116
except (OSError, AttributeError):
104
118
def if_nametoindex(interface):
105
119
"Get an interface index the hard way, i.e. using fcntl()"
106
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
121
with contextlib.closing(socket.socket()) as s:
108
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
125
return interface_index
116
128
def initlogger(debug, level=logging.WARNING):
117
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
119
135
syslogger.setFormatter(logging.Formatter
120
136
('Mandos [%(process)d]: %(levelname)s:'
273
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
276
300
"""Derived from the Avahi example code"""
277
301
if self.rename_count >= self.max_renames:
278
302
logger.critical("No suitable Zeroconf service name found"
279
303
" after %i retries, exiting.",
280
304
self.rename_count)
281
305
raise AvahiServiceError("Too many renames")
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
284
309
logger.info("Changing Zeroconf service name to %r ...",
289
315
except dbus.exceptions.DBusException as error:
290
logger.critical("D-Bus Exception", exc_info=error)
293
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)
295
325
def remove(self):
296
326
"""Derived from the Avahi example code"""
352
381
def server_state_changed(self, state, error=None):
353
382
"""Derived from the Avahi example code"""
354
383
logger.debug("Avahi server state change: %i", state)
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" }
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",
362
390
if state in bad_states:
363
391
if bad_states[state] is not None:
364
392
if error is None:
383
411
follow_name_owner_changes=True),
384
412
avahi.DBUS_INTERFACE_SERVER)
385
413
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
414
self.server_state_changed)
387
415
self.server_state_changed(self.server.GetState())
390
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
392
420
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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))
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))
408
437
class Client(object):
409
438
"""A representation of a client host served by this server.
454
485
"fingerprint", "host", "interval",
455
486
"last_approval_request", "last_checked_ok",
456
487
"last_enabled", "name", "timeout")
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)
490
"extended_timeout": "PT15M",
492
"checker": "fping -q -- %%(host)s",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"approved_by_default": "True",
484
501
def config_parser(config):
562
579
self.current_checker_command = None
563
580
self.approved = None
564
581
self.approvals_pending = 0
565
self.changedstate = (multiprocessing_manager
566
.Condition(multiprocessing_manager
568
self.client_structure = [attr for attr in
569
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()
570
586
if not attr.startswith("_")]
571
587
self.client_structure.append("client_structure")
573
for name, t in inspect.getmembers(type(self),
589
for name, t in inspect.getmembers(
590
type(self), lambda obj: isinstance(obj, property)):
577
591
if not name.startswith("_"):
578
592
self.client_structure.append(name)
621
635
# and every interval from then on.
622
636
if self.checker_initiator_tag is not None:
623
637
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
627
641
# Schedule a disable() when 'timeout' has passed
628
642
if self.disable_initiator_tag is not None:
629
643
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
633
646
# Also start a new checker *right now*.
634
647
self.start_checker()
636
def checker_callback(self, pid, condition, command):
649
def checker_callback(self, source, condition, connection,
637
651
"""The checker has completed, so take appropriate actions."""
638
652
self.checker_callback_tag = None
639
653
self.checker = None
640
if os.WIFEXITED(condition):
641
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
642
661
if self.last_checker_status == 0:
643
662
logger.info("Checker for %(name)s succeeded",
645
664
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
666
logger.info("Checker for %(name)s failed", vars(self))
650
668
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
651
670
logger.warning("Checker for %(name)s crashed?",
654
674
def checked_ok(self):
655
675
"""Assert that the client has been seen, alive and well."""
656
676
self.last_checked_ok = datetime.datetime.utcnow()
657
677
self.last_checker_status = 0
678
self.last_checker_signal = None
658
679
self.bump_timeout()
660
681
def bump_timeout(self, timeout=None):
687
707
# than 'timeout' for the client to be disabled, which is as it
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:
695
except OSError as error:
696
if error.errno != errno.ECHILD:
700
logger.warning("Checker was a zombie")
701
gobject.source_remove(self.checker_callback_tag)
702
self.checker_callback(pid, status,
703
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")
704
714
# Start a new checker if needed
705
715
if self.checker is None:
706
716
# Escape attributes for the shell
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
712
721
command = self.checker_command % escaped_attrs
713
722
except TypeError as error:
714
723
logger.error('Could not format string "%s"',
715
self.checker_command, exc_info=error)
716
return True # Try again later
724
self.checker_command,
726
return True # Try again later
717
727
self.current_checker_command = command
719
logger.info("Starting checker %r for %s",
721
# We don't need to redirect stdout and stderr, since
722
# in normal mode, that is already done by daemon(),
723
# and in debug mode we don't want to. (Stdin is
724
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
741
self.checker_callback_tag = (gobject.child_watch_add
743
self.checker_callback,
745
# The checker may have completed before the gobject
746
# watch was added. Check for this.
748
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
except OSError as error:
750
if error.errno == errno.ECHILD:
751
# This should never happen
752
logger.error("Child process vanished",
757
gobject.source_remove(self.checker_callback_tag)
758
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)
759
753
# Re-run this periodically if run by gobject.timeout_add
767
761
if getattr(self, "checker", None) is None:
769
763
logger.debug("Stopping checker for %(name)s", vars(self))
771
self.checker.terminate()
773
#if self.checker.poll() is None:
774
# self.checker.kill()
775
except OSError as error:
776
if error.errno != errno.ESRCH: # No such process
764
self.checker.terminate()
778
765
self.checker = None
781
def dbus_service_property(dbus_interface, signature="v",
782
access="readwrite", byte_arrays=False):
768
def dbus_service_property(dbus_interface,
783
772
"""Decorators for marking methods of a DBusObjectWithProperties to
784
773
become properties on the D-Bus.
831
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"})
834
830
@dbus_service_property("org.example.Interface", signature="b",
836
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
"org.freedesktop.DBus.Property."
838
"EmitsChangedSignal": "false"})
839
832
def Property_dbus_property(self):
840
833
return dbus.Boolean(False)
842
836
def decorator(func):
843
837
func._dbus_annotations = annotations
848
843
class DBusPropertyException(dbus.exceptions.DBusException):
849
844
"""A base class for D-Bus property-related exceptions
851
def __unicode__(self):
852
return unicode(str(self))
855
849
class DBusPropertyAccessException(DBusPropertyException):
879
873
If called like _is_dbus_thing("method") it returns a function
880
874
suitable for use as predicate to inspect.getmembers().
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
876
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
879
def _get_all_dbus_things(self, thing):
886
880
"""Returns a generator of (name, attribute) pairs
888
return ((getattr(athing.__get__(self), "_dbus_name",
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
890
883
athing.__get__(self))
891
884
for cls in self.__class__.__mro__
892
885
for name, athing in
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
896
888
def _get_dbus_property(self, interface_name, property_name):
897
889
"""Returns a bound method if one exists which is a D-Bus
898
890
property with the specified name and interface.
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
903
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")):
904
895
if (value._dbus_name == property_name
905
896
and value._dbus_interface == interface_name):
906
897
return value.__get__(self)
908
899
# No such property
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
914
905
out_signature="v")
915
906
def Get(self, interface_name, property_name):
916
907
"""Standard D-Bus property Get() method, see D-Bus standard.
962
954
if not hasattr(value, "variant_level"):
963
955
properties[name] = value
965
properties[name] = type(value)(value, variant_level=
966
value.variant_level+1)
957
properties[name] = type(value)(
958
value, variant_level = value.variant_level + 1)
967
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
969
969
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
970
out_signature="s",
971
971
path_keyword='object_path',
1089
1089
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
1090
# with the wrong interface name
1091
1091
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface
1093
.startswith(orig_interface_name)):
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
1095
1095
# Create an alternate D-Bus interface name based on
1096
1096
# the current name
1097
alt_interface = (attribute._dbus_interface
1098
.replace(orig_interface_name,
1099
alt_interface_name))
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1100
1099
interface_names.add(alt_interface)
1101
1100
# Is this a D-Bus signal?
1102
1101
if getattr(attribute, "_dbus_is_signal", False):
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
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(
1106
1106
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))["func"]
1107
attribute.__closure__))
1108
["func"].cell_contents)
1110
nonmethod_func = attribute
1109
1111
# Create a new, but exactly alike, function
1110
1112
# object, and decorate it to be a new D-Bus signal
1111
1113
# with the alternate D-Bus interface name
1112
new_function = (dbus.service.signal
1114
attribute._dbus_signature)
1115
(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)))
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))
1121
1131
# Copy annotations, if any
1123
new_function._dbus_annotations = (
1124
dict(attribute._dbus_annotations))
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1125
1135
except AttributeError:
1127
1137
# Define a creator of a function to call both the
1147
1159
# object. Decorate it to be a new D-Bus method
1148
1160
# with the alternate D-Bus interface name. Add it
1149
1161
# to the class.
1150
attr[attrname] = (dbus.service.method
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1155
(attribute.func_code,
1156
attribute.func_globals,
1157
attribute.func_name,
1158
attribute.func_defaults,
1159
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)))
1160
1172
# Copy annotations, if any
1162
attr[attrname]._dbus_annotations = (
1163
dict(attribute._dbus_annotations))
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1164
1176
except AttributeError:
1166
1178
# Is this a D-Bus property?
1169
1181
# object, and decorate it to be a new D-Bus
1170
1182
# property with the alternate D-Bus interface
1171
1183
# name. Add it to the class.
1172
attr[attrname] = (dbus_service_property
1174
attribute._dbus_signature,
1175
attribute._dbus_access,
1177
._dbus_get_args_options
1180
(attribute.func_code,
1181
attribute.func_globals,
1182
attribute.func_name,
1183
attribute.func_defaults,
1184
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)))
1185
1195
# Copy annotations, if any
1187
attr[attrname]._dbus_annotations = (
1188
dict(attribute._dbus_annotations))
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1189
1199
except AttributeError:
1191
1201
# Is this a D-Bus interface?
1194
1204
# object. Decorate it to be a new D-Bus interface
1195
1205
# with the alternate D-Bus interface name. Add it
1196
1206
# to the class.
1197
attr[attrname] = (dbus_interface_annotations
1200
(attribute.func_code,
1201
attribute.func_globals,
1202
attribute.func_name,
1203
attribute.func_defaults,
1204
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)))
1206
1215
# Deprecate all alternate interfaces
1207
iname="_AlternateDBusNames_interface_annotation{0}"
1216
iname="_AlternateDBusNames_interface_annotation{}"
1208
1217
for interface_name in interface_names:
1209
1219
@dbus_interface_annotations(interface_name)
1210
1220
def func(self):
1211
1221
return { "org.freedesktop.DBus.Deprecated":
1213
1223
# Find an unused name
1214
1224
for aname in (iname.format(i)
1215
1225
for i in itertools.count()):
1245
1258
Client.__init__(self, *args, **kwargs)
1246
1259
# Only now, when this client is initialized, can it show up on
1248
client_object_name = unicode(self.name).translate(
1261
client_object_name = str(self.name).translate(
1249
1262
{ord("."): ord("_"),
1250
1263
ord("-"): ord("_")})
1251
self.dbus_object_path = (dbus.ObjectPath
1252
("/clients/" + client_object_name))
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1253
1266
DBusObjectWithProperties.__init__(self, self.bus,
1254
1267
self.dbus_object_path)
1256
def notifychangeproperty(transform_func,
1257
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):
1259
1274
""" Modify a variable so that it's a property which announces
1260
1275
its changes to DBus.
1266
1281
to the D-Bus. Default: no transform
1267
1282
variant_level: D-Bus variant level. Default: 1
1269
attrname = "_{0}".format(dbus_name)
1284
attrname = "_{}".format(dbus_name)
1270
1286
def setter(self, value):
1271
1287
if hasattr(self, "dbus_object_path"):
1272
1288
if (not hasattr(self, attrname) or
1273
1289
type_func(getattr(self, attrname, None))
1274
1290
!= type_func(value)):
1275
dbus_value = transform_func(type_func(value),
1278
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):
1280
1306
setattr(self, attrname, value)
1282
1308
return property(lambda self: getattr(self, attrname), setter)
1288
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1289
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1291
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1292
type_func = lambda checker:
1293
checker is not None)
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1294
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1295
1321
"LastCheckedOK")
1296
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1299
1325
datetime_to_dbus, "LastApprovalRequest")
1300
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1301
1327
"ApprovedByDefault")
1302
approval_delay = notifychangeproperty(dbus.UInt64,
1305
timedelta_to_milliseconds)
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1306
1331
approval_duration = notifychangeproperty(
1307
1332
dbus.UInt64, "ApprovalDuration",
1308
type_func = timedelta_to_milliseconds)
1333
type_func = lambda td: td.total_seconds() * 1000)
1309
1334
host = notifychangeproperty(dbus.String, "Host")
1310
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1312
timedelta_to_milliseconds)
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1313
1338
extended_timeout = notifychangeproperty(
1314
1339
dbus.UInt64, "ExtendedTimeout",
1315
type_func = timedelta_to_milliseconds)
1316
interval = notifychangeproperty(dbus.UInt64,
1319
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)
1320
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1322
1348
del notifychangeproperty
1330
1356
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1331
1357
Client.__del__(self, *args, **kwargs)
1333
def checker_callback(self, pid, condition, command,
1335
self.checker_callback_tag = None
1337
if os.WIFEXITED(condition):
1338
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
1339
1366
# Emit D-Bus signal
1340
1367
self.CheckerCompleted(dbus.Int16(exitstatus),
1341
dbus.Int64(condition),
1342
1369
dbus.String(command))
1344
1371
# Emit D-Bus signal
1345
1372
self.CheckerCompleted(dbus.Int16(-1),
1346
dbus.Int64(condition),
1374
self.last_checker_signal),
1347
1375
dbus.String(command))
1349
return Client.checker_callback(self, pid, condition, command,
1352
1378
def start_checker(self, *args, **kwargs):
1353
old_checker = self.checker
1354
if self.checker is not None:
1355
old_checker_pid = self.checker.pid
1357
old_checker_pid = None
1379
old_checker_pid = getattr(self.checker, "pid", None)
1358
1380
r = Client.start_checker(self, *args, **kwargs)
1359
1381
# Only if new checker process was started
1360
1382
if (self.checker is not None
1476
1493
self.approved_by_default = bool(value)
1478
1495
# ApprovalDelay - property
1479
@dbus_service_property(_interface, signature="t",
1496
@dbus_service_property(_interface,
1480
1498
access="readwrite")
1481
1499
def ApprovalDelay_dbus_property(self, value=None):
1482
1500
if value is None: # get
1483
return dbus.UInt64(self.approval_delay_milliseconds())
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1484
1503
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1486
1505
# ApprovalDuration - property
1487
@dbus_service_property(_interface, signature="t",
1506
@dbus_service_property(_interface,
1488
1508
access="readwrite")
1489
1509
def ApprovalDuration_dbus_property(self, value=None):
1490
1510
if value is None: # get
1491
return dbus.UInt64(timedelta_to_milliseconds(
1492
self.approval_duration))
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1493
1513
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1495
1515
# Name - property
1578
1601
gobject.source_remove(self.disable_initiator_tag)
1579
self.disable_initiator_tag = (
1580
gobject.timeout_add(
1581
timedelta_to_milliseconds(self.expires - now),
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1584
1606
# ExtendedTimeout - property
1585
@dbus_service_property(_interface, signature="t",
1607
@dbus_service_property(_interface,
1586
1609
access="readwrite")
1587
1610
def ExtendedTimeout_dbus_property(self, value=None):
1588
1611
if value is None: # get
1589
return dbus.UInt64(self.extended_timeout_milliseconds())
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1590
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1592
1616
# Interval - property
1593
@dbus_service_property(_interface, signature="t",
1617
@dbus_service_property(_interface,
1594
1619
access="readwrite")
1595
1620
def Interval_dbus_property(self, value=None):
1596
1621
if value is None: # get
1597
return dbus.UInt64(self.interval_milliseconds())
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1598
1623
self.interval = datetime.timedelta(0, 0, 0, value)
1599
1624
if getattr(self, "checker_initiator_tag", None) is None:
1601
1626
if self.enabled:
1602
1627
# Reschedule checker run
1603
1628
gobject.source_remove(self.checker_initiator_tag)
1604
self.checker_initiator_tag = (gobject.timeout_add
1605
(value, self.start_checker))
1606
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
1608
1633
# Checker - property
1609
@dbus_service_property(_interface, signature="s",
1634
@dbus_service_property(_interface,
1610
1636
access="readwrite")
1611
1637
def Checker_dbus_property(self, value=None):
1612
1638
if value is None: # get
1613
1639
return dbus.String(self.checker_command)
1614
self.checker_command = unicode(value)
1640
self.checker_command = str(value)
1616
1642
# CheckerRunning - property
1617
@dbus_service_property(_interface, signature="b",
1643
@dbus_service_property(_interface,
1618
1645
access="readwrite")
1619
1646
def CheckerRunning_dbus_property(self, value=None):
1620
1647
if value is None: # get
1673
1704
def handle(self):
1674
1705
with contextlib.closing(self.server.child_pipe) as child_pipe:
1675
1706
logger.info("TCP connection from: %s",
1676
unicode(self.client_address))
1707
str(self.client_address))
1677
1708
logger.debug("Pipe FD: %d",
1678
1709
self.server.child_pipe.fileno())
1680
session = (gnutls.connection
1681
.ClientSession(self.request,
1683
.X509Credentials()))
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1685
1714
# Note: gnutls.connection.X509Credentials is really a
1686
1715
# generic GnuTLS certificate credentials object so long as
1846
1872
def fingerprint(openpgp):
1847
1873
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1848
1874
# New GnuTLS "datum" with the OpenPGP public key
1849
datum = (gnutls.library.types
1850
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1853
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)))
1854
1879
# New empty GnuTLS certificate
1855
1880
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1858
1883
# Import the OpenPGP public key into the certificate
1859
(gnutls.library.functions
1860
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1861
gnutls.library.constants
1862
.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)
1863
1887
# Verify the self signature in the key
1864
1888
crtverify = ctypes.c_uint()
1865
(gnutls.library.functions
1866
.gnutls_openpgp_crt_verify_self(crt, 0,
1867
ctypes.byref(crtverify)))
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1868
1891
if crtverify.value != 0:
1869
1892
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1870
raise (gnutls.errors.CertificateSecurityError
1893
raise gnutls.errors.CertificateSecurityError(
1872
1895
# New buffer for the fingerprint
1873
1896
buf = ctypes.create_string_buffer(20)
1874
1897
buf_len = ctypes.c_size_t()
1875
1898
# Get the fingerprint from the certificate into the buffer
1876
(gnutls.library.functions
1877
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1878
ctypes.byref(buf_len)))
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1879
1901
# Deinit the certificate
1880
1902
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1881
1903
# Convert the buffer to a Python bytestring
2049
2081
def add_pipe(self, parent_pipe, proc):
2050
2082
# Call "handle_ipc" for both data and EOF events
2051
gobject.io_add_watch(parent_pipe.fileno(),
2052
gobject.IO_IN | gobject.IO_HUP,
2053
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,
2058
def handle_ipc(self, source, condition, parent_pipe=None,
2059
proc = None, client_object=None):
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2060
2094
# error, or the other end of multiprocessing.Pipe has closed
2061
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2062
2096
# Wait for other process to exit
2149
2183
# avoid excessive use of external libraries.
2151
2185
# New type for defining tokens, syntax, and semantics all-in-one
2152
Token = collections.namedtuple("Token",
2153
("regexp", # To match token; if
2154
# "value" is not None,
2155
# must have a "group"
2157
"value", # datetime.timedelta or
2159
"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
2161
2191
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2162
2192
# the "duration" ABNF definition in RFC 3339, Appendix A.
2163
2193
token_end = Token(re.compile(r"$"), None, frozenset())
2164
2194
token_second = Token(re.compile(r"(\d+)S"),
2165
2195
datetime.timedelta(seconds=1),
2166
frozenset((token_end,)))
2196
frozenset((token_end, )))
2167
2197
token_minute = Token(re.compile(r"(\d+)M"),
2168
2198
datetime.timedelta(minutes=1),
2169
2199
frozenset((token_second, token_end)))
2185
2215
frozenset((token_month, token_end)))
2186
2216
token_week = Token(re.compile(r"(\d+)W"),
2187
2217
datetime.timedelta(weeks=1),
2188
frozenset((token_end,)))
2218
frozenset((token_end, )))
2189
2219
token_duration = Token(re.compile(r"P"), None,
2190
2220
frozenset((token_year, token_month,
2191
2221
token_day, token_time,
2193
2223
# Define starting values
2194
2224
value = datetime.timedelta() # Value so far
2195
2225
found_token = None
2196
followers = frozenset(token_duration,) # Following valid tokens
2226
followers = frozenset((token_duration, )) # Following valid tokens
2197
2227
s = duration # String left to parse
2198
2228
# Loop until end token is found
2199
2229
while found_token is not token_end:
2391
2425
# Override the settings from the config file with command line
2392
2426
# options, if set.
2393
2427
for option in ("interface", "address", "port", "debug",
2394
"priority", "servicename", "configdir",
2395
"use_dbus", "use_ipv6", "debuglevel", "restore",
2396
"statedir", "socket", "foreground"):
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
2397
2431
value = getattr(options, option)
2398
2432
if value is not None:
2399
2433
server_settings[option] = value
2401
2435
# Force all strings to be unicode
2402
2436
for option in server_settings.keys():
2403
if type(server_settings[option]) is str:
2404
server_settings[option] = unicode(server_settings[option])
2437
if isinstance(server_settings[option], bytes):
2438
server_settings[option] = (server_settings[option]
2405
2440
# Force all boolean options to be boolean
2406
2441
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
"foreground", "zeroconf"):
2408
2443
server_settings[option] = bool(server_settings[option])
2409
2444
# Debug implies foreground
2410
2445
if server_settings["debug"]:
2447
2487
global mandos_dbus_service
2448
2488
mandos_dbus_service = None
2450
tcp_server = MandosServer((server_settings["address"],
2451
server_settings["port"]),
2453
interface=(server_settings["interface"]
2457
server_settings["priority"],
2459
socketfd=(server_settings["socket"]
2491
if server_settings["socket"] != "":
2492
socketfd = server_settings["socket"]
2493
tcp_server = MandosServer(
2494
(server_settings["address"], server_settings["port"]),
2496
interface=(server_settings["interface"] or None),
2498
gnutls_priority=server_settings["priority"],
2461
2501
if not foreground:
2462
2502
pidfilename = "/run/mandos.pid"
2463
2503
if not os.path.isdir("/run/."):
2464
2504
pidfilename = "/var/run/mandos.pid"
2467
pidfile = open(pidfilename, "w")
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2468
2508
except IOError as e:
2469
2509
logger.error("Could not open file %r", pidfilename,
2526
2566
bus_name = dbus.service.BusName("se.recompile.Mandos",
2527
bus, do_not_queue=True)
2528
old_bus_name = (dbus.service.BusName
2529
("se.bsnet.fukt.Mandos", bus,
2531
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:
2532
2573
logger.error("Disabling D-Bus:", exc_info=e)
2533
2574
use_dbus = False
2534
2575
server_settings["use_dbus"] = False
2535
2576
tcp_server.use_dbus = False
2536
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
service = AvahiServiceToSyslog(name =
2538
server_settings["servicename"],
2539
servicetype = "_mandos._tcp",
2540
protocol = protocol, bus = bus)
2541
if server_settings["interface"]:
2542
service.interface = (if_nametoindex
2543
(str(server_settings["interface"])))
2578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
service = AvahiServiceToSyslog(
2580
name = server_settings["servicename"],
2581
servicetype = "_mandos._tcp",
2582
protocol = protocol,
2584
if server_settings["interface"]:
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
2545
2588
global multiprocessing_manager
2546
2589
multiprocessing_manager = multiprocessing.Manager()
2565
2608
if server_settings["restore"]:
2567
2610
with open(stored_state_path, "rb") as stored_state:
2568
clients_data, old_client_settings = (pickle.load
2611
clients_data, old_client_settings = pickle.load(
2570
2613
os.remove(stored_state_path)
2571
2614
except IOError as e:
2572
2615
if e.errno == errno.ENOENT:
2573
logger.warning("Could not load persistent state: {0}"
2574
.format(os.strerror(e.errno)))
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2576
2619
logger.critical("Could not load persistent state:",
2579
2622
except EOFError as e:
2580
2623
logger.warning("Could not load persistent state: "
2581
"EOFError:", exc_info=e)
2583
2627
with PGPEngine() as pgp:
2584
for client_name, client in clients_data.iteritems():
2628
for client_name, client in clients_data.items():
2585
2629
# Skip removed clients
2586
2630
if client_name not in client_settings:
2612
2656
if datetime.datetime.utcnow() >= client["expires"]:
2613
2657
if not client["last_checked_ok"]:
2614
2658
logger.warning(
2615
"disabling client {0} - Client never "
2616
"performed a successful checker"
2617
.format(client_name))
2659
"disabling client {} - Client never "
2660
"performed a successful checker".format(
2618
2662
client["enabled"] = False
2619
2663
elif client["last_checker_status"] != 0:
2620
2664
logger.warning(
2621
"disabling client {0} - Client "
2622
"last checker failed with error code {1}"
2623
.format(client_name,
2624
client["last_checker_status"]))
2665
"disabling client {} - Client last"
2666
" checker failed with error code"
2669
client["last_checker_status"]))
2625
2670
client["enabled"] = False
2627
client["expires"] = (datetime.datetime
2629
+ client["timeout"])
2672
client["expires"] = (
2673
datetime.datetime.utcnow()
2674
+ client["timeout"])
2630
2675
logger.debug("Last checker succeeded,"
2631
" keeping {0} enabled"
2632
.format(client_name))
2676
" keeping {} enabled".format(
2634
client["secret"] = (
2635
pgp.decrypt(client["encrypted_secret"],
2636
client_settings[client_name]
2679
client["secret"] = pgp.decrypt(
2680
client["encrypted_secret"],
2681
client_settings[client_name]["secret"])
2638
2682
except PGPError:
2639
2683
# If decryption fails, we use secret from new settings
2640
logger.debug("Failed to decrypt {0} old secret"
2641
.format(client_name))
2642
client["secret"] = (
2643
client_settings[client_name]["secret"])
2684
logger.debug("Failed to decrypt {} old secret".format(
2686
client["secret"] = (client_settings[client_name]
2645
2689
# Add/remove clients based on new changes made to config
2646
2690
for client_name in (set(old_client_settings)
2675
2720
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2678
@alternate_dbus_interfaces({"se.recompile.Mandos":
2679
"se.bsnet.fukt.Mandos"})
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2680
2726
class MandosDBusService(DBusObjectWithProperties):
2681
2727
"""A D-Bus proxy object"""
2682
2729
def __init__(self):
2683
2730
dbus.service.Object.__init__(self, bus, "/")
2684
2732
_interface = "se.recompile.Mandos"
2686
2734
@dbus_interface_annotations(_interface)
2687
2735
def _foo(self):
2688
return { "org.freedesktop.DBus.Property"
2689
".EmitsChangedSignal":
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2692
2740
@dbus.service.signal(_interface, signature="o")
2693
2741
def ClientAdded(self, objpath):
2761
2809
# A list of attributes that can not be pickled
2763
exclude = set(("bus", "changedstate", "secret",
2764
"checker", "server_settings"))
2765
for name, typ in (inspect.getmembers
2766
(dbus.service.Object)):
2811
exclude = { "bus", "changedstate", "secret",
2812
"checker", "server_settings" }
2813
for name, typ in inspect.getmembers(dbus.service
2767
2815
exclude.add(name)
2769
2817
client_dict["encrypted_secret"] = (client
2776
2824
del client_settings[client.name]["secret"]
2779
with (tempfile.NamedTemporaryFile
2780
(mode='wb', suffix=".pickle", prefix='clients-',
2781
dir=os.path.dirname(stored_state_path),
2782
delete=False)) as stored_state:
2827
with tempfile.NamedTemporaryFile(
2831
dir=os.path.dirname(stored_state_path),
2832
delete=False) as stored_state:
2783
2833
pickle.dump((clients, client_settings), stored_state)
2784
tempname=stored_state.name
2834
tempname = stored_state.name
2785
2835
os.rename(tempname, stored_state_path)
2786
2836
except (IOError, OSError) as e: