187
184
ciphertext = f.read()
189
186
except IOError as e:
191
188
self.gnupg.passphrase = None
192
189
return ciphertext
194
191
def decrypt(self, data, password):
195
192
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
193
with open(os.devnull) as devnull:
198
195
proc = self.gnupg.run(['--decrypt'],
199
196
create_fhs=['stdin', 'stdout'],
200
197
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
198
with contextlib.closing(proc.handles['stdin'] ) as f:
203
200
with contextlib.closing(proc.handles['stdout']) as f:
204
201
decrypted_plaintext = f.read()
206
203
except IOError as e:
208
205
self.gnupg.passphrase = None
209
206
return decrypted_plaintext
414
411
interval: datetime.timedelta(); How often to start a new checker
415
412
last_approval_request: datetime.datetime(); (UTC) or None
416
413
last_checked_ok: datetime.datetime(); (UTC) or None
417
415
last_checker_status: integer between 0 and 255 reflecting exit
418
416
status of last checker. -1 reflects crashed
419
checker, -2 means no checker completed yet.
420
418
last_enabled: datetime.datetime(); (UTC) or None
421
419
name: string; from the config file, used in log messages and
422
420
D-Bus identifiers
423
421
secret: bytestring; sent verbatim (over TLS) to client
424
422
timeout: datetime.timedelta(); How long from last_checked_ok
425
423
until this client is disabled
426
extended_timeout: extra long timeout when secret has been sent
424
extended_timeout: extra long timeout when password has been sent
427
425
runtime_expansions: Allowed attributes for runtime expansion.
428
426
expires: datetime.datetime(); time (UTC) when a client will be
429
427
disabled, or None
433
431
"created", "enabled", "fingerprint",
434
432
"host", "interval", "last_checked_ok",
435
433
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
439
"checker": "fping -q -- %%(host)s",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
447
435
def timeout_milliseconds(self):
448
436
"Return the 'timeout' attribute in milliseconds"
459
447
def approval_delay_milliseconds(self):
460
448
return timedelta_to_milliseconds(self.approval_delay)
463
def config_parser(config):
464
"""Construct a new dict of client settings of this form:
465
{ client_name: {setting_name: value, ...}, ...}
466
with exceptions for any special settings as defined above.
467
NOTE: Must be a pure function. Must return the same result
468
value given the same arguments.
471
for client_name in config.sections():
472
section = dict(config.items(client_name))
473
client = settings[client_name] = {}
475
client["host"] = section["host"]
476
# Reformat values from string types to Python types
477
client["approved_by_default"] = config.getboolean(
478
client_name, "approved_by_default")
479
client["enabled"] = config.getboolean(client_name,
482
client["fingerprint"] = (section["fingerprint"].upper()
484
if "secret" in section:
485
client["secret"] = section["secret"].decode("base64")
486
elif "secfile" in section:
487
with open(os.path.expanduser(os.path.expandvars
488
(section["secfile"])),
490
client["secret"] = secfile.read()
492
raise TypeError("No secret or secfile for section %s"
494
client["timeout"] = string_to_delta(section["timeout"])
495
client["extended_timeout"] = string_to_delta(
496
section["extended_timeout"])
497
client["interval"] = string_to_delta(section["interval"])
498
client["approval_delay"] = string_to_delta(
499
section["approval_delay"])
500
client["approval_duration"] = string_to_delta(
501
section["approval_duration"])
502
client["checker_command"] = section["checker"]
503
client["last_approval_request"] = None
504
client["last_checked_ok"] = None
505
client["last_checker_status"] = -2
510
def __init__(self, settings, name = None):
450
def __init__(self, name = None, config=None):
511
451
"""Note: the 'checker' key in 'config' sets the
512
452
'checker_command' attribute and *not* the 'checker'
515
# adding all client settings
516
for setting, value in settings.iteritems():
517
setattr(self, setting, value)
520
if not hasattr(self, "last_enabled"):
521
self.last_enabled = datetime.datetime.utcnow()
522
if not hasattr(self, "expires"):
523
self.expires = (datetime.datetime.utcnow()
526
self.last_enabled = None
529
457
logger.debug("Creating client %r", self.name)
530
458
# Uppercase and remove spaces from fingerprint for later
531
459
# comparison purposes with return value from the fingerprint()
461
self.fingerprint = (config["fingerprint"].upper()
533
463
logger.debug(" Fingerprint: %s", self.fingerprint)
534
self.created = settings.get("created",
535
datetime.datetime.utcnow())
537
# attributes specific for this server instance
464
if "secret" in config:
465
self.secret = config["secret"].decode("base64")
466
elif "secfile" in config:
467
with open(os.path.expanduser(os.path.expandvars
468
(config["secfile"])),
470
self.secret = secfile.read()
472
raise TypeError("No secret or secfile for client %s"
474
self.host = config.get("host", "")
475
self.created = datetime.datetime.utcnow()
476
self.enabled = config.get("enabled", True)
477
self.last_approval_request = None
479
self.last_enabled = datetime.datetime.utcnow()
481
self.last_enabled = None
482
self.last_checked_ok = None
483
self.last_checker_status = None
484
self.timeout = string_to_delta(config["timeout"])
485
self.extended_timeout = string_to_delta(config
486
["extended_timeout"])
487
self.interval = string_to_delta(config["interval"])
538
488
self.checker = None
539
489
self.checker_initiator_tag = None
540
490
self.disable_initiator_tag = None
492
self.expires = datetime.datetime.utcnow() + self.timeout
541
495
self.checker_callback_tag = None
496
self.checker_command = config["checker"]
542
497
self.current_checker_command = None
543
498
self.approved = None
499
self.approved_by_default = config.get("approved_by_default",
544
501
self.approvals_pending = 0
502
self.approval_delay = string_to_delta(
503
config["approval_delay"])
504
self.approval_duration = string_to_delta(
505
config["approval_duration"])
545
506
self.changedstate = (multiprocessing_manager
546
507
.Condition(multiprocessing_manager
627
588
logger.warning("Checker for %(name)s crashed?",
630
def checked_ok(self):
631
"""Assert that the client has been seen, alive and well."""
632
self.last_checked_ok = datetime.datetime.utcnow()
633
self.last_checker_status = 0
636
def bump_timeout(self, timeout=None):
637
"""Bump up the timeout for this client."""
591
def checked_ok(self, timeout=None):
592
"""Bump up the timeout for this client.
594
This should only be called when the client has been seen,
638
597
if timeout is None:
639
598
timeout = self.timeout
599
self.last_checked_ok = datetime.datetime.utcnow()
640
600
if self.disable_initiator_tag is not None:
641
601
gobject.source_remove(self.disable_initiator_tag)
642
602
if getattr(self, "enabled", False):
775
def dbus_interface_annotations(dbus_interface):
776
"""Decorator for marking functions returning interface annotations.
780
@dbus_interface_annotations("org.example.Interface")
781
def _foo(self): # Function name does not matter
782
return {"org.freedesktop.DBus.Deprecated": "true",
783
"org.freedesktop.DBus.Property.EmitsChangedSignal":
787
func._dbus_is_interface = True
788
func._dbus_interface = dbus_interface
789
func._dbus_name = dbus_interface
794
def dbus_annotations(annotations):
795
"""Decorator to annotate D-Bus methods, signals or properties
798
@dbus_service_property("org.example.Interface", signature="b",
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
803
def Property_dbus_property(self):
804
return dbus.Boolean(False)
807
func._dbus_annotations = annotations
812
735
class DBusPropertyException(dbus.exceptions.DBusException):
813
736
"""A base class for D-Bus property-related exceptions
840
def _is_dbus_thing(thing):
841
"""Returns a function testing if an attribute is a D-Bus thing
843
If called like _is_dbus_thing("method") it returns a function
844
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
763
def _is_dbus_property(obj):
764
return getattr(obj, "_dbus_is_property", False)
849
def _get_all_dbus_things(self, thing):
766
def _get_all_dbus_properties(self):
850
767
"""Returns a generator of (name, attribute) pairs
852
return ((getattr(athing.__get__(self), "_dbus_name",
854
athing.__get__(self))
769
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
855
770
for cls in self.__class__.__mro__
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
772
inspect.getmembers(cls, self._is_dbus_property))
860
774
def _get_dbus_property(self, interface_name, property_name):
861
775
"""Returns a bound method if one exists which is a D-Bus
948
859
e.setAttribute("access", prop._dbus_access)
950
861
for if_tag in document.getElementsByTagName("interface"):
952
862
for tag in (make_tag(document, name, prop)
954
in self._get_all_dbus_things("property")
864
in self._get_all_dbus_properties()
955
865
if prop._dbus_interface
956
866
== if_tag.getAttribute("name")):
957
867
if_tag.appendChild(tag)
958
# Add annotation tags
959
for typ in ("method", "signal", "property"):
960
for tag in if_tag.getElementsByTagName(typ):
962
for name, prop in (self.
963
_get_all_dbus_things(typ)):
964
if (name == tag.getAttribute("name")
965
and prop._dbus_interface
966
== if_tag.getAttribute("name")):
967
annots.update(getattr
971
for name, value in annots.iteritems():
972
ann_tag = document.createElement(
974
ann_tag.setAttribute("name", name)
975
ann_tag.setAttribute("value", value)
976
tag.appendChild(ann_tag)
977
# Add interface annotation tags
978
for annotation, value in dict(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
985
ann_tag = document.createElement("annotation")
986
ann_tag.setAttribute("name", annotation)
987
ann_tag.setAttribute("value", value)
988
if_tag.appendChild(ann_tag)
989
868
# Add the names to the return values for the
990
869
# "org.freedesktop.DBus.Properties" methods
991
870
if (if_tag.getAttribute("name")
1128
992
attribute.func_name,
1129
993
attribute.func_defaults,
1130
994
attribute.func_closure)))
1131
# Copy annotations, if any
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1135
except AttributeError:
1137
# Is this a D-Bus interface?
1138
elif getattr(attribute, "_dbus_is_interface", False):
1139
# Create a new, but exactly alike, function
1140
# object. Decorate it to be a new D-Bus interface
1141
# with the alternate D-Bus interface name. Add it
1143
attr[attrname] = (dbus_interface_annotations
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1160
if aname not in attr:
1163
995
return type.__new__(mcs, name, bases, attr)
1230
1064
checker is not None)
1231
1065
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
1066
"LastCheckedOK")
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1234
"LastCheckerStatus")
1235
1067
last_approval_request = notifychangeproperty(
1236
1068
datetime_to_dbus, "LastApprovalRequest")
1237
1069
approved_by_default = notifychangeproperty(dbus.Boolean,
1238
1070
"ApprovedByDefault")
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1071
approval_delay = notifychangeproperty(dbus.UInt16,
1240
1072
"ApprovalDelay",
1242
1074
timedelta_to_milliseconds)
1243
1075
approval_duration = notifychangeproperty(
1244
dbus.UInt64, "ApprovalDuration",
1076
dbus.UInt16, "ApprovalDuration",
1245
1077
type_func = timedelta_to_milliseconds)
1246
1078
host = notifychangeproperty(dbus.String, "Host")
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1079
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1249
1081
timedelta_to_milliseconds)
1250
1082
extended_timeout = notifychangeproperty(
1251
dbus.UInt64, "ExtendedTimeout",
1083
dbus.UInt16, "ExtendedTimeout",
1252
1084
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1085
interval = notifychangeproperty(dbus.UInt16,
1256
1088
timedelta_to_milliseconds)
1501
1328
if value is None: # get
1502
1329
return dbus.UInt64(self.timeout_milliseconds())
1503
1330
self.timeout = datetime.timedelta(0, 0, 0, value)
1331
if getattr(self, "disable_initiator_tag", None) is None:
1504
1333
# Reschedule timeout
1506
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1334
gobject.source_remove(self.disable_initiator_tag)
1335
self.disable_initiator_tag = None
1337
time_to_die = timedelta_to_milliseconds((self
1342
if time_to_die <= 0:
1343
# The timeout has passed
1346
self.expires = (datetime.datetime.utcnow()
1347
+ datetime.timedelta(milliseconds =
1349
self.disable_initiator_tag = (gobject.timeout_add
1350
(time_to_die, self.disable))
1524
1352
# ExtendedTimeout - property
1525
1353
@dbus_service_property(_interface, signature="t",
2292
2131
.gnutls_global_set_log_function(debug_gnutls))
2294
2133
# Redirect stdin so all checkers get /dev/null
2295
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2134
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2296
2135
os.dup2(null, sys.stdin.fileno())
2139
# No console logging
2140
logger.removeHandler(console)
2300
2142
# Need to fork before connecting to D-Bus
2302
2144
# Close all input and output, do double fork, etc.
2305
gobject.threads_init()
2307
2147
global main_loop
2308
2148
# From the Avahi example code
2309
DBusGMainLoop(set_as_default=True)
2149
DBusGMainLoop(set_as_default=True )
2310
2150
main_loop = gobject.MainLoop()
2311
2151
bus = dbus.SystemBus()
2312
2152
# End of Avahi example code
2339
2179
client_class = functools.partial(ClientDBusTransitional,
2342
client_settings = Client.config_parser(client_config)
2182
special_settings = {
2183
# Some settings need to be accessd by special methods;
2184
# booleans need .getboolean(), etc. Here is a list of them:
2185
"approved_by_default":
2187
client_config.getboolean(section, "approved_by_default"),
2190
client_config.getboolean(section, "enabled"),
2192
# Construct a new dict of client settings of this form:
2193
# { client_name: {setting_name: value, ...}, ...}
2194
# with exceptions for any special settings as defined above
2195
client_settings = dict((clientname,
2198
if setting not in special_settings
2199
else special_settings[setting]
2201
for setting, value in
2202
client_config.items(clientname)))
2203
for clientname in client_config.sections())
2343
2205
old_client_settings = {}
2346
2208
# Get client data and settings from last running state.
2347
2209
if server_settings["restore"]:
2374
2235
if (name != "secret" and
2375
2236
value != old_client_settings[client_name]
2377
client[name] = value
2238
setattr(client, name, value)
2378
2239
except KeyError:
2381
2242
# Clients who has passed its expire date can still be
2382
# enabled if its last checker was successful. Clients
2383
# whose checker succeeded before we stored its state is
2384
# assumed to have successfully run all checkers during
2386
if client["enabled"]:
2387
if datetime.datetime.utcnow() >= client["expires"]:
2388
if not client["last_checked_ok"]:
2390
"disabling client {0} - Client never "
2391
"performed a successful checker"
2392
.format(client_name))
2393
client["enabled"] = False
2394
elif client["last_checker_status"] != 0:
2396
"disabling client {0} - Client "
2397
"last checker failed with error code {1}"
2398
.format(client_name,
2399
client["last_checker_status"]))
2243
# enabled if its last checker was sucessful. Clients
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
2246
if client["enabled"] and client["last_checked_ok"]:
2247
if ((datetime.datetime.utcnow()
2248
- client["last_checked_ok"])
2249
> client["interval"]):
2250
if client["last_checker_status"] != 0:
2400
2251
client["enabled"] = False
2402
2253
client["expires"] = (datetime.datetime
2404
2255
+ client["timeout"])
2405
logger.debug("Last checker succeeded,"
2406
" keeping {0} enabled"
2407
.format(client_name))
2257
client["changedstate"] = (multiprocessing_manager
2259
(multiprocessing_manager
2262
new_client = (ClientDBusTransitional.__new__
2263
(ClientDBusTransitional))
2264
tcp_server.clients[client_name] = new_client
2265
new_client.bus = bus
2266
for name, value in client.iteritems():
2267
setattr(new_client, name, value)
2268
client_object_name = unicode(client_name).translate(
2269
{ord("."): ord("_"),
2270
ord("-"): ord("_")})
2271
new_client.dbus_object_path = (dbus.ObjectPath
2273
+ client_object_name))
2274
DBusObjectWithProperties.__init__(new_client,
2279
tcp_server.clients[client_name] = (Client.__new__
2281
for name, value in client.iteritems():
2282
setattr(tcp_server.clients[client_name],
2409
client["secret"] = (
2410
pgp.decrypt(client["encrypted_secret"],
2411
client_settings[client_name]
2286
tcp_server.clients[client_name].secret = (
2287
crypt.decrypt(tcp_server.clients[client_name]
2289
client_settings[client_name]
2414
2292
# If decryption fails, we use secret from new settings
2415
logger.debug("Failed to decrypt {0} old secret"
2416
.format(client_name))
2417
client["secret"] = (
2293
tcp_server.clients[client_name].secret = (
2418
2294
client_settings[client_name]["secret"])
2421
# Add/remove clients based on new changes made to config
2422
for client_name in (set(old_client_settings)
2423
- set(client_settings)):
2424
del clients_data[client_name]
2425
for client_name in (set(client_settings)
2426
- set(old_client_settings)):
2427
clients_data[client_name] = client_settings[client_name]
2429
# Create all client objects
2430
for client_name, client in clients_data.iteritems():
2431
tcp_server.clients[client_name] = client_class(
2432
name = client_name, settings = client)
2296
# Create/remove clients based on new changes made to config
2297
for clientname in set(old_client_settings) - set(client_settings):
2298
del tcp_server.clients[clientname]
2299
for clientname in set(client_settings) - set(old_client_settings):
2300
tcp_server.clients[clientname] = (client_class(name
2434
2306
if not tcp_server.clients:
2435
2307
logger.warning("No clients defined")
2447
2319
# "pidfile" was never created
2449
2321
del pidfilename
2450
2323
signal.signal(signal.SIGINT, signal.SIG_IGN)
2452
2325
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2453
2326
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2456
class MandosDBusService(DBusObjectWithProperties):
2329
class MandosDBusService(dbus.service.Object):
2457
2330
"""A D-Bus proxy object"""
2458
2331
def __init__(self):
2459
2332
dbus.service.Object.__init__(self, bus, "/")
2460
2333
_interface = "se.recompile.Mandos"
2462
@dbus_interface_annotations(_interface)
2464
return { "org.freedesktop.DBus.Property"
2465
".EmitsChangedSignal":
2468
2335
@dbus.service.signal(_interface, signature="o")
2469
2336
def ClientAdded(self, objpath):
2527
2394
# Store client before exiting. Secrets are encrypted with key
2528
2395
# based on what config file has. If config file is
2529
2396
# removed/edited, old secret will thus be unrecovable.
2531
with PGPEngine() as pgp:
2398
with Crypto() as crypt:
2532
2399
for client in tcp_server.clients.itervalues():
2533
2400
key = client_settings[client.name]["secret"]
2534
client.encrypted_secret = pgp.encrypt(client.secret,
2401
client.encrypted_secret = crypt.encrypt(client.secret,
2536
2403
client_dict = {}
2538
# A list of attributes that can not be pickled
2540
exclude = set(("bus", "changedstate", "secret",
2405
# A list of attributes that will not be stored when
2407
exclude = set(("bus", "changedstate", "secret"))
2542
2408
for name, typ in (inspect.getmembers
2543
2409
(dbus.service.Object)):
2544
2410
exclude.add(name)
2549
2415
if attr not in exclude:
2550
2416
client_dict[attr] = getattr(client, attr)
2552
clients[client.name] = client_dict
2418
clients.append(client_dict)
2553
2419
del client_settings[client.name]["secret"]
2556
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2559
(stored_state_path))
2560
with os.fdopen(tempfd, "wb") as stored_state:
2422
with os.fdopen(os.open(stored_state_path,
2423
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2424
0600), "wb") as stored_state:
2561
2425
pickle.dump((clients, client_settings), stored_state)
2562
os.rename(tempname, stored_state_path)
2563
2426
except (IOError, OSError) as e:
2564
2427
logger.warning("Could not save persistent state: {0}"
2571
if e.errno not in set((errno.ENOENT, errno.EACCES,
2429
if e.errno not in (errno.ENOENT, errno.EACCES):
2575
2432
# Delete all clients, and settings from config
2576
2433
while tcp_server.clients: