/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-03-16 17:11:12 UTC
  • Revision ID: teddy@recompile.se-20190316171112-0tpfk9ved7a2a5x2
mandos-ctl: Refactor and add a few more tests

* mandos-ctl (main): Remove comment and add empty line.
  (rfc3339_duration_to_delta): Change ValueError exception message to
                               use \"{}\"" instead of "{!r}" so Python
                               2 and Python 3 output is the same.
  (Test_check_option_syntax.temporarily_suppress_stderr): Rename to
                                         "redirect_stderr_to_devnull".

  (Test_check_option_syntax
  .test_actions_except_is_enabled_are_ok_with_two_clients):  Rename to
             "test_two_clients_are_ok_with_actions_except_is_enabled".
  (Test_check_option_syntax
   .test_one_client_with_all_actions_except_is_enabled): New.
  (Test_check_option_syntax
   .test_two_clients_with_all_actions_except_is_enabled): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
45
45
import io
46
46
import tempfile
47
47
import contextlib
48
 
import abc
49
48
 
50
 
import dbus as dbus_python
 
49
import dbus
51
50
 
52
51
# Show warnings by default
53
52
if not sys.warnoptions:
62
61
 
63
62
if sys.version_info.major == 2:
64
63
    str = unicode
65
 
    import StringIO
66
 
    io.StringIO = StringIO.StringIO
67
64
 
68
65
locale.setlocale(locale.LC_ALL, "")
69
66
 
 
67
dbus_busname_domain = "se.recompile"
 
68
dbus_busname = dbus_busname_domain + ".Mandos"
 
69
server_dbus_path = "/"
 
70
server_dbus_interface = dbus_busname_domain + ".Mandos"
 
71
client_dbus_interface = dbus_busname_domain + ".Mandos.Client"
 
72
del dbus_busname_domain
70
73
version = "1.8.3"
71
74
 
72
75
 
 
76
try:
 
77
    dbus.OBJECT_MANAGER_IFACE
 
78
except AttributeError:
 
79
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
80
 
 
81
 
73
82
def main():
74
83
    parser = argparse.ArgumentParser()
 
84
 
75
85
    add_command_line_options(parser)
76
86
 
77
87
    options = parser.parse_args()
 
88
 
78
89
    check_option_syntax(parser, options)
79
90
 
80
91
    clientnames = options.client
82
93
    if options.debug:
83
94
        log.setLevel(logging.DEBUG)
84
95
 
85
 
    bus = dbus_python_adapter.CachingBus(dbus_python)
86
 
 
87
 
    try:
88
 
        all_clients = bus.get_clients_and_properties()
89
 
    except dbus.ConnectFailed as e:
90
 
        log.critical("Could not connect to Mandos server: %s", e)
91
 
        sys.exit(1)
92
 
    except dbus.Error as e:
93
 
        log.critical(
94
 
            "Failed to access Mandos server through D-Bus:\n%s", e)
95
 
        sys.exit(1)
 
96
    bus = dbus.SystemBus()
 
97
 
 
98
    mandos_dbus_object = get_mandos_dbus_object(bus)
 
99
 
 
100
    mandos_serv = dbus.Interface(
 
101
        mandos_dbus_object, dbus_interface=server_dbus_interface)
 
102
    mandos_serv_object_manager = dbus.Interface(
 
103
        mandos_dbus_object, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
104
 
 
105
    managed_objects = get_managed_objects(mandos_serv_object_manager)
 
106
 
 
107
    all_clients = {}
 
108
    for path, ifs_and_props in managed_objects.items():
 
109
        try:
 
110
            all_clients[path] = ifs_and_props[client_dbus_interface]
 
111
        except KeyError:
 
112
            pass
96
113
 
97
114
    # Compile dict of (clientpath: properties) to process
98
115
    if not clientnames:
111
128
    commands = commands_from_options(options)
112
129
 
113
130
    for command in commands:
114
 
        command.run(clients, bus)
 
131
        command.run(clients, bus, mandos_serv)
115
132
 
116
133
 
117
134
def add_command_line_options(parser):
407
424
        options.remove = True
408
425
 
409
426
 
410
 
 
411
 
class dbus(object):
412
 
 
413
 
    class SystemBus(object):
414
 
 
415
 
        object_manager_iface = "org.freedesktop.DBus.ObjectManager"
416
 
        def get_managed_objects(self, busname, objectpath):
417
 
            return self.call_method("GetManagedObjects", busname,
418
 
                                    objectpath,
419
 
                                    self.object_manager_iface)
420
 
 
421
 
        properties_iface = "org.freedesktop.DBus.Properties"
422
 
        def set_property(self, busname, objectpath, interface, key,
423
 
                         value):
424
 
            self.call_method("Set", busname, objectpath,
425
 
                             self.properties_iface, interface, key,
426
 
                             value)
427
 
 
428
 
 
429
 
    class MandosBus(SystemBus):
430
 
        busname_domain = "se.recompile"
431
 
        busname = busname_domain + ".Mandos"
432
 
        server_path = "/"
433
 
        server_interface = busname_domain + ".Mandos"
434
 
        client_interface = busname_domain + ".Mandos.Client"
435
 
        del busname_domain
436
 
 
437
 
        def get_clients_and_properties(self):
438
 
            managed_objects = self.get_managed_objects(
439
 
                self.busname, self.server_path)
440
 
            return {objpath: properties[self.client_interface]
441
 
                    for objpath, properties in managed_objects.items()
442
 
                    if self.client_interface in properties}
443
 
 
444
 
        def set_client_property(self, objectpath, key, value):
445
 
            return self.set_property(self.busname, objectpath,
446
 
                                     self.client_interface, key,
447
 
                                     value)
448
 
 
449
 
        def call_client_method(self, objectpath, method, *args):
450
 
            return self.call_method(method, self.busname, objectpath,
451
 
                                    self.client_interface, *args)
452
 
 
453
 
        def call_server_method(self, method, *args):
454
 
            return self.call_method(method, self.busname,
455
 
                                    self.server_path,
456
 
                                    self.server_interface, *args)
457
 
 
458
 
    class Error(Exception):
459
 
        pass
460
 
 
461
 
    class ConnectFailed(Error):
462
 
        pass
463
 
 
464
 
 
465
 
class dbus_python_adapter(object):
466
 
 
467
 
    class SystemBus(dbus.MandosBus):
468
 
        """Use dbus-python"""
469
 
 
470
 
        def __init__(self, module=dbus_python):
471
 
            self.dbus_python = module
472
 
            self.bus = self.dbus_python.SystemBus()
473
 
 
474
 
        @contextlib.contextmanager
475
 
        def convert_exception(self, exception_class=dbus.Error):
476
 
            try:
477
 
                yield
478
 
            except self.dbus_python.exceptions.DBusException as e:
479
 
                # This does what "raise from" would do
480
 
                exc = exception_class(*e.args)
481
 
                exc.__cause__ = e
482
 
                raise exc
483
 
 
484
 
        def call_method(self, methodname, busname, objectpath,
485
 
                        interface, *args):
486
 
            proxy_object = self.get_object(busname, objectpath)
487
 
            log.debug("D-Bus: %s:%s:%s.%s(%s)", busname, objectpath,
488
 
                      interface, methodname,
489
 
                      ", ".join(repr(a) for a in args))
490
 
            method = getattr(proxy_object, methodname)
491
 
            with self.convert_exception():
492
 
                with dbus_python_adapter.SilenceLogger(
493
 
                        "dbus.proxies"):
494
 
                    value = method(*args, dbus_interface=interface)
495
 
            return self.type_filter(value)
496
 
 
497
 
        def get_object(self, busname, objectpath):
498
 
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
499
 
                      busname, objectpath)
500
 
            with self.convert_exception(dbus.ConnectFailed):
501
 
                return self.bus.get_object(busname, objectpath)
502
 
 
503
 
        def type_filter(self, value):
504
 
            """Convert the most bothersome types to Python types"""
505
 
            if isinstance(value, self.dbus_python.Boolean):
506
 
                return bool(value)
507
 
            if isinstance(value, self.dbus_python.ObjectPath):
508
 
                return str(value)
509
 
            # Also recurse into dictionaries
510
 
            if isinstance(value, self.dbus_python.Dictionary):
511
 
                return {self.type_filter(key):
512
 
                        self.type_filter(subval)
513
 
                        for key, subval in value.items()}
514
 
            return value
515
 
 
516
 
 
517
 
    class SilenceLogger(object):
518
 
        "Simple context manager to silence a particular logger"
519
 
        def __init__(self, loggername):
520
 
            self.logger = logging.getLogger(loggername)
521
 
 
522
 
        def __enter__(self):
523
 
            self.logger.addFilter(self.nullfilter)
524
 
 
525
 
        class NullFilter(logging.Filter):
526
 
            def filter(self, record):
527
 
                return False
528
 
 
529
 
        nullfilter = NullFilter()
530
 
 
531
 
        def __exit__(self, exc_type, exc_val, exc_tb):
532
 
            self.logger.removeFilter(self.nullfilter)
533
 
 
534
 
 
535
 
    class CachingBus(SystemBus):
536
 
        """A caching layer for dbus_python_adapter.SystemBus"""
537
 
        def __init__(self, *args, **kwargs):
538
 
            self.object_cache = {}
539
 
            super(dbus_python_adapter.CachingBus,
540
 
                  self).__init__(*args, **kwargs)
541
 
        def get_object(self, busname, objectpath):
542
 
            try:
543
 
                return self.object_cache[(busname, objectpath)]
544
 
            except KeyError:
545
 
                new_object = super(
546
 
                    dbus_python_adapter.CachingBus,
547
 
                    self).get_object(busname, objectpath)
548
 
                self.object_cache[(busname, objectpath)]  = new_object
549
 
                return new_object
 
427
def get_mandos_dbus_object(bus):
 
428
    log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
429
              dbus_busname, server_dbus_path)
 
430
    with if_dbus_exception_log_with_exception_and_exit(
 
431
            "Could not connect to Mandos server: %s"):
 
432
        mandos_dbus_object = bus.get_object(dbus_busname,
 
433
                                            server_dbus_path)
 
434
    return mandos_dbus_object
 
435
 
 
436
 
 
437
@contextlib.contextmanager
 
438
def if_dbus_exception_log_with_exception_and_exit(*args, **kwargs):
 
439
    try:
 
440
        yield
 
441
    except dbus.exceptions.DBusException as e:
 
442
        log.critical(*(args + (e,)), **kwargs)
 
443
        sys.exit(1)
 
444
 
 
445
 
 
446
def get_managed_objects(object_manager):
 
447
    log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", dbus_busname,
 
448
              server_dbus_path, dbus.OBJECT_MANAGER_IFACE)
 
449
    with if_dbus_exception_log_with_exception_and_exit(
 
450
            "Failed to access Mandos server through D-Bus:\n%s"):
 
451
        with SilenceLogger("dbus.proxies"):
 
452
            managed_objects = object_manager.GetManagedObjects()
 
453
    return managed_objects
 
454
 
 
455
 
 
456
class SilenceLogger(object):
 
457
    "Simple context manager to silence a particular logger"
 
458
    def __init__(self, loggername):
 
459
        self.logger = logging.getLogger(loggername)
 
460
 
 
461
    def __enter__(self):
 
462
        self.logger.addFilter(self.nullfilter)
 
463
        return self
 
464
 
 
465
    class NullFilter(logging.Filter):
 
466
        def filter(self, record):
 
467
            return False
 
468
 
 
469
    nullfilter = NullFilter()
 
470
 
 
471
    def __exit__(self, exc_type, exc_val, exc_tb):
 
472
        self.logger.removeFilter(self.nullfilter)
550
473
 
551
474
 
552
475
def commands_from_options(options):
554
477
    commands = []
555
478
 
556
479
    if options.is_enabled:
557
 
        commands.append(command.IsEnabled())
 
480
        commands.append(IsEnabledCmd())
558
481
 
559
482
    if options.approve:
560
 
        commands.append(command.Approve())
 
483
        commands.append(ApproveCmd())
561
484
 
562
485
    if options.deny:
563
 
        commands.append(command.Deny())
 
486
        commands.append(DenyCmd())
564
487
 
565
488
    if options.remove:
566
 
        commands.append(command.Remove())
 
489
        commands.append(RemoveCmd())
567
490
 
568
491
    if options.dump_json:
569
 
        commands.append(command.DumpJSON())
 
492
        commands.append(DumpJSONCmd())
570
493
 
571
494
    if options.enable:
572
 
        commands.append(command.Enable())
 
495
        commands.append(EnableCmd())
573
496
 
574
497
    if options.disable:
575
 
        commands.append(command.Disable())
 
498
        commands.append(DisableCmd())
576
499
 
577
500
    if options.bump_timeout:
578
 
        commands.append(command.BumpTimeout())
 
501
        commands.append(BumpTimeoutCmd())
579
502
 
580
503
    if options.start_checker:
581
 
        commands.append(command.StartChecker())
 
504
        commands.append(StartCheckerCmd())
582
505
 
583
506
    if options.stop_checker:
584
 
        commands.append(command.StopChecker())
 
507
        commands.append(StopCheckerCmd())
585
508
 
586
509
    if options.approved_by_default is not None:
587
510
        if options.approved_by_default:
588
 
            commands.append(command.ApproveByDefault())
 
511
            commands.append(ApproveByDefaultCmd())
589
512
        else:
590
 
            commands.append(command.DenyByDefault())
 
513
            commands.append(DenyByDefaultCmd())
591
514
 
592
515
    if options.checker is not None:
593
 
        commands.append(command.SetChecker(options.checker))
 
516
        commands.append(SetCheckerCmd(options.checker))
594
517
 
595
518
    if options.host is not None:
596
 
        commands.append(command.SetHost(options.host))
 
519
        commands.append(SetHostCmd(options.host))
597
520
 
598
521
    if options.secret is not None:
599
 
        commands.append(command.SetSecret(options.secret))
 
522
        commands.append(SetSecretCmd(options.secret))
600
523
 
601
524
    if options.timeout is not None:
602
 
        commands.append(command.SetTimeout(options.timeout))
 
525
        commands.append(SetTimeoutCmd(options.timeout))
603
526
 
604
527
    if options.extended_timeout:
605
528
        commands.append(
606
 
            command.SetExtendedTimeout(options.extended_timeout))
 
529
            SetExtendedTimeoutCmd(options.extended_timeout))
607
530
 
608
531
    if options.interval is not None:
609
 
        commands.append(command.SetInterval(options.interval))
 
532
        commands.append(SetIntervalCmd(options.interval))
610
533
 
611
534
    if options.approval_delay is not None:
612
 
        commands.append(
613
 
            command.SetApprovalDelay(options.approval_delay))
 
535
        commands.append(SetApprovalDelayCmd(options.approval_delay))
614
536
 
615
537
    if options.approval_duration is not None:
616
538
        commands.append(
617
 
            command.SetApprovalDuration(options.approval_duration))
 
539
            SetApprovalDurationCmd(options.approval_duration))
618
540
 
619
541
    # If no command option has been given, show table of clients,
620
542
    # optionally verbosely
621
543
    if not commands:
622
 
        commands.append(command.PrintTable(verbose=options.verbose))
 
544
        commands.append(PrintTableCmd(verbose=options.verbose))
623
545
 
624
546
    return commands
625
547
 
626
548
 
627
 
class command(object):
628
 
    """A namespace for command classes"""
629
 
 
630
 
    class Base(object):
631
 
        """Abstract base class for commands"""
632
 
        def run(self, clients, bus=None):
633
 
            """Normal commands should implement run_on_one_client(),
634
 
but commands which want to operate on all clients at the same time can
635
 
override this run() method instead.
636
 
"""
637
 
            self.bus = bus
638
 
            for client, properties in clients.items():
639
 
                self.run_on_one_client(client, properties)
640
 
 
641
 
 
642
 
    class IsEnabled(Base):
643
 
        def run(self, clients, bus=None):
644
 
            properties = next(iter(clients.values()))
645
 
            if properties["Enabled"]:
646
 
                sys.exit(0)
647
 
            sys.exit(1)
648
 
 
649
 
 
650
 
    class Approve(Base):
651
 
        def run_on_one_client(self, client, properties):
652
 
            self.bus.call_client_method(client, "Approve", True)
653
 
 
654
 
 
655
 
    class Deny(Base):
656
 
        def run_on_one_client(self, client, properties):
657
 
            self.bus.call_client_method(client, "Approve", False)
658
 
 
659
 
 
660
 
    class Remove(Base):
661
 
        def run(self, clients, bus):
662
 
            for clientpath in frozenset(clients.keys()):
663
 
                bus.call_server_method("RemoveClient", clientpath)
664
 
 
665
 
 
666
 
    class Output(Base):
667
 
        """Abstract class for commands outputting client details"""
668
 
        all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
669
 
                        "Created", "Interval", "Host", "KeyID",
670
 
                        "Fingerprint", "CheckerRunning",
671
 
                        "LastEnabled", "ApprovalPending",
672
 
                        "ApprovedByDefault", "LastApprovalRequest",
673
 
                        "ApprovalDelay", "ApprovalDuration",
674
 
                        "Checker", "ExtendedTimeout", "Expires",
675
 
                        "LastCheckerStatus")
676
 
 
677
 
 
678
 
    class DumpJSON(Output):
679
 
        def run(self, clients, bus=None):
680
 
            data = {properties["Name"]:
681
 
                    {key: properties[key]
682
 
                     for key in self.all_keywords}
683
 
                    for properties in clients.values()}
684
 
            print(json.dumps(data, indent=4, separators=(',', ': ')))
685
 
 
686
 
 
687
 
    class PrintTable(Output):
688
 
        def __init__(self, verbose=False):
689
 
            self.verbose = verbose
690
 
 
691
 
        def run(self, clients, bus=None):
692
 
            default_keywords = ("Name", "Enabled", "Timeout",
693
 
                                "LastCheckedOK")
694
 
            keywords = default_keywords
695
 
            if self.verbose:
696
 
                keywords = self.all_keywords
697
 
            print(self.TableOfClients(clients.values(), keywords))
698
 
 
699
 
        class TableOfClients(object):
700
 
            tableheaders = {
701
 
                "Name": "Name",
702
 
                "Enabled": "Enabled",
703
 
                "Timeout": "Timeout",
704
 
                "LastCheckedOK": "Last Successful Check",
705
 
                "LastApprovalRequest": "Last Approval Request",
706
 
                "Created": "Created",
707
 
                "Interval": "Interval",
708
 
                "Host": "Host",
709
 
                "Fingerprint": "Fingerprint",
710
 
                "KeyID": "Key ID",
711
 
                "CheckerRunning": "Check Is Running",
712
 
                "LastEnabled": "Last Enabled",
713
 
                "ApprovalPending": "Approval Is Pending",
714
 
                "ApprovedByDefault": "Approved By Default",
715
 
                "ApprovalDelay": "Approval Delay",
716
 
                "ApprovalDuration": "Approval Duration",
717
 
                "Checker": "Checker",
718
 
                "ExtendedTimeout": "Extended Timeout",
719
 
                "Expires": "Expires",
720
 
                "LastCheckerStatus": "Last Checker Status",
721
 
            }
722
 
 
723
 
            def __init__(self, clients, keywords):
724
 
                self.clients = clients
725
 
                self.keywords = keywords
726
 
 
 
549
class Command(object):
 
550
    """Abstract class for commands"""
 
551
    def run(self, clients, bus=None, mandos=None):
 
552
        """Normal commands should implement run_on_one_client(), but
 
553
        commands which want to operate on all clients at the same time
 
554
        can override this run() method instead."""
 
555
        self.mandos = mandos
 
556
        for clientpath, properties in clients.items():
 
557
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
558
                      dbus_busname, str(clientpath))
 
559
            client = bus.get_object(dbus_busname, clientpath)
 
560
            self.run_on_one_client(client, properties)
 
561
 
 
562
 
 
563
class IsEnabledCmd(Command):
 
564
    def run(self, clients, bus=None, mandos=None):
 
565
        client, properties = next(iter(clients.items()))
 
566
        if self.is_enabled(client, properties):
 
567
            sys.exit(0)
 
568
        sys.exit(1)
 
569
    def is_enabled(self, client, properties):
 
570
        return properties["Enabled"]
 
571
 
 
572
 
 
573
class ApproveCmd(Command):
 
574
    def run_on_one_client(self, client, properties):
 
575
        log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
 
576
                  client.__dbus_object_path__, client_dbus_interface)
 
577
        client.Approve(dbus.Boolean(True),
 
578
                       dbus_interface=client_dbus_interface)
 
579
 
 
580
 
 
581
class DenyCmd(Command):
 
582
    def run_on_one_client(self, client, properties):
 
583
        log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
 
584
                  client.__dbus_object_path__, client_dbus_interface)
 
585
        client.Approve(dbus.Boolean(False),
 
586
                       dbus_interface=client_dbus_interface)
 
587
 
 
588
 
 
589
class RemoveCmd(Command):
 
590
    def run_on_one_client(self, client, properties):
 
591
        log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
 
592
                  server_dbus_path, server_dbus_interface,
 
593
                  str(client.__dbus_object_path__))
 
594
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
595
 
 
596
 
 
597
class OutputCmd(Command):
 
598
    """Abstract class for commands outputting client details"""
 
599
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
600
                    "Created", "Interval", "Host", "KeyID",
 
601
                    "Fingerprint", "CheckerRunning", "LastEnabled",
 
602
                    "ApprovalPending", "ApprovedByDefault",
 
603
                    "LastApprovalRequest", "ApprovalDelay",
 
604
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
 
605
                    "Expires", "LastCheckerStatus")
 
606
 
 
607
    def run(self, clients, bus=None, mandos=None):
 
608
        print(self.output(clients.values()))
 
609
 
 
610
    def output(self, clients):
 
611
        raise NotImplementedError()
 
612
 
 
613
 
 
614
class DumpJSONCmd(OutputCmd):
 
615
    def output(self, clients):
 
616
        data = {client["Name"]:
 
617
                {key: self.dbus_boolean_to_bool(client[key])
 
618
                 for key in self.all_keywords}
 
619
                for client in clients}
 
620
        return json.dumps(data, indent=4, separators=(',', ': '))
 
621
 
 
622
    @staticmethod
 
623
    def dbus_boolean_to_bool(value):
 
624
        if isinstance(value, dbus.Boolean):
 
625
            value = bool(value)
 
626
        return value
 
627
 
 
628
 
 
629
class PrintTableCmd(OutputCmd):
 
630
    def __init__(self, verbose=False):
 
631
        self.verbose = verbose
 
632
 
 
633
    def output(self, clients):
 
634
        default_keywords = ("Name", "Enabled", "Timeout",
 
635
                            "LastCheckedOK")
 
636
        keywords = default_keywords
 
637
        if self.verbose:
 
638
            keywords = self.all_keywords
 
639
        return str(self.TableOfClients(clients, keywords))
 
640
 
 
641
    class TableOfClients(object):
 
642
        tableheaders = {
 
643
            "Name": "Name",
 
644
            "Enabled": "Enabled",
 
645
            "Timeout": "Timeout",
 
646
            "LastCheckedOK": "Last Successful Check",
 
647
            "LastApprovalRequest": "Last Approval Request",
 
648
            "Created": "Created",
 
649
            "Interval": "Interval",
 
650
            "Host": "Host",
 
651
            "Fingerprint": "Fingerprint",
 
652
            "KeyID": "Key ID",
 
653
            "CheckerRunning": "Check Is Running",
 
654
            "LastEnabled": "Last Enabled",
 
655
            "ApprovalPending": "Approval Is Pending",
 
656
            "ApprovedByDefault": "Approved By Default",
 
657
            "ApprovalDelay": "Approval Delay",
 
658
            "ApprovalDuration": "Approval Duration",
 
659
            "Checker": "Checker",
 
660
            "ExtendedTimeout": "Extended Timeout",
 
661
            "Expires": "Expires",
 
662
            "LastCheckerStatus": "Last Checker Status",
 
663
        }
 
664
 
 
665
        def __init__(self, clients, keywords):
 
666
            self.clients = clients
 
667
            self.keywords = keywords
 
668
 
 
669
        def __str__(self):
 
670
            return "\n".join(self.rows())
 
671
 
 
672
        if sys.version_info.major == 2:
 
673
            __unicode__ = __str__
727
674
            def __str__(self):
728
 
                return "\n".join(self.rows())
729
 
 
730
 
            if sys.version_info.major == 2:
731
 
                __unicode__ = __str__
732
 
                def __str__(self):
733
 
                    return str(self).encode(
734
 
                        locale.getpreferredencoding())
735
 
 
736
 
            def rows(self):
737
 
                format_string = self.row_formatting_string()
738
 
                rows = [self.header_line(format_string)]
739
 
                rows.extend(self.client_line(client, format_string)
740
 
                            for client in self.clients)
741
 
                return rows
742
 
 
743
 
            def row_formatting_string(self):
744
 
                "Format string used to format table rows"
745
 
                return " ".join("{{{key}:{width}}}".format(
746
 
                    width=max(len(self.tableheaders[key]),
747
 
                              *(len(self.string_from_client(client,
748
 
                                                            key))
749
 
                                for client in self.clients)),
750
 
                    key=key)
751
 
                                for key in self.keywords)
752
 
 
753
 
            def string_from_client(self, client, key):
754
 
                return self.valuetostring(client[key], key)
755
 
 
756
 
            @classmethod
757
 
            def valuetostring(cls, value, keyword):
758
 
                if isinstance(value, bool):
759
 
                    return "Yes" if value else "No"
760
 
                if keyword in ("Timeout", "Interval", "ApprovalDelay",
761
 
                               "ApprovalDuration", "ExtendedTimeout"):
762
 
                    return cls.milliseconds_to_string(value)
763
 
                return str(value)
764
 
 
765
 
            def header_line(self, format_string):
766
 
                return format_string.format(**self.tableheaders)
767
 
 
768
 
            def client_line(self, client, format_string):
769
 
                return format_string.format(
770
 
                    **{key: self.string_from_client(client, key)
771
 
                       for key in self.keywords})
772
 
 
773
 
            @staticmethod
774
 
            def milliseconds_to_string(ms):
775
 
                td = datetime.timedelta(0, 0, 0, ms)
776
 
                return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
777
 
                        .format(days="{}T".format(td.days)
778
 
                                if td.days else "",
779
 
                                hours=td.seconds // 3600,
780
 
                                minutes=(td.seconds % 3600) // 60,
781
 
                                seconds=td.seconds % 60))
782
 
 
783
 
 
784
 
    class PropertySetter(Base):
785
 
        "Abstract class for Actions for setting one client property"
786
 
 
787
 
        def run_on_one_client(self, client, properties=None):
788
 
            """Set the Client's D-Bus property"""
789
 
            self.bus.set_client_property(client, self.propname,
790
 
                                         self.value_to_set)
791
 
 
792
 
        @property
793
 
        def propname(self):
794
 
            raise NotImplementedError()
795
 
 
796
 
 
797
 
    class Enable(PropertySetter):
798
 
        propname = "Enabled"
799
 
        value_to_set = True
800
 
 
801
 
 
802
 
    class Disable(PropertySetter):
803
 
        propname = "Enabled"
804
 
        value_to_set = False
805
 
 
806
 
 
807
 
    class BumpTimeout(PropertySetter):
808
 
        propname = "LastCheckedOK"
809
 
        value_to_set = ""
810
 
 
811
 
 
812
 
    class StartChecker(PropertySetter):
813
 
        propname = "CheckerRunning"
814
 
        value_to_set = True
815
 
 
816
 
 
817
 
    class StopChecker(PropertySetter):
818
 
        propname = "CheckerRunning"
819
 
        value_to_set = False
820
 
 
821
 
 
822
 
    class ApproveByDefault(PropertySetter):
823
 
        propname = "ApprovedByDefault"
824
 
        value_to_set = True
825
 
 
826
 
 
827
 
    class DenyByDefault(PropertySetter):
828
 
        propname = "ApprovedByDefault"
829
 
        value_to_set = False
830
 
 
831
 
 
832
 
    class PropertySetterValue(PropertySetter):
833
 
        """Abstract class for PropertySetter recieving a value as
834
 
constructor argument instead of a class attribute."""
835
 
        def __init__(self, value):
836
 
            self.value_to_set = value
837
 
 
838
 
 
839
 
    class SetChecker(PropertySetterValue):
840
 
        propname = "Checker"
841
 
 
842
 
 
843
 
    class SetHost(PropertySetterValue):
844
 
        propname = "Host"
845
 
 
846
 
 
847
 
    class SetSecret(PropertySetterValue):
848
 
        propname = "Secret"
849
 
 
850
 
        @property
851
 
        def value_to_set(self):
852
 
            return self._vts
853
 
 
854
 
        @value_to_set.setter
855
 
        def value_to_set(self, value):
856
 
            """When setting, read data from supplied file object"""
857
 
            self._vts = value.read()
858
 
            value.close()
859
 
 
860
 
 
861
 
    class PropertySetterValueMilliseconds(PropertySetterValue):
862
 
        """Abstract class for PropertySetterValue taking a value
863
 
argument as a datetime.timedelta() but should store it as
864
 
milliseconds."""
865
 
 
866
 
        @property
867
 
        def value_to_set(self):
868
 
            return self._vts
869
 
 
870
 
        @value_to_set.setter
871
 
        def value_to_set(self, value):
872
 
            "When setting, convert value from a datetime.timedelta"
873
 
            self._vts = int(round(value.total_seconds() * 1000))
874
 
 
875
 
 
876
 
    class SetTimeout(PropertySetterValueMilliseconds):
877
 
        propname = "Timeout"
878
 
 
879
 
 
880
 
    class SetExtendedTimeout(PropertySetterValueMilliseconds):
881
 
        propname = "ExtendedTimeout"
882
 
 
883
 
 
884
 
    class SetInterval(PropertySetterValueMilliseconds):
885
 
        propname = "Interval"
886
 
 
887
 
 
888
 
    class SetApprovalDelay(PropertySetterValueMilliseconds):
889
 
        propname = "ApprovalDelay"
890
 
 
891
 
 
892
 
    class SetApprovalDuration(PropertySetterValueMilliseconds):
893
 
        propname = "ApprovalDuration"
 
675
                return str(self).encode(locale.getpreferredencoding())
 
676
 
 
677
        def rows(self):
 
678
            format_string = self.row_formatting_string()
 
679
            rows = [self.header_line(format_string)]
 
680
            rows.extend(self.client_line(client, format_string)
 
681
                        for client in self.clients)
 
682
            return rows
 
683
 
 
684
        def row_formatting_string(self):
 
685
            "Format string used to format table rows"
 
686
            return " ".join("{{{key}:{width}}}".format(
 
687
                width=max(len(self.tableheaders[key]),
 
688
                          *(len(self.string_from_client(client, key))
 
689
                            for client in self.clients)),
 
690
                key=key)
 
691
                            for key in self.keywords)
 
692
 
 
693
        def string_from_client(self, client, key):
 
694
            return self.valuetostring(client[key], key)
 
695
 
 
696
        @classmethod
 
697
        def valuetostring(cls, value, keyword):
 
698
            if isinstance(value, dbus.Boolean):
 
699
                return "Yes" if value else "No"
 
700
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
 
701
                           "ApprovalDuration", "ExtendedTimeout"):
 
702
                return cls.milliseconds_to_string(value)
 
703
            return str(value)
 
704
 
 
705
        def header_line(self, format_string):
 
706
            return format_string.format(**self.tableheaders)
 
707
 
 
708
        def client_line(self, client, format_string):
 
709
            return format_string.format(
 
710
                **{key: self.string_from_client(client, key)
 
711
                   for key in self.keywords})
 
712
 
 
713
        @staticmethod
 
714
        def milliseconds_to_string(ms):
 
715
            td = datetime.timedelta(0, 0, 0, ms)
 
716
            return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
717
                    .format(days="{}T".format(td.days)
 
718
                            if td.days else "",
 
719
                            hours=td.seconds // 3600,
 
720
                            minutes=(td.seconds % 3600) // 60,
 
721
                            seconds=td.seconds % 60))
 
722
 
 
723
 
 
724
class PropertyCmd(Command):
 
725
    """Abstract class for Actions for setting one client property"""
 
726
 
 
727
    def run_on_one_client(self, client, properties):
 
728
        """Set the Client's D-Bus property"""
 
729
        log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
 
730
                  client.__dbus_object_path__,
 
731
                  dbus.PROPERTIES_IFACE, client_dbus_interface,
 
732
                  self.propname, self.value_to_set
 
733
                  if not isinstance(self.value_to_set, dbus.Boolean)
 
734
                  else bool(self.value_to_set))
 
735
        client.Set(client_dbus_interface, self.propname,
 
736
                   self.value_to_set,
 
737
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
738
 
 
739
    @property
 
740
    def propname(self):
 
741
        raise NotImplementedError()
 
742
 
 
743
 
 
744
class EnableCmd(PropertyCmd):
 
745
    propname = "Enabled"
 
746
    value_to_set = dbus.Boolean(True)
 
747
 
 
748
 
 
749
class DisableCmd(PropertyCmd):
 
750
    propname = "Enabled"
 
751
    value_to_set = dbus.Boolean(False)
 
752
 
 
753
 
 
754
class BumpTimeoutCmd(PropertyCmd):
 
755
    propname = "LastCheckedOK"
 
756
    value_to_set = ""
 
757
 
 
758
 
 
759
class StartCheckerCmd(PropertyCmd):
 
760
    propname = "CheckerRunning"
 
761
    value_to_set = dbus.Boolean(True)
 
762
 
 
763
 
 
764
class StopCheckerCmd(PropertyCmd):
 
765
    propname = "CheckerRunning"
 
766
    value_to_set = dbus.Boolean(False)
 
767
 
 
768
 
 
769
class ApproveByDefaultCmd(PropertyCmd):
 
770
    propname = "ApprovedByDefault"
 
771
    value_to_set = dbus.Boolean(True)
 
772
 
 
773
 
 
774
class DenyByDefaultCmd(PropertyCmd):
 
775
    propname = "ApprovedByDefault"
 
776
    value_to_set = dbus.Boolean(False)
 
777
 
 
778
 
 
779
class PropertyValueCmd(PropertyCmd):
 
780
    """Abstract class for PropertyCmd recieving a value as argument"""
 
781
    def __init__(self, value):
 
782
        self.value_to_set = value
 
783
 
 
784
 
 
785
class SetCheckerCmd(PropertyValueCmd):
 
786
    propname = "Checker"
 
787
 
 
788
 
 
789
class SetHostCmd(PropertyValueCmd):
 
790
    propname = "Host"
 
791
 
 
792
 
 
793
class SetSecretCmd(PropertyValueCmd):
 
794
    propname = "Secret"
 
795
 
 
796
    @property
 
797
    def value_to_set(self):
 
798
        return self._vts
 
799
 
 
800
    @value_to_set.setter
 
801
    def value_to_set(self, value):
 
802
        """When setting, read data from supplied file object"""
 
803
        self._vts = value.read()
 
804
        value.close()
 
805
 
 
806
 
 
807
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
 
808
    """Abstract class for PropertyValueCmd taking a value argument as
 
809
a datetime.timedelta() but should store it as milliseconds."""
 
810
 
 
811
    @property
 
812
    def value_to_set(self):
 
813
        return self._vts
 
814
 
 
815
    @value_to_set.setter
 
816
    def value_to_set(self, value):
 
817
        """When setting, convert value from a datetime.timedelta"""
 
818
        self._vts = int(round(value.total_seconds() * 1000))
 
819
 
 
820
 
 
821
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
 
822
    propname = "Timeout"
 
823
 
 
824
 
 
825
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
 
826
    propname = "ExtendedTimeout"
 
827
 
 
828
 
 
829
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
 
830
    propname = "Interval"
 
831
 
 
832
 
 
833
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
 
834
    propname = "ApprovalDelay"
 
835
 
 
836
 
 
837
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
 
838
    propname = "ApprovalDuration"
894
839
 
895
840
 
896
841
 
928
873
                                                     "output"))
929
874
 
930
875
 
931
 
class Unique(object):
932
 
    """Class for objects which exist only to be unique objects, since
933
 
unittest.mock.sentinel only exists in Python 3.3"""
934
 
 
935
 
 
936
876
class Test_string_to_delta(TestCaseWithAssertLogs):
937
 
    # Just test basic RFC 3339 functionality here, the doc string for
938
 
    # rfc3339_duration_to_delta() already has more comprehensive
939
 
    # tests, which are run by doctest.
940
 
 
941
 
    def test_rfc3339_zero_seconds(self):
942
 
        self.assertEqual(datetime.timedelta(),
943
 
                         string_to_delta("PT0S"))
944
 
 
945
 
    def test_rfc3339_zero_days(self):
946
 
        self.assertEqual(datetime.timedelta(), string_to_delta("P0D"))
947
 
 
948
 
    def test_rfc3339_one_second(self):
949
 
        self.assertEqual(datetime.timedelta(0, 1),
950
 
                         string_to_delta("PT1S"))
951
 
 
952
 
    def test_rfc3339_two_hours(self):
953
 
        self.assertEqual(datetime.timedelta(0, 7200),
954
 
                         string_to_delta("PT2H"))
 
877
    def test_handles_basic_rfc3339(self):
 
878
        self.assertEqual(string_to_delta("PT0S"),
 
879
                         datetime.timedelta())
 
880
        self.assertEqual(string_to_delta("P0D"),
 
881
                         datetime.timedelta())
 
882
        self.assertEqual(string_to_delta("PT1S"),
 
883
                         datetime.timedelta(0, 1))
 
884
        self.assertEqual(string_to_delta("PT2H"),
 
885
                         datetime.timedelta(0, 7200))
955
886
 
956
887
    def test_falls_back_to_pre_1_6_1_with_warning(self):
957
888
        with self.assertLogs(log, logging.WARNING):
958
889
            value = string_to_delta("2h")
959
 
        self.assertEqual(datetime.timedelta(0, 7200), value)
 
890
        self.assertEqual(value, datetime.timedelta(0, 7200))
960
891
 
961
892
 
962
893
class Test_check_option_syntax(unittest.TestCase):
1005
936
        # Exit code from argparse is guaranteed to be "2".  Reference:
1006
937
        # https://docs.python.org/3/library
1007
938
        # /argparse.html#exiting-methods
1008
 
        self.assertEqual(2, e.exception.code)
 
939
        self.assertEqual(e.exception.code, 2)
1009
940
 
1010
941
    @staticmethod
1011
942
    @contextlib.contextmanager
1012
943
    def redirect_stderr_to_devnull():
1013
 
        old_stderr = sys.stderr
1014
 
        with contextlib.closing(open(os.devnull, "w")) as null:
1015
 
            sys.stderr = null
1016
 
            try:
1017
 
                yield
1018
 
            finally:
1019
 
                sys.stderr = old_stderr
 
944
        null = os.open(os.path.devnull, os.O_RDWR)
 
945
        stderrcopy = os.dup(sys.stderr.fileno())
 
946
        os.dup2(null, sys.stderr.fileno())
 
947
        os.close(null)
 
948
        try:
 
949
            yield
 
950
        finally:
 
951
            # restore stderr
 
952
            os.dup2(stderrcopy, sys.stderr.fileno())
 
953
            os.close(stderrcopy)
1020
954
 
1021
955
    def check_option_syntax(self, options):
1022
956
        check_option_syntax(self.parser, options)
1035
969
            options = self.parser.parse_args()
1036
970
            setattr(options, action, value)
1037
971
            options.verbose = True
1038
 
            options.client = ["client"]
 
972
            options.client = ["foo"]
1039
973
            with self.assertParseError():
1040
974
                self.check_option_syntax(options)
1041
975
 
1071
1005
        for action, value in self.actions.items():
1072
1006
            options = self.parser.parse_args()
1073
1007
            setattr(options, action, value)
1074
 
            options.client = ["client"]
 
1008
            options.client = ["foo"]
1075
1009
            self.check_option_syntax(options)
1076
1010
 
1077
1011
    def test_one_client_with_all_actions_except_is_enabled(self):
1080
1014
            if action == "is_enabled":
1081
1015
                continue
1082
1016
            setattr(options, action, value)
1083
 
        options.client = ["client"]
 
1017
        options.client = ["foo"]
1084
1018
        self.check_option_syntax(options)
1085
1019
 
1086
1020
    def test_two_clients_with_all_actions_except_is_enabled(self):
1089
1023
            if action == "is_enabled":
1090
1024
                continue
1091
1025
            setattr(options, action, value)
1092
 
        options.client = ["client1", "client2"]
 
1026
        options.client = ["foo", "barbar"]
1093
1027
        self.check_option_syntax(options)
1094
1028
 
1095
1029
    def test_two_clients_are_ok_with_actions_except_is_enabled(self):
1098
1032
                continue
1099
1033
            options = self.parser.parse_args()
1100
1034
            setattr(options, action, value)
1101
 
            options.client = ["client1", "client2"]
 
1035
            options.client = ["foo", "barbar"]
1102
1036
            self.check_option_syntax(options)
1103
1037
 
1104
1038
    def test_is_enabled_fails_without_client(self):
1110
1044
    def test_is_enabled_fails_with_two_clients(self):
1111
1045
        options = self.parser.parse_args()
1112
1046
        options.is_enabled = True
1113
 
        options.client = ["client1", "client2"]
 
1047
        options.client = ["foo", "barbar"]
1114
1048
        with self.assertParseError():
1115
1049
            self.check_option_syntax(options)
1116
1050
 
1126
1060
                self.check_option_syntax(options)
1127
1061
 
1128
1062
 
1129
 
class Test_dbus_exceptions(unittest.TestCase):
1130
 
 
1131
 
    def test_dbus_ConnectFailed_is_Error(self):
1132
 
        with self.assertRaises(dbus.Error):
1133
 
            raise dbus.ConnectFailed()
1134
 
 
1135
 
 
1136
 
class Test_dbus_MandosBus(unittest.TestCase):
1137
 
 
1138
 
    class MockMandosBus(dbus.MandosBus):
1139
 
        def __init__(self):
1140
 
            self._name = "se.recompile.Mandos"
1141
 
            self._server_path = "/"
1142
 
            self._server_interface = "se.recompile.Mandos"
1143
 
            self._client_interface = "se.recompile.Mandos.Client"
1144
 
            self.calls = []
1145
 
            self.call_method_return = Unique()
1146
 
 
1147
 
        def call_method(self, methodname, busname, objectpath,
1148
 
                        interface, *args):
1149
 
            self.calls.append((methodname, busname, objectpath,
1150
 
                               interface, args))
1151
 
            return self.call_method_return
1152
 
 
1153
 
    def setUp(self):
1154
 
        self.bus = self.MockMandosBus()
1155
 
 
1156
 
    def test_set_client_property(self):
1157
 
        self.bus.set_client_property("objectpath", "key", "value")
1158
 
        expected_call = ("Set", self.bus._name, "objectpath",
1159
 
                         "org.freedesktop.DBus.Properties",
1160
 
                         (self.bus._client_interface, "key", "value"))
1161
 
        self.assertIn(expected_call, self.bus.calls)
1162
 
 
1163
 
    def test_call_client_method(self):
1164
 
        ret = self.bus.call_client_method("objectpath", "methodname")
1165
 
        self.assertIs(self.bus.call_method_return, ret)
1166
 
        expected_call = ("methodname", self.bus._name, "objectpath",
1167
 
                         self.bus._client_interface, ())
1168
 
        self.assertIn(expected_call, self.bus.calls)
1169
 
 
1170
 
    def test_call_client_method_with_args(self):
1171
 
        args = (Unique(), Unique())
1172
 
        ret = self.bus.call_client_method("objectpath", "methodname",
1173
 
                                          *args)
1174
 
        self.assertIs(self.bus.call_method_return, ret)
1175
 
        expected_call = ("methodname", self.bus._name, "objectpath",
1176
 
                         self.bus._client_interface,
1177
 
                         (args[0], args[1]))
1178
 
        self.assertIn(expected_call, self.bus.calls)
1179
 
 
1180
 
    def test_get_clients_and_properties(self):
1181
 
        managed_objects = {
1182
 
            "objectpath": {
1183
 
                self.bus._client_interface: {
1184
 
                    "key": "value",
1185
 
                    "bool": True,
1186
 
                },
1187
 
                "irrelevant_interface": {
1188
 
                    "key": "othervalue",
1189
 
                    "bool": False,
1190
 
                },
1191
 
            },
1192
 
            "other_objectpath": {
1193
 
                "other_irrelevant_interface": {
1194
 
                    "key": "value 3",
1195
 
                    "bool": None,
1196
 
                },
1197
 
            },
1198
 
        }
1199
 
        expected_clients_and_properties = {
1200
 
            "objectpath": {
1201
 
                "key": "value",
1202
 
                "bool": True,
1203
 
            }
1204
 
        }
1205
 
        self.bus.call_method_return = managed_objects
1206
 
        ret = self.bus.get_clients_and_properties()
1207
 
        self.assertDictEqual(expected_clients_and_properties, ret)
1208
 
        expected_call = ("GetManagedObjects", self.bus._name,
1209
 
                         self.bus._server_path,
1210
 
                         "org.freedesktop.DBus.ObjectManager", ())
1211
 
        self.assertIn(expected_call, self.bus.calls)
1212
 
 
1213
 
    def test_call_server_method(self):
1214
 
        ret = self.bus.call_server_method("methodname")
1215
 
        self.assertIs(self.bus.call_method_return, ret)
1216
 
        expected_call = ("methodname", self.bus._name,
1217
 
                         self.bus._server_path,
1218
 
                         self.bus._server_interface, ())
1219
 
        self.assertIn(expected_call, self.bus.calls)
1220
 
 
1221
 
    def test_call_server_method_with_args(self):
1222
 
        args = (Unique(), Unique())
1223
 
        ret = self.bus.call_server_method("methodname", *args)
1224
 
        self.assertIs(self.bus.call_method_return, ret)
1225
 
        expected_call = ("methodname", self.bus._name,
1226
 
                         self.bus._server_path,
1227
 
                         self.bus._server_interface,
1228
 
                         (args[0], args[1]))
1229
 
        self.assertIn(expected_call, self.bus.calls)
1230
 
 
1231
 
 
1232
 
class Test_dbus_python_adapter_SystemBus(TestCaseWithAssertLogs):
1233
 
 
1234
 
    def MockDBusPython_func(self, func):
1235
 
        class mock_dbus_python(object):
1236
 
            """mock dbus-python module"""
1237
 
            class exceptions(object):
1238
 
                """Pseudo-namespace"""
1239
 
                class DBusException(Exception):
1240
 
                    pass
1241
 
            class SystemBus(object):
1242
 
                @staticmethod
1243
 
                def get_object(busname, objectpath):
1244
 
                    DBusObject = collections.namedtuple(
1245
 
                        "DBusObject", ("methodname",))
1246
 
                    def method(*args, **kwargs):
1247
 
                        self.assertEqual({"dbus_interface":
1248
 
                                          "interface"},
1249
 
                                         kwargs)
1250
 
                        return func(*args)
1251
 
                    return DBusObject(methodname=method)
1252
 
            class Boolean(object):
1253
 
                def __init__(self, value):
1254
 
                    self.value = bool(value)
1255
 
                def __bool__(self):
1256
 
                    return self.value
1257
 
                if sys.version_info.major == 2:
1258
 
                    __nonzero__ = __bool__
1259
 
            class ObjectPath(str):
1260
 
                pass
1261
 
            class Dictionary(dict):
1262
 
                pass
1263
 
        return mock_dbus_python
1264
 
 
1265
 
    def call_method(self, bus, methodname, busname, objectpath,
1266
 
                    interface, *args):
1267
 
        with self.assertLogs(log, logging.DEBUG):
1268
 
            return bus.call_method(methodname, busname, objectpath,
1269
 
                                   interface, *args)
1270
 
 
1271
 
    def test_call_method_returns(self):
1272
 
        expected_method_return = Unique()
1273
 
        method_args = (Unique(), Unique())
1274
 
        def func(*args):
1275
 
            self.assertEqual(len(method_args), len(args))
1276
 
            for marg, arg in zip(method_args, args):
1277
 
                self.assertIs(marg, arg)
1278
 
            return expected_method_return
1279
 
        mock_dbus_python = self.MockDBusPython_func(func)
1280
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1281
 
        ret = self.call_method(bus, "methodname", "busname",
1282
 
                               "objectpath", "interface",
1283
 
                               *method_args)
1284
 
        self.assertIs(ret, expected_method_return)
1285
 
 
1286
 
    def test_call_method_filters_bool_true(self):
1287
 
        def func():
1288
 
            return method_return
1289
 
        mock_dbus_python = self.MockDBusPython_func(func)
1290
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1291
 
        method_return = mock_dbus_python.Boolean(True)
1292
 
        ret = self.call_method(bus, "methodname", "busname",
1293
 
                               "objectpath", "interface")
1294
 
        self.assertTrue(ret)
1295
 
        self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
1296
 
 
1297
 
    def test_call_method_filters_bool_false(self):
1298
 
        def func():
1299
 
            return method_return
1300
 
        mock_dbus_python = self.MockDBusPython_func(func)
1301
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1302
 
        method_return = mock_dbus_python.Boolean(False)
1303
 
        ret = self.call_method(bus, "methodname", "busname",
1304
 
                               "objectpath", "interface")
1305
 
        self.assertFalse(ret)
1306
 
        self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
1307
 
 
1308
 
    def test_call_method_filters_objectpath(self):
1309
 
        def func():
1310
 
            return method_return
1311
 
        mock_dbus_python = self.MockDBusPython_func(func)
1312
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1313
 
        method_return = mock_dbus_python.ObjectPath("objectpath")
1314
 
        ret = self.call_method(bus, "methodname", "busname",
1315
 
                               "objectpath", "interface")
1316
 
        self.assertEqual("objectpath", ret)
1317
 
        self.assertIsNot("objectpath", ret)
1318
 
        self.assertNotIsInstance(ret, mock_dbus_python.ObjectPath)
1319
 
 
1320
 
    def test_call_method_filters_booleans_in_dict(self):
1321
 
        def func():
1322
 
            return method_return
1323
 
        mock_dbus_python = self.MockDBusPython_func(func)
1324
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1325
 
        method_return = mock_dbus_python.Dictionary(
1326
 
        {mock_dbus_python.Boolean(True):
1327
 
         mock_dbus_python.Boolean(False),
1328
 
         mock_dbus_python.Boolean(False):
1329
 
         mock_dbus_python.Boolean(True)})
1330
 
        ret = self.call_method(bus, "methodname", "busname",
1331
 
                               "objectpath", "interface")
1332
 
        expected_method_return = {True: False,
1333
 
                                  False: True}
1334
 
        self.assertEqual(expected_method_return, ret)
1335
 
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1336
 
 
1337
 
    def test_call_method_filters_objectpaths_in_dict(self):
1338
 
        def func():
1339
 
            return method_return
1340
 
        mock_dbus_python = self.MockDBusPython_func(func)
1341
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1342
 
        method_return = mock_dbus_python.Dictionary(
1343
 
        {mock_dbus_python.ObjectPath("objectpath_key_1"):
1344
 
         mock_dbus_python.ObjectPath("objectpath_value_1"),
1345
 
         mock_dbus_python.ObjectPath("objectpath_key_2"):
1346
 
         mock_dbus_python.ObjectPath("objectpath_value_2")})
1347
 
        ret = self.call_method(bus, "methodname", "busname",
1348
 
                               "objectpath", "interface")
1349
 
        expected_method_return = {str(key): str(value)
1350
 
                                  for key, value in
1351
 
                                  method_return.items()}
1352
 
        self.assertEqual(expected_method_return, ret)
1353
 
        self.assertIsInstance(ret, dict)
1354
 
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1355
 
 
1356
 
    def test_call_method_filters_dict_in_dict(self):
1357
 
        def func():
1358
 
            return method_return
1359
 
        mock_dbus_python = self.MockDBusPython_func(func)
1360
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1361
 
        method_return = mock_dbus_python.Dictionary(
1362
 
        {"key1": mock_dbus_python.Dictionary({"key11": "value11",
1363
 
                                              "key12": "value12"}),
1364
 
         "key2": mock_dbus_python.Dictionary({"key21": "value21",
1365
 
                                              "key22": "value22"})})
1366
 
        ret = self.call_method(bus, "methodname", "busname",
1367
 
                               "objectpath", "interface")
1368
 
        expected_method_return = {
1369
 
            "key1": {"key11": "value11",
1370
 
                     "key12": "value12"},
1371
 
            "key2": {"key21": "value21",
1372
 
                     "key22": "value22"},
1373
 
        }
1374
 
        self.assertEqual(expected_method_return, ret)
1375
 
        self.assertIsInstance(ret, dict)
1376
 
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1377
 
        for key, value in ret.items():
1378
 
            self.assertIsInstance(value, dict)
1379
 
            self.assertEqual(expected_method_return[key], value)
1380
 
            self.assertNotIsInstance(value,
1381
 
                                     mock_dbus_python.Dictionary)
1382
 
 
1383
 
    def test_call_method_filters_dict_three_deep(self):
1384
 
        def func():
1385
 
            return method_return
1386
 
        mock_dbus_python = self.MockDBusPython_func(func)
1387
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1388
 
        method_return = mock_dbus_python.Dictionary(
1389
 
            {"key1":
1390
 
             mock_dbus_python.Dictionary(
1391
 
                 {"key2":
1392
 
                  mock_dbus_python.Dictionary(
1393
 
                      {"key3":
1394
 
                       mock_dbus_python.Boolean(True),
1395
 
                       }),
1396
 
                  }),
1397
 
             })
1398
 
        ret = self.call_method(bus, "methodname", "busname",
1399
 
                               "objectpath", "interface")
1400
 
        expected_method_return = {"key1": {"key2": {"key3": True}}}
1401
 
        self.assertEqual(expected_method_return, ret)
1402
 
        self.assertIsInstance(ret, dict)
1403
 
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1404
 
        self.assertIsInstance(ret["key1"], dict)
1405
 
        self.assertNotIsInstance(ret["key1"],
1406
 
                                 mock_dbus_python.Dictionary)
1407
 
        self.assertIsInstance(ret["key1"]["key2"], dict)
1408
 
        self.assertNotIsInstance(ret["key1"]["key2"],
1409
 
                                 mock_dbus_python.Dictionary)
1410
 
        self.assertTrue(ret["key1"]["key2"]["key3"])
1411
 
        self.assertNotIsInstance(ret["key1"]["key2"]["key3"],
1412
 
                                 mock_dbus_python.Boolean)
1413
 
 
1414
 
    def test_call_method_handles_exception(self):
 
1063
class Test_get_mandos_dbus_object(TestCaseWithAssertLogs):
 
1064
    def test_calls_and_returns_get_object_on_bus(self):
 
1065
        class MockBus(object):
 
1066
            called = False
 
1067
            def get_object(mockbus_self, busname, dbus_path):
 
1068
                # Note that "self" is still the testcase instance,
 
1069
                # this MockBus instance is in "mockbus_self".
 
1070
                self.assertEqual(busname, dbus_busname)
 
1071
                self.assertEqual(dbus_path, server_dbus_path)
 
1072
                mockbus_self.called = True
 
1073
                return mockbus_self
 
1074
 
 
1075
        mockbus = get_mandos_dbus_object(bus=MockBus())
 
1076
        self.assertIsInstance(mockbus, MockBus)
 
1077
        self.assertTrue(mockbus.called)
 
1078
 
 
1079
    def test_logs_and_exits_on_dbus_error(self):
 
1080
        class MockBusFailing(object):
 
1081
            def get_object(self, busname, dbus_path):
 
1082
                raise dbus.exceptions.DBusException("Test")
 
1083
 
 
1084
        with self.assertLogs(log, logging.CRITICAL):
 
1085
            with self.assertRaises(SystemExit) as e:
 
1086
                bus = get_mandos_dbus_object(bus=MockBusFailing())
 
1087
 
 
1088
        if isinstance(e.exception.code, int):
 
1089
            self.assertNotEqual(e.exception.code, 0)
 
1090
        else:
 
1091
            self.assertIsNotNone(e.exception.code)
 
1092
 
 
1093
 
 
1094
class Test_get_managed_objects(TestCaseWithAssertLogs):
 
1095
    def test_calls_and_returns_GetManagedObjects(self):
 
1096
        managed_objects = {"/clients/foo": { "Name": "foo"}}
 
1097
        class MockObjectManager(object):
 
1098
            def GetManagedObjects(self):
 
1099
                return managed_objects
 
1100
        retval = get_managed_objects(MockObjectManager())
 
1101
        self.assertDictEqual(managed_objects, retval)
 
1102
 
 
1103
    def test_logs_and_exits_on_dbus_error(self):
1415
1104
        dbus_logger = logging.getLogger("dbus.proxies")
1416
1105
 
1417
 
        def func():
1418
 
            dbus_logger.error("Test")
1419
 
            raise mock_dbus_python.exceptions.DBusException()
1420
 
 
1421
 
        mock_dbus_python = self.MockDBusPython_func(func)
1422
 
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1106
        class MockObjectManagerFailing(object):
 
1107
            def GetManagedObjects(self):
 
1108
                dbus_logger.error("Test")
 
1109
                raise dbus.exceptions.DBusException("Test")
1423
1110
 
1424
1111
        class CountingHandler(logging.Handler):
1425
1112
            count = 0
1431
1118
        dbus_logger.addHandler(counting_handler)
1432
1119
 
1433
1120
        try:
1434
 
            with self.assertRaises(dbus.Error) as e:
1435
 
                self.call_method(bus, "methodname", "busname",
1436
 
                                 "objectpath", "interface")
 
1121
            with self.assertLogs(log, logging.CRITICAL) as watcher:
 
1122
                with self.assertRaises(SystemExit) as e:
 
1123
                    get_managed_objects(MockObjectManagerFailing())
1437
1124
        finally:
1438
1125
            dbus_logger.removeFilter(counting_handler)
1439
1126
 
1440
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
1441
 
 
1442
1127
        # Make sure the dbus logger was suppressed
1443
 
        self.assertEqual(0, counting_handler.count)
1444
 
 
1445
 
    def test_get_object_converts_to_correct_exception(self):
1446
 
        bus = dbus_python_adapter.SystemBus(
1447
 
            self.fake_dbus_python_raises_exception_on_connect)
1448
 
        with self.assertRaises(dbus.ConnectFailed):
1449
 
            self.call_method(bus, "methodname", "busname",
1450
 
                             "objectpath", "interface")
1451
 
 
1452
 
    class fake_dbus_python_raises_exception_on_connect(object):
1453
 
        """fake dbus-python module"""
1454
 
        class exceptions(object):
1455
 
            """Pseudo-namespace"""
1456
 
            class DBusException(Exception):
1457
 
                pass
1458
 
 
1459
 
        @classmethod
1460
 
        def SystemBus(cls):
1461
 
            def get_object(busname, objectpath):
1462
 
                raise cls.exceptions.DBusException()
1463
 
            Bus = collections.namedtuple("Bus", ["get_object"])
1464
 
            return Bus(get_object=get_object)
1465
 
 
1466
 
 
1467
 
class Test_dbus_python_adapter_CachingBus(unittest.TestCase):
1468
 
    class mock_dbus_python(object):
1469
 
        """mock dbus-python modules"""
1470
 
        class SystemBus(object):
1471
 
            @staticmethod
1472
 
            def get_object(busname, objectpath):
1473
 
                return Unique()
1474
 
 
1475
 
    def setUp(self):
1476
 
        self.bus = dbus_python_adapter.CachingBus(
1477
 
            self.mock_dbus_python)
1478
 
 
1479
 
    def test_returns_distinct_objectpaths(self):
1480
 
        obj1 = self.bus.get_object("busname", "objectpath1")
1481
 
        self.assertIsInstance(obj1, Unique)
1482
 
        obj2 = self.bus.get_object("busname", "objectpath2")
1483
 
        self.assertIsInstance(obj2, Unique)
1484
 
        self.assertIsNot(obj1, obj2)
1485
 
 
1486
 
    def test_returns_distinct_busnames(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)
1492
 
 
1493
 
    def test_returns_distinct_both(self):
1494
 
        obj1 = self.bus.get_object("busname1", "objectpath")
1495
 
        self.assertIsInstance(obj1, Unique)
1496
 
        obj2 = self.bus.get_object("busname2", "objectpath")
1497
 
        self.assertIsInstance(obj2, Unique)
1498
 
        self.assertIsNot(obj1, obj2)
1499
 
 
1500
 
    def test_returns_same(self):
1501
 
        obj1 = self.bus.get_object("busname", "objectpath")
1502
 
        self.assertIsInstance(obj1, Unique)
1503
 
        obj2 = self.bus.get_object("busname", "objectpath")
1504
 
        self.assertIsInstance(obj2, Unique)
1505
 
        self.assertIs(obj1, obj2)
1506
 
 
1507
 
    def test_returns_same_old(self):
1508
 
        obj1 = self.bus.get_object("busname1", "objectpath1")
1509
 
        self.assertIsInstance(obj1, Unique)
1510
 
        obj2 = self.bus.get_object("busname2", "objectpath2")
1511
 
        self.assertIsInstance(obj2, Unique)
1512
 
        obj1b = self.bus.get_object("busname1", "objectpath1")
1513
 
        self.assertIsInstance(obj1b, Unique)
1514
 
        self.assertIsNot(obj1, obj2)
1515
 
        self.assertIsNot(obj2, obj1b)
1516
 
        self.assertIs(obj1, obj1b)
 
1128
        self.assertEqual(counting_handler.count, 0)
 
1129
 
 
1130
        # Test that the dbus_logger still works
 
1131
        with self.assertLogs(dbus_logger, logging.ERROR):
 
1132
            dbus_logger.error("Test")
 
1133
 
 
1134
        if isinstance(e.exception.code, int):
 
1135
            self.assertNotEqual(e.exception.code, 0)
 
1136
        else:
 
1137
            self.assertIsNotNone(e.exception.code)
1517
1138
 
1518
1139
 
1519
1140
class Test_commands_from_options(unittest.TestCase):
1520
 
 
1521
1141
    def setUp(self):
1522
1142
        self.parser = argparse.ArgumentParser()
1523
1143
        add_command_line_options(self.parser)
1524
1144
 
1525
1145
    def test_is_enabled(self):
1526
 
        self.assert_command_from_args(["--is-enabled", "client"],
1527
 
                                      command.IsEnabled)
 
1146
        self.assert_command_from_args(["--is-enabled", "foo"],
 
1147
                                      IsEnabledCmd)
1528
1148
 
1529
1149
    def assert_command_from_args(self, args, command_cls,
1530
1150
                                 **cmd_attrs):
1533
1153
        options = self.parser.parse_args(args)
1534
1154
        check_option_syntax(self.parser, options)
1535
1155
        commands = commands_from_options(options)
1536
 
        self.assertEqual(1, len(commands))
 
1156
        self.assertEqual(len(commands), 1)
1537
1157
        command = commands[0]
1538
1158
        self.assertIsInstance(command, command_cls)
1539
1159
        for key, value in cmd_attrs.items():
1540
 
            self.assertEqual(value, getattr(command, key))
 
1160
            self.assertEqual(getattr(command, key), value)
1541
1161
 
1542
1162
    def test_is_enabled_short(self):
1543
 
        self.assert_command_from_args(["-V", "client"],
1544
 
                                      command.IsEnabled)
 
1163
        self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
1545
1164
 
1546
1165
    def test_approve(self):
1547
 
        self.assert_command_from_args(["--approve", "client"],
1548
 
                                      command.Approve)
 
1166
        self.assert_command_from_args(["--approve", "foo"],
 
1167
                                      ApproveCmd)
1549
1168
 
1550
1169
    def test_approve_short(self):
1551
 
        self.assert_command_from_args(["-A", "client"],
1552
 
                                      command.Approve)
 
1170
        self.assert_command_from_args(["-A", "foo"], ApproveCmd)
1553
1171
 
1554
1172
    def test_deny(self):
1555
 
        self.assert_command_from_args(["--deny", "client"],
1556
 
                                      command.Deny)
 
1173
        self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1557
1174
 
1558
1175
    def test_deny_short(self):
1559
 
        self.assert_command_from_args(["-D", "client"], command.Deny)
 
1176
        self.assert_command_from_args(["-D", "foo"], DenyCmd)
1560
1177
 
1561
1178
    def test_remove(self):
1562
 
        self.assert_command_from_args(["--remove", "client"],
1563
 
                                      command.Remove)
 
1179
        self.assert_command_from_args(["--remove", "foo"],
 
1180
                                      RemoveCmd)
1564
1181
 
1565
1182
    def test_deny_before_remove(self):
1566
1183
        options = self.parser.parse_args(["--deny", "--remove",
1567
 
                                          "client"])
 
1184
                                          "foo"])
1568
1185
        check_option_syntax(self.parser, options)
1569
1186
        commands = commands_from_options(options)
1570
 
        self.assertEqual(2, len(commands))
1571
 
        self.assertIsInstance(commands[0], command.Deny)
1572
 
        self.assertIsInstance(commands[1], command.Remove)
 
1187
        self.assertEqual(len(commands), 2)
 
1188
        self.assertIsInstance(commands[0], DenyCmd)
 
1189
        self.assertIsInstance(commands[1], RemoveCmd)
1573
1190
 
1574
1191
    def test_deny_before_remove_reversed(self):
1575
1192
        options = self.parser.parse_args(["--remove", "--deny",
1576
1193
                                          "--all"])
1577
1194
        check_option_syntax(self.parser, options)
1578
1195
        commands = commands_from_options(options)
1579
 
        self.assertEqual(2, len(commands))
1580
 
        self.assertIsInstance(commands[0], command.Deny)
1581
 
        self.assertIsInstance(commands[1], command.Remove)
 
1196
        self.assertEqual(len(commands), 2)
 
1197
        self.assertIsInstance(commands[0], DenyCmd)
 
1198
        self.assertIsInstance(commands[1], RemoveCmd)
1582
1199
 
1583
1200
    def test_remove_short(self):
1584
 
        self.assert_command_from_args(["-r", "client"],
1585
 
                                      command.Remove)
 
1201
        self.assert_command_from_args(["-r", "foo"], RemoveCmd)
1586
1202
 
1587
1203
    def test_dump_json(self):
1588
 
        self.assert_command_from_args(["--dump-json"],
1589
 
                                      command.DumpJSON)
 
1204
        self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1590
1205
 
1591
1206
    def test_enable(self):
1592
 
        self.assert_command_from_args(["--enable", "client"],
1593
 
                                      command.Enable)
 
1207
        self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1594
1208
 
1595
1209
    def test_enable_short(self):
1596
 
        self.assert_command_from_args(["-e", "client"],
1597
 
                                      command.Enable)
 
1210
        self.assert_command_from_args(["-e", "foo"], EnableCmd)
1598
1211
 
1599
1212
    def test_disable(self):
1600
 
        self.assert_command_from_args(["--disable", "client"],
1601
 
                                      command.Disable)
 
1213
        self.assert_command_from_args(["--disable", "foo"],
 
1214
                                      DisableCmd)
1602
1215
 
1603
1216
    def test_disable_short(self):
1604
 
        self.assert_command_from_args(["-d", "client"],
1605
 
                                      command.Disable)
 
1217
        self.assert_command_from_args(["-d", "foo"], DisableCmd)
1606
1218
 
1607
1219
    def test_bump_timeout(self):
1608
 
        self.assert_command_from_args(["--bump-timeout", "client"],
1609
 
                                      command.BumpTimeout)
 
1220
        self.assert_command_from_args(["--bump-timeout", "foo"],
 
1221
                                      BumpTimeoutCmd)
1610
1222
 
1611
1223
    def test_bump_timeout_short(self):
1612
 
        self.assert_command_from_args(["-b", "client"],
1613
 
                                      command.BumpTimeout)
 
1224
        self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
1614
1225
 
1615
1226
    def test_start_checker(self):
1616
 
        self.assert_command_from_args(["--start-checker", "client"],
1617
 
                                      command.StartChecker)
 
1227
        self.assert_command_from_args(["--start-checker", "foo"],
 
1228
                                      StartCheckerCmd)
1618
1229
 
1619
1230
    def test_stop_checker(self):
1620
 
        self.assert_command_from_args(["--stop-checker", "client"],
1621
 
                                      command.StopChecker)
 
1231
        self.assert_command_from_args(["--stop-checker", "foo"],
 
1232
                                      StopCheckerCmd)
1622
1233
 
1623
1234
    def test_approve_by_default(self):
1624
 
        self.assert_command_from_args(["--approve-by-default",
1625
 
                                       "client"],
1626
 
                                      command.ApproveByDefault)
 
1235
        self.assert_command_from_args(["--approve-by-default", "foo"],
 
1236
                                      ApproveByDefaultCmd)
1627
1237
 
1628
1238
    def test_deny_by_default(self):
1629
 
        self.assert_command_from_args(["--deny-by-default", "client"],
1630
 
                                      command.DenyByDefault)
 
1239
        self.assert_command_from_args(["--deny-by-default", "foo"],
 
1240
                                      DenyByDefaultCmd)
1631
1241
 
1632
1242
    def test_checker(self):
1633
 
        self.assert_command_from_args(["--checker", ":", "client"],
1634
 
                                      command.SetChecker,
1635
 
                                      value_to_set=":")
 
1243
        self.assert_command_from_args(["--checker", ":", "foo"],
 
1244
                                      SetCheckerCmd, value_to_set=":")
1636
1245
 
1637
1246
    def test_checker_empty(self):
1638
 
        self.assert_command_from_args(["--checker", "", "client"],
1639
 
                                      command.SetChecker,
1640
 
                                      value_to_set="")
 
1247
        self.assert_command_from_args(["--checker", "", "foo"],
 
1248
                                      SetCheckerCmd, value_to_set="")
1641
1249
 
1642
1250
    def test_checker_short(self):
1643
 
        self.assert_command_from_args(["-c", ":", "client"],
1644
 
                                      command.SetChecker,
1645
 
                                      value_to_set=":")
 
1251
        self.assert_command_from_args(["-c", ":", "foo"],
 
1252
                                      SetCheckerCmd, value_to_set=":")
1646
1253
 
1647
1254
    def test_host(self):
1648
 
        self.assert_command_from_args(
1649
 
            ["--host", "client.example.org", "client"],
1650
 
            command.SetHost, value_to_set="client.example.org")
 
1255
        self.assert_command_from_args(["--host", "foo.example.org",
 
1256
                                       "foo"], SetHostCmd,
 
1257
                                      value_to_set="foo.example.org")
1651
1258
 
1652
1259
    def test_host_short(self):
1653
 
        self.assert_command_from_args(
1654
 
            ["-H", "client.example.org", "client"], command.SetHost,
1655
 
            value_to_set="client.example.org")
 
1260
        self.assert_command_from_args(["-H", "foo.example.org",
 
1261
                                       "foo"], SetHostCmd,
 
1262
                                      value_to_set="foo.example.org")
1656
1263
 
1657
1264
    def test_secret_devnull(self):
1658
1265
        self.assert_command_from_args(["--secret", os.path.devnull,
1659
 
                                       "client"], command.SetSecret,
 
1266
                                       "foo"], SetSecretCmd,
1660
1267
                                      value_to_set=b"")
1661
1268
 
1662
1269
    def test_secret_tempfile(self):
1665
1272
            f.write(value)
1666
1273
            f.seek(0)
1667
1274
            self.assert_command_from_args(["--secret", f.name,
1668
 
                                           "client"],
1669
 
                                          command.SetSecret,
 
1275
                                           "foo"], SetSecretCmd,
1670
1276
                                          value_to_set=value)
1671
1277
 
1672
1278
    def test_secret_devnull_short(self):
1673
 
        self.assert_command_from_args(["-s", os.path.devnull,
1674
 
                                       "client"], command.SetSecret,
1675
 
                                      value_to_set=b"")
 
1279
        self.assert_command_from_args(["-s", os.path.devnull, "foo"],
 
1280
                                      SetSecretCmd, value_to_set=b"")
1676
1281
 
1677
1282
    def test_secret_tempfile_short(self):
1678
1283
        with tempfile.NamedTemporaryFile(mode="r+b") as f:
1679
1284
            value = b"secret\0xyzzy\nbar"
1680
1285
            f.write(value)
1681
1286
            f.seek(0)
1682
 
            self.assert_command_from_args(["-s", f.name, "client"],
1683
 
                                          command.SetSecret,
 
1287
            self.assert_command_from_args(["-s", f.name, "foo"],
 
1288
                                          SetSecretCmd,
1684
1289
                                          value_to_set=value)
1685
1290
 
1686
1291
    def test_timeout(self):
1687
 
        self.assert_command_from_args(["--timeout", "PT5M", "client"],
1688
 
                                      command.SetTimeout,
 
1292
        self.assert_command_from_args(["--timeout", "PT5M", "foo"],
 
1293
                                      SetTimeoutCmd,
1689
1294
                                      value_to_set=300000)
1690
1295
 
1691
1296
    def test_timeout_short(self):
1692
 
        self.assert_command_from_args(["-t", "PT5M", "client"],
1693
 
                                      command.SetTimeout,
 
1297
        self.assert_command_from_args(["-t", "PT5M", "foo"],
 
1298
                                      SetTimeoutCmd,
1694
1299
                                      value_to_set=300000)
1695
1300
 
1696
1301
    def test_extended_timeout(self):
1697
1302
        self.assert_command_from_args(["--extended-timeout", "PT15M",
1698
 
                                       "client"],
1699
 
                                      command.SetExtendedTimeout,
 
1303
                                       "foo"],
 
1304
                                      SetExtendedTimeoutCmd,
1700
1305
                                      value_to_set=900000)
1701
1306
 
1702
1307
    def test_interval(self):
1703
 
        self.assert_command_from_args(["--interval", "PT2M",
1704
 
                                       "client"], command.SetInterval,
 
1308
        self.assert_command_from_args(["--interval", "PT2M", "foo"],
 
1309
                                      SetIntervalCmd,
1705
1310
                                      value_to_set=120000)
1706
1311
 
1707
1312
    def test_interval_short(self):
1708
 
        self.assert_command_from_args(["-i", "PT2M", "client"],
1709
 
                                      command.SetInterval,
 
1313
        self.assert_command_from_args(["-i", "PT2M", "foo"],
 
1314
                                      SetIntervalCmd,
1710
1315
                                      value_to_set=120000)
1711
1316
 
1712
1317
    def test_approval_delay(self):
1713
1318
        self.assert_command_from_args(["--approval-delay", "PT30S",
1714
 
                                       "client"],
1715
 
                                      command.SetApprovalDelay,
 
1319
                                       "foo"], SetApprovalDelayCmd,
1716
1320
                                      value_to_set=30000)
1717
1321
 
1718
1322
    def test_approval_duration(self):
1719
1323
        self.assert_command_from_args(["--approval-duration", "PT1S",
1720
 
                                       "client"],
1721
 
                                      command.SetApprovalDuration,
 
1324
                                       "foo"], SetApprovalDurationCmd,
1722
1325
                                      value_to_set=1000)
1723
1326
 
1724
1327
    def test_print_table(self):
1725
 
        self.assert_command_from_args([], command.PrintTable,
 
1328
        self.assert_command_from_args([], PrintTableCmd,
1726
1329
                                      verbose=False)
1727
1330
 
1728
1331
    def test_print_table_verbose(self):
1729
 
        self.assert_command_from_args(["--verbose"],
1730
 
                                      command.PrintTable,
 
1332
        self.assert_command_from_args(["--verbose"], PrintTableCmd,
1731
1333
                                      verbose=True)
1732
1334
 
1733
1335
    def test_print_table_verbose_short(self):
1734
 
        self.assert_command_from_args(["-v"], command.PrintTable,
 
1336
        self.assert_command_from_args(["-v"], PrintTableCmd,
1735
1337
                                      verbose=True)
1736
1338
 
1737
1339
 
1738
 
class TestCommand(unittest.TestCase):
 
1340
class TestCmd(unittest.TestCase):
1739
1341
    """Abstract class for tests of command classes"""
1740
1342
 
1741
 
    class FakeMandosBus(dbus.MandosBus):
1742
 
        def __init__(self, testcase):
1743
 
            self.client_properties = {
 
1343
    def setUp(self):
 
1344
        testcase = self
 
1345
        class MockClient(object):
 
1346
            def __init__(self, name, **attributes):
 
1347
                self.__dbus_object_path__ = "/clients/{}".format(name)
 
1348
                self.attributes = attributes
 
1349
                self.attributes["Name"] = name
 
1350
                self.calls = []
 
1351
            def Set(self, interface, propname, value, dbus_interface):
 
1352
                testcase.assertEqual(interface, client_dbus_interface)
 
1353
                testcase.assertEqual(dbus_interface,
 
1354
                                     dbus.PROPERTIES_IFACE)
 
1355
                self.attributes[propname] = value
 
1356
            def Get(self, interface, propname, dbus_interface):
 
1357
                testcase.assertEqual(interface, client_dbus_interface)
 
1358
                testcase.assertEqual(dbus_interface,
 
1359
                                     dbus.PROPERTIES_IFACE)
 
1360
                return self.attributes[propname]
 
1361
            def Approve(self, approve, dbus_interface):
 
1362
                testcase.assertEqual(dbus_interface,
 
1363
                                     client_dbus_interface)
 
1364
                self.calls.append(("Approve", (approve,
 
1365
                                               dbus_interface)))
 
1366
        self.client = MockClient(
 
1367
            "foo",
 
1368
            KeyID=("92ed150794387c03ce684574b1139a65"
 
1369
                   "94a34f895daaaf09fd8ea90a27cddb12"),
 
1370
            Secret=b"secret",
 
1371
            Host="foo.example.org",
 
1372
            Enabled=dbus.Boolean(True),
 
1373
            Timeout=300000,
 
1374
            LastCheckedOK="2019-02-03T00:00:00",
 
1375
            Created="2019-01-02T00:00:00",
 
1376
            Interval=120000,
 
1377
            Fingerprint=("778827225BA7DE539C5A"
 
1378
                         "7CFA59CFF7CDBD9A5920"),
 
1379
            CheckerRunning=dbus.Boolean(False),
 
1380
            LastEnabled="2019-01-03T00:00:00",
 
1381
            ApprovalPending=dbus.Boolean(False),
 
1382
            ApprovedByDefault=dbus.Boolean(True),
 
1383
            LastApprovalRequest="",
 
1384
            ApprovalDelay=0,
 
1385
            ApprovalDuration=1000,
 
1386
            Checker="fping -q -- %(host)s",
 
1387
            ExtendedTimeout=900000,
 
1388
            Expires="2019-02-04T00:00:00",
 
1389
            LastCheckerStatus=0)
 
1390
        self.other_client = MockClient(
 
1391
            "barbar",
 
1392
            KeyID=("0558568eedd67d622f5c83b35a115f79"
 
1393
                   "6ab612cff5ad227247e46c2b020f441c"),
 
1394
            Secret=b"secretbar",
 
1395
            Host="192.0.2.3",
 
1396
            Enabled=dbus.Boolean(True),
 
1397
            Timeout=300000,
 
1398
            LastCheckedOK="2019-02-04T00:00:00",
 
1399
            Created="2019-01-03T00:00:00",
 
1400
            Interval=120000,
 
1401
            Fingerprint=("3E393AEAEFB84C7E89E2"
 
1402
                         "F547B3A107558FCA3A27"),
 
1403
            CheckerRunning=dbus.Boolean(True),
 
1404
            LastEnabled="2019-01-04T00:00:00",
 
1405
            ApprovalPending=dbus.Boolean(False),
 
1406
            ApprovedByDefault=dbus.Boolean(False),
 
1407
            LastApprovalRequest="2019-01-03T00:00:00",
 
1408
            ApprovalDelay=30000,
 
1409
            ApprovalDuration=93785000,
 
1410
            Checker=":",
 
1411
            ExtendedTimeout=900000,
 
1412
            Expires="2019-02-05T00:00:00",
 
1413
            LastCheckerStatus=-2)
 
1414
        self.clients =  collections.OrderedDict(
 
1415
            [
 
1416
                ("/clients/foo", self.client.attributes),
 
1417
                ("/clients/barbar", self.other_client.attributes),
 
1418
            ])
 
1419
        self.one_client = {"/clients/foo": self.client.attributes}
 
1420
 
 
1421
    @property
 
1422
    def bus(self):
 
1423
        class Bus(object):
 
1424
            @staticmethod
 
1425
            def get_object(client_bus_name, path):
 
1426
                self.assertEqual(client_bus_name, dbus_busname)
 
1427
                return {
 
1428
                    # Note: "self" here is the TestCmd instance, not
 
1429
                    # the Bus instance, since this is a static method!
 
1430
                    "/clients/foo": self.client,
 
1431
                    "/clients/barbar": self.other_client,
 
1432
                }[path]
 
1433
        return Bus()
 
1434
 
 
1435
 
 
1436
class TestIsEnabledCmd(TestCmd):
 
1437
    def test_is_enabled(self):
 
1438
        self.assertTrue(all(IsEnabledCmd().is_enabled(client,
 
1439
                                                      properties)
 
1440
                            for client, properties
 
1441
                            in self.clients.items()))
 
1442
 
 
1443
    def test_is_enabled_run_exits_successfully(self):
 
1444
        with self.assertRaises(SystemExit) as e:
 
1445
            IsEnabledCmd().run(self.one_client)
 
1446
        if e.exception.code is not None:
 
1447
            self.assertEqual(e.exception.code, 0)
 
1448
        else:
 
1449
            self.assertIsNone(e.exception.code)
 
1450
 
 
1451
    def test_is_enabled_run_exits_with_failure(self):
 
1452
        self.client.attributes["Enabled"] = dbus.Boolean(False)
 
1453
        with self.assertRaises(SystemExit) as e:
 
1454
            IsEnabledCmd().run(self.one_client)
 
1455
        if isinstance(e.exception.code, int):
 
1456
            self.assertNotEqual(e.exception.code, 0)
 
1457
        else:
 
1458
            self.assertIsNotNone(e.exception.code)
 
1459
 
 
1460
 
 
1461
class TestApproveCmd(TestCmd):
 
1462
    def test_approve(self):
 
1463
        ApproveCmd().run(self.clients, self.bus)
 
1464
        for clientpath in self.clients:
 
1465
            client = self.bus.get_object(dbus_busname, clientpath)
 
1466
            self.assertIn(("Approve", (True, client_dbus_interface)),
 
1467
                          client.calls)
 
1468
 
 
1469
 
 
1470
class TestDenyCmd(TestCmd):
 
1471
    def test_deny(self):
 
1472
        DenyCmd().run(self.clients, self.bus)
 
1473
        for clientpath in self.clients:
 
1474
            client = self.bus.get_object(dbus_busname, clientpath)
 
1475
            self.assertIn(("Approve", (False, client_dbus_interface)),
 
1476
                          client.calls)
 
1477
 
 
1478
 
 
1479
class TestRemoveCmd(TestCmd):
 
1480
    def test_remove(self):
 
1481
        class MockMandos(object):
 
1482
            def __init__(self):
 
1483
                self.calls = []
 
1484
            def RemoveClient(self, dbus_path):
 
1485
                self.calls.append(("RemoveClient", (dbus_path,)))
 
1486
        mandos = MockMandos()
 
1487
        super(TestRemoveCmd, self).setUp()
 
1488
        RemoveCmd().run(self.clients, self.bus, mandos)
 
1489
        self.assertEqual(len(mandos.calls), 2)
 
1490
        for clientpath in self.clients:
 
1491
            self.assertIn(("RemoveClient", (clientpath,)),
 
1492
                          mandos.calls)
 
1493
 
 
1494
 
 
1495
class TestDumpJSONCmd(TestCmd):
 
1496
    def setUp(self):
 
1497
        self.expected_json = {
 
1498
            "foo": {
1744
1499
                "Name": "foo",
1745
1500
                "KeyID": ("92ed150794387c03ce684574b1139a65"
1746
1501
                          "94a34f895daaaf09fd8ea90a27cddb12"),
1747
 
                "Secret": b"secret",
1748
1502
                "Host": "foo.example.org",
1749
1503
                "Enabled": True,
1750
1504
                "Timeout": 300000,
1764
1518
                "ExtendedTimeout": 900000,
1765
1519
                "Expires": "2019-02-04T00:00:00",
1766
1520
                "LastCheckerStatus": 0,
1767
 
            }
1768
 
            self.other_client_properties = {
 
1521
            },
 
1522
            "barbar": {
1769
1523
                "Name": "barbar",
1770
1524
                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
1771
1525
                          "6ab612cff5ad227247e46c2b020f441c"),
1772
 
                "Secret": b"secretbar",
1773
1526
                "Host": "192.0.2.3",
1774
1527
                "Enabled": True,
1775
1528
                "Timeout": 300000,
1789
1542
                "ExtendedTimeout": 900000,
1790
1543
                "Expires": "2019-02-05T00:00:00",
1791
1544
                "LastCheckerStatus": -2,
1792
 
            }
1793
 
            self.clients =  collections.OrderedDict(
1794
 
                [
1795
 
                    ("client_objectpath", self.client_properties),
1796
 
                    ("other_client_objectpath",
1797
 
                     self.other_client_properties),
1798
 
                ])
1799
 
            self.one_client = {"client_objectpath":
1800
 
                               self.client_properties}
1801
 
            self.testcase = testcase
1802
 
            self.calls = []
1803
 
 
1804
 
        def call_method(self, methodname, busname, objectpath,
1805
 
                        interface, *args):
1806
 
            self.testcase.assertEqual("se.recompile.Mandos", busname)
1807
 
            self.calls.append((methodname, busname, objectpath,
1808
 
                               interface, args))
1809
 
            if interface == "org.freedesktop.DBus.Properties":
1810
 
                if methodname == "Set":
1811
 
                    self.testcase.assertEqual(3, len(args))
1812
 
                    interface, key, value = args
1813
 
                    self.testcase.assertEqual(
1814
 
                        "se.recompile.Mandos.Client", interface)
1815
 
                    self.clients[objectpath][key] = value
1816
 
                    return
1817
 
            elif interface == "se.recompile.Mandos":
1818
 
                self.testcase.assertEqual("RemoveClient", methodname)
1819
 
                self.testcase.assertEqual(1, len(args))
1820
 
                clientpath = args[0]
1821
 
                del self.clients[clientpath]
1822
 
                return
1823
 
            elif interface == "se.recompile.Mandos.Client":
1824
 
                if methodname == "Approve":
1825
 
                    self.testcase.assertEqual(1, len(args))
1826
 
                    return
1827
 
            raise ValueError()
1828
 
 
1829
 
    def setUp(self):
1830
 
        self.bus = self.FakeMandosBus(self)
1831
 
 
1832
 
 
1833
 
class TestBaseCommands(TestCommand):
1834
 
 
1835
 
    def test_IsEnabled_exits_successfully(self):
1836
 
        with self.assertRaises(SystemExit) as e:
1837
 
            command.IsEnabled().run(self.bus.one_client)
1838
 
        if e.exception.code is not None:
1839
 
            self.assertEqual(0, e.exception.code)
1840
 
        else:
1841
 
            self.assertIsNone(e.exception.code)
1842
 
 
1843
 
    def test_IsEnabled_exits_with_failure(self):
1844
 
        self.bus.client_properties["Enabled"] = False
1845
 
        with self.assertRaises(SystemExit) as e:
1846
 
            command.IsEnabled().run(self.bus.one_client)
1847
 
        if isinstance(e.exception.code, int):
1848
 
            self.assertNotEqual(0, e.exception.code)
1849
 
        else:
1850
 
            self.assertIsNotNone(e.exception.code)
1851
 
 
1852
 
    def test_Approve(self):
1853
 
        busname = "se.recompile.Mandos"
1854
 
        client_interface = "se.recompile.Mandos.Client"
1855
 
        command.Approve().run(self.bus.clients, self.bus)
1856
 
        for clientpath in self.bus.clients:
1857
 
            self.assertIn(("Approve", busname, clientpath,
1858
 
                           client_interface, (True,)), self.bus.calls)
1859
 
 
1860
 
    def test_Deny(self):
1861
 
        busname = "se.recompile.Mandos"
1862
 
        client_interface = "se.recompile.Mandos.Client"
1863
 
        command.Deny().run(self.bus.clients, self.bus)
1864
 
        for clientpath in self.bus.clients:
1865
 
            self.assertIn(("Approve", busname, clientpath,
1866
 
                           client_interface, (False,)),
1867
 
                          self.bus.calls)
1868
 
 
1869
 
    def test_Remove(self):
1870
 
        command.Remove().run(self.bus.clients, self.bus)
1871
 
        for clientpath in self.bus.clients:
1872
 
            self.assertIn(("RemoveClient", dbus_busname,
1873
 
                           dbus_server_path, dbus_server_interface,
1874
 
                           (clientpath,)), self.bus.calls)
1875
 
 
1876
 
    expected_json = {
1877
 
        "foo": {
1878
 
            "Name": "foo",
1879
 
            "KeyID": ("92ed150794387c03ce684574b1139a65"
1880
 
                      "94a34f895daaaf09fd8ea90a27cddb12"),
1881
 
            "Host": "foo.example.org",
1882
 
            "Enabled": True,
1883
 
            "Timeout": 300000,
1884
 
            "LastCheckedOK": "2019-02-03T00:00:00",
1885
 
            "Created": "2019-01-02T00:00:00",
1886
 
            "Interval": 120000,
1887
 
            "Fingerprint": ("778827225BA7DE539C5A"
1888
 
                            "7CFA59CFF7CDBD9A5920"),
1889
 
            "CheckerRunning": False,
1890
 
            "LastEnabled": "2019-01-03T00:00:00",
1891
 
            "ApprovalPending": False,
1892
 
            "ApprovedByDefault": True,
1893
 
            "LastApprovalRequest": "",
1894
 
            "ApprovalDelay": 0,
1895
 
            "ApprovalDuration": 1000,
1896
 
            "Checker": "fping -q -- %(host)s",
1897
 
            "ExtendedTimeout": 900000,
1898
 
            "Expires": "2019-02-04T00:00:00",
1899
 
            "LastCheckerStatus": 0,
1900
 
        },
1901
 
        "barbar": {
1902
 
            "Name": "barbar",
1903
 
            "KeyID": ("0558568eedd67d622f5c83b35a115f79"
1904
 
                      "6ab612cff5ad227247e46c2b020f441c"),
1905
 
            "Host": "192.0.2.3",
1906
 
            "Enabled": True,
1907
 
            "Timeout": 300000,
1908
 
            "LastCheckedOK": "2019-02-04T00:00:00",
1909
 
            "Created": "2019-01-03T00:00:00",
1910
 
            "Interval": 120000,
1911
 
            "Fingerprint": ("3E393AEAEFB84C7E89E2"
1912
 
                            "F547B3A107558FCA3A27"),
1913
 
            "CheckerRunning": True,
1914
 
            "LastEnabled": "2019-01-04T00:00:00",
1915
 
            "ApprovalPending": False,
1916
 
            "ApprovedByDefault": False,
1917
 
            "LastApprovalRequest": "2019-01-03T00:00:00",
1918
 
            "ApprovalDelay": 30000,
1919
 
            "ApprovalDuration": 93785000,
1920
 
            "Checker": ":",
1921
 
            "ExtendedTimeout": 900000,
1922
 
            "Expires": "2019-02-05T00:00:00",
1923
 
            "LastCheckerStatus": -2,
1924
 
        },
1925
 
    }
1926
 
 
1927
 
    def test_DumpJSON_normal(self):
1928
 
        with self.capture_stdout_to_buffer() as buffer:
1929
 
            command.DumpJSON().run(self.bus.clients)
1930
 
        json_data = json.loads(buffer.getvalue())
1931
 
        self.assertDictEqual(self.expected_json, json_data)
1932
 
 
1933
 
    @staticmethod
1934
 
    @contextlib.contextmanager
1935
 
    def capture_stdout_to_buffer():
1936
 
        capture_buffer = io.StringIO()
1937
 
        old_stdout = sys.stdout
1938
 
        sys.stdout = capture_buffer
1939
 
        try:
1940
 
            yield capture_buffer
1941
 
        finally:
1942
 
            sys.stdout = old_stdout
1943
 
 
1944
 
    def test_DumpJSON_one_client(self):
1945
 
        with self.capture_stdout_to_buffer() as buffer:
1946
 
            command.DumpJSON().run(self.bus.one_client)
1947
 
        json_data = json.loads(buffer.getvalue())
 
1545
            },
 
1546
        }
 
1547
        return super(TestDumpJSONCmd, self).setUp()
 
1548
 
 
1549
    def test_normal(self):
 
1550
        output = DumpJSONCmd().output(self.clients.values())
 
1551
        json_data = json.loads(output)
 
1552
        self.assertDictEqual(json_data, self.expected_json)
 
1553
 
 
1554
    def test_one_client(self):
 
1555
        output = DumpJSONCmd().output(self.one_client.values())
 
1556
        json_data = json.loads(output)
1948
1557
        expected_json = {"foo": self.expected_json["foo"]}
1949
 
        self.assertDictEqual(expected_json, json_data)
1950
 
 
1951
 
    def test_PrintTable_normal(self):
1952
 
        with self.capture_stdout_to_buffer() as buffer:
1953
 
            command.PrintTable().run(self.bus.clients)
 
1558
        self.assertDictEqual(json_data, expected_json)
 
1559
 
 
1560
 
 
1561
class TestPrintTableCmd(TestCmd):
 
1562
    def test_normal(self):
 
1563
        output = PrintTableCmd().output(self.clients.values())
1954
1564
        expected_output = "\n".join((
1955
1565
            "Name   Enabled Timeout  Last Successful Check",
1956
1566
            "foo    Yes     00:05:00 2019-02-03T00:00:00  ",
1957
1567
            "barbar Yes     00:05:00 2019-02-04T00:00:00  ",
1958
 
        )) + "\n"
1959
 
        self.assertEqual(expected_output, buffer.getvalue())
 
1568
        ))
 
1569
        self.assertEqual(output, expected_output)
1960
1570
 
1961
 
    def test_PrintTable_verbose(self):
1962
 
        with self.capture_stdout_to_buffer() as buffer:
1963
 
            command.PrintTable(verbose=True).run(self.bus.clients)
 
1571
    def test_verbose(self):
 
1572
        output = PrintTableCmd(verbose=True).output(
 
1573
            self.clients.values())
1964
1574
        columns = (
1965
1575
            (
1966
1576
                "Name   ",
2048
1658
            )
2049
1659
        )
2050
1660
        num_lines = max(len(rows) for rows in columns)
2051
 
        expected_output = ("\n".join("".join(rows[line]
2052
 
                                             for rows in columns)
2053
 
                                     for line in range(num_lines))
2054
 
                           + "\n")
2055
 
        self.assertEqual(expected_output, buffer.getvalue())
 
1661
        expected_output = "\n".join("".join(rows[line]
 
1662
                                            for rows in columns)
 
1663
                                    for line in range(num_lines))
 
1664
        self.assertEqual(output, expected_output)
2056
1665
 
2057
 
    def test_PrintTable_one_client(self):
2058
 
        with self.capture_stdout_to_buffer() as buffer:
2059
 
            command.PrintTable().run(self.bus.one_client)
 
1666
    def test_one_client(self):
 
1667
        output = PrintTableCmd().output(self.one_client.values())
2060
1668
        expected_output = "\n".join((
2061
1669
            "Name Enabled Timeout  Last Successful Check",
2062
1670
            "foo  Yes     00:05:00 2019-02-03T00:00:00  ",
2063
 
        )) + "\n"
2064
 
        self.assertEqual(expected_output, buffer.getvalue())
2065
 
 
2066
 
 
2067
 
class TestPropertySetterCmd(TestCommand):
2068
 
    """Abstract class for tests of command.PropertySetter classes"""
2069
 
 
 
1671
        ))
 
1672
        self.assertEqual(output, expected_output)
 
1673
 
 
1674
 
 
1675
class TestPropertyCmd(TestCmd):
 
1676
    """Abstract class for tests of PropertyCmd classes"""
2070
1677
    def runTest(self):
2071
1678
        if not hasattr(self, "command"):
2072
 
            return              # Abstract TestCase class
2073
 
 
2074
 
        if hasattr(self, "values_to_set"):
2075
 
            cmd_args = [(value,) for value in self.values_to_set]
2076
 
            values_to_get = getattr(self, "values_to_get",
2077
 
                                    self.values_to_set)
2078
 
        else:
2079
 
            cmd_args = [() for x in range(len(self.values_to_get))]
2080
 
            values_to_get = self.values_to_get
2081
 
        for value_to_get, cmd_arg in zip(values_to_get, cmd_args):
2082
 
            for clientpath in self.bus.clients:
2083
 
                self.bus.clients[clientpath][self.propname] = (
2084
 
                    Unique())
2085
 
            self.command(*cmd_arg).run(self.bus.clients, self.bus)
2086
 
            for clientpath in self.bus.clients:
2087
 
                value = (self.bus.clients[clientpath]
2088
 
                         [self.propname])
2089
 
                self.assertNotIsInstance(value, Unique)
2090
 
                self.assertEqual(value_to_get, value)
2091
 
 
2092
 
 
2093
 
class TestEnableCmd(TestPropertySetterCmd):
2094
 
    command = command.Enable
2095
 
    propname = "Enabled"
2096
 
    values_to_get = [True]
2097
 
 
2098
 
 
2099
 
class TestDisableCmd(TestPropertySetterCmd):
2100
 
    command = command.Disable
2101
 
    propname = "Enabled"
2102
 
    values_to_get = [False]
2103
 
 
2104
 
 
2105
 
class TestBumpTimeoutCmd(TestPropertySetterCmd):
2106
 
    command = command.BumpTimeout
 
1679
            return
 
1680
        values_to_get = getattr(self, "values_to_get",
 
1681
                                self.values_to_set)
 
1682
        for value_to_set, value_to_get in zip(self.values_to_set,
 
1683
                                              values_to_get):
 
1684
            for clientpath in self.clients:
 
1685
                client = self.bus.get_object(dbus_busname, clientpath)
 
1686
                old_value = client.attributes[self.propname]
 
1687
                self.assertNotIsInstance(old_value, self.Unique)
 
1688
                client.attributes[self.propname] = self.Unique()
 
1689
            self.run_command(value_to_set, self.clients)
 
1690
            for clientpath in self.clients:
 
1691
                client = self.bus.get_object(dbus_busname, clientpath)
 
1692
                value = client.attributes[self.propname]
 
1693
                self.assertNotIsInstance(value, self.Unique)
 
1694
                self.assertEqual(value, value_to_get)
 
1695
 
 
1696
    class Unique(object):
 
1697
        """Class for objects which exist only to be unique objects,
 
1698
since unittest.mock.sentinel only exists in Python 3.3"""
 
1699
 
 
1700
    def run_command(self, value, clients):
 
1701
        self.command().run(clients, self.bus)
 
1702
 
 
1703
 
 
1704
class TestEnableCmd(TestPropertyCmd):
 
1705
    command = EnableCmd
 
1706
    propname = "Enabled"
 
1707
    values_to_set = [dbus.Boolean(True)]
 
1708
 
 
1709
 
 
1710
class TestDisableCmd(TestPropertyCmd):
 
1711
    command = DisableCmd
 
1712
    propname = "Enabled"
 
1713
    values_to_set = [dbus.Boolean(False)]
 
1714
 
 
1715
 
 
1716
class TestBumpTimeoutCmd(TestPropertyCmd):
 
1717
    command = BumpTimeoutCmd
2107
1718
    propname = "LastCheckedOK"
2108
 
    values_to_get = [""]
2109
 
 
2110
 
 
2111
 
class TestStartCheckerCmd(TestPropertySetterCmd):
2112
 
    command = command.StartChecker
2113
 
    propname = "CheckerRunning"
2114
 
    values_to_get = [True]
2115
 
 
2116
 
 
2117
 
class TestStopCheckerCmd(TestPropertySetterCmd):
2118
 
    command = command.StopChecker
2119
 
    propname = "CheckerRunning"
2120
 
    values_to_get = [False]
2121
 
 
2122
 
 
2123
 
class TestApproveByDefaultCmd(TestPropertySetterCmd):
2124
 
    command = command.ApproveByDefault
2125
 
    propname = "ApprovedByDefault"
2126
 
    values_to_get = [True]
2127
 
 
2128
 
 
2129
 
class TestDenyByDefaultCmd(TestPropertySetterCmd):
2130
 
    command = command.DenyByDefault
2131
 
    propname = "ApprovedByDefault"
2132
 
    values_to_get = [False]
2133
 
 
2134
 
 
2135
 
class TestSetCheckerCmd(TestPropertySetterCmd):
2136
 
    command = command.SetChecker
 
1719
    values_to_set = [""]
 
1720
 
 
1721
 
 
1722
class TestStartCheckerCmd(TestPropertyCmd):
 
1723
    command = StartCheckerCmd
 
1724
    propname = "CheckerRunning"
 
1725
    values_to_set = [dbus.Boolean(True)]
 
1726
 
 
1727
 
 
1728
class TestStopCheckerCmd(TestPropertyCmd):
 
1729
    command = StopCheckerCmd
 
1730
    propname = "CheckerRunning"
 
1731
    values_to_set = [dbus.Boolean(False)]
 
1732
 
 
1733
 
 
1734
class TestApproveByDefaultCmd(TestPropertyCmd):
 
1735
    command = ApproveByDefaultCmd
 
1736
    propname = "ApprovedByDefault"
 
1737
    values_to_set = [dbus.Boolean(True)]
 
1738
 
 
1739
 
 
1740
class TestDenyByDefaultCmd(TestPropertyCmd):
 
1741
    command = DenyByDefaultCmd
 
1742
    propname = "ApprovedByDefault"
 
1743
    values_to_set = [dbus.Boolean(False)]
 
1744
 
 
1745
 
 
1746
class TestPropertyValueCmd(TestPropertyCmd):
 
1747
    """Abstract class for tests of PropertyValueCmd classes"""
 
1748
 
 
1749
    def runTest(self):
 
1750
        if type(self) is TestPropertyValueCmd:
 
1751
            return
 
1752
        return super(TestPropertyValueCmd, self).runTest()
 
1753
 
 
1754
    def run_command(self, value, clients):
 
1755
        self.command(value).run(clients, self.bus)
 
1756
 
 
1757
 
 
1758
class TestSetCheckerCmd(TestPropertyValueCmd):
 
1759
    command = SetCheckerCmd
2137
1760
    propname = "Checker"
2138
1761
    values_to_set = ["", ":", "fping -q -- %s"]
2139
1762
 
2140
1763
 
2141
 
class TestSetHostCmd(TestPropertySetterCmd):
2142
 
    command = command.SetHost
 
1764
class TestSetHostCmd(TestPropertyValueCmd):
 
1765
    command = SetHostCmd
2143
1766
    propname = "Host"
2144
 
    values_to_set = ["192.0.2.3", "client.example.org"]
2145
 
 
2146
 
 
2147
 
class TestSetSecretCmd(TestPropertySetterCmd):
2148
 
    command = command.SetSecret
 
1767
    values_to_set = ["192.0.2.3", "foo.example.org"]
 
1768
 
 
1769
 
 
1770
class TestSetSecretCmd(TestPropertyValueCmd):
 
1771
    command = SetSecretCmd
2149
1772
    propname = "Secret"
2150
1773
    values_to_set = [io.BytesIO(b""),
2151
1774
                     io.BytesIO(b"secret\0xyzzy\nbar")]
2152
 
    values_to_get = [f.getvalue() for f in values_to_set]
2153
 
 
2154
 
 
2155
 
class TestSetTimeoutCmd(TestPropertySetterCmd):
2156
 
    command = command.SetTimeout
 
1775
    values_to_get = [b"", b"secret\0xyzzy\nbar"]
 
1776
 
 
1777
 
 
1778
class TestSetTimeoutCmd(TestPropertyValueCmd):
 
1779
    command = SetTimeoutCmd
2157
1780
    propname = "Timeout"
2158
1781
    values_to_set = [datetime.timedelta(),
2159
1782
                     datetime.timedelta(minutes=5),
2160
1783
                     datetime.timedelta(seconds=1),
2161
1784
                     datetime.timedelta(weeks=1),
2162
1785
                     datetime.timedelta(weeks=52)]
2163
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2164
 
 
2165
 
 
2166
 
class TestSetExtendedTimeoutCmd(TestPropertySetterCmd):
2167
 
    command = command.SetExtendedTimeout
 
1786
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1787
 
 
1788
 
 
1789
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
 
1790
    command = SetExtendedTimeoutCmd
2168
1791
    propname = "ExtendedTimeout"
2169
1792
    values_to_set = [datetime.timedelta(),
2170
1793
                     datetime.timedelta(minutes=5),
2171
1794
                     datetime.timedelta(seconds=1),
2172
1795
                     datetime.timedelta(weeks=1),
2173
1796
                     datetime.timedelta(weeks=52)]
2174
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2175
 
 
2176
 
 
2177
 
class TestSetIntervalCmd(TestPropertySetterCmd):
2178
 
    command = command.SetInterval
 
1797
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1798
 
 
1799
 
 
1800
class TestSetIntervalCmd(TestPropertyValueCmd):
 
1801
    command = SetIntervalCmd
2179
1802
    propname = "Interval"
2180
1803
    values_to_set = [datetime.timedelta(),
2181
1804
                     datetime.timedelta(minutes=5),
2182
1805
                     datetime.timedelta(seconds=1),
2183
1806
                     datetime.timedelta(weeks=1),
2184
1807
                     datetime.timedelta(weeks=52)]
2185
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2186
 
 
2187
 
 
2188
 
class TestSetApprovalDelayCmd(TestPropertySetterCmd):
2189
 
    command = command.SetApprovalDelay
 
1808
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1809
 
 
1810
 
 
1811
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
 
1812
    command = SetApprovalDelayCmd
2190
1813
    propname = "ApprovalDelay"
2191
1814
    values_to_set = [datetime.timedelta(),
2192
1815
                     datetime.timedelta(minutes=5),
2193
1816
                     datetime.timedelta(seconds=1),
2194
1817
                     datetime.timedelta(weeks=1),
2195
1818
                     datetime.timedelta(weeks=52)]
2196
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2197
 
 
2198
 
 
2199
 
class TestSetApprovalDurationCmd(TestPropertySetterCmd):
2200
 
    command = command.SetApprovalDuration
 
1819
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1820
 
 
1821
 
 
1822
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
 
1823
    command = SetApprovalDurationCmd
2201
1824
    propname = "ApprovalDuration"
2202
1825
    values_to_set = [datetime.timedelta(),
2203
1826
                     datetime.timedelta(minutes=5),
2204
1827
                     datetime.timedelta(seconds=1),
2205
1828
                     datetime.timedelta(weeks=1),
2206
1829
                     datetime.timedelta(weeks=52)]
2207
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
 
1830
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
2208
1831
 
2209
1832
 
2210
1833