/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-31 04:47:26 UTC
  • Revision ID: teddy@recompile.se-20190331044726-po11kmjmug07mw00
mandos-ctl: Remove import of unused module

* mandos-ctl: Remove "import abc".

Show diffs side-by-side

added added

removed removed

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