381
361
def server_state_changed(self, state, error=None):
382
362
"""Derived from the Avahi example code"""
383
363
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",
364
bad_states = { avahi.SERVER_INVALID:
365
"Zeroconf server invalid",
366
avahi.SERVER_REGISTERING: None,
367
avahi.SERVER_COLLISION:
368
"Zeroconf server name collision",
369
avahi.SERVER_FAILURE:
370
"Zeroconf server failure" }
390
371
if state in bad_states:
391
372
if bad_states[state] is not None:
392
373
if error is None:
419
400
def rename(self, *args, **kwargs):
420
401
"""Add the new name to the syslog messages"""
421
402
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
403
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
405
' %(levelname)s: %(message)s'
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))
437
410
class Client(object):
438
411
"""A representation of a client host served by this server.
485
456
"fingerprint", "host", "interval",
486
457
"last_approval_request", "last_checked_ok",
487
458
"last_enabled", "name", "timeout")
490
"extended_timeout": "PT15M",
492
"checker": "fping -q -- %%(host)s",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"approved_by_default": "True",
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
462
"checker": "fping -q -- %%(host)s",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
466
"approved_by_default": "True",
501
471
def config_parser(config):
579
549
self.current_checker_command = None
580
550
self.approved = None
581
551
self.approvals_pending = 0
582
self.changedstate = multiprocessing_manager.Condition(
583
multiprocessing_manager.Lock())
584
self.client_structure = [attr
585
for attr in self.__dict__.iterkeys()
552
self.changedstate = (multiprocessing_manager
553
.Condition(multiprocessing_manager
555
self.client_structure = [attr for attr in
556
self.__dict__.iterkeys()
586
557
if not attr.startswith("_")]
587
558
self.client_structure.append("client_structure")
589
for name, t in inspect.getmembers(
590
type(self), lambda obj: isinstance(obj, property)):
560
for name, t in inspect.getmembers(type(self),
591
564
if not name.startswith("_"):
592
565
self.client_structure.append(name)
635
608
# and every interval from then on.
636
609
if self.checker_initiator_tag is not None:
637
610
gobject.source_remove(self.checker_initiator_tag)
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
611
self.checker_initiator_tag = (gobject.timeout_add
613
.total_seconds() * 1000),
641
615
# Schedule a disable() when 'timeout' has passed
642
616
if self.disable_initiator_tag is not None:
643
617
gobject.source_remove(self.disable_initiator_tag)
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
618
self.disable_initiator_tag = (gobject.timeout_add
620
.total_seconds() * 1000),
646
622
# Also start a new checker *right now*.
647
623
self.start_checker()
649
def checker_callback(self, source, condition, connection,
625
def checker_callback(self, pid, condition, command):
651
626
"""The checker has completed, so take appropriate actions."""
652
627
self.checker_callback_tag = None
653
628
self.checker = None
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
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
661
631
if self.last_checker_status == 0:
662
632
logger.info("Checker for %(name)s succeeded",
664
634
self.checked_ok()
666
logger.info("Checker for %(name)s failed", vars(self))
636
logger.info("Checker for %(name)s failed",
668
639
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
670
640
logger.warning("Checker for %(name)s crashed?",
674
643
def checked_ok(self):
675
644
"""Assert that the client has been seen, alive and well."""
676
645
self.last_checked_ok = datetime.datetime.utcnow()
677
646
self.last_checker_status = 0
678
self.last_checker_signal = None
679
647
self.bump_timeout()
681
649
def bump_timeout(self, timeout=None):
707
676
# than 'timeout' for the client to be disabled, which is as it
710
if self.checker is not None and not self.checker.is_alive():
711
logger.warning("Checker was not alive; joining")
679
# If a checker exists, make sure it is not a zombie
681
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
except AttributeError:
684
except OSError as error:
685
if error.errno != errno.ECHILD:
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
714
693
# Start a new checker if needed
715
694
if self.checker is None:
716
695
# Escape attributes for the shell
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
721
700
command = self.checker_command % escaped_attrs
722
701
except TypeError as error:
723
702
logger.error('Could not format string "%s"',
724
self.checker_command,
703
self.checker_command, exc_info=error)
704
return True # Try again later
705
self.current_checker_command = command
707
logger.info("Starting checker %r for %s",
709
# We don't need to redirect stdout and stderr, since
710
# in normal mode, that is already done by daemon(),
711
# and in debug mode we don't want to. (Stdin is
712
# always replaced by /dev/null.)
713
# The exception is when not debugging but nevertheless
714
# running in the foreground; use the previously
717
if (not self.server_settings["debug"]
718
and self.server_settings["foreground"]):
719
popen_args.update({"stdout": wnull,
721
self.checker = subprocess.Popen(command,
725
except OSError as error:
726
logger.error("Failed to start subprocess",
726
return True # Try again later
727
self.current_checker_command = 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)
729
self.checker_callback_tag = (gobject.child_watch_add
731
self.checker_callback,
733
# The checker may have completed before the gobject
734
# watch was added. Check for this.
736
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
737
except OSError as error:
738
if error.errno == errno.ECHILD:
739
# This should never happen
740
logger.error("Child process vanished",
745
gobject.source_remove(self.checker_callback_tag)
746
self.checker_callback(pid, status, command)
753
747
# Re-run this periodically if run by gobject.timeout_add
879
871
def _get_all_dbus_things(self, thing):
880
872
"""Returns a generator of (name, attribute) pairs
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
874
return ((getattr(athing.__get__(self), "_dbus_name",
883
876
athing.__get__(self))
884
877
for cls in self.__class__.__mro__
885
878
for name, athing in
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
879
inspect.getmembers(cls,
880
self._is_dbus_thing(thing)))
888
882
def _get_dbus_property(self, interface_name, property_name):
889
883
"""Returns a bound method if one exists which is a D-Bus
890
884
property with the specified name and interface.
892
for cls in self.__class__.__mro__:
893
for name, value in inspect.getmembers(
894
cls, self._is_dbus_thing("property")):
886
for cls in self.__class__.__mro__:
887
for name, value in (inspect.getmembers
889
self._is_dbus_thing("property"))):
895
890
if (value._dbus_name == property_name
896
891
and value._dbus_interface == interface_name):
897
892
return value.__get__(self)
899
894
# No such property
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
895
raise DBusPropertyNotFound(self.dbus_object_path + ":"
896
+ interface_name + "."
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
899
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
900
out_signature="v")
906
901
def Get(self, interface_name, property_name):
907
902
"""Standard D-Bus property Get() method, see D-Bus standard.
1089
1083
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
1084
# with the wrong interface name
1091
1085
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
1086
or not attribute._dbus_interface
1087
.startswith(orig_interface_name)):
1095
1089
# Create an alternate D-Bus interface name based on
1096
1090
# the current name
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1091
alt_interface = (attribute._dbus_interface
1092
.replace(orig_interface_name,
1093
alt_interface_name))
1099
1094
interface_names.add(alt_interface)
1100
1095
# Is this a D-Bus signal?
1101
1096
if getattr(attribute, "_dbus_is_signal", False):
1102
if sys.version_info.major == 2:
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1097
# Extract the original non-method undecorated
1098
# function by black magic
1099
nonmethod_func = (dict(
1106
1100
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))
1108
["func"].cell_contents)
1110
nonmethod_func = attribute
1101
attribute.__closure__))["func"]
1111
1103
# Create a new, but exactly alike, function
1112
1104
# object, and decorate it to be a new D-Bus signal
1113
1105
# with the alternate D-Bus interface name
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))
1106
new_function = (dbus.service.signal
1108
attribute._dbus_signature)
1109
(types.FunctionType(
1110
nonmethod_func.func_code,
1111
nonmethod_func.func_globals,
1112
nonmethod_func.func_name,
1113
nonmethod_func.func_defaults,
1114
nonmethod_func.func_closure)))
1131
1115
# Copy annotations, if any
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1117
new_function._dbus_annotations = (
1118
dict(attribute._dbus_annotations))
1135
1119
except AttributeError:
1137
1121
# Define a creator of a function to call both the
1159
1141
# object. Decorate it to be a new D-Bus method
1160
1142
# with the alternate D-Bus interface name. Add it
1161
1143
# to the class.
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)))
1144
attr[attrname] = (dbus.service.method
1146
attribute._dbus_in_signature,
1147
attribute._dbus_out_signature)
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1172
1154
# Copy annotations, if any
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1176
1158
except AttributeError:
1178
1160
# Is this a D-Bus property?
1181
1163
# object, and decorate it to be a new D-Bus
1182
1164
# property with the alternate D-Bus interface
1183
1165
# name. Add it to the class.
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)))
1166
attr[attrname] = (dbus_service_property
1168
attribute._dbus_signature,
1169
attribute._dbus_access,
1171
._dbus_get_args_options
1174
(attribute.func_code,
1175
attribute.func_globals,
1176
attribute.func_name,
1177
attribute.func_defaults,
1178
attribute.func_closure)))
1195
1179
# Copy annotations, if any
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1181
attr[attrname]._dbus_annotations = (
1182
dict(attribute._dbus_annotations))
1199
1183
except AttributeError:
1201
1185
# Is this a D-Bus interface?
1204
1188
# object. Decorate it to be a new D-Bus interface
1205
1189
# with the alternate D-Bus interface name. Add it
1206
1190
# to the class.
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)))
1191
attr[attrname] = (dbus_interface_annotations
1194
(attribute.func_code,
1195
attribute.func_globals,
1196
attribute.func_name,
1197
attribute.func_defaults,
1198
attribute.func_closure)))
1215
1200
# Deprecate all alternate interfaces
1216
1201
iname="_AlternateDBusNames_interface_annotation{}"
1217
1202
for interface_name in interface_names:
1219
1203
@dbus_interface_annotations(interface_name)
1220
1204
def func(self):
1221
1205
return { "org.freedesktop.DBus.Deprecated":
1223
1207
# Find an unused name
1224
1208
for aname in (iname.format(i)
1225
1209
for i in itertools.count()):
1261
1244
client_object_name = str(self.name).translate(
1262
1245
{ord("."): ord("_"),
1263
1246
ord("-"): ord("_")})
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1247
self.dbus_object_path = (dbus.ObjectPath
1248
("/clients/" + client_object_name))
1266
1249
DBusObjectWithProperties.__init__(self, self.bus,
1267
1250
self.dbus_object_path)
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1252
def notifychangeproperty(transform_func,
1253
dbus_name, type_func=lambda x: x,
1254
variant_level=1, invalidate_only=False,
1273
1255
_interface=_interface):
1274
1256
""" Modify a variable so that it's a property which announces
1275
1257
its changes to DBus.
1282
1264
variant_level: D-Bus variant level. Default: 1
1284
1266
attrname = "_{}".format(dbus_name)
1286
1267
def setter(self, value):
1287
1268
if hasattr(self, "dbus_object_path"):
1288
1269
if (not hasattr(self, attrname) or
1289
1270
type_func(getattr(self, attrname, None))
1290
1271
!= type_func(value)):
1291
1272
if invalidate_only:
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1273
self.PropertiesChanged(_interface,
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1278
dbus_value = transform_func(type_func(value),
1299
1281
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1283
self.PropertiesChanged(_interface,
1285
dbus.String(dbus_name):
1286
dbus_value }), dbus.Array())
1306
1287
setattr(self, attrname, value)
1308
1289
return property(lambda self: getattr(self, attrname), setter)
1314
1295
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1296
last_enabled = notifychangeproperty(datetime_to_dbus,
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1298
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1299
type_func = lambda checker:
1300
checker is not None)
1320
1301
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1302
"LastCheckedOK")
1322
1303
last_checker_status = notifychangeproperty(dbus.Int16,
1325
1306
datetime_to_dbus, "LastApprovalRequest")
1326
1307
approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1308
"ApprovedByDefault")
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1309
approval_delay = notifychangeproperty(dbus.UInt64,
1312
lambda td: td.total_seconds()
1331
1314
approval_duration = notifychangeproperty(
1332
1315
dbus.UInt64, "ApprovalDuration",
1333
1316
type_func = lambda td: td.total_seconds() * 1000)
1334
1317
host = notifychangeproperty(dbus.String, "Host")
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1318
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1338
1321
extended_timeout = notifychangeproperty(
1339
1322
dbus.UInt64, "ExtendedTimeout",
1340
1323
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1324
interval = notifychangeproperty(dbus.UInt64,
1327
lambda td: td.total_seconds()
1344
1329
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
1330
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
1331
invalidate_only=True)
1356
1341
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1342
Client.__del__(self, *args, **kwargs)
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
1344
def checker_callback(self, pid, condition, command,
1346
self.checker_callback_tag = None
1348
if os.WIFEXITED(condition):
1349
exitstatus = os.WEXITSTATUS(condition)
1366
1350
# Emit D-Bus signal
1367
1351
self.CheckerCompleted(dbus.Int16(exitstatus),
1352
dbus.Int64(condition),
1369
1353
dbus.String(command))
1371
1355
# Emit D-Bus signal
1372
1356
self.CheckerCompleted(dbus.Int16(-1),
1374
self.last_checker_signal),
1357
dbus.Int64(condition),
1375
1358
dbus.String(command))
1360
return Client.checker_callback(self, pid, condition, command,
1378
1363
def start_checker(self, *args, **kwargs):
1379
1364
old_checker_pid = getattr(self.checker, "pid", None)
1626
1604
if self.enabled:
1627
1605
# Reschedule checker run
1628
1606
gobject.source_remove(self.checker_initiator_tag)
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1607
self.checker_initiator_tag = (gobject.timeout_add
1608
(value, self.start_checker))
1609
self.start_checker() # Start one now, too
1633
1611
# Checker - property
1634
@dbus_service_property(_interface,
1612
@dbus_service_property(_interface, signature="s",
1636
1613
access="readwrite")
1637
1614
def Checker_dbus_property(self, value=None):
1638
1615
if value is None: # get
1872
1847
def fingerprint(openpgp):
1873
1848
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1849
# New GnuTLS "datum" with the OpenPGP public key
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)))
1850
datum = (gnutls.library.types
1851
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1854
ctypes.c_uint(len(openpgp))))
1879
1855
# New empty GnuTLS certificate
1880
1856
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1859
# Import the OpenPGP public key into the certificate
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1860
(gnutls.library.functions
1861
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1862
gnutls.library.constants
1863
.GNUTLS_OPENPGP_FMT_RAW))
1887
1864
# Verify the self signature in the key
1888
1865
crtverify = ctypes.c_uint()
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1866
(gnutls.library.functions
1867
.gnutls_openpgp_crt_verify_self(crt, 0,
1868
ctypes.byref(crtverify)))
1891
1869
if crtverify.value != 0:
1892
1870
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
raise gnutls.errors.CertificateSecurityError(
1871
raise (gnutls.errors.CertificateSecurityError
1895
1873
# New buffer for the fingerprint
1896
1874
buf = ctypes.create_string_buffer(20)
1897
1875
buf_len = ctypes.c_size_t()
1898
1876
# Get the fingerprint from the certificate into the buffer
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1877
(gnutls.library.functions
1878
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1879
ctypes.byref(buf_len)))
1901
1880
# Deinit the certificate
1902
1881
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1882
# Convert the buffer to a Python bytestring
2081
2051
def add_pipe(self, parent_pipe, proc):
2082
2052
# Call "handle_ipc" for both data and EOF events
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,
2053
gobject.io_add_watch(parent_pipe.fileno(),
2054
gobject.IO_IN | gobject.IO_HUP,
2055
functools.partial(self.handle_ipc,
2090
def handle_ipc(self, source, condition,
2093
client_object=None):
2060
def handle_ipc(self, source, condition, parent_pipe=None,
2061
proc = None, client_object=None):
2094
2062
# error, or the other end of multiprocessing.Pipe has closed
2095
2063
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2096
2064
# Wait for other process to exit
2183
2151
# avoid excessive use of external libraries.
2185
2153
# New type for defining tokens, syntax, and semantics all-in-one
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
2154
Token = collections.namedtuple("Token",
2155
("regexp", # To match token; if
2156
# "value" is not None,
2157
# must have a "group"
2159
"value", # datetime.timedelta or
2161
"followers")) # Tokens valid after
2191
2163
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
2164
# the "duration" ABNF definition in RFC 3339, Appendix A.
2193
2165
token_end = Token(re.compile(r"$"), None, frozenset())
2194
2166
token_second = Token(re.compile(r"(\d+)S"),
2195
2167
datetime.timedelta(seconds=1),
2196
frozenset((token_end, )))
2168
frozenset((token_end,)))
2197
2169
token_minute = Token(re.compile(r"(\d+)M"),
2198
2170
datetime.timedelta(minutes=1),
2199
2171
frozenset((token_second, token_end)))
2425
2397
# Override the settings from the config file with command line
2426
2398
# options, if set.
2427
2399
for option in ("interface", "address", "port", "debug",
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
2400
"priority", "servicename", "configdir",
2401
"use_dbus", "use_ipv6", "debuglevel", "restore",
2402
"statedir", "socket", "foreground", "zeroconf"):
2431
2403
value = getattr(options, option)
2432
2404
if value is not None:
2433
2405
server_settings[option] = value
2490
2464
socketfd = None
2491
2465
if server_settings["socket"] != "":
2492
2466
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"],
2467
tcp_server = MandosServer((server_settings["address"],
2468
server_settings["port"]),
2470
interface=(server_settings["interface"]
2474
server_settings["priority"],
2501
2477
if not foreground:
2502
2478
pidfilename = "/run/mandos.pid"
2503
2479
if not os.path.isdir("/run/."):
2504
2480
pidfilename = "/var/run/mandos.pid"
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2483
pidfile = open(pidfilename, "w")
2508
2484
except IOError as e:
2509
2485
logger.error("Could not open file %r", pidfilename,
2566
2542
bus_name = dbus.service.BusName("se.recompile.Mandos",
2569
old_bus_name = dbus.service.BusName(
2570
"se.bsnet.fukt.Mandos", bus,
2572
except dbus.exceptions.DBusException as e:
2543
bus, do_not_queue=True)
2544
old_bus_name = (dbus.service.BusName
2545
("se.bsnet.fukt.Mandos", bus,
2547
except dbus.exceptions.NameExistsException as e:
2573
2548
logger.error("Disabling D-Bus:", exc_info=e)
2574
2549
use_dbus = False
2575
2550
server_settings["use_dbus"] = False
2576
2551
tcp_server.use_dbus = False
2578
2553
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,
2554
service = AvahiServiceToSyslog(name =
2555
server_settings["servicename"],
2556
servicetype = "_mandos._tcp",
2557
protocol = protocol, bus = bus)
2584
2558
if server_settings["interface"]:
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
2559
service.interface = (if_nametoindex
2560
(server_settings["interface"]
2588
2563
global multiprocessing_manager
2589
2564
multiprocessing_manager = multiprocessing.Manager()
2608
2583
if server_settings["restore"]:
2610
2585
with open(stored_state_path, "rb") as stored_state:
2611
clients_data, old_client_settings = pickle.load(
2586
clients_data, old_client_settings = (pickle.load
2613
2588
os.remove(stored_state_path)
2614
2589
except IOError as e:
2615
2590
if e.errno == errno.ENOENT:
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2591
logger.warning("Could not load persistent state: {}"
2592
.format(os.strerror(e.errno)))
2619
2594
logger.critical("Could not load persistent state:",
2622
2597
except EOFError as e:
2623
2598
logger.warning("Could not load persistent state: "
2599
"EOFError:", exc_info=e)
2627
2601
with PGPEngine() as pgp:
2628
2602
for client_name, client in clients_data.items():
2657
2631
if not client["last_checked_ok"]:
2658
2632
logger.warning(
2659
2633
"disabling client {} - Client never "
2660
"performed a successful checker".format(
2634
"performed a successful checker"
2635
.format(client_name))
2662
2636
client["enabled"] = False
2663
2637
elif client["last_checker_status"] != 0:
2664
2638
logger.warning(
2665
2639
"disabling client {} - Client last"
2666
" checker failed with error code"
2669
client["last_checker_status"]))
2640
" checker failed with error code {}"
2641
.format(client_name,
2642
client["last_checker_status"]))
2670
2643
client["enabled"] = False
2672
client["expires"] = (
2673
datetime.datetime.utcnow()
2674
+ client["timeout"])
2645
client["expires"] = (datetime.datetime
2647
+ client["timeout"])
2675
2648
logger.debug("Last checker succeeded,"
2676
" keeping {} enabled".format(
2649
" keeping {} enabled"
2650
.format(client_name))
2679
client["secret"] = pgp.decrypt(
2680
client["encrypted_secret"],
2681
client_settings[client_name]["secret"])
2652
client["secret"] = (
2653
pgp.decrypt(client["encrypted_secret"],
2654
client_settings[client_name]
2682
2656
except PGPError:
2683
2657
# If decryption fails, we use secret from new settings
2684
logger.debug("Failed to decrypt {} old secret".format(
2686
client["secret"] = (client_settings[client_name]
2658
logger.debug("Failed to decrypt {} old secret"
2659
.format(client_name))
2660
client["secret"] = (
2661
client_settings[client_name]["secret"])
2689
2663
# Add/remove clients based on new changes made to config
2690
2664
for client_name in (set(old_client_settings)
2720
2693
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2696
@alternate_dbus_interfaces({"se.recompile.Mandos":
2697
"se.bsnet.fukt.Mandos"})
2726
2698
class MandosDBusService(DBusObjectWithProperties):
2727
2699
"""A D-Bus proxy object"""
2729
2700
def __init__(self):
2730
2701
dbus.service.Object.__init__(self, bus, "/")
2732
2702
_interface = "se.recompile.Mandos"
2734
2704
@dbus_interface_annotations(_interface)
2735
2705
def _foo(self):
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2706
return { "org.freedesktop.DBus.Property"
2707
".EmitsChangedSignal":
2740
2710
@dbus.service.signal(_interface, signature="o")
2741
2711
def ClientAdded(self, objpath):
2824
2795
del client_settings[client.name]["secret"]
2827
with tempfile.NamedTemporaryFile(
2831
dir=os.path.dirname(stored_state_path),
2832
delete=False) as stored_state:
2798
with (tempfile.NamedTemporaryFile
2799
(mode='wb', suffix=".pickle", prefix='clients-',
2800
dir=os.path.dirname(stored_state_path),
2801
delete=False)) as stored_state:
2833
2802
pickle.dump((clients, client_settings), stored_state)
2834
tempname = stored_state.name
2803
tempname=stored_state.name
2835
2804
os.rename(tempname, stored_state_path)
2836
2805
except (IOError, OSError) as e: