/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-04-09 20:09:51 UTC
  • Revision ID: teddy@recompile.se-20190409200951-zgdjfh0mftlqz8pn
Tags: version-1.8.4-1
* Makefile (version): Change to 1.8.4.
* NEWS (Version 1.8.4): Add new entry.
* debian/changelog (1.8.4-1): - '' -

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