410
408
"""Apply additional restrictions on options, not expressible in
413
def has_commands(options, commands=None):
415
commands = (command.Enable,
418
command.StartChecker,
424
command.SetExtendedTimeout,
426
command.ApproveByDefault,
427
command.DenyByDefault,
428
command.SetApprovalDelay,
429
command.SetApprovalDuration,
434
return any(isinstance(cmd, commands)
435
for cmd in options.commands)
411
def has_actions(options):
412
return any((options.enable,
414
options.bump_timeout,
415
options.start_checker,
416
options.stop_checker,
419
options.checker is not None,
420
options.timeout is not None,
421
options.extended_timeout is not None,
422
options.interval is not None,
423
options.approved_by_default is not None,
424
options.approval_delay is not None,
425
options.approval_duration is not None,
426
options.host is not None,
427
options.secret is not None,
437
if has_commands(options) and not (options.client or options.all):
431
if has_actions(options) and not (options.client or options.all):
438
432
parser.error("Options require clients names or --all.")
439
if options.verbose and has_commands(options):
433
if options.verbose and has_actions(options):
440
434
parser.error("--verbose can only be used alone.")
441
if (has_commands(options, (command.DumpJSON,))
442
and (options.verbose or len(options.commands) > 1)):
435
if options.dump_json and (options.verbose
436
or has_actions(options)):
443
437
parser.error("--dump-json can only be used alone.")
444
if options.all and not has_commands(options):
438
if options.all and not has_actions(options):
445
439
parser.error("--all requires an action.")
446
if (has_commands(options, (command.IsEnabled,))
447
and len(options.client) > 1):
440
if options.is_enabled and len(options.client) > 1:
448
441
parser.error("--is-enabled requires exactly one client")
449
if (len(options.commands) > 1
450
and has_commands(options, (command.Remove,))
451
and not has_commands(options, (command.Deny,))):
452
parser.error("--remove can only be combined with --deny")
457
class SystemBus(object):
459
object_manager_iface = "org.freedesktop.DBus.ObjectManager"
460
def get_managed_objects(self, busname, objectpath):
461
return self.call_method("GetManagedObjects", busname,
463
self.object_manager_iface)
465
properties_iface = "org.freedesktop.DBus.Properties"
466
def set_property(self, busname, objectpath, interface, key,
468
self.call_method("Set", busname, objectpath,
469
self.properties_iface, interface, key,
473
class MandosBus(SystemBus):
474
busname_domain = "se.recompile"
475
busname = busname_domain + ".Mandos"
477
server_interface = busname_domain + ".Mandos"
478
client_interface = busname_domain + ".Mandos.Client"
481
def get_clients_and_properties(self):
482
managed_objects = self.get_managed_objects(
483
self.busname, self.server_path)
484
return {objpath: properties[self.client_interface]
485
for objpath, properties in managed_objects.items()
486
if self.client_interface in properties}
488
def set_client_property(self, objectpath, key, value):
489
return self.set_property(self.busname, objectpath,
490
self.client_interface, key,
493
def call_client_method(self, objectpath, method, *args):
494
return self.call_method(method, self.busname, objectpath,
495
self.client_interface, *args)
497
def call_server_method(self, method, *args):
498
return self.call_method(method, self.busname,
500
self.server_interface, *args)
502
class Error(Exception):
505
class ConnectFailed(Error):
509
class dbus_python_adapter(object):
511
class SystemBus(dbus.MandosBus):
512
"""Use dbus-python"""
514
def __init__(self, module=dbus_python):
515
self.dbus_python = module
516
self.bus = self.dbus_python.SystemBus()
518
@contextlib.contextmanager
519
def convert_exception(self, exception_class=dbus.Error):
522
except self.dbus_python.exceptions.DBusException as e:
523
# This does what "raise from" would do
524
exc = exception_class(*e.args)
528
def call_method(self, methodname, busname, objectpath,
530
proxy_object = self.get_object(busname, objectpath)
531
log.debug("D-Bus: %s:%s:%s.%s(%s)", busname, objectpath,
532
interface, methodname,
533
", ".join(repr(a) for a in args))
534
method = getattr(proxy_object, methodname)
535
with self.convert_exception():
536
with dbus_python_adapter.SilenceLogger(
538
value = method(*args, dbus_interface=interface)
539
return self.type_filter(value)
541
def get_object(self, busname, objectpath):
542
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
544
with self.convert_exception(dbus.ConnectFailed):
545
return self.bus.get_object(busname, objectpath)
547
def type_filter(self, value):
548
"""Convert the most bothersome types to Python types"""
549
if isinstance(value, self.dbus_python.Boolean):
551
if isinstance(value, self.dbus_python.ObjectPath):
553
# Also recurse into dictionaries
554
if isinstance(value, self.dbus_python.Dictionary):
555
return {self.type_filter(key):
556
self.type_filter(subval)
557
for key, subval in value.items()}
561
class SilenceLogger(object):
562
"Simple context manager to silence a particular logger"
563
def __init__(self, loggername):
564
self.logger = logging.getLogger(loggername)
567
self.logger.addFilter(self.nullfilter)
569
class NullFilter(logging.Filter):
570
def filter(self, record):
573
nullfilter = NullFilter()
575
def __exit__(self, exc_type, exc_val, exc_tb):
576
self.logger.removeFilter(self.nullfilter)
579
class CachingBus(SystemBus):
580
"""A caching layer for dbus_python_adapter.SystemBus"""
581
def __init__(self, *args, **kwargs):
582
self.object_cache = {}
583
super(dbus_python_adapter.CachingBus,
584
self).__init__(*args, **kwargs)
585
def get_object(self, busname, objectpath):
587
return self.object_cache[(busname, objectpath)]
590
dbus_python_adapter.CachingBus,
591
self).get_object(busname, objectpath)
592
self.object_cache[(busname, objectpath)] = new_object
443
options.remove = False
444
if has_actions(options) and not options.deny:
445
parser.error("--remove can only be combined with --deny")
446
options.remove = True
596
449
def commands_from_options(options):
598
commands = list(options.commands)
600
def find_cmd(cmd, commands):
602
for i, c in enumerate(commands):
603
if isinstance(c, cmd):
607
# If command.Remove is present, move any instances of command.Deny
608
# to occur ahead of command.Remove.
609
index_of_remove = find_cmd(command.Remove, commands)
610
before_remove = commands[:index_of_remove]
611
after_remove = commands[index_of_remove:]
613
for cmd in after_remove:
614
if isinstance(cmd, command.Deny):
615
before_remove.append(cmd)
453
if options.is_enabled:
454
commands.append(IsEnabledCmd())
457
commands.append(ApproveCmd())
460
commands.append(DenyCmd())
463
commands.append(RemoveCmd())
465
if options.dump_json:
466
commands.append(DumpJSONCmd())
469
commands.append(EnableCmd())
472
commands.append(DisableCmd())
474
if options.bump_timeout:
475
commands.append(BumpTimeoutCmd())
477
if options.start_checker:
478
commands.append(StartCheckerCmd())
480
if options.stop_checker:
481
commands.append(StopCheckerCmd())
483
if options.approved_by_default is not None:
484
if options.approved_by_default:
485
commands.append(ApproveByDefaultCmd())
617
cleaned_after.append(cmd)
618
if cleaned_after != after_remove:
619
commands = before_remove + cleaned_after
487
commands.append(DenyByDefaultCmd())
489
if options.checker is not None:
490
commands.append(SetCheckerCmd(options.checker))
492
if options.host is not None:
493
commands.append(SetHostCmd(options.host))
495
if options.secret is not None:
496
commands.append(SetSecretCmd(options.secret))
498
if options.timeout is not None:
499
commands.append(SetTimeoutCmd(options.timeout))
501
if options.extended_timeout:
503
SetExtendedTimeoutCmd(options.extended_timeout))
505
if options.interval is not None:
506
commands.append(SetIntervalCmd(options.interval))
508
if options.approval_delay is not None:
509
commands.append(SetApprovalDelayCmd(options.approval_delay))
511
if options.approval_duration is not None:
513
SetApprovalDurationCmd(options.approval_duration))
621
515
# If no command option has been given, show table of clients,
622
516
# optionally verbosely
624
commands.append(command.PrintTable(verbose=options.verbose))
518
commands.append(PrintTableCmd(verbose=options.verbose))
629
class command(object):
630
"""A namespace for command classes"""
633
"""Abstract base class for commands"""
634
def run(self, clients, bus=None):
635
"""Normal commands should implement run_on_one_client(),
636
but commands which want to operate on all clients at the same time can
637
override this run() method instead.
640
for client, properties in clients.items():
641
self.run_on_one_client(client, properties)
644
class IsEnabled(Base):
645
def run(self, clients, bus=None):
646
properties = next(iter(clients.values()))
647
if properties["Enabled"]:
653
def run_on_one_client(self, client, properties):
654
self.bus.call_client_method(client, "Approve", True)
658
def run_on_one_client(self, client, properties):
659
self.bus.call_client_method(client, "Approve", False)
663
def run(self, clients, bus):
664
for clientpath in frozenset(clients.keys()):
665
bus.call_server_method("RemoveClient", clientpath)
669
"""Abstract class for commands outputting client details"""
670
all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
671
"Created", "Interval", "Host", "KeyID",
672
"Fingerprint", "CheckerRunning",
673
"LastEnabled", "ApprovalPending",
674
"ApprovedByDefault", "LastApprovalRequest",
675
"ApprovalDelay", "ApprovalDuration",
676
"Checker", "ExtendedTimeout", "Expires",
680
class DumpJSON(Output):
681
def run(self, clients, bus=None):
682
data = {properties["Name"]:
683
{key: properties[key]
684
for key in self.all_keywords}
685
for properties in clients.values()}
686
print(json.dumps(data, indent=4, separators=(',', ': ')))
689
class PrintTable(Output):
690
def __init__(self, verbose=False):
691
self.verbose = verbose
693
def run(self, clients, bus=None):
694
default_keywords = ("Name", "Enabled", "Timeout",
696
keywords = default_keywords
698
keywords = self.all_keywords
699
print(self.TableOfClients(clients.values(), keywords))
701
class TableOfClients(object):
704
"Enabled": "Enabled",
705
"Timeout": "Timeout",
706
"LastCheckedOK": "Last Successful Check",
707
"LastApprovalRequest": "Last Approval Request",
708
"Created": "Created",
709
"Interval": "Interval",
711
"Fingerprint": "Fingerprint",
713
"CheckerRunning": "Check Is Running",
714
"LastEnabled": "Last Enabled",
715
"ApprovalPending": "Approval Is Pending",
716
"ApprovedByDefault": "Approved By Default",
717
"ApprovalDelay": "Approval Delay",
718
"ApprovalDuration": "Approval Duration",
719
"Checker": "Checker",
720
"ExtendedTimeout": "Extended Timeout",
721
"Expires": "Expires",
722
"LastCheckerStatus": "Last Checker Status",
725
def __init__(self, clients, keywords):
726
self.clients = clients
727
self.keywords = keywords
523
class Command(object):
524
"""Abstract class for commands"""
525
def run(self, clients, bus=None, mandos=None):
526
"""Normal commands should implement run_on_one_client(), but
527
commands which want to operate on all clients at the same time
528
can override this run() method instead."""
530
for clientpath, properties in clients.items():
531
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
532
dbus_busname, str(clientpath))
533
client = bus.get_object(dbus_busname, clientpath)
534
self.run_on_one_client(client, properties)
537
class IsEnabledCmd(Command):
538
def run(self, clients, bus=None, mandos=None):
539
client, properties = next(iter(clients.items()))
540
if self.is_enabled(client, properties):
543
def is_enabled(self, client, properties):
544
return properties["Enabled"]
547
class ApproveCmd(Command):
548
def run_on_one_client(self, client, properties):
549
log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
550
client.__dbus_object_path__, client_dbus_interface)
551
client.Approve(dbus.Boolean(True),
552
dbus_interface=client_dbus_interface)
555
class DenyCmd(Command):
556
def run_on_one_client(self, client, properties):
557
log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
558
client.__dbus_object_path__, client_dbus_interface)
559
client.Approve(dbus.Boolean(False),
560
dbus_interface=client_dbus_interface)
563
class RemoveCmd(Command):
564
def run_on_one_client(self, client, properties):
565
log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
566
server_dbus_path, server_dbus_interface,
567
str(client.__dbus_object_path__))
568
self.mandos.RemoveClient(client.__dbus_object_path__)
571
class OutputCmd(Command):
572
"""Abstract class for commands outputting client details"""
573
all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
574
"Created", "Interval", "Host", "KeyID",
575
"Fingerprint", "CheckerRunning", "LastEnabled",
576
"ApprovalPending", "ApprovedByDefault",
577
"LastApprovalRequest", "ApprovalDelay",
578
"ApprovalDuration", "Checker", "ExtendedTimeout",
579
"Expires", "LastCheckerStatus")
580
def run(self, clients, bus=None, mandos=None):
581
print(self.output(clients.values()))
582
def output(self, clients):
583
raise NotImplementedError()
586
class DumpJSONCmd(OutputCmd):
587
def output(self, clients):
588
data = {client["Name"]:
589
{key: self.dbus_boolean_to_bool(client[key])
590
for key in self.all_keywords}
591
for client in clients.values()}
592
return json.dumps(data, indent=4, separators=(',', ': '))
594
def dbus_boolean_to_bool(value):
595
if isinstance(value, dbus.Boolean):
600
class PrintTableCmd(OutputCmd):
601
def __init__(self, verbose=False):
602
self.verbose = verbose
604
def output(self, clients):
605
default_keywords = ("Name", "Enabled", "Timeout",
607
keywords = default_keywords
609
keywords = self.all_keywords
610
return str(self.TableOfClients(clients, keywords))
612
class TableOfClients(object):
615
"Enabled": "Enabled",
616
"Timeout": "Timeout",
617
"LastCheckedOK": "Last Successful Check",
618
"LastApprovalRequest": "Last Approval Request",
619
"Created": "Created",
620
"Interval": "Interval",
622
"Fingerprint": "Fingerprint",
624
"CheckerRunning": "Check Is Running",
625
"LastEnabled": "Last Enabled",
626
"ApprovalPending": "Approval Is Pending",
627
"ApprovedByDefault": "Approved By Default",
628
"ApprovalDelay": "Approval Delay",
629
"ApprovalDuration": "Approval Duration",
630
"Checker": "Checker",
631
"ExtendedTimeout": "Extended Timeout",
632
"Expires": "Expires",
633
"LastCheckerStatus": "Last Checker Status",
636
def __init__(self, clients, keywords, tableheaders=None):
637
self.clients = clients
638
self.keywords = keywords
639
if tableheaders is not None:
640
self.tableheaders = tableheaders
643
return "\n".join(self.rows())
645
if sys.version_info.major == 2:
646
__unicode__ = __str__
729
647
def __str__(self):
730
return "\n".join(self.rows())
732
if sys.version_info.major == 2:
733
__unicode__ = __str__
735
return str(self).encode(
736
locale.getpreferredencoding())
739
format_string = self.row_formatting_string()
740
rows = [self.header_line(format_string)]
741
rows.extend(self.client_line(client, format_string)
742
for client in self.clients)
745
def row_formatting_string(self):
746
"Format string used to format table rows"
747
return " ".join("{{{key}:{width}}}".format(
748
width=max(len(self.tableheaders[key]),
749
*(len(self.string_from_client(client,
751
for client in self.clients)),
753
for key in self.keywords)
755
def string_from_client(self, client, key):
756
return self.valuetostring(client[key], key)
759
def valuetostring(cls, value, keyword):
760
if isinstance(value, bool):
761
return "Yes" if value else "No"
762
if keyword in ("Timeout", "Interval", "ApprovalDelay",
763
"ApprovalDuration", "ExtendedTimeout"):
764
return cls.milliseconds_to_string(value)
767
def header_line(self, format_string):
768
return format_string.format(**self.tableheaders)
770
def client_line(self, client, format_string):
771
return format_string.format(
772
**{key: self.string_from_client(client, key)
773
for key in self.keywords})
776
def milliseconds_to_string(ms):
777
td = datetime.timedelta(0, 0, 0, ms)
778
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
779
.format(days="{}T".format(td.days)
781
hours=td.seconds // 3600,
782
minutes=(td.seconds % 3600) // 60,
783
seconds=td.seconds % 60))
786
class PropertySetter(Base):
787
"Abstract class for Actions for setting one client property"
789
def run_on_one_client(self, client, properties=None):
790
"""Set the Client's D-Bus property"""
791
self.bus.set_client_property(client, self.propname,
796
raise NotImplementedError()
799
class Enable(PropertySetter):
804
class Disable(PropertySetter):
809
class BumpTimeout(PropertySetter):
810
propname = "LastCheckedOK"
814
class StartChecker(PropertySetter):
815
propname = "CheckerRunning"
819
class StopChecker(PropertySetter):
820
propname = "CheckerRunning"
824
class ApproveByDefault(PropertySetter):
825
propname = "ApprovedByDefault"
829
class DenyByDefault(PropertySetter):
830
propname = "ApprovedByDefault"
834
class PropertySetterValue(PropertySetter):
835
"""Abstract class for PropertySetter recieving a value as
836
constructor argument instead of a class attribute."""
837
def __init__(self, value):
838
self.value_to_set = value
648
return str(self).encode(locale.getpreferredencoding())
651
format_string = self.row_formatting_string()
652
rows = [self.header_line(format_string)]
653
rows.extend(self.client_line(client, format_string)
654
for client in self.clients)
657
def row_formatting_string(self):
658
"Format string used to format table rows"
659
return " ".join("{{{key}:{width}}}".format(
660
width=max(len(self.tableheaders[key]),
661
*(len(self.string_from_client(client, key))
662
for client in self.clients)),
664
for key in self.keywords)
666
def string_from_client(self, client, key):
667
return self.valuetostring(client[key], key)
841
def argparse(cls, argtype):
843
return cls(argtype(arg))
846
class SetChecker(PropertySetterValue):
850
class SetHost(PropertySetterValue):
854
class SetSecret(PropertySetterValue):
858
def value_to_set(self):
862
def value_to_set(self, value):
863
"""When setting, read data from supplied file object"""
864
self._vts = value.read()
868
class PropertySetterValueMilliseconds(PropertySetterValue):
869
"""Abstract class for PropertySetterValue taking a value
870
argument as a datetime.timedelta() but should store it as
874
def value_to_set(self):
878
def value_to_set(self, value):
879
"When setting, convert value from a datetime.timedelta"
880
self._vts = int(round(value.total_seconds() * 1000))
883
class SetTimeout(PropertySetterValueMilliseconds):
887
class SetExtendedTimeout(PropertySetterValueMilliseconds):
888
propname = "ExtendedTimeout"
891
class SetInterval(PropertySetterValueMilliseconds):
892
propname = "Interval"
895
class SetApprovalDelay(PropertySetterValueMilliseconds):
896
propname = "ApprovalDelay"
899
class SetApprovalDuration(PropertySetterValueMilliseconds):
900
propname = "ApprovalDuration"
670
def valuetostring(cls, value, keyword):
671
if isinstance(value, dbus.Boolean):
672
return "Yes" if value else "No"
673
if keyword in ("Timeout", "Interval", "ApprovalDelay",
674
"ApprovalDuration", "ExtendedTimeout"):
675
return cls.milliseconds_to_string(value)
678
def header_line(self, format_string):
679
return format_string.format(**self.tableheaders)
681
def client_line(self, client, format_string):
682
return format_string.format(
683
**{key: self.string_from_client(client, key)
684
for key in self.keywords})
687
def milliseconds_to_string(ms):
688
td = datetime.timedelta(0, 0, 0, ms)
689
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
690
.format(days="{}T".format(td.days)
692
hours=td.seconds // 3600,
693
minutes=(td.seconds % 3600) // 60,
694
seconds=td.seconds % 60))
697
class PropertyCmd(Command):
698
"""Abstract class for Actions for setting one client property"""
699
def run_on_one_client(self, client, properties):
700
"""Set the Client's D-Bus property"""
701
log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
702
client.__dbus_object_path__,
703
dbus.PROPERTIES_IFACE, client_dbus_interface,
704
self.propname, self.value_to_set
705
if not isinstance(self.value_to_set, dbus.Boolean)
706
else bool(self.value_to_set))
707
client.Set(client_dbus_interface, self.propname,
709
dbus_interface=dbus.PROPERTIES_IFACE)
712
raise NotImplementedError()
715
class EnableCmd(PropertyCmd):
717
value_to_set = dbus.Boolean(True)
720
class DisableCmd(PropertyCmd):
722
value_to_set = dbus.Boolean(False)
725
class BumpTimeoutCmd(PropertyCmd):
726
propname = "LastCheckedOK"
730
class StartCheckerCmd(PropertyCmd):
731
propname = "CheckerRunning"
732
value_to_set = dbus.Boolean(True)
735
class StopCheckerCmd(PropertyCmd):
736
propname = "CheckerRunning"
737
value_to_set = dbus.Boolean(False)
740
class ApproveByDefaultCmd(PropertyCmd):
741
propname = "ApprovedByDefault"
742
value_to_set = dbus.Boolean(True)
745
class DenyByDefaultCmd(PropertyCmd):
746
propname = "ApprovedByDefault"
747
value_to_set = dbus.Boolean(False)
750
class PropertyValueCmd(PropertyCmd):
751
"""Abstract class for PropertyCmd recieving a value as argument"""
752
def __init__(self, value):
753
self.value_to_set = value
756
class SetCheckerCmd(PropertyValueCmd):
760
class SetHostCmd(PropertyValueCmd):
764
class SetSecretCmd(PropertyValueCmd):
767
def value_to_set(self):
770
def value_to_set(self, value):
771
"""When setting, read data from supplied file object"""
772
self._vts = value.read()
776
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
777
"""Abstract class for PropertyValueCmd taking a value argument as
778
a datetime.timedelta() but should store it as milliseconds."""
780
def value_to_set(self):
783
def value_to_set(self, value):
784
"""When setting, convert value from a datetime.timedelta"""
785
self._vts = int(round(value.total_seconds() * 1000))
788
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
792
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
793
propname = "ExtendedTimeout"
796
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
797
propname = "Interval"
800
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
801
propname = "ApprovalDelay"
804
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
805
propname = "ApprovalDuration"
904
class TestCaseWithAssertLogs(unittest.TestCase):
905
"""unittest.TestCase.assertLogs only exists in Python 3.4"""
907
if not hasattr(unittest.TestCase, "assertLogs"):
908
@contextlib.contextmanager
909
def assertLogs(self, logger, level=logging.INFO):
910
capturing_handler = self.CapturingLevelHandler(level)
911
old_level = logger.level
912
old_propagate = logger.propagate
913
logger.addHandler(capturing_handler)
914
logger.setLevel(level)
915
logger.propagate = False
917
yield capturing_handler.watcher
919
logger.propagate = old_propagate
920
logger.removeHandler(capturing_handler)
921
logger.setLevel(old_level)
922
self.assertGreater(len(capturing_handler.watcher.records),
925
class CapturingLevelHandler(logging.Handler):
926
def __init__(self, level, *args, **kwargs):
927
logging.Handler.__init__(self, *args, **kwargs)
928
self.watcher = self.LoggingWatcher([], [])
929
def emit(self, record):
930
self.watcher.records.append(record)
931
self.watcher.output.append(self.format(record))
933
LoggingWatcher = collections.namedtuple("LoggingWatcher",
938
class Unique(object):
939
"""Class for objects which exist only to be unique objects, since
940
unittest.mock.sentinel only exists in Python 3.3"""
943
class Test_string_to_delta(TestCaseWithAssertLogs):
944
# Just test basic RFC 3339 functionality here, the doc string for
945
# rfc3339_duration_to_delta() already has more comprehensive
946
# tests, which are run by doctest.
948
def test_rfc3339_zero_seconds(self):
949
self.assertEqual(datetime.timedelta(),
950
string_to_delta("PT0S"))
952
def test_rfc3339_zero_days(self):
953
self.assertEqual(datetime.timedelta(), string_to_delta("P0D"))
955
def test_rfc3339_one_second(self):
956
self.assertEqual(datetime.timedelta(0, 1),
957
string_to_delta("PT1S"))
959
def test_rfc3339_two_hours(self):
960
self.assertEqual(datetime.timedelta(0, 7200),
961
string_to_delta("PT2H"))
809
class Test_string_to_delta(unittest.TestCase):
810
def test_handles_basic_rfc3339(self):
811
self.assertEqual(string_to_delta("PT0S"),
812
datetime.timedelta())
813
self.assertEqual(string_to_delta("P0D"),
814
datetime.timedelta())
815
self.assertEqual(string_to_delta("PT1S"),
816
datetime.timedelta(0, 1))
817
self.assertEqual(string_to_delta("PT2H"),
818
datetime.timedelta(0, 7200))
963
819
def test_falls_back_to_pre_1_6_1_with_warning(self):
964
with self.assertLogs(log, logging.WARNING):
965
value = string_to_delta("2h")
966
self.assertEqual(datetime.timedelta(0, 7200), value)
820
# assertLogs only exists in Python 3.4
821
if hasattr(self, "assertLogs"):
822
with self.assertLogs(log, logging.WARNING):
823
value = string_to_delta("2h")
825
class WarningFilter(logging.Filter):
826
"""Don't show, but record the presence of, warnings"""
827
def filter(self, record):
828
is_warning = record.levelno >= logging.WARNING
829
self.found = is_warning or getattr(self, "found",
831
return not is_warning
832
warning_filter = WarningFilter()
833
log.addFilter(warning_filter)
835
value = string_to_delta("2h")
837
log.removeFilter(warning_filter)
838
self.assertTrue(getattr(warning_filter, "found", False))
839
self.assertEqual(value, datetime.timedelta(0, 7200))
969
842
class Test_check_option_syntax(unittest.TestCase):
971
self.parser = argparse.ArgumentParser()
972
add_command_line_options(self.parser)
974
def test_actions_requires_client_or_all(self):
975
for action, value in self.actions.items():
976
args = self.actionargs(action, value)
977
with self.assertParseError():
978
self.parse_args(args)
980
# This mostly corresponds to the definition from has_commands() in
843
# This mostly corresponds to the definition from has_actions() in
981
844
# check_option_syntax()
985
"--bump-timeout": None,
986
"--start-checker": None,
987
"--stop-checker": None,
988
"--is-enabled": None,
992
"--extended-timeout": "PT0S",
993
"--interval": "PT0S",
994
"--approve-by-default": None,
995
"--deny-by-default": None,
996
"--approval-delay": "PT0S",
997
"--approval-duration": "PT0S",
998
"--host": "hostname",
999
"--secret": "/dev/null",
846
# The actual values set here are not that important, but we do
847
# at least stick to the correct types, even though they are
851
"bump_timeout": True,
852
"start_checker": True,
853
"stop_checker": True,
857
"timeout": datetime.timedelta(),
858
"extended_timeout": datetime.timedelta(),
859
"interval": datetime.timedelta(),
860
"approved_by_default": True,
861
"approval_delay": datetime.timedelta(),
862
"approval_duration": datetime.timedelta(),
864
"secret": io.BytesIO(b"x"),
1005
def actionargs(action, value, *args):
1006
if value is not None:
1007
return [action, value] + list(args)
1009
return [action] + list(args)
870
self.parser = argparse.ArgumentParser()
871
add_command_line_options(self.parser)
1011
873
@contextlib.contextmanager
1012
874
def assertParseError(self):
1013
875
with self.assertRaises(SystemExit) as e:
1014
with self.redirect_stderr_to_devnull():
876
with self.temporarily_suppress_stderr():
1016
878
# Exit code from argparse is guaranteed to be "2". Reference:
1017
879
# https://docs.python.org/3/library
1018
880
# /argparse.html#exiting-methods
1019
self.assertEqual(2, e.exception.code)
1021
def parse_args(self, args):
1022
options = self.parser.parse_args(args)
1023
check_option_syntax(self.parser, options)
881
self.assertEqual(e.exception.code, 2)
1026
884
@contextlib.contextmanager
1027
def redirect_stderr_to_devnull():
1028
old_stderr = sys.stderr
1029
with contextlib.closing(open(os.devnull, "w")) as null:
1034
sys.stderr = old_stderr
885
def temporarily_suppress_stderr():
886
null = os.open(os.path.devnull, os.O_RDWR)
887
stderrcopy = os.dup(sys.stderr.fileno())
888
os.dup2(null, sys.stderr.fileno())
894
os.dup2(stderrcopy, sys.stderr.fileno())
1036
897
def check_option_syntax(self, options):
1037
898
check_option_syntax(self.parser, options)
1039
def test_actions_all_conflicts_with_verbose(self):
900
def test_actions_requires_client_or_all(self):
1040
901
for action, value in self.actions.items():
1041
args = self.actionargs(action, value, "--all",
902
options = self.parser.parse_args()
903
setattr(options, action, value)
1043
904
with self.assertParseError():
1044
self.parse_args(args)
905
self.check_option_syntax(options)
1046
def test_actions_with_client_conflicts_with_verbose(self):
907
def test_actions_conflicts_with_verbose(self):
1047
908
for action, value in self.actions.items():
1048
args = self.actionargs(action, value, "--verbose",
909
options = self.parser.parse_args()
910
setattr(options, action, value)
911
options.verbose = True
1050
912
with self.assertParseError():
1051
self.parse_args(args)
913
self.check_option_syntax(options)
1053
915
def test_dump_json_conflicts_with_verbose(self):
1054
args = ["--dump-json", "--verbose"]
916
options = self.parser.parse_args()
917
options.dump_json = True
918
options.verbose = True
1055
919
with self.assertParseError():
1056
self.parse_args(args)
920
self.check_option_syntax(options)
1058
922
def test_dump_json_conflicts_with_action(self):
1059
923
for action, value in self.actions.items():
1060
args = self.actionargs(action, value, "--dump-json")
924
options = self.parser.parse_args()
925
setattr(options, action, value)
926
options.dump_json = True
1061
927
with self.assertParseError():
1062
self.parse_args(args)
928
self.check_option_syntax(options)
1064
930
def test_all_can_not_be_alone(self):
931
options = self.parser.parse_args()
1066
933
with self.assertParseError():
1067
self.parse_args(args)
934
self.check_option_syntax(options)
1069
936
def test_all_is_ok_with_any_action(self):
1070
937
for action, value in self.actions.items():
1071
args = self.actionargs(action, value, "--all")
1072
self.parse_args(args)
1074
def test_any_action_is_ok_with_one_client(self):
1075
for action, value in self.actions.items():
1076
args = self.actionargs(action, value, "client")
1077
self.parse_args(args)
1079
def test_one_client_with_all_actions_except_is_enabled(self):
1080
for action, value in self.actions.items():
1081
if action == "--is-enabled":
1083
args = self.actionargs(action, value, "client")
1084
self.parse_args(args)
1086
def test_two_clients_with_all_actions_except_is_enabled(self):
1087
for action, value in self.actions.items():
1088
if action == "--is-enabled":
1090
args = self.actionargs(action, value, "client1",
1092
self.parse_args(args)
1094
def test_two_clients_are_ok_with_actions_except_is_enabled(self):
1095
for action, value in self.actions.items():
1096
if action == "--is-enabled":
1098
args = self.actionargs(action, value, "client1",
1100
self.parse_args(args)
938
options = self.parser.parse_args()
939
setattr(options, action, value)
941
self.check_option_syntax(options)
1102
943
def test_is_enabled_fails_without_client(self):
1103
args = ["--is-enabled"]
944
options = self.parser.parse_args()
945
options.is_enabled = True
1104
946
with self.assertParseError():
1105
self.parse_args(args)
947
self.check_option_syntax(options)
949
def test_is_enabled_works_with_one_client(self):
950
options = self.parser.parse_args()
951
options.is_enabled = True
952
options.client = ["foo"]
953
self.check_option_syntax(options)
1107
955
def test_is_enabled_fails_with_two_clients(self):
1108
args = ["--is-enabled", "client1", "client2"]
956
options = self.parser.parse_args()
957
options.is_enabled = True
958
options.client = ["foo", "barbar"]
1109
959
with self.assertParseError():
1110
self.parse_args(args)
960
self.check_option_syntax(options)
1112
962
def test_remove_can_only_be_combined_with_action_deny(self):
1113
963
for action, value in self.actions.items():
1114
if action in {"--remove", "--deny"}:
964
if action in {"remove", "deny"}:
1116
args = self.actionargs(action, value, "--all",
966
options = self.parser.parse_args()
967
setattr(options, action, value)
969
options.remove = True
1118
970
with self.assertParseError():
1119
self.parse_args(args)
1122
class Test_dbus_exceptions(unittest.TestCase):
1124
def test_dbus_ConnectFailed_is_Error(self):
1125
with self.assertRaises(dbus.Error):
1126
raise dbus.ConnectFailed()
1129
class Test_dbus_MandosBus(unittest.TestCase):
1131
class MockMandosBus(dbus.MandosBus):
1133
self._name = "se.recompile.Mandos"
1134
self._server_path = "/"
1135
self._server_interface = "se.recompile.Mandos"
1136
self._client_interface = "se.recompile.Mandos.Client"
1138
self.call_method_return = Unique()
1140
def call_method(self, methodname, busname, objectpath,
1142
self.calls.append((methodname, busname, objectpath,
1144
return self.call_method_return
1147
self.bus = self.MockMandosBus()
1149
def test_set_client_property(self):
1150
self.bus.set_client_property("objectpath", "key", "value")
1151
expected_call = ("Set", self.bus._name, "objectpath",
1152
"org.freedesktop.DBus.Properties",
1153
(self.bus._client_interface, "key", "value"))
1154
self.assertIn(expected_call, self.bus.calls)
1156
def test_call_client_method(self):
1157
ret = self.bus.call_client_method("objectpath", "methodname")
1158
self.assertIs(self.bus.call_method_return, ret)
1159
expected_call = ("methodname", self.bus._name, "objectpath",
1160
self.bus._client_interface, ())
1161
self.assertIn(expected_call, self.bus.calls)
1163
def test_call_client_method_with_args(self):
1164
args = (Unique(), Unique())
1165
ret = self.bus.call_client_method("objectpath", "methodname",
1167
self.assertIs(self.bus.call_method_return, ret)
1168
expected_call = ("methodname", self.bus._name, "objectpath",
1169
self.bus._client_interface,
1171
self.assertIn(expected_call, self.bus.calls)
1173
def test_get_clients_and_properties(self):
1176
self.bus._client_interface: {
1180
"irrelevant_interface": {
1181
"key": "othervalue",
1185
"other_objectpath": {
1186
"other_irrelevant_interface": {
1192
expected_clients_and_properties = {
1198
self.bus.call_method_return = managed_objects
1199
ret = self.bus.get_clients_and_properties()
1200
self.assertDictEqual(expected_clients_and_properties, ret)
1201
expected_call = ("GetManagedObjects", self.bus._name,
1202
self.bus._server_path,
1203
"org.freedesktop.DBus.ObjectManager", ())
1204
self.assertIn(expected_call, self.bus.calls)
1206
def test_call_server_method(self):
1207
ret = self.bus.call_server_method("methodname")
1208
self.assertIs(self.bus.call_method_return, ret)
1209
expected_call = ("methodname", self.bus._name,
1210
self.bus._server_path,
1211
self.bus._server_interface, ())
1212
self.assertIn(expected_call, self.bus.calls)
1214
def test_call_server_method_with_args(self):
1215
args = (Unique(), Unique())
1216
ret = self.bus.call_server_method("methodname", *args)
1217
self.assertIs(self.bus.call_method_return, ret)
1218
expected_call = ("methodname", self.bus._name,
1219
self.bus._server_path,
1220
self.bus._server_interface,
1222
self.assertIn(expected_call, self.bus.calls)
1225
class Test_dbus_python_adapter_SystemBus(TestCaseWithAssertLogs):
1227
def MockDBusPython_func(self, func):
1228
class mock_dbus_python(object):
1229
"""mock dbus-python module"""
1230
class exceptions(object):
1231
"""Pseudo-namespace"""
1232
class DBusException(Exception):
1234
class SystemBus(object):
1236
def get_object(busname, objectpath):
1237
DBusObject = collections.namedtuple(
1238
"DBusObject", ("methodname",))
1239
def method(*args, **kwargs):
1240
self.assertEqual({"dbus_interface":
1244
return DBusObject(methodname=method)
1245
class Boolean(object):
1246
def __init__(self, value):
1247
self.value = bool(value)
1250
if sys.version_info.major == 2:
1251
__nonzero__ = __bool__
1252
class ObjectPath(str):
1254
class Dictionary(dict):
1256
return mock_dbus_python
1258
def call_method(self, bus, methodname, busname, objectpath,
1260
with self.assertLogs(log, logging.DEBUG):
1261
return bus.call_method(methodname, busname, objectpath,
1264
def test_call_method_returns(self):
1265
expected_method_return = Unique()
1266
method_args = (Unique(), Unique())
1268
self.assertEqual(len(method_args), len(args))
1269
for marg, arg in zip(method_args, args):
1270
self.assertIs(marg, arg)
1271
return expected_method_return
1272
mock_dbus_python = self.MockDBusPython_func(func)
1273
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1274
ret = self.call_method(bus, "methodname", "busname",
1275
"objectpath", "interface",
1277
self.assertIs(ret, expected_method_return)
1279
def test_call_method_filters_bool_true(self):
1281
return method_return
1282
mock_dbus_python = self.MockDBusPython_func(func)
1283
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1284
method_return = mock_dbus_python.Boolean(True)
1285
ret = self.call_method(bus, "methodname", "busname",
1286
"objectpath", "interface")
1287
self.assertTrue(ret)
1288
self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
1290
def test_call_method_filters_bool_false(self):
1292
return method_return
1293
mock_dbus_python = self.MockDBusPython_func(func)
1294
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1295
method_return = mock_dbus_python.Boolean(False)
1296
ret = self.call_method(bus, "methodname", "busname",
1297
"objectpath", "interface")
1298
self.assertFalse(ret)
1299
self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
1301
def test_call_method_filters_objectpath(self):
1303
return method_return
1304
mock_dbus_python = self.MockDBusPython_func(func)
1305
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1306
method_return = mock_dbus_python.ObjectPath("objectpath")
1307
ret = self.call_method(bus, "methodname", "busname",
1308
"objectpath", "interface")
1309
self.assertEqual("objectpath", ret)
1310
self.assertIsNot("objectpath", ret)
1311
self.assertNotIsInstance(ret, mock_dbus_python.ObjectPath)
1313
def test_call_method_filters_booleans_in_dict(self):
1315
return method_return
1316
mock_dbus_python = self.MockDBusPython_func(func)
1317
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1318
method_return = mock_dbus_python.Dictionary(
1319
{mock_dbus_python.Boolean(True):
1320
mock_dbus_python.Boolean(False),
1321
mock_dbus_python.Boolean(False):
1322
mock_dbus_python.Boolean(True)})
1323
ret = self.call_method(bus, "methodname", "busname",
1324
"objectpath", "interface")
1325
expected_method_return = {True: False,
1327
self.assertEqual(expected_method_return, ret)
1328
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1330
def test_call_method_filters_objectpaths_in_dict(self):
1332
return method_return
1333
mock_dbus_python = self.MockDBusPython_func(func)
1334
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1335
method_return = mock_dbus_python.Dictionary(
1336
{mock_dbus_python.ObjectPath("objectpath_key_1"):
1337
mock_dbus_python.ObjectPath("objectpath_value_1"),
1338
mock_dbus_python.ObjectPath("objectpath_key_2"):
1339
mock_dbus_python.ObjectPath("objectpath_value_2")})
1340
ret = self.call_method(bus, "methodname", "busname",
1341
"objectpath", "interface")
1342
expected_method_return = {str(key): str(value)
1344
method_return.items()}
1345
self.assertEqual(expected_method_return, ret)
1346
self.assertIsInstance(ret, dict)
1347
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1349
def test_call_method_filters_dict_in_dict(self):
1351
return method_return
1352
mock_dbus_python = self.MockDBusPython_func(func)
1353
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1354
method_return = mock_dbus_python.Dictionary(
1355
{"key1": mock_dbus_python.Dictionary({"key11": "value11",
1356
"key12": "value12"}),
1357
"key2": mock_dbus_python.Dictionary({"key21": "value21",
1358
"key22": "value22"})})
1359
ret = self.call_method(bus, "methodname", "busname",
1360
"objectpath", "interface")
1361
expected_method_return = {
1362
"key1": {"key11": "value11",
1363
"key12": "value12"},
1364
"key2": {"key21": "value21",
1365
"key22": "value22"},
1367
self.assertEqual(expected_method_return, ret)
1368
self.assertIsInstance(ret, dict)
1369
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1370
for key, value in ret.items():
1371
self.assertIsInstance(value, dict)
1372
self.assertEqual(expected_method_return[key], value)
1373
self.assertNotIsInstance(value,
1374
mock_dbus_python.Dictionary)
1376
def test_call_method_filters_dict_three_deep(self):
1378
return method_return
1379
mock_dbus_python = self.MockDBusPython_func(func)
1380
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1381
method_return = mock_dbus_python.Dictionary(
1383
mock_dbus_python.Dictionary(
1385
mock_dbus_python.Dictionary(
1387
mock_dbus_python.Boolean(True),
1391
ret = self.call_method(bus, "methodname", "busname",
1392
"objectpath", "interface")
1393
expected_method_return = {"key1": {"key2": {"key3": True}}}
1394
self.assertEqual(expected_method_return, ret)
1395
self.assertIsInstance(ret, dict)
1396
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1397
self.assertIsInstance(ret["key1"], dict)
1398
self.assertNotIsInstance(ret["key1"],
1399
mock_dbus_python.Dictionary)
1400
self.assertIsInstance(ret["key1"]["key2"], dict)
1401
self.assertNotIsInstance(ret["key1"]["key2"],
1402
mock_dbus_python.Dictionary)
1403
self.assertTrue(ret["key1"]["key2"]["key3"])
1404
self.assertNotIsInstance(ret["key1"]["key2"]["key3"],
1405
mock_dbus_python.Boolean)
1407
def test_call_method_handles_exception(self):
1408
dbus_logger = logging.getLogger("dbus.proxies")
1411
dbus_logger.error("Test")
1412
raise mock_dbus_python.exceptions.DBusException()
1414
mock_dbus_python = self.MockDBusPython_func(func)
1415
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1417
class CountingHandler(logging.Handler):
1419
def emit(self, record):
1422
counting_handler = CountingHandler()
1424
dbus_logger.addHandler(counting_handler)
1427
with self.assertRaises(dbus.Error) as e:
1428
self.call_method(bus, "methodname", "busname",
1429
"objectpath", "interface")
1431
dbus_logger.removeFilter(counting_handler)
1433
self.assertNotIsInstance(e, dbus.ConnectFailed)
1435
# Make sure the dbus logger was suppressed
1436
self.assertEqual(0, counting_handler.count)
1438
def test_get_object_converts_to_correct_exception(self):
1439
bus = dbus_python_adapter.SystemBus(
1440
self.fake_dbus_python_raises_exception_on_connect)
1441
with self.assertRaises(dbus.ConnectFailed):
1442
self.call_method(bus, "methodname", "busname",
1443
"objectpath", "interface")
1445
class fake_dbus_python_raises_exception_on_connect(object):
1446
"""fake dbus-python module"""
1447
class exceptions(object):
1448
"""Pseudo-namespace"""
1449
class DBusException(Exception):
1454
def get_object(busname, objectpath):
1455
raise cls.exceptions.DBusException()
1456
Bus = collections.namedtuple("Bus", ["get_object"])
1457
return Bus(get_object=get_object)
1460
class Test_dbus_python_adapter_CachingBus(unittest.TestCase):
1461
class mock_dbus_python(object):
1462
"""mock dbus-python modules"""
1463
class SystemBus(object):
1465
def get_object(busname, objectpath):
1469
self.bus = dbus_python_adapter.CachingBus(
1470
self.mock_dbus_python)
1472
def test_returns_distinct_objectpaths(self):
1473
obj1 = self.bus.get_object("busname", "objectpath1")
1474
self.assertIsInstance(obj1, Unique)
1475
obj2 = self.bus.get_object("busname", "objectpath2")
1476
self.assertIsInstance(obj2, Unique)
1477
self.assertIsNot(obj1, obj2)
1479
def test_returns_distinct_busnames(self):
1480
obj1 = self.bus.get_object("busname1", "objectpath")
1481
self.assertIsInstance(obj1, Unique)
1482
obj2 = self.bus.get_object("busname2", "objectpath")
1483
self.assertIsInstance(obj2, Unique)
1484
self.assertIsNot(obj1, obj2)
1486
def test_returns_distinct_both(self):
1487
obj1 = self.bus.get_object("busname1", "objectpath")
1488
self.assertIsInstance(obj1, Unique)
1489
obj2 = self.bus.get_object("busname2", "objectpath")
1490
self.assertIsInstance(obj2, Unique)
1491
self.assertIsNot(obj1, obj2)
1493
def test_returns_same(self):
1494
obj1 = self.bus.get_object("busname", "objectpath")
1495
self.assertIsInstance(obj1, Unique)
1496
obj2 = self.bus.get_object("busname", "objectpath")
1497
self.assertIsInstance(obj2, Unique)
1498
self.assertIs(obj1, obj2)
1500
def test_returns_same_old(self):
1501
obj1 = self.bus.get_object("busname1", "objectpath1")
1502
self.assertIsInstance(obj1, Unique)
1503
obj2 = self.bus.get_object("busname2", "objectpath2")
1504
self.assertIsInstance(obj2, Unique)
1505
obj1b = self.bus.get_object("busname1", "objectpath1")
1506
self.assertIsInstance(obj1b, Unique)
1507
self.assertIsNot(obj1, obj2)
1508
self.assertIsNot(obj2, obj1b)
1509
self.assertIs(obj1, obj1b)
1512
class Test_commands_from_options(unittest.TestCase):
971
self.check_option_syntax(options)
974
class Test_command_from_options(unittest.TestCase):
1514
975
def setUp(self):
1515
976
self.parser = argparse.ArgumentParser()
1516
977
add_command_line_options(self.parser)
1518
def test_is_enabled(self):
1519
self.assert_command_from_args(["--is-enabled", "client"],
1522
978
def assert_command_from_args(self, args, command_cls,
1524
980
"""Assert that parsing ARGS should result in an instance of
1526
982
options = self.parser.parse_args(args)
1527
983
check_option_syntax(self.parser, options)
1528
984
commands = commands_from_options(options)
1529
self.assertEqual(1, len(commands))
985
self.assertEqual(len(commands), 1)
1530
986
command = commands[0]
1531
987
self.assertIsInstance(command, command_cls)
1532
988
for key, value in cmd_attrs.items():
1533
self.assertEqual(value, getattr(command, key))
1535
def test_is_enabled_short(self):
1536
self.assert_command_from_args(["-V", "client"],
1539
def test_approve(self):
1540
self.assert_command_from_args(["--approve", "client"],
1543
def test_approve_short(self):
1544
self.assert_command_from_args(["-A", "client"],
1547
def test_deny(self):
1548
self.assert_command_from_args(["--deny", "client"],
1551
def test_deny_short(self):
1552
self.assert_command_from_args(["-D", "client"], command.Deny)
1554
def test_remove(self):
1555
self.assert_command_from_args(["--remove", "client"],
1558
def test_deny_before_remove(self):
1559
options = self.parser.parse_args(["--deny", "--remove",
1561
check_option_syntax(self.parser, options)
1562
commands = commands_from_options(options)
1563
self.assertEqual(2, len(commands))
1564
self.assertIsInstance(commands[0], command.Deny)
1565
self.assertIsInstance(commands[1], command.Remove)
1567
def test_deny_before_remove_reversed(self):
1568
options = self.parser.parse_args(["--remove", "--deny",
1570
check_option_syntax(self.parser, options)
1571
commands = commands_from_options(options)
1572
self.assertEqual(2, len(commands))
1573
self.assertIsInstance(commands[0], command.Deny)
1574
self.assertIsInstance(commands[1], command.Remove)
1576
def test_remove_short(self):
1577
self.assert_command_from_args(["-r", "client"],
1580
def test_dump_json(self):
1581
self.assert_command_from_args(["--dump-json"],
989
self.assertEqual(getattr(command, key), value)
990
def test_print_table(self):
991
self.assert_command_from_args([], PrintTableCmd,
994
def test_print_table_verbose(self):
995
self.assert_command_from_args(["--verbose"], PrintTableCmd,
998
def test_print_table_verbose_short(self):
999
self.assert_command_from_args(["-v"], PrintTableCmd,
1584
1002
def test_enable(self):
1585
self.assert_command_from_args(["--enable", "client"],
1003
self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1588
1005
def test_enable_short(self):
1589
self.assert_command_from_args(["-e", "client"],
1006
self.assert_command_from_args(["-e", "foo"], EnableCmd)
1592
1008
def test_disable(self):
1593
self.assert_command_from_args(["--disable", "client"],
1009
self.assert_command_from_args(["--disable", "foo"],
1596
1012
def test_disable_short(self):
1597
self.assert_command_from_args(["-d", "client"],
1013
self.assert_command_from_args(["-d", "foo"], DisableCmd)
1600
1015
def test_bump_timeout(self):
1601
self.assert_command_from_args(["--bump-timeout", "client"],
1602
command.BumpTimeout)
1016
self.assert_command_from_args(["--bump-timeout", "foo"],
1604
1019
def test_bump_timeout_short(self):
1605
self.assert_command_from_args(["-b", "client"],
1606
command.BumpTimeout)
1020
self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
1608
1022
def test_start_checker(self):
1609
self.assert_command_from_args(["--start-checker", "client"],
1610
command.StartChecker)
1023
self.assert_command_from_args(["--start-checker", "foo"],
1612
1026
def test_stop_checker(self):
1613
self.assert_command_from_args(["--stop-checker", "client"],
1614
command.StopChecker)
1616
def test_approve_by_default(self):
1617
self.assert_command_from_args(["--approve-by-default",
1619
command.ApproveByDefault)
1621
def test_deny_by_default(self):
1622
self.assert_command_from_args(["--deny-by-default", "client"],
1623
command.DenyByDefault)
1027
self.assert_command_from_args(["--stop-checker", "foo"],
1030
def test_remove(self):
1031
self.assert_command_from_args(["--remove", "foo"],
1034
def test_remove_short(self):
1035
self.assert_command_from_args(["-r", "foo"], RemoveCmd)
1625
1037
def test_checker(self):
1626
self.assert_command_from_args(["--checker", ":", "client"],
1038
self.assert_command_from_args(["--checker", ":", "foo"],
1039
SetCheckerCmd, value_to_set=":")
1630
1041
def test_checker_empty(self):
1631
self.assert_command_from_args(["--checker", "", "client"],
1042
self.assert_command_from_args(["--checker", "", "foo"],
1043
SetCheckerCmd, value_to_set="")
1635
1045
def test_checker_short(self):
1636
self.assert_command_from_args(["-c", ":", "client"],
1640
def test_host(self):
1641
self.assert_command_from_args(
1642
["--host", "client.example.org", "client"],
1643
command.SetHost, value_to_set="client.example.org")
1645
def test_host_short(self):
1646
self.assert_command_from_args(
1647
["-H", "client.example.org", "client"], command.SetHost,
1648
value_to_set="client.example.org")
1650
def test_secret_devnull(self):
1651
self.assert_command_from_args(["--secret", os.path.devnull,
1652
"client"], command.SetSecret,
1655
def test_secret_tempfile(self):
1656
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1657
value = b"secret\0xyzzy\nbar"
1660
self.assert_command_from_args(["--secret", f.name,
1665
def test_secret_devnull_short(self):
1666
self.assert_command_from_args(["-s", os.path.devnull,
1667
"client"], command.SetSecret,
1670
def test_secret_tempfile_short(self):
1671
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1672
value = b"secret\0xyzzy\nbar"
1675
self.assert_command_from_args(["-s", f.name, "client"],
1046
self.assert_command_from_args(["-c", ":", "foo"],
1047
SetCheckerCmd, value_to_set=":")
1679
1049
def test_timeout(self):
1680
self.assert_command_from_args(["--timeout", "PT5M", "client"],
1050
self.assert_command_from_args(["--timeout", "PT5M", "foo"],
1682
1052
value_to_set=300000)
1684
1054
def test_timeout_short(self):
1685
self.assert_command_from_args(["-t", "PT5M", "client"],
1055
self.assert_command_from_args(["-t", "PT5M", "foo"],
1687
1057
value_to_set=300000)
1689
1059
def test_extended_timeout(self):
1690
1060
self.assert_command_from_args(["--extended-timeout", "PT15M",
1692
command.SetExtendedTimeout,
1062
SetExtendedTimeoutCmd,
1693
1063
value_to_set=900000)
1695
1065
def test_interval(self):
1696
self.assert_command_from_args(["--interval", "PT2M",
1697
"client"], command.SetInterval,
1066
self.assert_command_from_args(["--interval", "PT2M", "foo"],
1698
1068
value_to_set=120000)
1700
1070
def test_interval_short(self):
1701
self.assert_command_from_args(["-i", "PT2M", "client"],
1702
command.SetInterval,
1071
self.assert_command_from_args(["-i", "PT2M", "foo"],
1703
1073
value_to_set=120000)
1075
def test_approve_by_default(self):
1076
self.assert_command_from_args(["--approve-by-default", "foo"],
1077
ApproveByDefaultCmd)
1079
def test_deny_by_default(self):
1080
self.assert_command_from_args(["--deny-by-default", "foo"],
1705
1083
def test_approval_delay(self):
1706
1084
self.assert_command_from_args(["--approval-delay", "PT30S",
1708
command.SetApprovalDelay,
1085
"foo"], SetApprovalDelayCmd,
1709
1086
value_to_set=30000)
1711
1088
def test_approval_duration(self):
1712
1089
self.assert_command_from_args(["--approval-duration", "PT1S",
1714
command.SetApprovalDuration,
1090
"foo"], SetApprovalDurationCmd,
1715
1091
value_to_set=1000)
1717
def test_print_table(self):
1718
self.assert_command_from_args([], command.PrintTable,
1721
def test_print_table_verbose(self):
1722
self.assert_command_from_args(["--verbose"],
1726
def test_print_table_verbose_short(self):
1727
self.assert_command_from_args(["-v"], command.PrintTable,
1731
class TestCommand(unittest.TestCase):
1093
def test_host(self):
1094
self.assert_command_from_args(["--host", "foo.example.org",
1096
value_to_set="foo.example.org")
1098
def test_host_short(self):
1099
self.assert_command_from_args(["-H", "foo.example.org",
1101
value_to_set="foo.example.org")
1103
def test_secret_devnull(self):
1104
self.assert_command_from_args(["--secret", os.path.devnull,
1105
"foo"], SetSecretCmd,
1108
def test_secret_tempfile(self):
1109
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1110
value = b"secret\0xyzzy\nbar"
1113
self.assert_command_from_args(["--secret", f.name,
1114
"foo"], SetSecretCmd,
1117
def test_secret_devnull_short(self):
1118
self.assert_command_from_args(["-s", os.path.devnull, "foo"],
1119
SetSecretCmd, value_to_set=b"")
1121
def test_secret_tempfile_short(self):
1122
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1123
value = b"secret\0xyzzy\nbar"
1126
self.assert_command_from_args(["-s", f.name, "foo"],
1130
def test_approve(self):
1131
self.assert_command_from_args(["--approve", "foo"],
1134
def test_approve_short(self):
1135
self.assert_command_from_args(["-A", "foo"], ApproveCmd)
1137
def test_deny(self):
1138
self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1140
def test_deny_short(self):
1141
self.assert_command_from_args(["-D", "foo"], DenyCmd)
1143
def test_dump_json(self):
1144
self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1146
def test_is_enabled(self):
1147
self.assert_command_from_args(["--is-enabled", "foo"],
1150
def test_is_enabled_short(self):
1151
self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
1153
def test_deny_before_remove(self):
1154
options = self.parser.parse_args(["--deny", "--remove",
1156
check_option_syntax(self.parser, options)
1157
commands = commands_from_options(options)
1158
self.assertEqual(len(commands), 2)
1159
self.assertIsInstance(commands[0], DenyCmd)
1160
self.assertIsInstance(commands[1], RemoveCmd)
1162
def test_deny_before_remove_reversed(self):
1163
options = self.parser.parse_args(["--remove", "--deny",
1165
check_option_syntax(self.parser, options)
1166
commands = commands_from_options(options)
1167
self.assertEqual(len(commands), 2)
1168
self.assertIsInstance(commands[0], DenyCmd)
1169
self.assertIsInstance(commands[1], RemoveCmd)
1172
class TestCmd(unittest.TestCase):
1732
1173
"""Abstract class for tests of command classes"""
1734
class FakeMandosBus(dbus.MandosBus):
1735
def __init__(self, testcase):
1736
self.client_properties = {
1176
class MockClient(object):
1177
def __init__(self, name, **attributes):
1178
self.__dbus_object_path__ = "/clients/{}".format(name)
1179
self.attributes = attributes
1180
self.attributes["Name"] = name
1182
def Set(self, interface, propname, value, dbus_interface):
1183
testcase.assertEqual(interface, client_dbus_interface)
1184
testcase.assertEqual(dbus_interface,
1185
dbus.PROPERTIES_IFACE)
1186
self.attributes[propname] = value
1187
def Get(self, interface, propname, dbus_interface):
1188
testcase.assertEqual(interface, client_dbus_interface)
1189
testcase.assertEqual(dbus_interface,
1190
dbus.PROPERTIES_IFACE)
1191
return self.attributes[propname]
1192
def Approve(self, approve, dbus_interface):
1193
testcase.assertEqual(dbus_interface,
1194
client_dbus_interface)
1195
self.calls.append(("Approve", (approve,
1197
self.client = MockClient(
1199
KeyID=("92ed150794387c03ce684574b1139a65"
1200
"94a34f895daaaf09fd8ea90a27cddb12"),
1202
Host="foo.example.org",
1203
Enabled=dbus.Boolean(True),
1205
LastCheckedOK="2019-02-03T00:00:00",
1206
Created="2019-01-02T00:00:00",
1208
Fingerprint=("778827225BA7DE539C5A"
1209
"7CFA59CFF7CDBD9A5920"),
1210
CheckerRunning=dbus.Boolean(False),
1211
LastEnabled="2019-01-03T00:00:00",
1212
ApprovalPending=dbus.Boolean(False),
1213
ApprovedByDefault=dbus.Boolean(True),
1214
LastApprovalRequest="",
1216
ApprovalDuration=1000,
1217
Checker="fping -q -- %(host)s",
1218
ExtendedTimeout=900000,
1219
Expires="2019-02-04T00:00:00",
1220
LastCheckerStatus=0)
1221
self.other_client = MockClient(
1223
KeyID=("0558568eedd67d622f5c83b35a115f79"
1224
"6ab612cff5ad227247e46c2b020f441c"),
1225
Secret=b"secretbar",
1227
Enabled=dbus.Boolean(True),
1229
LastCheckedOK="2019-02-04T00:00:00",
1230
Created="2019-01-03T00:00:00",
1232
Fingerprint=("3E393AEAEFB84C7E89E2"
1233
"F547B3A107558FCA3A27"),
1234
CheckerRunning=dbus.Boolean(True),
1235
LastEnabled="2019-01-04T00:00:00",
1236
ApprovalPending=dbus.Boolean(False),
1237
ApprovedByDefault=dbus.Boolean(False),
1238
LastApprovalRequest="2019-01-03T00:00:00",
1239
ApprovalDelay=30000,
1240
ApprovalDuration=93785000,
1242
ExtendedTimeout=900000,
1243
Expires="2019-02-05T00:00:00",
1244
LastCheckerStatus=-2)
1245
self.clients = collections.OrderedDict(
1247
("/clients/foo", self.client.attributes),
1248
("/clients/barbar", self.other_client.attributes),
1250
self.one_client = {"/clients/foo": self.client.attributes}
1255
def get_object(client_bus_name, path):
1256
self.assertEqual(client_bus_name, dbus_busname)
1258
"/clients/foo": self.client,
1259
"/clients/barbar": self.other_client,
1264
class TestIsEnabledCmd(TestCmd):
1265
def test_is_enabled(self):
1266
self.assertTrue(all(IsEnabledCmd().is_enabled(client,
1268
for client, properties
1269
in self.clients.items()))
1270
def test_is_enabled_run_exits_successfully(self):
1271
with self.assertRaises(SystemExit) as e:
1272
IsEnabledCmd().run(self.one_client)
1273
if e.exception.code is not None:
1274
self.assertEqual(e.exception.code, 0)
1276
self.assertIsNone(e.exception.code)
1277
def test_is_enabled_run_exits_with_failure(self):
1278
self.client.attributes["Enabled"] = dbus.Boolean(False)
1279
with self.assertRaises(SystemExit) as e:
1280
IsEnabledCmd().run(self.one_client)
1281
if isinstance(e.exception.code, int):
1282
self.assertNotEqual(e.exception.code, 0)
1284
self.assertIsNotNone(e.exception.code)
1287
class TestApproveCmd(TestCmd):
1288
def test_approve(self):
1289
ApproveCmd().run(self.clients, self.bus)
1290
for clientpath in self.clients:
1291
client = self.bus.get_object(dbus_busname, clientpath)
1292
self.assertIn(("Approve", (True, client_dbus_interface)),
1296
class TestDenyCmd(TestCmd):
1297
def test_deny(self):
1298
DenyCmd().run(self.clients, self.bus)
1299
for clientpath in self.clients:
1300
client = self.bus.get_object(dbus_busname, clientpath)
1301
self.assertIn(("Approve", (False, client_dbus_interface)),
1304
class TestRemoveCmd(TestCmd):
1305
def test_remove(self):
1306
class MockMandos(object):
1309
def RemoveClient(self, dbus_path):
1310
self.calls.append(("RemoveClient", (dbus_path,)))
1311
mandos = MockMandos()
1312
super(TestRemoveCmd, self).setUp()
1313
RemoveCmd().run(self.clients, self.bus, mandos)
1314
self.assertEqual(len(mandos.calls), 2)
1315
for clientpath in self.clients:
1316
self.assertIn(("RemoveClient", (clientpath,)),
1320
class TestDumpJSONCmd(TestCmd):
1322
self.expected_json = {
1738
1325
"KeyID": ("92ed150794387c03ce684574b1139a65"
1739
1326
"94a34f895daaaf09fd8ea90a27cddb12"),
1740
"Secret": b"secret",
1741
1327
"Host": "foo.example.org",
1742
1328
"Enabled": True,
1743
1329
"Timeout": 300000,