276
297
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
279
300
"""Derived from the Avahi example code"""
280
301
if self.rename_count >= self.max_renames:
281
302
logger.critical("No suitable Zeroconf service name found"
282
303
" after %i retries, exiting.",
283
304
self.rename_count)
284
305
raise AvahiServiceError("Too many renames")
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
287
309
logger.info("Changing Zeroconf service name to %r ...",
292
315
except dbus.exceptions.DBusException as error:
293
logger.critical("D-Bus Exception", exc_info=error)
296
self.rename_count += 1
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
321
logger.critical("D-Bus Exception", exc_info=error)
298
325
def remove(self):
299
326
"""Derived from the Avahi example code"""
355
381
def server_state_changed(self, state, error=None):
356
382
"""Derived from the Avahi example code"""
357
383
logger.debug("Avahi server state change: %i", state)
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
365
390
if state in bad_states:
366
391
if bad_states[state] is not None:
367
392
if error is None:
386
422
follow_name_owner_changes=True),
387
423
avahi.DBUS_INTERFACE_SERVER)
388
424
self.server.connect_to_signal("StateChanged",
389
self.server_state_changed)
425
self.server_state_changed)
390
426
self.server_state_changed(self.server.GetState())
393
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
395
431
"""Add the new name to the syslog messages"""
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
445
connection.send(func(*args, **kwargs))
404
448
class Client(object):
405
449
"""A representation of a client host served by this server.
450
496
"fingerprint", "host", "interval",
451
497
"last_approval_request", "last_checked_ok",
452
498
"last_enabled", "name", "timeout")
453
client_defaults = { "timeout": "PT5M",
454
"extended_timeout": "PT15M",
456
"checker": "fping -q -- %%(host)s",
458
"approval_delay": "PT0S",
459
"approval_duration": "PT1S",
460
"approved_by_default": "True",
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
465
512
def config_parser(config):
543
590
self.current_checker_command = None
544
591
self.approved = None
545
592
self.approvals_pending = 0
546
self.changedstate = (multiprocessing_manager
547
.Condition(multiprocessing_manager
549
self.client_structure = [attr for attr in
550
self.__dict__.iterkeys()
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
551
597
if not attr.startswith("_")]
552
598
self.client_structure.append("client_structure")
554
for name, t in inspect.getmembers(type(self),
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
558
602
if not name.startswith("_"):
559
603
self.client_structure.append(name)
602
646
# and every interval from then on.
603
647
if self.checker_initiator_tag is not None:
604
648
gobject.source_remove(self.checker_initiator_tag)
605
self.checker_initiator_tag = (gobject.timeout_add
607
.total_seconds() * 1000),
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
609
652
# Schedule a disable() when 'timeout' has passed
610
653
if self.disable_initiator_tag is not None:
611
654
gobject.source_remove(self.disable_initiator_tag)
612
self.disable_initiator_tag = (gobject.timeout_add
614
.total_seconds() * 1000),
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
616
657
# Also start a new checker *right now*.
617
658
self.start_checker()
619
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
620
662
"""The checker has completed, so take appropriate actions."""
621
663
self.checker_callback_tag = None
622
664
self.checker = None
623
if os.WIFEXITED(condition):
624
self.last_checker_status = os.WEXITSTATUS(condition)
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
625
672
if self.last_checker_status == 0:
626
673
logger.info("Checker for %(name)s succeeded",
628
675
self.checked_ok()
630
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
633
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
634
681
logger.warning("Checker for %(name)s crashed?",
637
685
def checked_ok(self):
638
686
"""Assert that the client has been seen, alive and well."""
639
687
self.last_checked_ok = datetime.datetime.utcnow()
640
688
self.last_checker_status = 0
689
self.last_checker_signal = None
641
690
self.bump_timeout()
643
692
def bump_timeout(self, timeout=None):
670
718
# than 'timeout' for the client to be disabled, which is as it
673
# If a checker exists, make sure it is not a zombie
675
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
678
except OSError as error:
679
if error.errno != errno.ECHILD:
683
logger.warning("Checker was a zombie")
684
gobject.source_remove(self.checker_callback_tag)
685
self.checker_callback(pid, status,
686
self.current_checker_command)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
687
725
# Start a new checker if needed
688
726
if self.checker is None:
689
727
# Escape attributes for the shell
690
escaped_attrs = { attr:
691
re.escape(str(getattr(self, attr)))
692
for attr in self.runtime_expansions }
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
694
732
command = self.checker_command % escaped_attrs
695
733
except TypeError as error:
696
734
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
698
return True # Try again later
735
self.checker_command,
737
return True # Try again later
699
738
self.current_checker_command = command
701
logger.info("Starting checker %r for %s",
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
# The exception is when not debugging but nevertheless
708
# running in the foreground; use the previously
711
if (not self.server_settings["debug"]
712
and self.server_settings["foreground"]):
713
popen_args.update({"stdout": wnull,
715
self.checker = subprocess.Popen(command,
719
except OSError as error:
720
logger.error("Failed to start subprocess",
723
self.checker_callback_tag = (gobject.child_watch_add
725
self.checker_callback,
727
# The checker may have completed before the gobject
728
# watch was added. Check for this.
730
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
731
except OSError as error:
732
if error.errno == errno.ECHILD:
733
# This should never happen
734
logger.error("Child process vanished",
739
gobject.source_remove(self.checker_callback_tag)
740
self.checker_callback(pid, status, 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)
741
764
# Re-run this periodically if run by gobject.timeout_add
865
890
def _get_all_dbus_things(self, thing):
866
891
"""Returns a generator of (name, attribute) pairs
868
return ((getattr(athing.__get__(self), "_dbus_name",
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
870
894
athing.__get__(self))
871
895
for cls in self.__class__.__mro__
872
896
for name, athing in
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
876
899
def _get_dbus_property(self, interface_name, property_name):
877
900
"""Returns a bound method if one exists which is a D-Bus
878
901
property with the specified name and interface.
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
883
self._is_dbus_thing("property"))):
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
884
906
if (value._dbus_name == property_name
885
907
and value._dbus_interface == interface_name):
886
908
return value.__get__(self)
888
910
# No such property
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
894
916
out_signature="v")
895
917
def Get(self, interface_name, property_name):
896
918
"""Standard D-Bus property Get() method, see D-Bus standard.
1077
1100
# Ignore non-D-Bus attributes, and D-Bus attributes
1078
1101
# with the wrong interface name
1079
1102
if (not hasattr(attribute, "_dbus_interface")
1080
or not attribute._dbus_interface
1081
.startswith(orig_interface_name)):
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1083
1106
# Create an alternate D-Bus interface name based on
1084
1107
# the current name
1085
alt_interface = (attribute._dbus_interface
1086
.replace(orig_interface_name,
1087
alt_interface_name))
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1088
1110
interface_names.add(alt_interface)
1089
1111
# Is this a D-Bus signal?
1090
1112
if getattr(attribute, "_dbus_is_signal", False):
1091
# Extract the original non-method undecorated
1092
# function by black magic
1093
nonmethod_func = (dict(
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1094
1117
zip(attribute.func_code.co_freevars,
1095
attribute.__closure__))["func"]
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1097
1122
# Create a new, but exactly alike, function
1098
1123
# object, and decorate it to be a new D-Bus signal
1099
1124
# with the alternate D-Bus interface name
1100
new_function = (dbus.service.signal
1102
attribute._dbus_signature)
1103
(types.FunctionType(
1104
nonmethod_func.func_code,
1105
nonmethod_func.func_globals,
1106
nonmethod_func.func_name,
1107
nonmethod_func.func_defaults,
1108
nonmethod_func.func_closure)))
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
1142
# Copy annotations, if any
1111
new_function._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1113
1146
except AttributeError:
1115
1148
# Define a creator of a function to call both the
1135
1170
# object. Decorate it to be a new D-Bus method
1136
1171
# with the alternate D-Bus interface name. Add it
1137
1172
# to the class.
1138
attr[attrname] = (dbus.service.method
1140
attribute._dbus_in_signature,
1141
attribute._dbus_out_signature)
1143
(attribute.func_code,
1144
attribute.func_globals,
1145
attribute.func_name,
1146
attribute.func_defaults,
1147
attribute.func_closure)))
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)))
1148
1183
# Copy annotations, if any
1150
attr[attrname]._dbus_annotations = (
1151
dict(attribute._dbus_annotations))
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1152
1187
except AttributeError:
1154
1189
# Is this a D-Bus property?
1157
1192
# object, and decorate it to be a new D-Bus
1158
1193
# property with the alternate D-Bus interface
1159
1194
# name. Add it to the class.
1160
attr[attrname] = (dbus_service_property
1162
attribute._dbus_signature,
1163
attribute._dbus_access,
1165
._dbus_get_args_options
1168
(attribute.func_code,
1169
attribute.func_globals,
1170
attribute.func_name,
1171
attribute.func_defaults,
1172
attribute.func_closure)))
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)))
1173
1206
# Copy annotations, if any
1175
attr[attrname]._dbus_annotations = (
1176
dict(attribute._dbus_annotations))
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1177
1210
except AttributeError:
1179
1212
# Is this a D-Bus interface?
1182
1215
# object. Decorate it to be a new D-Bus interface
1183
1216
# with the alternate D-Bus interface name. Add it
1184
1217
# to the class.
1185
attr[attrname] = (dbus_interface_annotations
1188
(attribute.func_code,
1189
attribute.func_globals,
1190
attribute.func_name,
1191
attribute.func_defaults,
1192
attribute.func_closure)))
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
1226
# Deprecate all alternate interfaces
1195
1227
iname="_AlternateDBusNames_interface_annotation{}"
1196
1228
for interface_name in interface_names:
1197
1230
@dbus_interface_annotations(interface_name)
1198
1231
def func(self):
1199
1232
return { "org.freedesktop.DBus.Deprecated":
1201
1234
# Find an unused name
1202
1235
for aname in (iname.format(i)
1203
1236
for i in itertools.count()):
1238
1272
client_object_name = str(self.name).translate(
1239
1273
{ord("."): ord("_"),
1240
1274
ord("-"): ord("_")})
1241
self.dbus_object_path = (dbus.ObjectPath
1242
("/clients/" + client_object_name))
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1243
1277
DBusObjectWithProperties.__init__(self, self.bus,
1244
1278
self.dbus_object_path)
1246
def notifychangeproperty(transform_func,
1247
dbus_name, type_func=lambda x: x,
1248
variant_level=1, invalidate_only=False,
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1249
1284
_interface=_interface):
1250
1285
""" Modify a variable so that it's a property which announces
1251
1286
its changes to DBus.
1258
1293
variant_level: D-Bus variant level. Default: 1
1260
1295
attrname = "_{}".format(dbus_name)
1261
1297
def setter(self, value):
1262
1298
if hasattr(self, "dbus_object_path"):
1263
1299
if (not hasattr(self, attrname) or
1264
1300
type_func(getattr(self, attrname, None))
1265
1301
!= type_func(value)):
1266
1302
if invalidate_only:
1267
self.PropertiesChanged(_interface,
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1272
dbus_value = transform_func(type_func(value),
1307
dbus_value = transform_func(
1309
variant_level = variant_level)
1275
1310
self.PropertyChanged(dbus.String(dbus_name),
1277
self.PropertiesChanged(_interface,
1279
dbus.String(dbus_name):
1280
dbus_value }), dbus.Array())
1312
self.PropertiesChanged(
1314
dbus.Dictionary({ dbus.String(dbus_name):
1281
1317
setattr(self, attrname, value)
1283
1319
return property(lambda self: getattr(self, attrname), setter)
1289
1325
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1290
1326
last_enabled = notifychangeproperty(datetime_to_dbus,
1292
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1293
type_func = lambda checker:
1294
checker is not None)
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1295
1331
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1296
1332
"LastCheckedOK")
1297
1333
last_checker_status = notifychangeproperty(dbus.Int16,
1300
1336
datetime_to_dbus, "LastApprovalRequest")
1301
1337
approved_by_default = notifychangeproperty(dbus.Boolean,
1302
1338
"ApprovedByDefault")
1303
approval_delay = notifychangeproperty(dbus.UInt64,
1306
lambda td: td.total_seconds()
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1308
1342
approval_duration = notifychangeproperty(
1309
1343
dbus.UInt64, "ApprovalDuration",
1310
1344
type_func = lambda td: td.total_seconds() * 1000)
1311
1345
host = notifychangeproperty(dbus.String, "Host")
1312
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func = lambda td:
1314
td.total_seconds() * 1000)
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1315
1349
extended_timeout = notifychangeproperty(
1316
1350
dbus.UInt64, "ExtendedTimeout",
1317
1351
type_func = lambda td: td.total_seconds() * 1000)
1318
interval = notifychangeproperty(dbus.UInt64,
1321
lambda td: td.total_seconds()
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1323
1355
checker_command = notifychangeproperty(dbus.String, "Checker")
1324
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1325
1357
invalidate_only=True)
1335
1367
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1336
1368
Client.__del__(self, *args, **kwargs)
1338
def checker_callback(self, pid, condition, command,
1340
self.checker_callback_tag = None
1342
if os.WIFEXITED(condition):
1343
exitstatus = os.WEXITSTATUS(condition)
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
1344
1377
# Emit D-Bus signal
1345
1378
self.CheckerCompleted(dbus.Int16(exitstatus),
1346
dbus.Int64(condition),
1347
1380
dbus.String(command))
1349
1382
# Emit D-Bus signal
1350
1383
self.CheckerCompleted(dbus.Int16(-1),
1351
dbus.Int64(condition),
1385
self.last_checker_signal),
1352
1386
dbus.String(command))
1354
return Client.checker_callback(self, pid, condition, command,
1357
1389
def start_checker(self, *args, **kwargs):
1358
1390
old_checker_pid = getattr(self.checker, "pid", None)
1598
1637
if self.enabled:
1599
1638
# Reschedule checker run
1600
1639
gobject.source_remove(self.checker_initiator_tag)
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
self.start_checker() # Start one now, too
1640
self.checker_initiator_tag = gobject.timeout_add(
1641
value, self.start_checker)
1642
self.start_checker() # Start one now, too
1605
1644
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
1645
@dbus_service_property(_interface,
1607
1647
access="readwrite")
1608
1648
def Checker_dbus_property(self, value=None):
1609
1649
if value is None: # get
1841
1883
def fingerprint(openpgp):
1842
1884
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1843
1885
# New GnuTLS "datum" with the OpenPGP public key
1844
datum = (gnutls.library.types
1845
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1848
ctypes.c_uint(len(openpgp))))
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)))
1849
1890
# New empty GnuTLS certificate
1850
1891
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1851
(gnutls.library.functions
1852
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1853
1894
# Import the OpenPGP public key into the certificate
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1856
gnutls.library.constants
1857
.GNUTLS_OPENPGP_FMT_RAW))
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1858
1898
# Verify the self signature in the key
1859
1899
crtverify = ctypes.c_uint()
1860
(gnutls.library.functions
1861
.gnutls_openpgp_crt_verify_self(crt, 0,
1862
ctypes.byref(crtverify)))
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1863
1902
if crtverify.value != 0:
1864
1903
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1865
raise (gnutls.errors.CertificateSecurityError
1904
raise gnutls.errors.CertificateSecurityError(
1867
1906
# New buffer for the fingerprint
1868
1907
buf = ctypes.create_string_buffer(20)
1869
1908
buf_len = ctypes.c_size_t()
1870
1909
# Get the fingerprint from the certificate into the buffer
1871
(gnutls.library.functions
1872
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1873
ctypes.byref(buf_len)))
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1874
1912
# Deinit the certificate
1875
1913
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1876
1914
# Convert the buffer to a Python bytestring
2045
2092
def add_pipe(self, parent_pipe, proc):
2046
2093
# Call "handle_ipc" for both data and EOF events
2047
gobject.io_add_watch(parent_pipe.fileno(),
2048
gobject.IO_IN | gobject.IO_HUP,
2049
functools.partial(self.handle_ipc,
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,
2054
def handle_ipc(self, source, condition, parent_pipe=None,
2055
proc = None, client_object=None):
2101
def handle_ipc(self, source, condition,
2104
client_object=None):
2056
2105
# error, or the other end of multiprocessing.Pipe has closed
2057
2106
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2058
2107
# Wait for other process to exit
2145
2194
# avoid excessive use of external libraries.
2147
2196
# New type for defining tokens, syntax, and semantics all-in-one
2148
Token = collections.namedtuple("Token",
2149
("regexp", # To match token; if
2150
# "value" is not None,
2151
# must have a "group"
2153
"value", # datetime.timedelta or
2155
"followers")) # Tokens valid after
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
2157
2202
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2158
2203
# the "duration" ABNF definition in RFC 3339, Appendix A.
2159
2204
token_end = Token(re.compile(r"$"), None, frozenset())
2160
2205
token_second = Token(re.compile(r"(\d+)S"),
2161
2206
datetime.timedelta(seconds=1),
2162
frozenset((token_end,)))
2207
frozenset((token_end, )))
2163
2208
token_minute = Token(re.compile(r"(\d+)M"),
2164
2209
datetime.timedelta(minutes=1),
2165
2210
frozenset((token_second, token_end)))
2390
2436
# Override the settings from the config file with command line
2391
2437
# options, if set.
2392
2438
for option in ("interface", "address", "port", "debug",
2393
"priority", "servicename", "configdir",
2394
"use_dbus", "use_ipv6", "debuglevel", "restore",
2395
"statedir", "socket", "foreground", "zeroconf"):
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2396
2442
value = getattr(options, option)
2397
2443
if value is not None:
2398
2444
server_settings[option] = value
2457
2501
socketfd = None
2458
2502
if server_settings["socket"] != "":
2459
2503
socketfd = server_settings["socket"]
2460
tcp_server = MandosServer((server_settings["address"],
2461
server_settings["port"]),
2463
interface=(server_settings["interface"]
2467
server_settings["priority"],
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2507
interface=(server_settings["interface"] or None),
2509
gnutls_priority=server_settings["priority"],
2470
2512
if not foreground:
2471
2513
pidfilename = "/run/mandos.pid"
2472
2514
if not os.path.isdir("/run/."):
2473
2515
pidfilename = "/var/run/mandos.pid"
2476
pidfile = open(pidfilename, "w")
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2477
2519
except IOError as e:
2478
2520
logger.error("Could not open file %r", pidfilename,
2535
2577
bus_name = dbus.service.BusName("se.recompile.Mandos",
2536
bus, do_not_queue=True)
2537
old_bus_name = (dbus.service.BusName
2538
("se.bsnet.fukt.Mandos", bus,
2540
except dbus.exceptions.NameExistsException as e:
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2583
except dbus.exceptions.DBusException as e:
2541
2584
logger.error("Disabling D-Bus:", exc_info=e)
2542
2585
use_dbus = False
2543
2586
server_settings["use_dbus"] = False
2544
2587
tcp_server.use_dbus = False
2546
2589
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2547
service = AvahiServiceToSyslog(name =
2548
server_settings["servicename"],
2549
servicetype = "_mandos._tcp",
2550
protocol = protocol, bus = bus)
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2551
2595
if server_settings["interface"]:
2552
service.interface = (if_nametoindex
2553
(server_settings["interface"]
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2556
2599
global multiprocessing_manager
2557
2600
multiprocessing_manager = multiprocessing.Manager()
2576
2619
if server_settings["restore"]:
2578
2621
with open(stored_state_path, "rb") as stored_state:
2579
clients_data, old_client_settings = (pickle.load
2622
clients_data, old_client_settings = pickle.load(
2581
2624
os.remove(stored_state_path)
2582
2625
except IOError as e:
2583
2626
if e.errno == errno.ENOENT:
2584
logger.warning("Could not load persistent state: {}"
2585
.format(os.strerror(e.errno)))
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2587
2630
logger.critical("Could not load persistent state:",
2590
2633
except EOFError as e:
2591
2634
logger.warning("Could not load persistent state: "
2592
"EOFError:", exc_info=e)
2594
2638
with PGPEngine() as pgp:
2595
2639
for client_name, client in clients_data.items():
2624
2668
if not client["last_checked_ok"]:
2625
2669
logger.warning(
2626
2670
"disabling client {} - Client never "
2627
"performed a successful checker"
2628
.format(client_name))
2671
"performed a successful checker".format(
2629
2673
client["enabled"] = False
2630
2674
elif client["last_checker_status"] != 0:
2631
2675
logger.warning(
2632
2676
"disabling client {} - Client last"
2633
" checker failed with error code {}"
2634
.format(client_name,
2635
client["last_checker_status"]))
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2636
2681
client["enabled"] = False
2638
client["expires"] = (datetime.datetime
2640
+ client["timeout"])
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2641
2686
logger.debug("Last checker succeeded,"
2642
" keeping {} enabled"
2643
.format(client_name))
2687
" keeping {} enabled".format(
2645
client["secret"] = (
2646
pgp.decrypt(client["encrypted_secret"],
2647
client_settings[client_name]
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2649
2693
except PGPError:
2650
2694
# If decryption fails, we use secret from new settings
2651
logger.debug("Failed to decrypt {} old secret"
2652
.format(client_name))
2653
client["secret"] = (
2654
client_settings[client_name]["secret"])
2695
logger.debug("Failed to decrypt {} old secret".format(
2697
client["secret"] = (client_settings[client_name]
2656
2700
# Add/remove clients based on new changes made to config
2657
2701
for client_name in (set(old_client_settings)
2686
2731
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2689
@alternate_dbus_interfaces({"se.recompile.Mandos":
2690
"se.bsnet.fukt.Mandos"})
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2691
2737
class MandosDBusService(DBusObjectWithProperties):
2692
2738
"""A D-Bus proxy object"""
2693
2740
def __init__(self):
2694
2741
dbus.service.Object.__init__(self, bus, "/")
2695
2743
_interface = "se.recompile.Mandos"
2697
2745
@dbus_interface_annotations(_interface)
2698
2746
def _foo(self):
2699
return { "org.freedesktop.DBus.Property"
2700
".EmitsChangedSignal":
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2703
2751
@dbus.service.signal(_interface, signature="o")
2704
2752
def ClientAdded(self, objpath):
2788
2835
del client_settings[client.name]["secret"]
2791
with (tempfile.NamedTemporaryFile
2792
(mode='wb', suffix=".pickle", prefix='clients-',
2793
dir=os.path.dirname(stored_state_path),
2794
delete=False)) as stored_state:
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2795
2844
pickle.dump((clients, client_settings), stored_state)
2796
tempname=stored_state.name
2845
tempname = stored_state.name
2797
2846
os.rename(tempname, stored_state_path)
2798
2847
except (IOError, OSError) as e: