/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-30 17:02:33 UTC
  • Revision ID: teddy@recompile.se-20190330170233-nxu3cgb98q2g3o5j
Fix typo in intro(8mandos).

* intro.xml (INTRODUCTION): Add missing period at end of last sentence
                            of penultimate paragraph.

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
48
49
 
49
 
import dbus
 
50
import dbus as dbus_python
50
51
 
51
52
# Show warnings by default
52
53
if not sys.warnoptions:
61
62
 
62
63
if sys.version_info.major == 2:
63
64
    str = unicode
 
65
    import StringIO
 
66
    io.StringIO = StringIO.StringIO
64
67
 
65
68
locale.setlocale(locale.LC_ALL, "")
66
69
 
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
73
70
version = "1.8.3"
74
71
 
75
72
 
76
 
try:
77
 
    dbus.OBJECT_MANAGER_IFACE
78
 
except AttributeError:
79
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
80
 
 
81
 
 
82
73
def main():
83
74
    parser = argparse.ArgumentParser()
84
 
 
85
75
    add_command_line_options(parser)
86
76
 
87
77
    options = parser.parse_args()
88
 
 
89
78
    check_option_syntax(parser, options)
90
79
 
91
80
    clientnames = options.client
93
82
    if options.debug:
94
83
        log.setLevel(logging.DEBUG)
95
84
 
96
 
    try:
97
 
        bus = dbus.SystemBus()
98
 
        log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
99
 
                  dbus_busname, server_dbus_path)
100
 
        mandos_dbus_objc = bus.get_object(dbus_busname,
101
 
                                          server_dbus_path)
102
 
    except dbus.exceptions.DBusException:
103
 
        log.critical("Could not connect to Mandos server")
104
 
        sys.exit(1)
105
 
 
106
 
    mandos_serv = dbus.Interface(mandos_dbus_objc,
107
 
                                 dbus_interface=server_dbus_interface)
108
 
    mandos_serv_object_manager = dbus.Interface(
109
 
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
110
 
 
111
 
    # Filter out log message from dbus module
112
 
    dbus_logger = logging.getLogger("dbus.proxies")
113
 
    class NullFilter(logging.Filter):
114
 
        def filter(self, record):
115
 
            return False
116
 
    dbus_filter = NullFilter()
117
 
    try:
118
 
        dbus_logger.addFilter(dbus_filter)
119
 
        log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", dbus_busname,
120
 
                  server_dbus_path, dbus.OBJECT_MANAGER_IFACE)
121
 
        mandos_clients = {path: ifs_and_props[client_dbus_interface]
122
 
                          for path, ifs_and_props in
123
 
                          mandos_serv_object_manager
124
 
                          .GetManagedObjects().items()
125
 
                          if client_dbus_interface in ifs_and_props}
126
 
    except dbus.exceptions.DBusException as e:
127
 
        log.critical("Failed to access Mandos server through D-Bus:"
128
 
                     "\n%s", e)
129
 
        sys.exit(1)
130
 
    finally:
131
 
        # restore dbus logger
132
 
        dbus_logger.removeFilter(dbus_filter)
133
 
 
134
 
    # Compile dict of (clients: properties) to process
135
 
    clients = {}
136
 
 
 
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
 
 
97
    # Compile dict of (clientpath: properties) to process
137
98
    if not clientnames:
138
 
        clients = {objpath: properties
139
 
                   for objpath, properties in mandos_clients.items()}
 
99
        clients = all_clients
140
100
    else:
 
101
        clients = {}
141
102
        for name in clientnames:
142
 
            for objpath, properties in mandos_clients.items():
 
103
            for objpath, properties in all_clients.items():
143
104
                if properties["Name"] == name:
144
105
                    clients[objpath] = properties
145
106
                    break
147
108
                log.critical("Client not found on server: %r", name)
148
109
                sys.exit(1)
149
110
 
150
 
    # Run all commands on clients
151
111
    commands = commands_from_options(options)
 
112
 
152
113
    for command in commands:
153
 
        command.run(clients, bus, mandos_serv)
 
114
        command.run(clients, bus)
154
115
 
155
116
 
156
117
def add_command_line_options(parser):
254
215
    >>> rfc3339_duration_to_delta("")
255
216
    Traceback (most recent call last):
256
217
    ...
257
 
    ValueError: Invalid RFC 3339 duration: u''
 
218
    ValueError: Invalid RFC 3339 duration: ""
258
219
    >>> # Must start with "P":
259
220
    >>> rfc3339_duration_to_delta("1D")
260
221
    Traceback (most recent call last):
261
222
    ...
262
 
    ValueError: Invalid RFC 3339 duration: u'1D'
 
223
    ValueError: Invalid RFC 3339 duration: "1D"
263
224
    >>> # Must use correct order
264
225
    >>> rfc3339_duration_to_delta("PT1S2M")
265
226
    Traceback (most recent call last):
266
227
    ...
267
 
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
 
228
    ValueError: Invalid RFC 3339 duration: "PT1S2M"
268
229
    >>> # Time needs time marker
269
230
    >>> rfc3339_duration_to_delta("P1H2S")
270
231
    Traceback (most recent call last):
271
232
    ...
272
 
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
 
233
    ValueError: Invalid RFC 3339 duration: "P1H2S"
273
234
    >>> # Weeks can not be combined with anything else
274
235
    >>> rfc3339_duration_to_delta("P1D2W")
275
236
    Traceback (most recent call last):
276
237
    ...
277
 
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
 
238
    ValueError: Invalid RFC 3339 duration: "P1D2W"
278
239
    >>> rfc3339_duration_to_delta("P2W2H")
279
240
    Traceback (most recent call last):
280
241
    ...
281
 
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
 
242
    ValueError: Invalid RFC 3339 duration: "P2W2H"
282
243
    """
283
244
 
284
245
    # Parsing an RFC 3339 duration with regular expressions is not
355
316
                break
356
317
        else:
357
318
            # No currently valid tokens were found
358
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
319
            raise ValueError("Invalid RFC 3339 duration: \"{}\""
359
320
                             .format(duration))
360
321
    # End token found
361
322
    return value
446
407
        options.remove = True
447
408
 
448
409
 
 
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
 
550
 
 
551
 
449
552
def commands_from_options(options):
450
553
 
451
554
    commands = []
452
555
 
453
556
    if options.is_enabled:
454
 
        commands.append(IsEnabledCmd())
 
557
        commands.append(command.IsEnabled())
455
558
 
456
559
    if options.approve:
457
 
        commands.append(ApproveCmd())
 
560
        commands.append(command.Approve())
458
561
 
459
562
    if options.deny:
460
 
        commands.append(DenyCmd())
 
563
        commands.append(command.Deny())
461
564
 
462
565
    if options.remove:
463
 
        commands.append(RemoveCmd())
 
566
        commands.append(command.Remove())
464
567
 
465
568
    if options.dump_json:
466
 
        commands.append(DumpJSONCmd())
 
569
        commands.append(command.DumpJSON())
467
570
 
468
571
    if options.enable:
469
 
        commands.append(EnableCmd())
 
572
        commands.append(command.Enable())
470
573
 
471
574
    if options.disable:
472
 
        commands.append(DisableCmd())
 
575
        commands.append(command.Disable())
473
576
 
474
577
    if options.bump_timeout:
475
 
        commands.append(BumpTimeoutCmd())
 
578
        commands.append(command.BumpTimeout())
476
579
 
477
580
    if options.start_checker:
478
 
        commands.append(StartCheckerCmd())
 
581
        commands.append(command.StartChecker())
479
582
 
480
583
    if options.stop_checker:
481
 
        commands.append(StopCheckerCmd())
 
584
        commands.append(command.StopChecker())
482
585
 
483
586
    if options.approved_by_default is not None:
484
587
        if options.approved_by_default:
485
 
            commands.append(ApproveByDefaultCmd())
 
588
            commands.append(command.ApproveByDefault())
486
589
        else:
487
 
            commands.append(DenyByDefaultCmd())
 
590
            commands.append(command.DenyByDefault())
488
591
 
489
592
    if options.checker is not None:
490
 
        commands.append(SetCheckerCmd(options.checker))
 
593
        commands.append(command.SetChecker(options.checker))
491
594
 
492
595
    if options.host is not None:
493
 
        commands.append(SetHostCmd(options.host))
 
596
        commands.append(command.SetHost(options.host))
494
597
 
495
598
    if options.secret is not None:
496
 
        commands.append(SetSecretCmd(options.secret))
 
599
        commands.append(command.SetSecret(options.secret))
497
600
 
498
601
    if options.timeout is not None:
499
 
        commands.append(SetTimeoutCmd(options.timeout))
 
602
        commands.append(command.SetTimeout(options.timeout))
500
603
 
501
604
    if options.extended_timeout:
502
605
        commands.append(
503
 
            SetExtendedTimeoutCmd(options.extended_timeout))
 
606
            command.SetExtendedTimeout(options.extended_timeout))
504
607
 
505
608
    if options.interval is not None:
506
 
        commands.append(SetIntervalCmd(options.interval))
 
609
        commands.append(command.SetInterval(options.interval))
507
610
 
508
611
    if options.approval_delay is not None:
509
 
        commands.append(SetApprovalDelayCmd(options.approval_delay))
 
612
        commands.append(
 
613
            command.SetApprovalDelay(options.approval_delay))
510
614
 
511
615
    if options.approval_duration is not None:
512
616
        commands.append(
513
 
            SetApprovalDurationCmd(options.approval_duration))
 
617
            command.SetApprovalDuration(options.approval_duration))
514
618
 
515
619
    # If no command option has been given, show table of clients,
516
620
    # optionally verbosely
517
621
    if not commands:
518
 
        commands.append(PrintTableCmd(verbose=options.verbose))
 
622
        commands.append(command.PrintTable(verbose=options.verbose))
519
623
 
520
624
    return commands
521
625
 
522
626
 
523
 
class Command(object):
524
 
    """Abstract class for commands"""
525
 
    def run(self, clients, bus=None, mandos=None):
526
 
        """Normal commands should implement run_on_one_client(), but
527
 
        commands which want to operate on all clients at the same time
528
 
        can override this run() method instead."""
529
 
        self.mandos = mandos
530
 
        for clientpath, properties in clients.items():
531
 
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
532
 
                      dbus_busname, str(clientpath))
533
 
            client = bus.get_object(dbus_busname, clientpath)
534
 
            self.run_on_one_client(client, properties)
535
 
 
536
 
 
537
 
class IsEnabledCmd(Command):
538
 
    def run(self, clients, bus=None, mandos=None):
539
 
        client, properties = next(iter(clients.items()))
540
 
        if self.is_enabled(client, properties):
541
 
            sys.exit(0)
542
 
        sys.exit(1)
543
 
    def is_enabled(self, client, properties):
544
 
        return properties["Enabled"]
545
 
 
546
 
 
547
 
class ApproveCmd(Command):
548
 
    def run_on_one_client(self, client, properties):
549
 
        log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
550
 
                  client.__dbus_object_path__, client_dbus_interface)
551
 
        client.Approve(dbus.Boolean(True),
552
 
                       dbus_interface=client_dbus_interface)
553
 
 
554
 
 
555
 
class DenyCmd(Command):
556
 
    def run_on_one_client(self, client, properties):
557
 
        log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
558
 
                  client.__dbus_object_path__, client_dbus_interface)
559
 
        client.Approve(dbus.Boolean(False),
560
 
                       dbus_interface=client_dbus_interface)
561
 
 
562
 
 
563
 
class RemoveCmd(Command):
564
 
    def run_on_one_client(self, client, properties):
565
 
        log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
566
 
                  server_dbus_path, server_dbus_interface,
567
 
                  str(client.__dbus_object_path__))
568
 
        self.mandos.RemoveClient(client.__dbus_object_path__)
569
 
 
570
 
 
571
 
class OutputCmd(Command):
572
 
    """Abstract class for commands outputting client details"""
573
 
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
574
 
                    "Created", "Interval", "Host", "KeyID",
575
 
                    "Fingerprint", "CheckerRunning", "LastEnabled",
576
 
                    "ApprovalPending", "ApprovedByDefault",
577
 
                    "LastApprovalRequest", "ApprovalDelay",
578
 
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
579
 
                    "Expires", "LastCheckerStatus")
580
 
 
581
 
    def run(self, clients, bus=None, mandos=None):
582
 
        print(self.output(clients.values()))
583
 
 
584
 
    def output(self, clients):
585
 
        raise NotImplementedError()
586
 
 
587
 
 
588
 
class DumpJSONCmd(OutputCmd):
589
 
    def output(self, clients):
590
 
        data = {client["Name"]:
591
 
                {key: self.dbus_boolean_to_bool(client[key])
592
 
                 for key in self.all_keywords}
593
 
                for client in clients.values()}
594
 
        return json.dumps(data, indent=4, separators=(',', ': '))
595
 
 
596
 
    @staticmethod
597
 
    def dbus_boolean_to_bool(value):
598
 
        if isinstance(value, dbus.Boolean):
599
 
            value = bool(value)
600
 
        return value
601
 
 
602
 
 
603
 
class PrintTableCmd(OutputCmd):
604
 
    def __init__(self, verbose=False):
605
 
        self.verbose = verbose
606
 
 
607
 
    def output(self, clients):
608
 
        default_keywords = ("Name", "Enabled", "Timeout",
609
 
                            "LastCheckedOK")
610
 
        keywords = default_keywords
611
 
        if self.verbose:
612
 
            keywords = self.all_keywords
613
 
        return str(self.TableOfClients(clients, keywords))
614
 
 
615
 
    class TableOfClients(object):
616
 
        tableheaders = {
617
 
            "Name": "Name",
618
 
            "Enabled": "Enabled",
619
 
            "Timeout": "Timeout",
620
 
            "LastCheckedOK": "Last Successful Check",
621
 
            "LastApprovalRequest": "Last Approval Request",
622
 
            "Created": "Created",
623
 
            "Interval": "Interval",
624
 
            "Host": "Host",
625
 
            "Fingerprint": "Fingerprint",
626
 
            "KeyID": "Key ID",
627
 
            "CheckerRunning": "Check Is Running",
628
 
            "LastEnabled": "Last Enabled",
629
 
            "ApprovalPending": "Approval Is Pending",
630
 
            "ApprovedByDefault": "Approved By Default",
631
 
            "ApprovalDelay": "Approval Delay",
632
 
            "ApprovalDuration": "Approval Duration",
633
 
            "Checker": "Checker",
634
 
            "ExtendedTimeout": "Extended Timeout",
635
 
            "Expires": "Expires",
636
 
            "LastCheckerStatus": "Last Checker Status",
637
 
        }
638
 
 
639
 
        def __init__(self, clients, keywords, tableheaders=None):
640
 
            self.clients = clients
641
 
            self.keywords = keywords
642
 
            if tableheaders is not None:
643
 
                self.tableheaders = tableheaders
644
 
 
645
 
        def __str__(self):
646
 
            return "\n".join(self.rows())
647
 
 
648
 
        if sys.version_info.major == 2:
649
 
            __unicode__ = __str__
 
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
 
650
727
            def __str__(self):
651
 
                return str(self).encode(locale.getpreferredencoding())
652
 
 
653
 
        def rows(self):
654
 
            format_string = self.row_formatting_string()
655
 
            rows = [self.header_line(format_string)]
656
 
            rows.extend(self.client_line(client, format_string)
657
 
                        for client in self.clients)
658
 
            return rows
659
 
 
660
 
        def row_formatting_string(self):
661
 
            "Format string used to format table rows"
662
 
            return " ".join("{{{key}:{width}}}".format(
663
 
                width=max(len(self.tableheaders[key]),
664
 
                          *(len(self.string_from_client(client, key))
665
 
                            for client in self.clients)),
666
 
                key=key)
667
 
                            for key in self.keywords)
668
 
 
669
 
        def string_from_client(self, client, key):
670
 
            return self.valuetostring(client[key], key)
671
 
 
672
 
        @classmethod
673
 
        def valuetostring(cls, value, keyword):
674
 
            if isinstance(value, dbus.Boolean):
675
 
                return "Yes" if value else "No"
676
 
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
677
 
                           "ApprovalDuration", "ExtendedTimeout"):
678
 
                return cls.milliseconds_to_string(value)
679
 
            return str(value)
680
 
 
681
 
        def header_line(self, format_string):
682
 
            return format_string.format(**self.tableheaders)
683
 
 
684
 
        def client_line(self, client, format_string):
685
 
            return format_string.format(
686
 
                **{key: self.string_from_client(client, key)
687
 
                   for key in self.keywords})
688
 
 
689
 
        @staticmethod
690
 
        def milliseconds_to_string(ms):
691
 
            td = datetime.timedelta(0, 0, 0, ms)
692
 
            return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
693
 
                    .format(days="{}T".format(td.days)
694
 
                            if td.days else "",
695
 
                            hours=td.seconds // 3600,
696
 
                            minutes=(td.seconds % 3600) // 60,
697
 
                            seconds=td.seconds % 60))
698
 
 
699
 
 
700
 
class PropertyCmd(Command):
701
 
    """Abstract class for Actions for setting one client property"""
702
 
 
703
 
    def run_on_one_client(self, client, properties):
704
 
        """Set the Client's D-Bus property"""
705
 
        log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
706
 
                  client.__dbus_object_path__,
707
 
                  dbus.PROPERTIES_IFACE, client_dbus_interface,
708
 
                  self.propname, self.value_to_set
709
 
                  if not isinstance(self.value_to_set, dbus.Boolean)
710
 
                  else bool(self.value_to_set))
711
 
        client.Set(client_dbus_interface, self.propname,
712
 
                   self.value_to_set,
713
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
714
 
 
715
 
    @property
716
 
    def propname(self):
717
 
        raise NotImplementedError()
718
 
 
719
 
 
720
 
class EnableCmd(PropertyCmd):
721
 
    propname = "Enabled"
722
 
    value_to_set = dbus.Boolean(True)
723
 
 
724
 
 
725
 
class DisableCmd(PropertyCmd):
726
 
    propname = "Enabled"
727
 
    value_to_set = dbus.Boolean(False)
728
 
 
729
 
 
730
 
class BumpTimeoutCmd(PropertyCmd):
731
 
    propname = "LastCheckedOK"
732
 
    value_to_set = ""
733
 
 
734
 
 
735
 
class StartCheckerCmd(PropertyCmd):
736
 
    propname = "CheckerRunning"
737
 
    value_to_set = dbus.Boolean(True)
738
 
 
739
 
 
740
 
class StopCheckerCmd(PropertyCmd):
741
 
    propname = "CheckerRunning"
742
 
    value_to_set = dbus.Boolean(False)
743
 
 
744
 
 
745
 
class ApproveByDefaultCmd(PropertyCmd):
746
 
    propname = "ApprovedByDefault"
747
 
    value_to_set = dbus.Boolean(True)
748
 
 
749
 
 
750
 
class DenyByDefaultCmd(PropertyCmd):
751
 
    propname = "ApprovedByDefault"
752
 
    value_to_set = dbus.Boolean(False)
753
 
 
754
 
 
755
 
class PropertyValueCmd(PropertyCmd):
756
 
    """Abstract class for PropertyCmd recieving a value as argument"""
757
 
    def __init__(self, value):
758
 
        self.value_to_set = value
759
 
 
760
 
 
761
 
class SetCheckerCmd(PropertyValueCmd):
762
 
    propname = "Checker"
763
 
 
764
 
 
765
 
class SetHostCmd(PropertyValueCmd):
766
 
    propname = "Host"
767
 
 
768
 
 
769
 
class SetSecretCmd(PropertyValueCmd):
770
 
    propname = "Secret"
771
 
 
772
 
    @property
773
 
    def value_to_set(self):
774
 
        return self._vts
775
 
 
776
 
    @value_to_set.setter
777
 
    def value_to_set(self, value):
778
 
        """When setting, read data from supplied file object"""
779
 
        self._vts = value.read()
780
 
        value.close()
781
 
 
782
 
 
783
 
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
784
 
    """Abstract class for PropertyValueCmd taking a value argument as
785
 
a datetime.timedelta() but should store it as milliseconds."""
786
 
 
787
 
    @property
788
 
    def value_to_set(self):
789
 
        return self._vts
790
 
 
791
 
    @value_to_set.setter
792
 
    def value_to_set(self, value):
793
 
        """When setting, convert value from a datetime.timedelta"""
794
 
        self._vts = int(round(value.total_seconds() * 1000))
795
 
 
796
 
 
797
 
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
798
 
    propname = "Timeout"
799
 
 
800
 
 
801
 
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
802
 
    propname = "ExtendedTimeout"
803
 
 
804
 
 
805
 
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
806
 
    propname = "Interval"
807
 
 
808
 
 
809
 
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
810
 
    propname = "ApprovalDelay"
811
 
 
812
 
 
813
 
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
814
 
    propname = "ApprovalDuration"
 
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"
815
894
 
816
895
 
817
896
 
818
 
class Test_string_to_delta(unittest.TestCase):
819
 
    def test_handles_basic_rfc3339(self):
820
 
        self.assertEqual(string_to_delta("PT0S"),
821
 
                         datetime.timedelta())
822
 
        self.assertEqual(string_to_delta("P0D"),
823
 
                         datetime.timedelta())
824
 
        self.assertEqual(string_to_delta("PT1S"),
825
 
                         datetime.timedelta(0, 1))
826
 
        self.assertEqual(string_to_delta("PT2H"),
827
 
                         datetime.timedelta(0, 7200))
 
897
class TestCaseWithAssertLogs(unittest.TestCase):
 
898
    """unittest.TestCase.assertLogs only exists in Python 3.4"""
 
899
 
 
900
    if not hasattr(unittest.TestCase, "assertLogs"):
 
901
        @contextlib.contextmanager
 
902
        def assertLogs(self, logger, level=logging.INFO):
 
903
            capturing_handler = self.CapturingLevelHandler(level)
 
904
            old_level = logger.level
 
905
            old_propagate = logger.propagate
 
906
            logger.addHandler(capturing_handler)
 
907
            logger.setLevel(level)
 
908
            logger.propagate = False
 
909
            try:
 
910
                yield capturing_handler.watcher
 
911
            finally:
 
912
                logger.propagate = old_propagate
 
913
                logger.removeHandler(capturing_handler)
 
914
                logger.setLevel(old_level)
 
915
            self.assertGreater(len(capturing_handler.watcher.records),
 
916
                               0)
 
917
 
 
918
        class CapturingLevelHandler(logging.Handler):
 
919
            def __init__(self, level, *args, **kwargs):
 
920
                logging.Handler.__init__(self, *args, **kwargs)
 
921
                self.watcher = self.LoggingWatcher([], [])
 
922
            def emit(self, record):
 
923
                self.watcher.records.append(record)
 
924
                self.watcher.output.append(self.format(record))
 
925
 
 
926
            LoggingWatcher = collections.namedtuple("LoggingWatcher",
 
927
                                                    ("records",
 
928
                                                     "output"))
 
929
 
 
930
 
 
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
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"))
828
955
 
829
956
    def test_falls_back_to_pre_1_6_1_with_warning(self):
830
 
        # assertLogs only exists in Python 3.4
831
 
        if hasattr(self, "assertLogs"):
832
 
            with self.assertLogs(log, logging.WARNING):
833
 
                value = string_to_delta("2h")
834
 
        else:
835
 
            class WarningFilter(logging.Filter):
836
 
                """Don't show, but record the presence of, warnings"""
837
 
                def filter(self, record):
838
 
                    is_warning = record.levelno >= logging.WARNING
839
 
                    self.found = is_warning or getattr(self, "found",
840
 
                                                       False)
841
 
                    return not is_warning
842
 
            warning_filter = WarningFilter()
843
 
            log.addFilter(warning_filter)
844
 
            try:
845
 
                value = string_to_delta("2h")
846
 
            finally:
847
 
                log.removeFilter(warning_filter)
848
 
            self.assertTrue(getattr(warning_filter, "found", False))
849
 
        self.assertEqual(value, datetime.timedelta(0, 7200))
 
957
        with self.assertLogs(log, logging.WARNING):
 
958
            value = string_to_delta("2h")
 
959
        self.assertEqual(datetime.timedelta(0, 7200), value)
850
960
 
851
961
 
852
962
class Test_check_option_syntax(unittest.TestCase):
890
1000
    @contextlib.contextmanager
891
1001
    def assertParseError(self):
892
1002
        with self.assertRaises(SystemExit) as e:
893
 
            with self.temporarily_suppress_stderr():
 
1003
            with self.redirect_stderr_to_devnull():
894
1004
                yield
895
1005
        # Exit code from argparse is guaranteed to be "2".  Reference:
896
1006
        # https://docs.python.org/3/library
897
1007
        # /argparse.html#exiting-methods
898
 
        self.assertEqual(e.exception.code, 2)
 
1008
        self.assertEqual(2, e.exception.code)
899
1009
 
900
1010
    @staticmethod
901
1011
    @contextlib.contextmanager
902
 
    def temporarily_suppress_stderr():
903
 
        null = os.open(os.path.devnull, os.O_RDWR)
904
 
        stderrcopy = os.dup(sys.stderr.fileno())
905
 
        os.dup2(null, sys.stderr.fileno())
906
 
        os.close(null)
907
 
        try:
908
 
            yield
909
 
        finally:
910
 
            # restore stderr
911
 
            os.dup2(stderrcopy, sys.stderr.fileno())
912
 
            os.close(stderrcopy)
 
1012
    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
913
1020
 
914
1021
    def check_option_syntax(self, options):
915
1022
        check_option_syntax(self.parser, options)
916
1023
 
917
 
    def test_actions_conflicts_with_verbose(self):
918
 
        for action, value in self.actions.items():
919
 
            options = self.parser.parse_args()
920
 
            setattr(options, action, value)
921
 
            options.verbose = True
 
1024
    def test_actions_all_conflicts_with_verbose(self):
 
1025
        for action, value in self.actions.items():
 
1026
            options = self.parser.parse_args()
 
1027
            setattr(options, action, value)
 
1028
            options.all = True
 
1029
            options.verbose = True
 
1030
            with self.assertParseError():
 
1031
                self.check_option_syntax(options)
 
1032
 
 
1033
    def test_actions_with_client_conflicts_with_verbose(self):
 
1034
        for action, value in self.actions.items():
 
1035
            options = self.parser.parse_args()
 
1036
            setattr(options, action, value)
 
1037
            options.verbose = True
 
1038
            options.client = ["client"]
922
1039
            with self.assertParseError():
923
1040
                self.check_option_syntax(options)
924
1041
 
950
1067
            options.all = True
951
1068
            self.check_option_syntax(options)
952
1069
 
 
1070
    def test_any_action_is_ok_with_one_client(self):
 
1071
        for action, value in self.actions.items():
 
1072
            options = self.parser.parse_args()
 
1073
            setattr(options, action, value)
 
1074
            options.client = ["client"]
 
1075
            self.check_option_syntax(options)
 
1076
 
 
1077
    def test_one_client_with_all_actions_except_is_enabled(self):
 
1078
        options = self.parser.parse_args()
 
1079
        for action, value in self.actions.items():
 
1080
            if action == "is_enabled":
 
1081
                continue
 
1082
            setattr(options, action, value)
 
1083
        options.client = ["client"]
 
1084
        self.check_option_syntax(options)
 
1085
 
 
1086
    def test_two_clients_with_all_actions_except_is_enabled(self):
 
1087
        options = self.parser.parse_args()
 
1088
        for action, value in self.actions.items():
 
1089
            if action == "is_enabled":
 
1090
                continue
 
1091
            setattr(options, action, value)
 
1092
        options.client = ["client1", "client2"]
 
1093
        self.check_option_syntax(options)
 
1094
 
 
1095
    def test_two_clients_are_ok_with_actions_except_is_enabled(self):
 
1096
        for action, value in self.actions.items():
 
1097
            if action == "is_enabled":
 
1098
                continue
 
1099
            options = self.parser.parse_args()
 
1100
            setattr(options, action, value)
 
1101
            options.client = ["client1", "client2"]
 
1102
            self.check_option_syntax(options)
 
1103
 
953
1104
    def test_is_enabled_fails_without_client(self):
954
1105
        options = self.parser.parse_args()
955
1106
        options.is_enabled = True
956
1107
        with self.assertParseError():
957
1108
            self.check_option_syntax(options)
958
1109
 
959
 
    def test_is_enabled_works_with_one_client(self):
960
 
        options = self.parser.parse_args()
961
 
        options.is_enabled = True
962
 
        options.client = ["foo"]
963
 
        self.check_option_syntax(options)
964
 
 
965
1110
    def test_is_enabled_fails_with_two_clients(self):
966
1111
        options = self.parser.parse_args()
967
1112
        options.is_enabled = True
968
 
        options.client = ["foo", "barbar"]
 
1113
        options.client = ["client1", "client2"]
969
1114
        with self.assertParseError():
970
1115
            self.check_option_syntax(options)
971
1116
 
981
1126
                self.check_option_syntax(options)
982
1127
 
983
1128
 
 
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):
 
1415
        dbus_logger = logging.getLogger("dbus.proxies")
 
1416
 
 
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)
 
1423
 
 
1424
        class CountingHandler(logging.Handler):
 
1425
            count = 0
 
1426
            def emit(self, record):
 
1427
                self.count += 1
 
1428
 
 
1429
        counting_handler = CountingHandler()
 
1430
 
 
1431
        dbus_logger.addHandler(counting_handler)
 
1432
 
 
1433
        try:
 
1434
            with self.assertRaises(dbus.Error) as e:
 
1435
                self.call_method(bus, "methodname", "busname",
 
1436
                                 "objectpath", "interface")
 
1437
        finally:
 
1438
            dbus_logger.removeFilter(counting_handler)
 
1439
 
 
1440
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1441
 
 
1442
        # 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)
 
1517
 
 
1518
 
984
1519
class Test_commands_from_options(unittest.TestCase):
 
1520
 
985
1521
    def setUp(self):
986
1522
        self.parser = argparse.ArgumentParser()
987
1523
        add_command_line_options(self.parser)
988
1524
 
989
1525
    def test_is_enabled(self):
990
 
        self.assert_command_from_args(["--is-enabled", "foo"],
991
 
                                      IsEnabledCmd)
 
1526
        self.assert_command_from_args(["--is-enabled", "client"],
 
1527
                                      command.IsEnabled)
992
1528
 
993
1529
    def assert_command_from_args(self, args, command_cls,
994
1530
                                 **cmd_attrs):
997
1533
        options = self.parser.parse_args(args)
998
1534
        check_option_syntax(self.parser, options)
999
1535
        commands = commands_from_options(options)
1000
 
        self.assertEqual(len(commands), 1)
 
1536
        self.assertEqual(1, len(commands))
1001
1537
        command = commands[0]
1002
1538
        self.assertIsInstance(command, command_cls)
1003
1539
        for key, value in cmd_attrs.items():
1004
 
            self.assertEqual(getattr(command, key), value)
 
1540
            self.assertEqual(value, getattr(command, key))
1005
1541
 
1006
1542
    def test_is_enabled_short(self):
1007
 
        self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
 
1543
        self.assert_command_from_args(["-V", "client"],
 
1544
                                      command.IsEnabled)
1008
1545
 
1009
1546
    def test_approve(self):
1010
 
        self.assert_command_from_args(["--approve", "foo"],
1011
 
                                      ApproveCmd)
 
1547
        self.assert_command_from_args(["--approve", "client"],
 
1548
                                      command.Approve)
1012
1549
 
1013
1550
    def test_approve_short(self):
1014
 
        self.assert_command_from_args(["-A", "foo"], ApproveCmd)
 
1551
        self.assert_command_from_args(["-A", "client"],
 
1552
                                      command.Approve)
1015
1553
 
1016
1554
    def test_deny(self):
1017
 
        self.assert_command_from_args(["--deny", "foo"], DenyCmd)
 
1555
        self.assert_command_from_args(["--deny", "client"],
 
1556
                                      command.Deny)
1018
1557
 
1019
1558
    def test_deny_short(self):
1020
 
        self.assert_command_from_args(["-D", "foo"], DenyCmd)
 
1559
        self.assert_command_from_args(["-D", "client"], command.Deny)
1021
1560
 
1022
1561
    def test_remove(self):
1023
 
        self.assert_command_from_args(["--remove", "foo"],
1024
 
                                      RemoveCmd)
 
1562
        self.assert_command_from_args(["--remove", "client"],
 
1563
                                      command.Remove)
1025
1564
 
1026
1565
    def test_deny_before_remove(self):
1027
1566
        options = self.parser.parse_args(["--deny", "--remove",
1028
 
                                          "foo"])
 
1567
                                          "client"])
1029
1568
        check_option_syntax(self.parser, options)
1030
1569
        commands = commands_from_options(options)
1031
 
        self.assertEqual(len(commands), 2)
1032
 
        self.assertIsInstance(commands[0], DenyCmd)
1033
 
        self.assertIsInstance(commands[1], RemoveCmd)
 
1570
        self.assertEqual(2, len(commands))
 
1571
        self.assertIsInstance(commands[0], command.Deny)
 
1572
        self.assertIsInstance(commands[1], command.Remove)
1034
1573
 
1035
1574
    def test_deny_before_remove_reversed(self):
1036
1575
        options = self.parser.parse_args(["--remove", "--deny",
1037
1576
                                          "--all"])
1038
1577
        check_option_syntax(self.parser, options)
1039
1578
        commands = commands_from_options(options)
1040
 
        self.assertEqual(len(commands), 2)
1041
 
        self.assertIsInstance(commands[0], DenyCmd)
1042
 
        self.assertIsInstance(commands[1], RemoveCmd)
 
1579
        self.assertEqual(2, len(commands))
 
1580
        self.assertIsInstance(commands[0], command.Deny)
 
1581
        self.assertIsInstance(commands[1], command.Remove)
1043
1582
 
1044
1583
    def test_remove_short(self):
1045
 
        self.assert_command_from_args(["-r", "foo"], RemoveCmd)
 
1584
        self.assert_command_from_args(["-r", "client"],
 
1585
                                      command.Remove)
1046
1586
 
1047
1587
    def test_dump_json(self):
1048
 
        self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
 
1588
        self.assert_command_from_args(["--dump-json"],
 
1589
                                      command.DumpJSON)
1049
1590
 
1050
1591
    def test_enable(self):
1051
 
        self.assert_command_from_args(["--enable", "foo"], EnableCmd)
 
1592
        self.assert_command_from_args(["--enable", "client"],
 
1593
                                      command.Enable)
1052
1594
 
1053
1595
    def test_enable_short(self):
1054
 
        self.assert_command_from_args(["-e", "foo"], EnableCmd)
 
1596
        self.assert_command_from_args(["-e", "client"],
 
1597
                                      command.Enable)
1055
1598
 
1056
1599
    def test_disable(self):
1057
 
        self.assert_command_from_args(["--disable", "foo"],
1058
 
                                      DisableCmd)
 
1600
        self.assert_command_from_args(["--disable", "client"],
 
1601
                                      command.Disable)
1059
1602
 
1060
1603
    def test_disable_short(self):
1061
 
        self.assert_command_from_args(["-d", "foo"], DisableCmd)
 
1604
        self.assert_command_from_args(["-d", "client"],
 
1605
                                      command.Disable)
1062
1606
 
1063
1607
    def test_bump_timeout(self):
1064
 
        self.assert_command_from_args(["--bump-timeout", "foo"],
1065
 
                                      BumpTimeoutCmd)
 
1608
        self.assert_command_from_args(["--bump-timeout", "client"],
 
1609
                                      command.BumpTimeout)
1066
1610
 
1067
1611
    def test_bump_timeout_short(self):
1068
 
        self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
 
1612
        self.assert_command_from_args(["-b", "client"],
 
1613
                                      command.BumpTimeout)
1069
1614
 
1070
1615
    def test_start_checker(self):
1071
 
        self.assert_command_from_args(["--start-checker", "foo"],
1072
 
                                      StartCheckerCmd)
 
1616
        self.assert_command_from_args(["--start-checker", "client"],
 
1617
                                      command.StartChecker)
1073
1618
 
1074
1619
    def test_stop_checker(self):
1075
 
        self.assert_command_from_args(["--stop-checker", "foo"],
1076
 
                                      StopCheckerCmd)
 
1620
        self.assert_command_from_args(["--stop-checker", "client"],
 
1621
                                      command.StopChecker)
1077
1622
 
1078
1623
    def test_approve_by_default(self):
1079
 
        self.assert_command_from_args(["--approve-by-default", "foo"],
1080
 
                                      ApproveByDefaultCmd)
 
1624
        self.assert_command_from_args(["--approve-by-default",
 
1625
                                       "client"],
 
1626
                                      command.ApproveByDefault)
1081
1627
 
1082
1628
    def test_deny_by_default(self):
1083
 
        self.assert_command_from_args(["--deny-by-default", "foo"],
1084
 
                                      DenyByDefaultCmd)
 
1629
        self.assert_command_from_args(["--deny-by-default", "client"],
 
1630
                                      command.DenyByDefault)
1085
1631
 
1086
1632
    def test_checker(self):
1087
 
        self.assert_command_from_args(["--checker", ":", "foo"],
1088
 
                                      SetCheckerCmd, value_to_set=":")
 
1633
        self.assert_command_from_args(["--checker", ":", "client"],
 
1634
                                      command.SetChecker,
 
1635
                                      value_to_set=":")
1089
1636
 
1090
1637
    def test_checker_empty(self):
1091
 
        self.assert_command_from_args(["--checker", "", "foo"],
1092
 
                                      SetCheckerCmd, value_to_set="")
 
1638
        self.assert_command_from_args(["--checker", "", "client"],
 
1639
                                      command.SetChecker,
 
1640
                                      value_to_set="")
1093
1641
 
1094
1642
    def test_checker_short(self):
1095
 
        self.assert_command_from_args(["-c", ":", "foo"],
1096
 
                                      SetCheckerCmd, value_to_set=":")
 
1643
        self.assert_command_from_args(["-c", ":", "client"],
 
1644
                                      command.SetChecker,
 
1645
                                      value_to_set=":")
1097
1646
 
1098
1647
    def test_host(self):
1099
 
        self.assert_command_from_args(["--host", "foo.example.org",
1100
 
                                       "foo"], SetHostCmd,
1101
 
                                      value_to_set="foo.example.org")
 
1648
        self.assert_command_from_args(
 
1649
            ["--host", "client.example.org", "client"],
 
1650
            command.SetHost, value_to_set="client.example.org")
1102
1651
 
1103
1652
    def test_host_short(self):
1104
 
        self.assert_command_from_args(["-H", "foo.example.org",
1105
 
                                       "foo"], SetHostCmd,
1106
 
                                      value_to_set="foo.example.org")
 
1653
        self.assert_command_from_args(
 
1654
            ["-H", "client.example.org", "client"], command.SetHost,
 
1655
            value_to_set="client.example.org")
1107
1656
 
1108
1657
    def test_secret_devnull(self):
1109
1658
        self.assert_command_from_args(["--secret", os.path.devnull,
1110
 
                                       "foo"], SetSecretCmd,
 
1659
                                       "client"], command.SetSecret,
1111
1660
                                      value_to_set=b"")
1112
1661
 
1113
1662
    def test_secret_tempfile(self):
1116
1665
            f.write(value)
1117
1666
            f.seek(0)
1118
1667
            self.assert_command_from_args(["--secret", f.name,
1119
 
                                           "foo"], SetSecretCmd,
 
1668
                                           "client"],
 
1669
                                          command.SetSecret,
1120
1670
                                          value_to_set=value)
1121
1671
 
1122
1672
    def test_secret_devnull_short(self):
1123
 
        self.assert_command_from_args(["-s", os.path.devnull, "foo"],
1124
 
                                      SetSecretCmd, value_to_set=b"")
 
1673
        self.assert_command_from_args(["-s", os.path.devnull,
 
1674
                                       "client"], command.SetSecret,
 
1675
                                      value_to_set=b"")
1125
1676
 
1126
1677
    def test_secret_tempfile_short(self):
1127
1678
        with tempfile.NamedTemporaryFile(mode="r+b") as f:
1128
1679
            value = b"secret\0xyzzy\nbar"
1129
1680
            f.write(value)
1130
1681
            f.seek(0)
1131
 
            self.assert_command_from_args(["-s", f.name, "foo"],
1132
 
                                          SetSecretCmd,
 
1682
            self.assert_command_from_args(["-s", f.name, "client"],
 
1683
                                          command.SetSecret,
1133
1684
                                          value_to_set=value)
1134
1685
 
1135
1686
    def test_timeout(self):
1136
 
        self.assert_command_from_args(["--timeout", "PT5M", "foo"],
1137
 
                                      SetTimeoutCmd,
 
1687
        self.assert_command_from_args(["--timeout", "PT5M", "client"],
 
1688
                                      command.SetTimeout,
1138
1689
                                      value_to_set=300000)
1139
1690
 
1140
1691
    def test_timeout_short(self):
1141
 
        self.assert_command_from_args(["-t", "PT5M", "foo"],
1142
 
                                      SetTimeoutCmd,
 
1692
        self.assert_command_from_args(["-t", "PT5M", "client"],
 
1693
                                      command.SetTimeout,
1143
1694
                                      value_to_set=300000)
1144
1695
 
1145
1696
    def test_extended_timeout(self):
1146
1697
        self.assert_command_from_args(["--extended-timeout", "PT15M",
1147
 
                                       "foo"],
1148
 
                                      SetExtendedTimeoutCmd,
 
1698
                                       "client"],
 
1699
                                      command.SetExtendedTimeout,
1149
1700
                                      value_to_set=900000)
1150
1701
 
1151
1702
    def test_interval(self):
1152
 
        self.assert_command_from_args(["--interval", "PT2M", "foo"],
1153
 
                                      SetIntervalCmd,
 
1703
        self.assert_command_from_args(["--interval", "PT2M",
 
1704
                                       "client"], command.SetInterval,
1154
1705
                                      value_to_set=120000)
1155
1706
 
1156
1707
    def test_interval_short(self):
1157
 
        self.assert_command_from_args(["-i", "PT2M", "foo"],
1158
 
                                      SetIntervalCmd,
 
1708
        self.assert_command_from_args(["-i", "PT2M", "client"],
 
1709
                                      command.SetInterval,
1159
1710
                                      value_to_set=120000)
1160
1711
 
1161
1712
    def test_approval_delay(self):
1162
1713
        self.assert_command_from_args(["--approval-delay", "PT30S",
1163
 
                                       "foo"], SetApprovalDelayCmd,
 
1714
                                       "client"],
 
1715
                                      command.SetApprovalDelay,
1164
1716
                                      value_to_set=30000)
1165
1717
 
1166
1718
    def test_approval_duration(self):
1167
1719
        self.assert_command_from_args(["--approval-duration", "PT1S",
1168
 
                                       "foo"], SetApprovalDurationCmd,
 
1720
                                       "client"],
 
1721
                                      command.SetApprovalDuration,
1169
1722
                                      value_to_set=1000)
1170
1723
 
1171
1724
    def test_print_table(self):
1172
 
        self.assert_command_from_args([], PrintTableCmd,
 
1725
        self.assert_command_from_args([], command.PrintTable,
1173
1726
                                      verbose=False)
1174
1727
 
1175
1728
    def test_print_table_verbose(self):
1176
 
        self.assert_command_from_args(["--verbose"], PrintTableCmd,
 
1729
        self.assert_command_from_args(["--verbose"],
 
1730
                                      command.PrintTable,
1177
1731
                                      verbose=True)
1178
1732
 
1179
1733
    def test_print_table_verbose_short(self):
1180
 
        self.assert_command_from_args(["-v"], PrintTableCmd,
 
1734
        self.assert_command_from_args(["-v"], command.PrintTable,
1181
1735
                                      verbose=True)
1182
1736
 
1183
1737
 
1184
 
class TestCmd(unittest.TestCase):
 
1738
class TestCommand(unittest.TestCase):
1185
1739
    """Abstract class for tests of command classes"""
1186
1740
 
1187
 
    def setUp(self):
1188
 
        testcase = self
1189
 
        class MockClient(object):
1190
 
            def __init__(self, name, **attributes):
1191
 
                self.__dbus_object_path__ = "/clients/{}".format(name)
1192
 
                self.attributes = attributes
1193
 
                self.attributes["Name"] = name
1194
 
                self.calls = []
1195
 
            def Set(self, interface, propname, value, dbus_interface):
1196
 
                testcase.assertEqual(interface, client_dbus_interface)
1197
 
                testcase.assertEqual(dbus_interface,
1198
 
                                     dbus.PROPERTIES_IFACE)
1199
 
                self.attributes[propname] = value
1200
 
            def Get(self, interface, propname, dbus_interface):
1201
 
                testcase.assertEqual(interface, client_dbus_interface)
1202
 
                testcase.assertEqual(dbus_interface,
1203
 
                                     dbus.PROPERTIES_IFACE)
1204
 
                return self.attributes[propname]
1205
 
            def Approve(self, approve, dbus_interface):
1206
 
                testcase.assertEqual(dbus_interface,
1207
 
                                     client_dbus_interface)
1208
 
                self.calls.append(("Approve", (approve,
1209
 
                                               dbus_interface)))
1210
 
        self.client = MockClient(
1211
 
            "foo",
1212
 
            KeyID=("92ed150794387c03ce684574b1139a65"
1213
 
                   "94a34f895daaaf09fd8ea90a27cddb12"),
1214
 
            Secret=b"secret",
1215
 
            Host="foo.example.org",
1216
 
            Enabled=dbus.Boolean(True),
1217
 
            Timeout=300000,
1218
 
            LastCheckedOK="2019-02-03T00:00:00",
1219
 
            Created="2019-01-02T00:00:00",
1220
 
            Interval=120000,
1221
 
            Fingerprint=("778827225BA7DE539C5A"
1222
 
                         "7CFA59CFF7CDBD9A5920"),
1223
 
            CheckerRunning=dbus.Boolean(False),
1224
 
            LastEnabled="2019-01-03T00:00:00",
1225
 
            ApprovalPending=dbus.Boolean(False),
1226
 
            ApprovedByDefault=dbus.Boolean(True),
1227
 
            LastApprovalRequest="",
1228
 
            ApprovalDelay=0,
1229
 
            ApprovalDuration=1000,
1230
 
            Checker="fping -q -- %(host)s",
1231
 
            ExtendedTimeout=900000,
1232
 
            Expires="2019-02-04T00:00:00",
1233
 
            LastCheckerStatus=0)
1234
 
        self.other_client = MockClient(
1235
 
            "barbar",
1236
 
            KeyID=("0558568eedd67d622f5c83b35a115f79"
1237
 
                   "6ab612cff5ad227247e46c2b020f441c"),
1238
 
            Secret=b"secretbar",
1239
 
            Host="192.0.2.3",
1240
 
            Enabled=dbus.Boolean(True),
1241
 
            Timeout=300000,
1242
 
            LastCheckedOK="2019-02-04T00:00:00",
1243
 
            Created="2019-01-03T00:00:00",
1244
 
            Interval=120000,
1245
 
            Fingerprint=("3E393AEAEFB84C7E89E2"
1246
 
                         "F547B3A107558FCA3A27"),
1247
 
            CheckerRunning=dbus.Boolean(True),
1248
 
            LastEnabled="2019-01-04T00:00:00",
1249
 
            ApprovalPending=dbus.Boolean(False),
1250
 
            ApprovedByDefault=dbus.Boolean(False),
1251
 
            LastApprovalRequest="2019-01-03T00:00:00",
1252
 
            ApprovalDelay=30000,
1253
 
            ApprovalDuration=93785000,
1254
 
            Checker=":",
1255
 
            ExtendedTimeout=900000,
1256
 
            Expires="2019-02-05T00:00:00",
1257
 
            LastCheckerStatus=-2)
1258
 
        self.clients =  collections.OrderedDict(
1259
 
            [
1260
 
                ("/clients/foo", self.client.attributes),
1261
 
                ("/clients/barbar", self.other_client.attributes),
1262
 
            ])
1263
 
        self.one_client = {"/clients/foo": self.client.attributes}
1264
 
 
1265
 
    @property
1266
 
    def bus(self):
1267
 
        class Bus(object):
1268
 
            @staticmethod
1269
 
            def get_object(client_bus_name, path):
1270
 
                self.assertEqual(client_bus_name, dbus_busname)
1271
 
                return {
1272
 
                    # Note: "self" here is the TestCmd instance, not
1273
 
                    # the Bus instance, since this is a static method!
1274
 
                    "/clients/foo": self.client,
1275
 
                    "/clients/barbar": self.other_client,
1276
 
                }[path]
1277
 
        return Bus()
1278
 
 
1279
 
 
1280
 
class TestIsEnabledCmd(TestCmd):
1281
 
    def test_is_enabled(self):
1282
 
        self.assertTrue(all(IsEnabledCmd().is_enabled(client,
1283
 
                                                      properties)
1284
 
                            for client, properties
1285
 
                            in self.clients.items()))
1286
 
 
1287
 
    def test_is_enabled_run_exits_successfully(self):
1288
 
        with self.assertRaises(SystemExit) as e:
1289
 
            IsEnabledCmd().run(self.one_client)
1290
 
        if e.exception.code is not None:
1291
 
            self.assertEqual(e.exception.code, 0)
1292
 
        else:
1293
 
            self.assertIsNone(e.exception.code)
1294
 
 
1295
 
    def test_is_enabled_run_exits_with_failure(self):
1296
 
        self.client.attributes["Enabled"] = dbus.Boolean(False)
1297
 
        with self.assertRaises(SystemExit) as e:
1298
 
            IsEnabledCmd().run(self.one_client)
1299
 
        if isinstance(e.exception.code, int):
1300
 
            self.assertNotEqual(e.exception.code, 0)
1301
 
        else:
1302
 
            self.assertIsNotNone(e.exception.code)
1303
 
 
1304
 
 
1305
 
class TestApproveCmd(TestCmd):
1306
 
    def test_approve(self):
1307
 
        ApproveCmd().run(self.clients, self.bus)
1308
 
        for clientpath in self.clients:
1309
 
            client = self.bus.get_object(dbus_busname, clientpath)
1310
 
            self.assertIn(("Approve", (True, client_dbus_interface)),
1311
 
                          client.calls)
1312
 
 
1313
 
 
1314
 
class TestDenyCmd(TestCmd):
1315
 
    def test_deny(self):
1316
 
        DenyCmd().run(self.clients, self.bus)
1317
 
        for clientpath in self.clients:
1318
 
            client = self.bus.get_object(dbus_busname, clientpath)
1319
 
            self.assertIn(("Approve", (False, client_dbus_interface)),
1320
 
                          client.calls)
1321
 
 
1322
 
 
1323
 
class TestRemoveCmd(TestCmd):
1324
 
    def test_remove(self):
1325
 
        class MockMandos(object):
1326
 
            def __init__(self):
1327
 
                self.calls = []
1328
 
            def RemoveClient(self, dbus_path):
1329
 
                self.calls.append(("RemoveClient", (dbus_path,)))
1330
 
        mandos = MockMandos()
1331
 
        super(TestRemoveCmd, self).setUp()
1332
 
        RemoveCmd().run(self.clients, self.bus, mandos)
1333
 
        self.assertEqual(len(mandos.calls), 2)
1334
 
        for clientpath in self.clients:
1335
 
            self.assertIn(("RemoveClient", (clientpath,)),
1336
 
                          mandos.calls)
1337
 
 
1338
 
 
1339
 
class TestDumpJSONCmd(TestCmd):
1340
 
    def setUp(self):
1341
 
        self.expected_json = {
1342
 
            "foo": {
 
1741
    class FakeMandosBus(dbus.MandosBus):
 
1742
        def __init__(self, testcase):
 
1743
            self.client_properties = {
1343
1744
                "Name": "foo",
1344
1745
                "KeyID": ("92ed150794387c03ce684574b1139a65"
1345
1746
                          "94a34f895daaaf09fd8ea90a27cddb12"),
 
1747
                "Secret": b"secret",
1346
1748
                "Host": "foo.example.org",
1347
1749
                "Enabled": True,
1348
1750
                "Timeout": 300000,
1362
1764
                "ExtendedTimeout": 900000,
1363
1765
                "Expires": "2019-02-04T00:00:00",
1364
1766
                "LastCheckerStatus": 0,
1365
 
            },
1366
 
            "barbar": {
 
1767
            }
 
1768
            self.other_client_properties = {
1367
1769
                "Name": "barbar",
1368
1770
                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
1369
1771
                          "6ab612cff5ad227247e46c2b020f441c"),
 
1772
                "Secret": b"secretbar",
1370
1773
                "Host": "192.0.2.3",
1371
1774
                "Enabled": True,
1372
1775
                "Timeout": 300000,
1386
1789
                "ExtendedTimeout": 900000,
1387
1790
                "Expires": "2019-02-05T00:00:00",
1388
1791
                "LastCheckerStatus": -2,
1389
 
            },
1390
 
        }
1391
 
        return super(TestDumpJSONCmd, self).setUp()
1392
 
 
1393
 
    def test_normal(self):
1394
 
        json_data = json.loads(DumpJSONCmd().output(self.clients))
1395
 
        self.assertDictEqual(json_data, self.expected_json)
1396
 
 
1397
 
    def test_one_client(self):
1398
 
        clients = self.one_client
1399
 
        json_data = json.loads(DumpJSONCmd().output(clients))
 
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())
1400
1948
        expected_json = {"foo": self.expected_json["foo"]}
1401
 
        self.assertDictEqual(json_data, expected_json)
1402
 
 
1403
 
 
1404
 
class TestPrintTableCmd(TestCmd):
1405
 
    def test_normal(self):
1406
 
        output = PrintTableCmd().output(self.clients.values())
 
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)
1407
1954
        expected_output = "\n".join((
1408
1955
            "Name   Enabled Timeout  Last Successful Check",
1409
1956
            "foo    Yes     00:05:00 2019-02-03T00:00:00  ",
1410
1957
            "barbar Yes     00:05:00 2019-02-04T00:00:00  ",
1411
 
        ))
1412
 
        self.assertEqual(output, expected_output)
 
1958
        )) + "\n"
 
1959
        self.assertEqual(expected_output, buffer.getvalue())
1413
1960
 
1414
 
    def test_verbose(self):
1415
 
        output = PrintTableCmd(verbose=True).output(
1416
 
            self.clients.values())
 
1961
    def test_PrintTable_verbose(self):
 
1962
        with self.capture_stdout_to_buffer() as buffer:
 
1963
            command.PrintTable(verbose=True).run(self.bus.clients)
1417
1964
        columns = (
1418
1965
            (
1419
1966
                "Name   ",
1501
2048
            )
1502
2049
        )
1503
2050
        num_lines = max(len(rows) for rows in columns)
1504
 
        expected_output = "\n".join("".join(rows[line]
1505
 
                                            for rows in columns)
1506
 
                                    for line in range(num_lines))
1507
 
        self.assertEqual(output, expected_output)
 
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())
1508
2056
 
1509
 
    def test_one_client(self):
1510
 
        output = PrintTableCmd().output(self.one_client.values())
 
2057
    def test_PrintTable_one_client(self):
 
2058
        with self.capture_stdout_to_buffer() as buffer:
 
2059
            command.PrintTable().run(self.bus.one_client)
1511
2060
        expected_output = "\n".join((
1512
2061
            "Name Enabled Timeout  Last Successful Check",
1513
2062
            "foo  Yes     00:05:00 2019-02-03T00:00:00  ",
1514
 
        ))
1515
 
        self.assertEqual(output, expected_output)
1516
 
 
1517
 
 
1518
 
class TestPropertyCmd(TestCmd):
1519
 
    """Abstract class for tests of PropertyCmd classes"""
 
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
 
1520
2070
    def runTest(self):
1521
2071
        if not hasattr(self, "command"):
1522
 
            return
 
2072
            return              # Abstract TestCase class
1523
2073
        values_to_get = getattr(self, "values_to_get",
1524
2074
                                self.values_to_set)
1525
2075
        for value_to_set, value_to_get in zip(self.values_to_set,
1526
2076
                                              values_to_get):
1527
 
            for clientpath in self.clients:
1528
 
                client = self.bus.get_object(dbus_busname, clientpath)
1529
 
                old_value = client.attributes[self.propname]
1530
 
                self.assertNotIsInstance(old_value, self.Unique)
1531
 
                client.attributes[self.propname] = self.Unique()
1532
 
            self.run_command(value_to_set, self.clients)
1533
 
            for clientpath in self.clients:
1534
 
                client = self.bus.get_object(dbus_busname, clientpath)
1535
 
                value = client.attributes[self.propname]
1536
 
                self.assertNotIsInstance(value, self.Unique)
1537
 
                self.assertEqual(value, value_to_get)
1538
 
 
1539
 
    class Unique(object):
1540
 
        """Class for objects which exist only to be unique objects,
1541
 
since unittest.mock.sentinel only exists in Python 3.3"""
 
2077
            for clientpath in self.bus.clients:
 
2078
                self.bus.clients[clientpath][self.propname] = Unique()
 
2079
            self.run_command(value_to_set, self.bus.clients)
 
2080
            for clientpath in self.bus.clients:
 
2081
                value = self.bus.clients[clientpath][self.propname]
 
2082
                self.assertNotIsInstance(value, Unique)
 
2083
                self.assertEqual(value_to_get, value)
1542
2084
 
1543
2085
    def run_command(self, value, clients):
1544
2086
        self.command().run(clients, self.bus)
1545
2087
 
1546
2088
 
1547
 
class TestEnableCmd(TestPropertyCmd):
1548
 
    command = EnableCmd
1549
 
    propname = "Enabled"
1550
 
    values_to_set = [dbus.Boolean(True)]
1551
 
 
1552
 
 
1553
 
class TestDisableCmd(TestPropertyCmd):
1554
 
    command = DisableCmd
1555
 
    propname = "Enabled"
1556
 
    values_to_set = [dbus.Boolean(False)]
1557
 
 
1558
 
 
1559
 
class TestBumpTimeoutCmd(TestPropertyCmd):
1560
 
    command = BumpTimeoutCmd
 
2089
class TestEnableCmd(TestPropertySetterCmd):
 
2090
    command = command.Enable
 
2091
    propname = "Enabled"
 
2092
    values_to_set = [True]
 
2093
 
 
2094
 
 
2095
class TestDisableCmd(TestPropertySetterCmd):
 
2096
    command = command.Disable
 
2097
    propname = "Enabled"
 
2098
    values_to_set = [False]
 
2099
 
 
2100
 
 
2101
class TestBumpTimeoutCmd(TestPropertySetterCmd):
 
2102
    command = command.BumpTimeout
1561
2103
    propname = "LastCheckedOK"
1562
2104
    values_to_set = [""]
1563
2105
 
1564
2106
 
1565
 
class TestStartCheckerCmd(TestPropertyCmd):
1566
 
    command = StartCheckerCmd
1567
 
    propname = "CheckerRunning"
1568
 
    values_to_set = [dbus.Boolean(True)]
1569
 
 
1570
 
 
1571
 
class TestStopCheckerCmd(TestPropertyCmd):
1572
 
    command = StopCheckerCmd
1573
 
    propname = "CheckerRunning"
1574
 
    values_to_set = [dbus.Boolean(False)]
1575
 
 
1576
 
 
1577
 
class TestApproveByDefaultCmd(TestPropertyCmd):
1578
 
    command = ApproveByDefaultCmd
1579
 
    propname = "ApprovedByDefault"
1580
 
    values_to_set = [dbus.Boolean(True)]
1581
 
 
1582
 
 
1583
 
class TestDenyByDefaultCmd(TestPropertyCmd):
1584
 
    command = DenyByDefaultCmd
1585
 
    propname = "ApprovedByDefault"
1586
 
    values_to_set = [dbus.Boolean(False)]
1587
 
 
1588
 
 
1589
 
class TestPropertyValueCmd(TestPropertyCmd):
1590
 
    """Abstract class for tests of PropertyValueCmd classes"""
1591
 
 
1592
 
    def runTest(self):
1593
 
        if type(self) is TestPropertyValueCmd:
1594
 
            return
1595
 
        return super(TestPropertyValueCmd, self).runTest()
 
2107
class TestStartCheckerCmd(TestPropertySetterCmd):
 
2108
    command = command.StartChecker
 
2109
    propname = "CheckerRunning"
 
2110
    values_to_set = [True]
 
2111
 
 
2112
 
 
2113
class TestStopCheckerCmd(TestPropertySetterCmd):
 
2114
    command = command.StopChecker
 
2115
    propname = "CheckerRunning"
 
2116
    values_to_set = [False]
 
2117
 
 
2118
 
 
2119
class TestApproveByDefaultCmd(TestPropertySetterCmd):
 
2120
    command = command.ApproveByDefault
 
2121
    propname = "ApprovedByDefault"
 
2122
    values_to_set = [True]
 
2123
 
 
2124
 
 
2125
class TestDenyByDefaultCmd(TestPropertySetterCmd):
 
2126
    command = command.DenyByDefault
 
2127
    propname = "ApprovedByDefault"
 
2128
    values_to_set = [False]
 
2129
 
 
2130
 
 
2131
class TestPropertySetterValueCmd(TestPropertySetterCmd):
 
2132
    """Abstract class for tests of PropertySetterValueCmd classes"""
1596
2133
 
1597
2134
    def run_command(self, value, clients):
1598
2135
        self.command(value).run(clients, self.bus)
1599
2136
 
1600
2137
 
1601
 
class TestSetCheckerCmd(TestPropertyValueCmd):
1602
 
    command = SetCheckerCmd
 
2138
class TestSetCheckerCmd(TestPropertySetterValueCmd):
 
2139
    command = command.SetChecker
1603
2140
    propname = "Checker"
1604
2141
    values_to_set = ["", ":", "fping -q -- %s"]
1605
2142
 
1606
2143
 
1607
 
class TestSetHostCmd(TestPropertyValueCmd):
1608
 
    command = SetHostCmd
 
2144
class TestSetHostCmd(TestPropertySetterValueCmd):
 
2145
    command = command.SetHost
1609
2146
    propname = "Host"
1610
 
    values_to_set = ["192.0.2.3", "foo.example.org"]
1611
 
 
1612
 
 
1613
 
class TestSetSecretCmd(TestPropertyValueCmd):
1614
 
    command = SetSecretCmd
 
2147
    values_to_set = ["192.0.2.3", "client.example.org"]
 
2148
 
 
2149
 
 
2150
class TestSetSecretCmd(TestPropertySetterValueCmd):
 
2151
    command = command.SetSecret
1615
2152
    propname = "Secret"
1616
2153
    values_to_set = [io.BytesIO(b""),
1617
2154
                     io.BytesIO(b"secret\0xyzzy\nbar")]
1618
 
    values_to_get = [b"", b"secret\0xyzzy\nbar"]
1619
 
 
1620
 
 
1621
 
class TestSetTimeoutCmd(TestPropertyValueCmd):
1622
 
    command = SetTimeoutCmd
 
2155
    values_to_get = [f.getvalue() for f in values_to_set]
 
2156
 
 
2157
 
 
2158
class TestSetTimeoutCmd(TestPropertySetterValueCmd):
 
2159
    command = command.SetTimeout
1623
2160
    propname = "Timeout"
1624
2161
    values_to_set = [datetime.timedelta(),
1625
2162
                     datetime.timedelta(minutes=5),
1626
2163
                     datetime.timedelta(seconds=1),
1627
2164
                     datetime.timedelta(weeks=1),
1628
2165
                     datetime.timedelta(weeks=52)]
1629
 
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1630
 
 
1631
 
 
1632
 
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
1633
 
    command = SetExtendedTimeoutCmd
 
2166
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
 
2167
 
 
2168
 
 
2169
class TestSetExtendedTimeoutCmd(TestPropertySetterValueCmd):
 
2170
    command = command.SetExtendedTimeout
1634
2171
    propname = "ExtendedTimeout"
1635
2172
    values_to_set = [datetime.timedelta(),
1636
2173
                     datetime.timedelta(minutes=5),
1637
2174
                     datetime.timedelta(seconds=1),
1638
2175
                     datetime.timedelta(weeks=1),
1639
2176
                     datetime.timedelta(weeks=52)]
1640
 
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1641
 
 
1642
 
 
1643
 
class TestSetIntervalCmd(TestPropertyValueCmd):
1644
 
    command = SetIntervalCmd
 
2177
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
 
2178
 
 
2179
 
 
2180
class TestSetIntervalCmd(TestPropertySetterValueCmd):
 
2181
    command = command.SetInterval
1645
2182
    propname = "Interval"
1646
2183
    values_to_set = [datetime.timedelta(),
1647
2184
                     datetime.timedelta(minutes=5),
1648
2185
                     datetime.timedelta(seconds=1),
1649
2186
                     datetime.timedelta(weeks=1),
1650
2187
                     datetime.timedelta(weeks=52)]
1651
 
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1652
 
 
1653
 
 
1654
 
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
1655
 
    command = SetApprovalDelayCmd
 
2188
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
 
2189
 
 
2190
 
 
2191
class TestSetApprovalDelayCmd(TestPropertySetterValueCmd):
 
2192
    command = command.SetApprovalDelay
1656
2193
    propname = "ApprovalDelay"
1657
2194
    values_to_set = [datetime.timedelta(),
1658
2195
                     datetime.timedelta(minutes=5),
1659
2196
                     datetime.timedelta(seconds=1),
1660
2197
                     datetime.timedelta(weeks=1),
1661
2198
                     datetime.timedelta(weeks=52)]
1662
 
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1663
 
 
1664
 
 
1665
 
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
1666
 
    command = SetApprovalDurationCmd
 
2199
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
 
2200
 
 
2201
 
 
2202
class TestSetApprovalDurationCmd(TestPropertySetterValueCmd):
 
2203
    command = command.SetApprovalDuration
1667
2204
    propname = "ApprovalDuration"
1668
2205
    values_to_set = [datetime.timedelta(),
1669
2206
                     datetime.timedelta(minutes=5),
1670
2207
                     datetime.timedelta(seconds=1),
1671
2208
                     datetime.timedelta(weeks=1),
1672
2209
                     datetime.timedelta(weeks=52)]
1673
 
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
2210
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
1674
2211
 
1675
2212
 
1676
2213
 
1691
2228
    return tests
1692
2229
 
1693
2230
if __name__ == "__main__":
1694
 
    if should_only_run_tests():
1695
 
        # Call using ./tdd-python-script --check [--verbose]
1696
 
        unittest.main()
1697
 
    else:
1698
 
        main()
 
2231
    try:
 
2232
        if should_only_run_tests():
 
2233
            # Call using ./tdd-python-script --check [--verbose]
 
2234
            unittest.main()
 
2235
        else:
 
2236
            main()
 
2237
    finally:
 
2238
        logging.shutdown()