297
276
self.entry_group_state_changed_match = None
299
def rename(self, remove=True):
300
279
"""Derived from the Avahi example code"""
301
280
if self.rename_count >= self.max_renames:
302
281
logger.critical("No suitable Zeroconf service name found"
303
282
" after %i retries, exiting.",
304
283
self.rename_count)
305
284
raise AvahiServiceError("Too many renames")
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
309
287
logger.info("Changing Zeroconf service name to %r ...",
315
292
except dbus.exceptions.DBusException as error:
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
321
logger.critical("D-Bus Exception", exc_info=error)
293
logger.critical("D-Bus Exception", exc_info=error)
296
self.rename_count += 1
325
298
def remove(self):
326
299
"""Derived from the Avahi example code"""
381
355
def server_state_changed(self, state, error=None):
382
356
"""Derived from the Avahi example code"""
383
357
logger.debug("Avahi server state change: %i", state)
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
390
365
if state in bad_states:
391
366
if bad_states[state] is not None:
392
367
if error is None:
422
386
follow_name_owner_changes=True),
423
387
avahi.DBUS_INTERFACE_SERVER)
424
388
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
389
self.server_state_changed)
426
390
self.server_state_changed(self.server.GetState())
429
393
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
431
395
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
445
connection.send(func(*args, **kwargs))
448
404
class Client(object):
449
405
"""A representation of a client host served by this server.
496
450
"fingerprint", "host", "interval",
497
451
"last_approval_request", "last_checked_ok",
498
452
"last_enabled", "name", "timeout")
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
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",
512
465
def config_parser(config):
590
543
self.current_checker_command = None
591
544
self.approved = None
592
545
self.approvals_pending = 0
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
546
self.changedstate = (multiprocessing_manager
547
.Condition(multiprocessing_manager
549
self.client_structure = [attr for attr in
550
self.__dict__.iterkeys()
597
551
if not attr.startswith("_")]
598
552
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
554
for name, t in inspect.getmembers(type(self),
602
558
if not name.startswith("_"):
603
559
self.client_structure.append(name)
646
602
# and every interval from then on.
647
603
if self.checker_initiator_tag is not None:
648
604
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
605
self.checker_initiator_tag = (gobject.timeout_add
607
.total_seconds() * 1000),
652
609
# Schedule a disable() when 'timeout' has passed
653
610
if self.disable_initiator_tag is not None:
654
611
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
612
self.disable_initiator_tag = (gobject.timeout_add
614
.total_seconds() * 1000),
657
616
# Also start a new checker *right now*.
658
617
self.start_checker()
660
def checker_callback(self, source, condition, connection,
619
def checker_callback(self, pid, condition, command):
662
620
"""The checker has completed, so take appropriate actions."""
663
621
self.checker_callback_tag = None
664
622
self.checker = None
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
623
if os.WIFEXITED(condition):
624
self.last_checker_status = os.WEXITSTATUS(condition)
672
625
if self.last_checker_status == 0:
673
626
logger.info("Checker for %(name)s succeeded",
675
628
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
630
logger.info("Checker for %(name)s failed",
679
633
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
634
logger.warning("Checker for %(name)s crashed?",
685
637
def checked_ok(self):
686
638
"""Assert that the client has been seen, alive and well."""
687
639
self.last_checked_ok = datetime.datetime.utcnow()
688
640
self.last_checker_status = 0
689
self.last_checker_signal = None
690
641
self.bump_timeout()
692
643
def bump_timeout(self, timeout=None):
718
670
# than 'timeout' for the client to be disabled, which is as it
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
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)
725
687
# Start a new checker if needed
726
688
if self.checker is None:
727
689
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
690
escaped_attrs = { attr:
691
re.escape(str(getattr(self, attr)))
692
for attr in self.runtime_expansions }
732
694
command = self.checker_command % escaped_attrs
733
695
except TypeError as error:
734
696
logger.error('Could not format string "%s"',
735
self.checker_command,
697
self.checker_command, exc_info=error)
698
return True # Try again later
699
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",
737
return True # Try again later
738
self.current_checker_command = command
739
logger.info("Starting checker %r for %s", command,
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
748
popen_args = { "close_fds": True,
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
758
args = (pipe[1], subprocess.call, command),
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
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)
764
741
# Re-run this periodically if run by gobject.timeout_add
835
813
"""Decorator to annotate D-Bus methods, signals or properties
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
816
@dbus_service_property("org.example.Interface", signature="b",
818
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
819
"org.freedesktop.DBus.Property."
820
"EmitsChangedSignal": "false"})
843
821
def Property_dbus_property(self):
844
822
return dbus.Boolean(False)
847
824
def decorator(func):
848
825
func._dbus_annotations = annotations
890
865
def _get_all_dbus_things(self, thing):
891
866
"""Returns a generator of (name, attribute) pairs
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
return ((getattr(athing.__get__(self), "_dbus_name",
894
870
athing.__get__(self))
895
871
for cls in self.__class__.__mro__
896
872
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
899
876
def _get_dbus_property(self, interface_name, property_name):
900
877
"""Returns a bound method if one exists which is a D-Bus
901
878
property with the specified name and interface.
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
883
self._is_dbus_thing("property"))):
906
884
if (value._dbus_name == property_name
907
885
and value._dbus_interface == interface_name):
908
886
return value.__get__(self)
910
888
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
894
out_signature="v")
917
895
def Get(self, interface_name, property_name):
918
896
"""Standard D-Bus property Get() method, see D-Bus standard.
965
942
if not hasattr(value, "variant_level"):
966
943
properties[name] = value
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
945
properties[name] = type(value)(value, variant_level=
946
value.variant_level+1)
970
947
return dbus.Dictionary(properties, signature="sv")
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
980
949
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
950
out_signature="s",
982
951
path_keyword='object_path',
1100
1069
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1070
# with the wrong interface name
1102
1071
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1072
or not attribute._dbus_interface
1073
.startswith(orig_interface_name)):
1106
1075
# Create an alternate D-Bus interface name based on
1107
1076
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1077
alt_interface = (attribute._dbus_interface
1078
.replace(orig_interface_name,
1079
alt_interface_name))
1110
1080
interface_names.add(alt_interface)
1111
1081
# Is this a D-Bus signal?
1112
1082
if getattr(attribute, "_dbus_is_signal", False):
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1083
# Extract the original non-method undecorated
1084
# function by black magic
1085
nonmethod_func = (dict(
1117
1086
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1087
attribute.__closure__))["func"]
1122
1089
# Create a new, but exactly alike, function
1123
1090
# object, and decorate it to be a new D-Bus signal
1124
1091
# with the alternate D-Bus interface name
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1141
attribute._dbus_signature)(new_function))
1092
new_function = (dbus.service.signal
1094
attribute._dbus_signature)
1095
(types.FunctionType(
1096
nonmethod_func.func_code,
1097
nonmethod_func.func_globals,
1098
nonmethod_func.func_name,
1099
nonmethod_func.func_defaults,
1100
nonmethod_func.func_closure)))
1142
1101
# Copy annotations, if any
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1103
new_function._dbus_annotations = (
1104
dict(attribute._dbus_annotations))
1146
1105
except AttributeError:
1148
1107
# Define a creator of a function to call both the
1170
1127
# object. Decorate it to be a new D-Bus method
1171
1128
# with the alternate D-Bus interface name. Add it
1172
1129
# to the class.
1174
dbus.service.method(
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1130
attr[attrname] = (dbus.service.method
1132
attribute._dbus_in_signature,
1133
attribute._dbus_out_signature)
1135
(attribute.func_code,
1136
attribute.func_globals,
1137
attribute.func_name,
1138
attribute.func_defaults,
1139
attribute.func_closure)))
1183
1140
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1142
attr[attrname]._dbus_annotations = (
1143
dict(attribute._dbus_annotations))
1187
1144
except AttributeError:
1189
1146
# Is this a D-Bus property?
1192
1149
# object, and decorate it to be a new D-Bus
1193
1150
# property with the alternate D-Bus interface
1194
1151
# name. Add it to the class.
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1152
attr[attrname] = (dbus_service_property
1154
attribute._dbus_signature,
1155
attribute._dbus_access,
1157
._dbus_get_args_options
1160
(attribute.func_code,
1161
attribute.func_globals,
1162
attribute.func_name,
1163
attribute.func_defaults,
1164
attribute.func_closure)))
1206
1165
# Copy annotations, if any
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1167
attr[attrname]._dbus_annotations = (
1168
dict(attribute._dbus_annotations))
1210
1169
except AttributeError:
1212
1171
# Is this a D-Bus interface?
1215
1174
# object. Decorate it to be a new D-Bus interface
1216
1175
# with the alternate D-Bus interface name. Add it
1217
1176
# to the class.
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1177
attr[attrname] = (dbus_interface_annotations
1180
(attribute.func_code,
1181
attribute.func_globals,
1182
attribute.func_name,
1183
attribute.func_defaults,
1184
attribute.func_closure)))
1226
1186
# Deprecate all alternate interfaces
1227
1187
iname="_AlternateDBusNames_interface_annotation{}"
1228
1188
for interface_name in interface_names:
1230
1189
@dbus_interface_annotations(interface_name)
1231
1190
def func(self):
1232
1191
return { "org.freedesktop.DBus.Deprecated":
1234
1193
# Find an unused name
1235
1194
for aname in (iname.format(i)
1236
1195
for i in itertools.count()):
1272
1228
client_object_name = str(self.name).translate(
1273
1229
{ord("."): ord("_"),
1274
1230
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1231
self.dbus_object_path = (dbus.ObjectPath
1232
("/clients/" + client_object_name))
1277
1233
DBusObjectWithProperties.__init__(self, self.bus,
1278
1234
self.dbus_object_path)
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1284
_interface=_interface):
1236
def notifychangeproperty(transform_func,
1237
dbus_name, type_func=lambda x: x,
1285
1239
""" Modify a variable so that it's a property which announces
1286
1240
its changes to DBus.
1293
1247
variant_level: D-Bus variant level. Default: 1
1295
1249
attrname = "_{}".format(dbus_name)
1297
1250
def setter(self, value):
1298
1251
if hasattr(self, "dbus_object_path"):
1299
1252
if (not hasattr(self, attrname) or
1300
1253
type_func(getattr(self, attrname, None))
1301
1254
!= type_func(value)):
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1307
dbus_value = transform_func(
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1312
self.PropertiesChanged(
1314
dbus.Dictionary({ dbus.String(dbus_name):
1255
dbus_value = transform_func(type_func(value),
1258
self.PropertyChanged(dbus.String(dbus_name),
1317
1260
setattr(self, attrname, value)
1319
1262
return property(lambda self: getattr(self, attrname), setter)
1325
1268
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1269
last_enabled = notifychangeproperty(datetime_to_dbus,
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1271
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1272
type_func = lambda checker:
1273
checker is not None)
1331
1274
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1275
"LastCheckedOK")
1333
1276
last_checker_status = notifychangeproperty(dbus.Int16,
1336
1279
datetime_to_dbus, "LastApprovalRequest")
1337
1280
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1281
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1282
approval_delay = notifychangeproperty(dbus.UInt64,
1285
lambda td: td.total_seconds()
1342
1287
approval_duration = notifychangeproperty(
1343
1288
dbus.UInt64, "ApprovalDuration",
1344
1289
type_func = lambda td: td.total_seconds() * 1000)
1345
1290
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1291
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1292
type_func = lambda td:
1293
td.total_seconds() * 1000)
1349
1294
extended_timeout = notifychangeproperty(
1350
1295
dbus.UInt64, "ExtendedTimeout",
1351
1296
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1297
interval = notifychangeproperty(dbus.UInt64,
1300
lambda td: td.total_seconds()
1355
1302
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1359
1304
del notifychangeproperty
1367
1312
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1313
Client.__del__(self, *args, **kwargs)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1375
exitstatus = self.last_checker_status
1315
def checker_callback(self, pid, condition, command,
1317
self.checker_callback_tag = None
1319
if os.WIFEXITED(condition):
1320
exitstatus = os.WEXITSTATUS(condition)
1377
1321
# Emit D-Bus signal
1378
1322
self.CheckerCompleted(dbus.Int16(exitstatus),
1323
dbus.Int64(condition),
1380
1324
dbus.String(command))
1382
1326
# Emit D-Bus signal
1383
1327
self.CheckerCompleted(dbus.Int16(-1),
1385
self.last_checker_signal),
1328
dbus.Int64(condition),
1386
1329
dbus.String(command))
1331
return Client.checker_callback(self, pid, condition, command,
1389
1334
def start_checker(self, *args, **kwargs):
1390
1335
old_checker_pid = getattr(self.checker, "pid", None)
1637
1580
if self.enabled:
1638
1581
# Reschedule checker run
1639
1582
gobject.source_remove(self.checker_initiator_tag)
1640
self.checker_initiator_tag = gobject.timeout_add(
1641
value, self.start_checker)
1642
self.start_checker() # Start one now, too
1583
self.checker_initiator_tag = (gobject.timeout_add
1584
(value, self.start_checker))
1585
self.start_checker() # Start one now, too
1644
1587
# Checker - property
1645
@dbus_service_property(_interface,
1588
@dbus_service_property(_interface, signature="s",
1647
1589
access="readwrite")
1648
1590
def Checker_dbus_property(self, value=None):
1649
1591
if value is None: # get
1883
1823
def fingerprint(openpgp):
1884
1824
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1825
# New GnuTLS "datum" with the OpenPGP public key
1886
datum = gnutls.library.types.gnutls_datum_t(
1887
ctypes.cast(ctypes.c_char_p(openpgp),
1888
ctypes.POINTER(ctypes.c_ubyte)),
1889
ctypes.c_uint(len(openpgp)))
1826
datum = (gnutls.library.types
1827
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1830
ctypes.c_uint(len(openpgp))))
1890
1831
# New empty GnuTLS certificate
1891
1832
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1833
(gnutls.library.functions
1834
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1835
# Import the OpenPGP public key into the certificate
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1836
(gnutls.library.functions
1837
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1838
gnutls.library.constants
1839
.GNUTLS_OPENPGP_FMT_RAW))
1898
1840
# Verify the self signature in the key
1899
1841
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1842
(gnutls.library.functions
1843
.gnutls_openpgp_crt_verify_self(crt, 0,
1844
ctypes.byref(crtverify)))
1902
1845
if crtverify.value != 0:
1903
1846
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1847
raise (gnutls.errors.CertificateSecurityError
1906
1849
# New buffer for the fingerprint
1907
1850
buf = ctypes.create_string_buffer(20)
1908
1851
buf_len = ctypes.c_size_t()
1909
1852
# Get the fingerprint from the certificate into the buffer
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1855
ctypes.byref(buf_len)))
1912
1856
# Deinit the certificate
1913
1857
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1858
# Convert the buffer to a Python bytestring
2092
2027
def add_pipe(self, parent_pipe, proc):
2093
2028
# Call "handle_ipc" for both data and EOF events
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2097
functools.partial(self.handle_ipc,
2098
parent_pipe = parent_pipe,
2029
gobject.io_add_watch(parent_pipe.fileno(),
2030
gobject.IO_IN | gobject.IO_HUP,
2031
functools.partial(self.handle_ipc,
2101
def handle_ipc(self, source, condition,
2104
client_object=None):
2036
def handle_ipc(self, source, condition, parent_pipe=None,
2037
proc = None, client_object=None):
2105
2038
# error, or the other end of multiprocessing.Pipe has closed
2106
2039
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2040
# Wait for other process to exit
2194
2127
# avoid excessive use of external libraries.
2196
2129
# New type for defining tokens, syntax, and semantics all-in-one
2197
Token = collections.namedtuple("Token", (
2198
"regexp", # To match token; if "value" is not None, must have
2199
# a "group" containing digits
2200
"value", # datetime.timedelta or None
2201
"followers")) # Tokens valid after this token
2130
Token = collections.namedtuple("Token",
2131
("regexp", # To match token; if
2132
# "value" is not None,
2133
# must have a "group"
2135
"value", # datetime.timedelta or
2137
"followers")) # Tokens valid after
2202
2139
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2140
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2141
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2142
token_second = Token(re.compile(r"(\d+)S"),
2206
2143
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2144
frozenset((token_end,)))
2208
2145
token_minute = Token(re.compile(r"(\d+)M"),
2209
2146
datetime.timedelta(minutes=1),
2210
2147
frozenset((token_second, token_end)))
2436
2372
# Override the settings from the config file with command line
2437
2373
# options, if set.
2438
2374
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2375
"priority", "servicename", "configdir",
2376
"use_dbus", "use_ipv6", "debuglevel", "restore",
2377
"statedir", "socket", "foreground", "zeroconf"):
2442
2378
value = getattr(options, option)
2443
2379
if value is not None:
2444
2380
server_settings[option] = value
2501
2439
socketfd = None
2502
2440
if server_settings["socket"] != "":
2503
2441
socketfd = server_settings["socket"]
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2507
interface=(server_settings["interface"] or None),
2509
gnutls_priority=server_settings["priority"],
2442
tcp_server = MandosServer((server_settings["address"],
2443
server_settings["port"]),
2445
interface=(server_settings["interface"]
2449
server_settings["priority"],
2512
2452
if not foreground:
2513
2453
pidfilename = "/run/mandos.pid"
2514
2454
if not os.path.isdir("/run/."):
2515
2455
pidfilename = "/var/run/mandos.pid"
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2458
pidfile = open(pidfilename, "w")
2519
2459
except IOError as e:
2520
2460
logger.error("Could not open file %r", pidfilename,
2577
2517
bus_name = dbus.service.BusName("se.recompile.Mandos",
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2583
except dbus.exceptions.DBusException as e:
2518
bus, do_not_queue=True)
2519
old_bus_name = (dbus.service.BusName
2520
("se.bsnet.fukt.Mandos", bus,
2522
except dbus.exceptions.NameExistsException as e:
2584
2523
logger.error("Disabling D-Bus:", exc_info=e)
2585
2524
use_dbus = False
2586
2525
server_settings["use_dbus"] = False
2587
2526
tcp_server.use_dbus = False
2589
2528
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2529
service = AvahiServiceToSyslog(name =
2530
server_settings["servicename"],
2531
servicetype = "_mandos._tcp",
2532
protocol = protocol, bus = bus)
2595
2533
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2534
service.interface = (if_nametoindex
2535
(server_settings["interface"]
2599
2538
global multiprocessing_manager
2600
2539
multiprocessing_manager = multiprocessing.Manager()
2619
2558
if server_settings["restore"]:
2621
2560
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2561
clients_data, old_client_settings = (pickle.load
2624
2563
os.remove(stored_state_path)
2625
2564
except IOError as e:
2626
2565
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2566
logger.warning("Could not load persistent state: {}"
2567
.format(os.strerror(e.errno)))
2630
2569
logger.critical("Could not load persistent state:",
2633
2572
except EOFError as e:
2634
2573
logger.warning("Could not load persistent state: "
2574
"EOFError:", exc_info=e)
2638
2576
with PGPEngine() as pgp:
2639
2577
for client_name, client in clients_data.items():
2668
2606
if not client["last_checked_ok"]:
2669
2607
logger.warning(
2670
2608
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2609
"performed a successful checker"
2610
.format(client_name))
2673
2611
client["enabled"] = False
2674
2612
elif client["last_checker_status"] != 0:
2675
2613
logger.warning(
2676
2614
"disabling client {} - Client last"
2677
" checker failed with error code"
2680
client["last_checker_status"]))
2615
" checker failed with error code {}"
2616
.format(client_name,
2617
client["last_checker_status"]))
2681
2618
client["enabled"] = False
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2620
client["expires"] = (datetime.datetime
2622
+ client["timeout"])
2686
2623
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2624
" keeping {} enabled"
2625
.format(client_name))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2627
client["secret"] = (
2628
pgp.decrypt(client["encrypted_secret"],
2629
client_settings[client_name]
2693
2631
except PGPError:
2694
2632
# If decryption fails, we use secret from new settings
2695
logger.debug("Failed to decrypt {} old secret".format(
2697
client["secret"] = (client_settings[client_name]
2633
logger.debug("Failed to decrypt {} old secret"
2634
.format(client_name))
2635
client["secret"] = (
2636
client_settings[client_name]["secret"])
2700
2638
# Add/remove clients based on new changes made to config
2701
2639
for client_name in (set(old_client_settings)
2731
2668
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2671
@alternate_dbus_interfaces({"se.recompile.Mandos":
2672
"se.bsnet.fukt.Mandos"})
2737
2673
class MandosDBusService(DBusObjectWithProperties):
2738
2674
"""A D-Bus proxy object"""
2740
2675
def __init__(self):
2741
2676
dbus.service.Object.__init__(self, bus, "/")
2743
2677
_interface = "se.recompile.Mandos"
2745
2679
@dbus_interface_annotations(_interface)
2746
2680
def _foo(self):
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2681
return { "org.freedesktop.DBus.Property"
2682
".EmitsChangedSignal":
2751
2685
@dbus.service.signal(_interface, signature="o")
2752
2686
def ClientAdded(self, objpath):
2835
2770
del client_settings[client.name]["secret"]
2838
with tempfile.NamedTemporaryFile(
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2773
with (tempfile.NamedTemporaryFile
2774
(mode='wb', suffix=".pickle", prefix='clients-',
2775
dir=os.path.dirname(stored_state_path),
2776
delete=False)) as stored_state:
2844
2777
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2778
tempname=stored_state.name
2846
2779
os.rename(tempname, stored_state_path)
2847
2780
except (IOError, OSError) as e: