267
229
value += datetime.timedelta(0, 0, 0, int(num))
271
class TableOfClients(object):
274
"Enabled": "Enabled",
275
"Timeout": "Timeout",
276
"LastCheckedOK": "Last Successful Check",
277
"LastApprovalRequest": "Last Approval Request",
278
"Created": "Created",
279
"Interval": "Interval",
281
"Fingerprint": "Fingerprint",
283
"CheckerRunning": "Check Is Running",
284
"LastEnabled": "Last Enabled",
285
"ApprovalPending": "Approval Is Pending",
286
"ApprovedByDefault": "Approved By Default",
287
"ApprovalDelay": "Approval Delay",
288
"ApprovalDuration": "Approval Duration",
289
"Checker": "Checker",
290
"ExtendedTimeout": "Extended Timeout",
291
"Expires": "Expires",
292
"LastCheckerStatus": "Last Checker Status",
295
def __init__(self, clients, keywords, tableheaders=None):
296
self.clients = clients
297
self.keywords = keywords
298
if tableheaders is not None:
299
self.tableheaders = tableheaders
302
return "\n".join(self.rows())
304
if sys.version_info.major == 2:
305
__unicode__ = __str__
307
return str(self).encode(locale.getpreferredencoding())
310
format_string = self.row_formatting_string()
311
rows = [self.header_line(format_string)]
312
rows.extend(self.client_line(client, format_string)
313
for client in self.clients)
316
def row_formatting_string(self):
317
"Format string used to format table rows"
318
return " ".join("{{{key}:{width}}}".format(
319
width=max(len(self.tableheaders[key]),
320
*(len(self.string_from_client(client, key))
321
for client in self.clients)),
323
for key in self.keywords)
325
def string_from_client(self, client, key):
326
return self.valuetostring(client[key], key)
232
def print_clients(clients, keywords):
329
233
def valuetostring(value, keyword):
330
if isinstance(value, dbus.Boolean):
234
if type(value) is dbus.Boolean:
331
235
return "Yes" if value else "No"
332
236
if keyword in ("Timeout", "Interval", "ApprovalDelay",
333
237
"ApprovalDuration", "ExtendedTimeout"):
334
238
return milliseconds_to_string(value)
335
239
return str(value)
337
def header_line(self, format_string):
338
return format_string.format(**self.tableheaders)
340
def client_line(self, client, format_string):
341
return format_string.format(
342
**{key: self.string_from_client(client, key)
343
for key in self.keywords})
346
## Classes for commands.
348
# Abstract classes first
349
class Command(object):
350
"""Abstract class for commands"""
351
def run(self, mandos, clients):
352
"""Normal commands should implement run_on_one_client(), but
353
commands which want to operate on all clients at the same time
354
can override this run() method instead."""
356
for client in clients:
357
self.run_on_one_client(client)
359
class PrintCmd(Command):
360
"""Abstract class for commands printing client details"""
361
all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
362
"Created", "Interval", "Host", "KeyID",
363
"Fingerprint", "CheckerRunning", "LastEnabled",
364
"ApprovalPending", "ApprovedByDefault",
365
"LastApprovalRequest", "ApprovalDelay",
366
"ApprovalDuration", "Checker", "ExtendedTimeout",
367
"Expires", "LastCheckerStatus")
368
def run(self, mandos, clients):
369
print(self.output(clients))
371
class PropertyCmd(Command):
372
"""Abstract class for Actions for setting one client property"""
373
def run_on_one_client(self, client):
374
"""Set the Client's D-Bus property"""
375
client.Set(client_interface, self.property, self.value_to_set,
376
dbus_interface=dbus.PROPERTIES_IFACE)
378
class ValueArgumentMixIn(object):
379
"""Mixin class for commands taking a value as argument"""
380
def __init__(self, value):
381
self.value_to_set = value
383
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
384
"""Mixin class for commands taking a value argument as
387
def value_to_set(self):
390
def value_to_set(self, value):
391
"""When setting, convert value to a datetime.timedelta"""
392
self._vts = string_to_delta(value).total_seconds() * 1000
394
# Actual (non-abstract) command classes
396
class PrintTableCmd(PrintCmd):
397
def __init__(self, verbose=False):
398
self.verbose = verbose
399
def output(self, clients):
401
keywords = self.all_keywords
403
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
404
return str(TableOfClients(clients.values(), keywords))
406
class DumpJSONCmd(PrintCmd):
407
def output(self, clients):
408
data = {client["Name"]:
409
{key: self.dbus_boolean_to_bool(client[key])
410
for key in self.all_keywords}
411
for client in clients.values()}
412
return json.dumps(data, indent=4, separators=(',', ': '))
414
def dbus_boolean_to_bool(value):
415
if isinstance(value, dbus.Boolean):
419
class IsEnabledCmd(Command):
420
def run_on_one_client(self, client):
421
if self.is_enabled(client):
424
def is_enabled(self, client):
425
return client.Get(client_interface, "Enabled",
426
dbus_interface=dbus.PROPERTIES_IFACE)
428
class RemoveCmd(Command):
429
def run_on_one_client(self, client):
430
self.mandos.RemoveClient(client.__dbus_object_path__)
432
class ApproveCmd(Command):
433
def run_on_one_client(self, client):
434
client.Approve(dbus.Boolean(True),
435
dbus_interface=client_interface)
437
class DenyCmd(Command):
438
def run_on_one_client(self, client):
439
client.Approve(dbus.Boolean(False),
440
dbus_interface=client_interface)
442
class EnableCmd(PropertyCmd):
444
value_to_set = dbus.Boolean(True)
446
class DisableCmd(PropertyCmd):
448
value_to_set = dbus.Boolean(False)
450
class BumpTimeoutCmd(PropertyCmd):
451
property = "LastCheckedOK"
454
class StartCheckerCmd(PropertyCmd):
455
property = "CheckerRunning"
456
value_to_set = dbus.Boolean(True)
458
class StopCheckerCmd(PropertyCmd):
459
property = "CheckerRunning"
460
value_to_set = dbus.Boolean(False)
462
class ApproveByDefaultCmd(PropertyCmd):
463
property = "ApprovedByDefault"
464
value_to_set = dbus.Boolean(True)
466
class DenyByDefaultCmd(PropertyCmd):
467
property = "ApprovedByDefault"
468
value_to_set = dbus.Boolean(False)
470
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
473
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
476
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
479
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
482
class SetExtendedTimeoutCmd(PropertyCmd,
483
MillisecondsValueArgumentMixIn):
484
property = "ExtendedTimeout"
486
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
487
property = "Interval"
489
class SetApprovalDelayCmd(PropertyCmd,
490
MillisecondsValueArgumentMixIn):
491
property = "ApprovalDelay"
493
class SetApprovalDurationCmd(PropertyCmd,
494
MillisecondsValueArgumentMixIn):
495
property = "ApprovalDuration"
241
# Create format string to print table rows
242
format_string = " ".join("{{{key}:{width}}}".format(
243
width = max(len(tablewords[key]),
244
max(len(valuetostring(client[key],
248
key = key) for key in keywords)
250
print(format_string.format(**tablewords))
251
for client in clients:
252
print(format_string.format(**dict((key,
253
valuetostring(client[key],
255
for key in keywords)))
497
257
def has_actions(options):
498
258
return any((options.enable,
572
319
parser.add_argument("-s", "--secret",
573
320
type=argparse.FileType(mode="rb"),
574
321
help="Set password blob (file) for client")
575
approve_deny = parser.add_mutually_exclusive_group()
576
approve_deny.add_argument(
577
"-A", "--approve", action="store_true",
578
help="Approve any current client request")
579
approve_deny.add_argument("-D", "--deny", action="store_true",
580
help="Deny any current client request")
322
parser.add_argument("-A", "--approve", action="store_true",
323
help="Approve any current client request")
324
parser.add_argument("-D", "--deny", action="store_true",
325
help="Deny any current client request")
581
326
parser.add_argument("--check", action="store_true",
582
327
help="Run self-test")
583
328
parser.add_argument("client", nargs="*", help="Client name")
584
options = parser.parse_args(args=args)
329
options = parser.parse_args()
586
331
if has_actions(options) and not (options.client or options.all):
587
332
parser.error("Options require clients names or --all.")
588
333
if options.verbose and has_actions(options):
589
parser.error("--verbose can only be used alone.")
590
if options.dump_json and (options.verbose
591
or has_actions(options)):
592
parser.error("--dump-json can only be used alone.")
334
parser.error("--verbose can only be used alone or with"
593
336
if options.all and not has_actions(options):
594
337
parser.error("--all requires an action.")
595
if options.is_enabled and len(options.client) > 1:
596
parser.error("--is-enabled requires exactly one client")
600
if options.dump_json:
601
commands.append(DumpJSONCmd())
604
commands.append(EnableCmd())
607
commands.append(DisableCmd())
609
if options.bump_timeout:
610
commands.append(BumpTimeoutCmd(options.bump_timeout))
612
if options.start_checker:
613
commands.append(StartCheckerCmd())
615
if options.stop_checker:
616
commands.append(StopCheckerCmd())
618
if options.is_enabled:
619
commands.append(IsEnabledCmd())
622
commands.append(RemoveCmd())
624
if options.checker is not None:
625
commands.append(SetCheckerCmd())
627
if options.timeout is not None:
628
commands.append(SetTimeoutCmd(options.timeout))
630
if options.extended_timeout:
632
SetExtendedTimeoutCmd(options.extended_timeout))
634
if options.interval is not None:
635
command.append(SetIntervalCmd(options.interval))
637
if options.approved_by_default is not None:
638
if options.approved_by_default:
639
command.append(ApproveByDefaultCmd())
641
command.append(DenyByDefaultCmd())
643
if options.approval_delay is not None:
644
command.append(SetApprovalDelayCmd(options.approval_delay))
646
if options.approval_duration is not None:
648
SetApprovalDurationCmd(options.approval_duration))
650
if options.host is not None:
651
command.append(SetHostCmd(options.host))
653
if options.secret is not None:
654
command.append(SetSecretCmd(options.secret))
657
commands.append(ApproveCmd())
660
commands.append(DenyCmd())
662
# If no command option has been given, show table of clients,
663
# optionally verbosely
665
commands.append(PrintTableCmd(verbose=options.verbose))
667
return commands, options.client
671
commands, clientnames = commands_and_clients_from_options()
340
fail_count, test_count = doctest.testmod()
341
sys.exit(os.EX_OK if fail_count == 0 else 1)
674
344
bus = dbus.SystemBus()
675
345
mandos_dbus_objc = bus.get_object(busname, server_path)
676
346
except dbus.exceptions.DBusException:
677
log.critical("Could not connect to Mandos server")
347
print("Could not connect to Mandos server",
680
351
mandos_serv = dbus.Interface(mandos_dbus_objc,
681
dbus_interface=server_interface)
682
mandos_serv_object_manager = dbus.Interface(
683
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
685
# Filter out log message from dbus module
686
dbus_logger = logging.getLogger("dbus.proxies")
687
class NullFilter(logging.Filter):
688
def filter(self, record):
690
dbus_filter = NullFilter()
691
dbus_logger.addFilter(dbus_filter)
352
dbus_interface = server_interface)
354
#block stderr since dbus library prints to stderr
355
null = os.open(os.path.devnull, os.O_RDWR)
356
stderrcopy = os.dup(sys.stderr.fileno())
357
os.dup2(null, sys.stderr.fileno())
694
mandos_clients = {path: ifs_and_props[client_interface]
695
for path, ifs_and_props in
696
mandos_serv_object_manager
697
.GetManagedObjects().items()
698
if client_interface in ifs_and_props}
361
mandos_clients = mandos_serv.GetAllClientsWithProperties()
700
# restore dbus logger
701
dbus_logger.removeFilter(dbus_filter)
702
except dbus.exceptions.DBusException as e:
703
log.critical("Failed to access Mandos server through D-Bus:"
364
os.dup2(stderrcopy, sys.stderr.fileno())
366
except dbus.exceptions.DBusException:
367
print("Access denied: Accessing mandos server through dbus.",
707
371
# Compile dict of (clients: properties) to process
711
clients = {bus.get_object(busname, path): properties
712
for path, properties in mandos_clients.items()}
374
if options.all or not options.client:
375
clients = dict((bus.get_object(busname, path), properties)
376
for path, properties in
377
mandos_clients.items())
714
for name in clientnames:
715
for path, client in mandos_clients.items():
379
for name in options.client:
380
for path, client in mandos_clients.iteritems():
716
381
if client["Name"] == name:
717
382
client_objc = bus.get_object(busname, path)
718
383
clients[client_objc] = client
721
log.critical("Client not found on server: %r", name)
386
print("Client not found on server: {0!r}"
387
.format(name), file=sys.stderr)
724
# Run all commands on clients
725
for command in commands:
726
command.run(mandos_serv, clients)
729
class Test_milliseconds_to_string(unittest.TestCase):
731
self.assertEqual(milliseconds_to_string(93785000),
733
def test_no_days(self):
734
self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
735
def test_all_zero(self):
736
self.assertEqual(milliseconds_to_string(0), "00:00:00")
737
def test_no_fractional_seconds(self):
738
self.assertEqual(milliseconds_to_string(400), "00:00:00")
739
self.assertEqual(milliseconds_to_string(900), "00:00:00")
740
self.assertEqual(milliseconds_to_string(1900), "00:00:01")
742
class Test_string_to_delta(unittest.TestCase):
743
def test_handles_basic_rfc3339(self):
744
self.assertEqual(string_to_delta("PT2H"),
745
datetime.timedelta(0, 7200))
746
def test_falls_back_to_pre_1_6_1_with_warning(self):
747
# assertLogs only exists in Python 3.4
748
if hasattr(self, "assertLogs"):
749
with self.assertLogs(log, logging.WARNING):
750
value = string_to_delta("2h")
390
if not has_actions(options) and clients:
392
keywords = ("Name", "Enabled", "Timeout",
393
"LastCheckedOK", "Created", "Interval",
394
"Host", "Fingerprint", "CheckerRunning",
395
"LastEnabled", "ApprovalPending",
397
"LastApprovalRequest", "ApprovalDelay",
398
"ApprovalDuration", "Checker",
752
class WarningFilter(logging.Filter):
753
"""Don't show, but record the presence of, warnings"""
754
def filter(self, record):
755
is_warning = record.levelno >= logging.WARNING
756
self.found = is_warning or getattr(self, "found",
758
return not is_warning
759
warning_filter = WarningFilter()
760
log.addFilter(warning_filter)
762
value = string_to_delta("2h")
764
log.removeFilter(warning_filter)
765
self.assertTrue(getattr(warning_filter, "found", False))
766
self.assertEqual(value, datetime.timedelta(0, 7200))
769
class TestCmd(unittest.TestCase):
770
"""Abstract class for tests of command classes"""
773
class MockClient(object):
774
def __init__(self, name, **attributes):
775
self.__dbus_object_path__ = "objpath_{}".format(name)
776
self.attributes = attributes
777
self.attributes["Name"] = name
778
def Set(interface, property, value,
779
properties_interface):
780
testcase.assertEqual(interface, client_interface)
781
testcase.assertEqual(properties_interface,
782
dbus.PROPERTIES_IFACE)
783
self.attributes[property] = value
784
def Get(interface, property, properties_interface):
785
testcase.assertEqual(interface, client_interface)
786
testcase.assertEqual(properties_interface,
787
dbus.PROPERTIES_IFACE)
788
return self.attributes[property]
789
def __getitem__(self, key):
790
return self.attributes[key]
791
self.clients = collections.OrderedDict([
795
KeyID=("92ed150794387c03ce684574b1139a65"
796
"94a34f895daaaf09fd8ea90a27cddb12"),
798
Host="foo.example.org",
799
Enabled=dbus.Boolean(True),
801
LastCheckedOK="2019-02-03T00:00:00",
802
Created="2019-01-02T00:00:00",
804
Fingerprint=("778827225BA7DE539C5A"
805
"7CFA59CFF7CDBD9A5920"),
806
CheckerRunning=dbus.Boolean(False),
807
LastEnabled="2019-01-03T00:00:00",
808
ApprovalPending=dbus.Boolean(False),
809
ApprovedByDefault=dbus.Boolean(True),
810
LastApprovalRequest="",
812
ApprovalDuration=1000,
813
Checker="fping -q -- %(host)s",
814
ExtendedTimeout=900000,
815
Expires="2019-02-04T00:00:00",
816
LastCheckerStatus=0)),
820
KeyID=("0558568eedd67d622f5c83b35a115f79"
821
"6ab612cff5ad227247e46c2b020f441c"),
824
Enabled=dbus.Boolean(True),
826
LastCheckedOK="2019-02-04T00:00:00",
827
Created="2019-01-03T00:00:00",
829
Fingerprint=("3E393AEAEFB84C7E89E2"
830
"F547B3A107558FCA3A27"),
831
CheckerRunning=dbus.Boolean(True),
832
LastEnabled="2019-01-04T00:00:00",
833
ApprovalPending=dbus.Boolean(False),
834
ApprovedByDefault=dbus.Boolean(False),
835
LastApprovalRequest="2019-01-03T00:00:00",
837
ApprovalDuration=1000,
839
ExtendedTimeout=900000,
840
Expires="2019-02-05T00:00:00",
841
LastCheckerStatus=-2)),
844
class TestPrintTableCmd(TestCmd):
845
def test_normal(self):
846
output = PrintTableCmd().output(self.clients)
847
expected_output = """
848
Name Enabled Timeout Last Successful Check
849
foo Yes 00:05:00 2019-02-03T00:00:00
850
barbar Yes 00:05:00 2019-02-04T00:00:00
852
self.assertEqual(output, expected_output)
853
def test_verbose(self):
854
output = PrintTableCmd(verbose=True).output(self.clients)
855
expected_output = """
856
Name Enabled Timeout Last Successful Check Created Interval Host Key ID Fingerprint Check Is Running Last Enabled Approval Is Pending Approved By Default Last Approval Request Approval Delay Approval Duration Checker Extended Timeout Expires Last Checker Status
857
foo Yes 00:05:00 2019-02-03T00:00:00 2019-01-02T00:00:00 00:02:00 foo.example.org 92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8ea90a27cddb12 778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 No 2019-01-03T00:00:00 No Yes 00:00:00 00:00:01 fping -q -- %(host)s 00:15:00 2019-02-04T00:00:00 0
858
barbar Yes 00:05:00 2019-02-04T00:00:00 2019-01-03T00:00:00 00:02:00 192.0.2.3 0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e46c2b020f441c 3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 Yes 2019-01-04T00:00:00 No No 2019-01-03T00:00:00 00:00:30 00:00:01 : 00:15:00 2019-02-05T00:00:00 -2
860
self.assertEqual(output, expected_output)
861
def test_one_client(self):
862
output = PrintTableCmd().output({"foo": self.clients["foo"]})
863
expected_output = """
864
Name Enabled Timeout Last Successful Check
865
foo Yes 00:05:00 2019-02-03T00:00:00
867
self.assertEqual(output, expected_output)
871
def should_only_run_tests():
872
parser = argparse.ArgumentParser(add_help=False)
873
parser.add_argument("--check", action='store_true')
874
args, unknown_args = parser.parse_known_args()
875
run_tests = args.check
877
# Remove --check argument from sys.argv
878
sys.argv[1:] = unknown_args
881
# Add all tests from doctest strings
882
def load_tests(loader, tests, none):
884
tests.addTests(doctest.DocTestSuite())
401
keywords = defaultkeywords
403
print_clients(clients.values(), keywords)
405
# Process each client in the list by all selected options
406
for client in clients:
407
def set_client_prop(prop, value):
408
"""Set a Client D-Bus property"""
409
client.Set(client_interface, prop, value,
410
dbus_interface=dbus.PROPERTIES_IFACE)
411
def set_client_prop_ms(prop, value):
412
"""Set a Client D-Bus property, converted
413
from a string to milliseconds."""
414
set_client_prop(prop,
415
timedelta_to_milliseconds
416
(string_to_delta(value)))
418
mandos_serv.RemoveClient(client.__dbus_object_path__)
420
set_client_prop("Enabled", dbus.Boolean(True))
422
set_client_prop("Enabled", dbus.Boolean(False))
423
if options.bump_timeout:
424
set_client_prop("LastCheckedOK", "")
425
if options.start_checker:
426
set_client_prop("CheckerRunning", dbus.Boolean(True))
427
if options.stop_checker:
428
set_client_prop("CheckerRunning", dbus.Boolean(False))
429
if options.is_enabled:
430
sys.exit(0 if client.Get(client_interface,
433
dbus.PROPERTIES_IFACE)
435
if options.checker is not None:
436
set_client_prop("Checker", options.checker)
437
if options.host is not None:
438
set_client_prop("Host", options.host)
439
if options.interval is not None:
440
set_client_prop_ms("Interval", options.interval)
441
if options.approval_delay is not None:
442
set_client_prop_ms("ApprovalDelay",
443
options.approval_delay)
444
if options.approval_duration is not None:
445
set_client_prop_ms("ApprovalDuration",
446
options.approval_duration)
447
if options.timeout is not None:
448
set_client_prop_ms("Timeout", options.timeout)
449
if options.extended_timeout is not None:
450
set_client_prop_ms("ExtendedTimeout",
451
options.extended_timeout)
452
if options.secret is not None:
453
set_client_prop("Secret",
454
dbus.ByteArray(options.secret.read()))
455
if options.approved_by_default is not None:
456
set_client_prop("ApprovedByDefault",
458
.approved_by_default))
460
client.Approve(dbus.Boolean(True),
461
dbus_interface=client_interface)
463
client.Approve(dbus.Boolean(False),
464
dbus_interface=client_interface)
887
466
if __name__ == "__main__":
888
if should_only_run_tests():
889
# Call using ./tdd-python-script --check [--verbose]