/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-11-03 19:17:57 UTC
  • Revision ID: teddy@recompile.se-20191103191757-1hdpp0u5fxa8iumo
INSTALL: Add "-" argument to "su" invocations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8; after-save-hook: (lambda () (let ((command (if (and (boundp 'tramp-file-name-structure) (string-match (car tramp-file-name-structure) (buffer-file-name))) (tramp-file-name-localname (tramp-dissect-file-name (buffer-file-name))) (buffer-file-name)))) (if (= (shell-command (format "%s --check" (shell-quote-argument command)) "*Test*") 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w)) (kill-buffer "*Test*")) (display-buffer "*Test*")))); -*-
 
1
#!/usr/bin/python3 -bbI
 
2
# -*- after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
46
46
import tempfile
47
47
import contextlib
48
48
 
49
 
import dbus
 
49
if sys.version_info.major == 2:
 
50
    __metaclass__ = type
 
51
 
 
52
try:
 
53
    import pydbus
 
54
    import gi
 
55
    dbus_python = None
 
56
except ImportError:
 
57
    import dbus as dbus_python
 
58
    pydbus = None
 
59
    class gi:
 
60
        """Dummy gi module, for the tests"""
 
61
        class repository:
 
62
            class GLib:
 
63
                class Error(Exception):
 
64
                    pass
50
65
 
51
66
# Show warnings by default
52
67
if not sys.warnoptions:
66
81
 
67
82
locale.setlocale(locale.LC_ALL, "")
68
83
 
69
 
dbus_busname_domain = "se.recompile"
70
 
dbus_busname = dbus_busname_domain + ".Mandos"
71
 
server_dbus_path = "/"
72
 
server_dbus_interface = dbus_busname_domain + ".Mandos"
73
 
client_dbus_interface = dbus_busname_domain + ".Mandos.Client"
74
 
del dbus_busname_domain
75
 
version = "1.8.3"
76
 
 
77
 
 
78
 
try:
79
 
    dbus.OBJECT_MANAGER_IFACE
80
 
except AttributeError:
81
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
84
version = "1.8.9"
82
85
 
83
86
 
84
87
def main():
93
96
    if options.debug:
94
97
        log.setLevel(logging.DEBUG)
95
98
 
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
 
99
    if pydbus is not None:
 
100
        bus = pydbus_adapter.CachingBus(pydbus)
 
101
    else:
 
102
        bus = dbus_python_adapter.CachingBus(dbus_python)
 
103
 
 
104
    try:
 
105
        all_clients = bus.get_clients_and_properties()
 
106
    except dbus.ConnectFailed as e:
 
107
        log.critical("Could not connect to Mandos server: %s", e)
 
108
        sys.exit(1)
 
109
    except dbus.Error as e:
 
110
        log.critical(
 
111
            "Failed to access Mandos server through D-Bus:\n%s", e)
 
112
        sys.exit(1)
113
113
 
114
114
    # Compile dict of (clientpath: properties) to process
115
115
    if not clientnames:
128
128
    commands = commands_from_options(options)
129
129
 
130
130
    for command in commands:
131
 
        command.run(clients, bus, mandos_serv)
 
131
        command.run(clients, bus)
132
132
 
133
133
 
134
134
def add_command_line_options(parser):
139
139
                        help="Select all clients")
140
140
    parser.add_argument("-v", "--verbose", action="store_true",
141
141
                        help="Print all fields")
142
 
    parser.add_argument("-j", "--dump-json", action="store_true",
 
142
    parser.add_argument("-j", "--dump-json", dest="commands",
 
143
                        action="append_const", default=[],
 
144
                        const=command.DumpJSON(),
143
145
                        help="Dump client data in JSON format")
144
146
    enable_disable = parser.add_mutually_exclusive_group()
145
 
    enable_disable.add_argument("-e", "--enable", action="store_true",
 
147
    enable_disable.add_argument("-e", "--enable", dest="commands",
 
148
                                action="append_const", default=[],
 
149
                                const=command.Enable(),
146
150
                                help="Enable client")
147
 
    enable_disable.add_argument("-d", "--disable",
148
 
                                action="store_true",
 
151
    enable_disable.add_argument("-d", "--disable", dest="commands",
 
152
                                action="append_const", default=[],
 
153
                                const=command.Disable(),
149
154
                                help="disable client")
150
 
    parser.add_argument("-b", "--bump-timeout", action="store_true",
 
155
    parser.add_argument("-b", "--bump-timeout", dest="commands",
 
156
                        action="append_const", default=[],
 
157
                        const=command.BumpTimeout(),
151
158
                        help="Bump timeout for client")
152
159
    start_stop_checker = parser.add_mutually_exclusive_group()
153
160
    start_stop_checker.add_argument("--start-checker",
154
 
                                    action="store_true",
 
161
                                    dest="commands",
 
162
                                    action="append_const", default=[],
 
163
                                    const=command.StartChecker(),
155
164
                                    help="Start checker for client")
156
 
    start_stop_checker.add_argument("--stop-checker",
157
 
                                    action="store_true",
 
165
    start_stop_checker.add_argument("--stop-checker", dest="commands",
 
166
                                    action="append_const", default=[],
 
167
                                    const=command.StopChecker(),
158
168
                                    help="Stop checker for client")
159
 
    parser.add_argument("-V", "--is-enabled", action="store_true",
 
169
    parser.add_argument("-V", "--is-enabled", dest="commands",
 
170
                        action="append_const", default=[],
 
171
                        const=command.IsEnabled(),
160
172
                        help="Check if client is enabled")
161
 
    parser.add_argument("-r", "--remove", action="store_true",
 
173
    parser.add_argument("-r", "--remove", dest="commands",
 
174
                        action="append_const", default=[],
 
175
                        const=command.Remove(),
162
176
                        help="Remove client")
163
 
    parser.add_argument("-c", "--checker",
 
177
    parser.add_argument("-c", "--checker", dest="commands",
 
178
                        action="append", default=[],
 
179
                        metavar="COMMAND", type=command.SetChecker,
164
180
                        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")
 
181
    parser.add_argument(
 
182
        "-t", "--timeout", dest="commands", action="append",
 
183
        default=[], metavar="TIME",
 
184
        type=command.SetTimeout.argparse(string_to_delta),
 
185
        help="Set timeout for client")
 
186
    parser.add_argument(
 
187
        "--extended-timeout", dest="commands", action="append",
 
188
        default=[], metavar="TIME",
 
189
        type=command.SetExtendedTimeout.argparse(string_to_delta),
 
190
        help="Set extended timeout for client")
 
191
    parser.add_argument(
 
192
        "-i", "--interval", dest="commands", action="append",
 
193
        default=[], metavar="TIME",
 
194
        type=command.SetInterval.argparse(string_to_delta),
 
195
        help="Set checker interval for client")
171
196
    approve_deny_default = parser.add_mutually_exclusive_group()
172
197
    approve_deny_default.add_argument(
173
 
        "--approve-by-default", action="store_true",
174
 
        default=None, dest="approved_by_default",
 
198
        "--approve-by-default", dest="commands",
 
199
        action="append_const", default=[],
 
200
        const=command.ApproveByDefault(),
175
201
        help="Set client to be approved by default")
176
202
    approve_deny_default.add_argument(
177
 
        "--deny-by-default", action="store_false",
178
 
        dest="approved_by_default",
 
203
        "--deny-by-default", dest="commands",
 
204
        action="append_const", default=[],
 
205
        const=command.DenyByDefault(),
179
206
        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")
 
207
    parser.add_argument(
 
208
        "--approval-delay", dest="commands", action="append",
 
209
        default=[], metavar="TIME",
 
210
        type=command.SetApprovalDelay.argparse(string_to_delta),
 
211
        help="Set delay before client approve/deny")
 
212
    parser.add_argument(
 
213
        "--approval-duration", dest="commands", action="append",
 
214
        default=[], metavar="TIME",
 
215
        type=command.SetApprovalDuration.argparse(string_to_delta),
 
216
        help="Set duration of one client approval")
 
217
    parser.add_argument("-H", "--host", dest="commands",
 
218
                        action="append", default=[], metavar="STRING",
 
219
                        type=command.SetHost,
 
220
                        help="Set host for client")
 
221
    parser.add_argument(
 
222
        "-s", "--secret", dest="commands", action="append",
 
223
        default=[], metavar="FILENAME",
 
224
        type=command.SetSecret.argparse(argparse.FileType(mode="rb")),
 
225
        help="Set password blob (file) for client")
188
226
    approve_deny = parser.add_mutually_exclusive_group()
189
227
    approve_deny.add_argument(
190
 
        "-A", "--approve", action="store_true",
 
228
        "-A", "--approve", dest="commands", action="append_const",
 
229
        default=[], const=command.Approve(),
191
230
        help="Approve any current client request")
192
 
    approve_deny.add_argument("-D", "--deny", action="store_true",
 
231
    approve_deny.add_argument("-D", "--deny", dest="commands",
 
232
                              action="append_const", default=[],
 
233
                              const=command.Deny(),
193
234
                              help="Deny any current client request")
194
235
    parser.add_argument("--debug", action="store_true",
195
236
                        help="Debug mode (show D-Bus commands)")
212
253
def rfc3339_duration_to_delta(duration):
213
254
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
214
255
 
215
 
    >>> rfc3339_duration_to_delta("P7D")
216
 
    datetime.timedelta(7)
217
 
    >>> rfc3339_duration_to_delta("PT60S")
218
 
    datetime.timedelta(0, 60)
219
 
    >>> rfc3339_duration_to_delta("PT60M")
220
 
    datetime.timedelta(0, 3600)
221
 
    >>> rfc3339_duration_to_delta("P60M")
222
 
    datetime.timedelta(1680)
223
 
    >>> rfc3339_duration_to_delta("PT24H")
224
 
    datetime.timedelta(1)
225
 
    >>> rfc3339_duration_to_delta("P1W")
226
 
    datetime.timedelta(7)
227
 
    >>> rfc3339_duration_to_delta("PT5M30S")
228
 
    datetime.timedelta(0, 330)
229
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
230
 
    datetime.timedelta(1, 200)
 
256
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
257
    True
 
258
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
259
    True
 
260
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(hours=1)
 
261
    True
 
262
    >>> # 60 months
 
263
    >>> rfc3339_duration_to_delta("P60M") == datetime.timedelta(1680)
 
264
    True
 
265
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
266
    True
 
267
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
268
    True
 
269
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
270
    True
 
271
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
272
    True
231
273
    >>> # Can not be empty:
232
274
    >>> rfc3339_duration_to_delta("")
233
275
    Traceback (most recent call last):
343
385
    """Parse an interval string as documented by Mandos before 1.6.1,
344
386
    and return a datetime.timedelta
345
387
 
346
 
    >>> parse_pre_1_6_1_interval('7d')
347
 
    datetime.timedelta(7)
348
 
    >>> parse_pre_1_6_1_interval('60s')
349
 
    datetime.timedelta(0, 60)
350
 
    >>> parse_pre_1_6_1_interval('60m')
351
 
    datetime.timedelta(0, 3600)
352
 
    >>> parse_pre_1_6_1_interval('24h')
353
 
    datetime.timedelta(1)
354
 
    >>> parse_pre_1_6_1_interval('1w')
355
 
    datetime.timedelta(7)
356
 
    >>> parse_pre_1_6_1_interval('5m 30s')
357
 
    datetime.timedelta(0, 330)
358
 
    >>> parse_pre_1_6_1_interval('')
359
 
    datetime.timedelta(0)
 
388
    >>> parse_pre_1_6_1_interval('7d') == datetime.timedelta(days=7)
 
389
    True
 
390
    >>> parse_pre_1_6_1_interval('60s') == datetime.timedelta(0, 60)
 
391
    True
 
392
    >>> parse_pre_1_6_1_interval('60m') == datetime.timedelta(hours=1)
 
393
    True
 
394
    >>> parse_pre_1_6_1_interval('24h') == datetime.timedelta(days=1)
 
395
    True
 
396
    >>> parse_pre_1_6_1_interval('1w') == datetime.timedelta(days=7)
 
397
    True
 
398
    >>> parse_pre_1_6_1_interval('5m 30s') == datetime.timedelta(0, 330)
 
399
    True
 
400
    >>> parse_pre_1_6_1_interval('') == datetime.timedelta(0)
 
401
    True
360
402
    >>> # Ignore unknown characters, allow any order and repetitions
361
 
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
362
 
    datetime.timedelta(2, 480, 18000)
 
403
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m') == datetime.timedelta(2, 480, 18000)
 
404
    True
363
405
 
364
406
    """
365
407
 
386
428
    """Apply additional restrictions on options, not expressible in
387
429
argparse"""
388
430
 
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))
 
431
    def has_commands(options, commands=None):
 
432
        if commands is None:
 
433
            commands = (command.Enable,
 
434
                        command.Disable,
 
435
                        command.BumpTimeout,
 
436
                        command.StartChecker,
 
437
                        command.StopChecker,
 
438
                        command.IsEnabled,
 
439
                        command.Remove,
 
440
                        command.SetChecker,
 
441
                        command.SetTimeout,
 
442
                        command.SetExtendedTimeout,
 
443
                        command.SetInterval,
 
444
                        command.ApproveByDefault,
 
445
                        command.DenyByDefault,
 
446
                        command.SetApprovalDelay,
 
447
                        command.SetApprovalDuration,
 
448
                        command.SetHost,
 
449
                        command.SetSecret,
 
450
                        command.Approve,
 
451
                        command.Deny)
 
452
        return any(isinstance(cmd, commands)
 
453
                   for cmd in options.commands)
408
454
 
409
 
    if has_actions(options) and not (options.client or options.all):
 
455
    if has_commands(options) and not (options.client or options.all):
410
456
        parser.error("Options require clients names or --all.")
411
 
    if options.verbose and has_actions(options):
 
457
    if options.verbose and has_commands(options):
412
458
        parser.error("--verbose can only be used alone.")
413
 
    if options.dump_json and (options.verbose
414
 
                              or has_actions(options)):
 
459
    if (has_commands(options, (command.DumpJSON,))
 
460
        and (options.verbose or len(options.commands) > 1)):
415
461
        parser.error("--dump-json can only be used alone.")
416
 
    if options.all and not has_actions(options):
 
462
    if options.all and not has_commands(options):
417
463
        parser.error("--all requires an action.")
418
 
    if options.is_enabled and len(options.client) > 1:
 
464
    if (has_commands(options, (command.IsEnabled,))
 
465
        and len(options.client) > 1):
419
466
        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
 
 
464
 
    class NullFilter(logging.Filter):
465
 
        def filter(self, record):
466
 
            return False
467
 
 
468
 
    nullfilter = NullFilter()
469
 
 
470
 
    def __exit__(self, exc_type, exc_val, exc_tb):
471
 
        self.logger.removeFilter(self.nullfilter)
 
467
    if (len(options.commands) > 1
 
468
        and has_commands(options, (command.Remove,))
 
469
        and not has_commands(options, (command.Deny,))):
 
470
        parser.error("--remove can only be combined with --deny")
 
471
 
 
472
 
 
473
class dbus:
 
474
 
 
475
    class SystemBus:
 
476
 
 
477
        object_manager_iface = "org.freedesktop.DBus.ObjectManager"
 
478
        def get_managed_objects(self, busname, objectpath):
 
479
            return self.call_method("GetManagedObjects", busname,
 
480
                                    objectpath,
 
481
                                    self.object_manager_iface)
 
482
 
 
483
        properties_iface = "org.freedesktop.DBus.Properties"
 
484
        def set_property(self, busname, objectpath, interface, key,
 
485
                         value):
 
486
            self.call_method("Set", busname, objectpath,
 
487
                             self.properties_iface, interface, key,
 
488
                             value)
 
489
 
 
490
 
 
491
    class MandosBus(SystemBus):
 
492
        busname_domain = "se.recompile"
 
493
        busname = busname_domain + ".Mandos"
 
494
        server_path = "/"
 
495
        server_interface = busname_domain + ".Mandos"
 
496
        client_interface = busname_domain + ".Mandos.Client"
 
497
        del busname_domain
 
498
 
 
499
        def get_clients_and_properties(self):
 
500
            managed_objects = self.get_managed_objects(
 
501
                self.busname, self.server_path)
 
502
            return {objpath: properties[self.client_interface]
 
503
                    for objpath, properties in managed_objects.items()
 
504
                    if self.client_interface in properties}
 
505
 
 
506
        def set_client_property(self, objectpath, key, value):
 
507
            return self.set_property(self.busname, objectpath,
 
508
                                     self.client_interface, key,
 
509
                                     value)
 
510
 
 
511
        def call_client_method(self, objectpath, method, *args):
 
512
            return self.call_method(method, self.busname, objectpath,
 
513
                                    self.client_interface, *args)
 
514
 
 
515
        def call_server_method(self, method, *args):
 
516
            return self.call_method(method, self.busname,
 
517
                                    self.server_path,
 
518
                                    self.server_interface, *args)
 
519
 
 
520
    class Error(Exception):
 
521
        pass
 
522
 
 
523
    class ConnectFailed(Error):
 
524
        pass
 
525
 
 
526
 
 
527
class dbus_python_adapter:
 
528
 
 
529
    class SystemBus(dbus.MandosBus):
 
530
        """Use dbus-python"""
 
531
 
 
532
        def __init__(self, module=dbus_python):
 
533
            self.dbus_python = module
 
534
            self.bus = self.dbus_python.SystemBus()
 
535
 
 
536
        @contextlib.contextmanager
 
537
        def convert_exception(self, exception_class=dbus.Error):
 
538
            try:
 
539
                yield
 
540
            except self.dbus_python.exceptions.DBusException as e:
 
541
                # This does what "raise from" would do
 
542
                exc = exception_class(*e.args)
 
543
                exc.__cause__ = e
 
544
                raise exc
 
545
 
 
546
        def call_method(self, methodname, busname, objectpath,
 
547
                        interface, *args):
 
548
            proxy_object = self.get_object(busname, objectpath)
 
549
            log.debug("D-Bus: %s:%s:%s.%s(%s)", busname, objectpath,
 
550
                      interface, methodname,
 
551
                      ", ".join(repr(a) for a in args))
 
552
            method = getattr(proxy_object, methodname)
 
553
            with self.convert_exception():
 
554
                with dbus_python_adapter.SilenceLogger(
 
555
                        "dbus.proxies"):
 
556
                    value = method(*args, dbus_interface=interface)
 
557
            return self.type_filter(value)
 
558
 
 
559
        def get_object(self, busname, objectpath):
 
560
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
561
                      busname, objectpath)
 
562
            with self.convert_exception(dbus.ConnectFailed):
 
563
                return self.bus.get_object(busname, objectpath)
 
564
 
 
565
        def type_filter(self, value):
 
566
            """Convert the most bothersome types to Python types"""
 
567
            if isinstance(value, self.dbus_python.Boolean):
 
568
                return bool(value)
 
569
            if isinstance(value, self.dbus_python.ObjectPath):
 
570
                return str(value)
 
571
            # Also recurse into dictionaries
 
572
            if isinstance(value, self.dbus_python.Dictionary):
 
573
                return {self.type_filter(key):
 
574
                        self.type_filter(subval)
 
575
                        for key, subval in value.items()}
 
576
            return value
 
577
 
 
578
        def set_client_property(self, objectpath, key, value):
 
579
            if key == "Secret":
 
580
                if not isinstance(value, bytes):
 
581
                    value = value.encode("utf-8")
 
582
                value = self.dbus_python.ByteArray(value)
 
583
            return self.set_property(self.busname, objectpath,
 
584
                                     self.client_interface, key,
 
585
                                     value)
 
586
 
 
587
    class SilenceLogger:
 
588
        "Simple context manager to silence a particular logger"
 
589
        def __init__(self, loggername):
 
590
            self.logger = logging.getLogger(loggername)
 
591
 
 
592
        def __enter__(self):
 
593
            self.logger.addFilter(self.nullfilter)
 
594
 
 
595
        class NullFilter(logging.Filter):
 
596
            def filter(self, record):
 
597
                return False
 
598
 
 
599
        nullfilter = NullFilter()
 
600
 
 
601
        def __exit__(self, exc_type, exc_val, exc_tb):
 
602
            self.logger.removeFilter(self.nullfilter)
 
603
 
 
604
 
 
605
    class CachingBus(SystemBus):
 
606
        """A caching layer for dbus_python_adapter.SystemBus"""
 
607
        def __init__(self, *args, **kwargs):
 
608
            self.object_cache = {}
 
609
            super(dbus_python_adapter.CachingBus,
 
610
                  self).__init__(*args, **kwargs)
 
611
        def get_object(self, busname, objectpath):
 
612
            try:
 
613
                return self.object_cache[(busname, objectpath)]
 
614
            except KeyError:
 
615
                new_object = super(
 
616
                    dbus_python_adapter.CachingBus,
 
617
                    self).get_object(busname, objectpath)
 
618
                self.object_cache[(busname, objectpath)]  = new_object
 
619
                return new_object
 
620
 
 
621
 
 
622
class pydbus_adapter:
 
623
    class SystemBus(dbus.MandosBus):
 
624
        def __init__(self, module=pydbus):
 
625
            self.pydbus = module
 
626
            self.bus = self.pydbus.SystemBus()
 
627
 
 
628
        @contextlib.contextmanager
 
629
        def convert_exception(self, exception_class=dbus.Error):
 
630
            try:
 
631
                yield
 
632
            except gi.repository.GLib.Error as e:
 
633
                # This does what "raise from" would do
 
634
                exc = exception_class(*e.args)
 
635
                exc.__cause__ = e
 
636
                raise exc
 
637
 
 
638
        def call_method(self, methodname, busname, objectpath,
 
639
                        interface, *args):
 
640
            proxy_object = self.get(busname, objectpath)
 
641
            log.debug("D-Bus: %s:%s:%s.%s(%s)", busname, objectpath,
 
642
                      interface, methodname,
 
643
                      ", ".join(repr(a) for a in args))
 
644
            method = getattr(proxy_object[interface], methodname)
 
645
            with self.convert_exception():
 
646
                return method(*args)
 
647
 
 
648
        def get(self, busname, objectpath):
 
649
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
650
                      busname, objectpath)
 
651
            with self.convert_exception(dbus.ConnectFailed):
 
652
                if sys.version_info.major <= 2:
 
653
                    with warnings.catch_warnings():
 
654
                        warnings.filterwarnings(
 
655
                            "ignore", "", DeprecationWarning,
 
656
                            r"^xml\.etree\.ElementTree$")
 
657
                        return self.bus.get(busname, objectpath)
 
658
                else:
 
659
                    return self.bus.get(busname, objectpath)
 
660
 
 
661
        def set_property(self, busname, objectpath, interface, key,
 
662
                         value):
 
663
            proxy_object = self.get(busname, objectpath)
 
664
            log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", busname,
 
665
                      objectpath, self.properties_iface, interface,
 
666
                      key, value)
 
667
            setattr(proxy_object[interface], key, value)
 
668
 
 
669
    class CachingBus(SystemBus):
 
670
        """A caching layer for pydbus_adapter.SystemBus"""
 
671
        def __init__(self, *args, **kwargs):
 
672
            self.object_cache = {}
 
673
            super(pydbus_adapter.CachingBus,
 
674
                  self).__init__(*args, **kwargs)
 
675
        def get(self, busname, objectpath):
 
676
            try:
 
677
                return self.object_cache[(busname, objectpath)]
 
678
            except KeyError:
 
679
                new_object = (super(pydbus_adapter.CachingBus, self)
 
680
                              .get(busname, objectpath))
 
681
                self.object_cache[(busname, objectpath)]  = new_object
 
682
                return new_object
472
683
 
473
684
 
474
685
def commands_from_options(options):
475
686
 
476
 
    commands = []
477
 
 
478
 
    if options.is_enabled:
479
 
        commands.append(command.IsEnabled())
480
 
 
481
 
    if options.approve:
482
 
        commands.append(command.Approve())
483
 
 
484
 
    if options.deny:
485
 
        commands.append(command.Deny())
486
 
 
487
 
    if options.remove:
488
 
        commands.append(command.Remove())
489
 
 
490
 
    if options.dump_json:
491
 
        commands.append(command.DumpJSON())
492
 
 
493
 
    if options.enable:
494
 
        commands.append(command.Enable())
495
 
 
496
 
    if options.disable:
497
 
        commands.append(command.Disable())
498
 
 
499
 
    if options.bump_timeout:
500
 
        commands.append(command.BumpTimeout())
501
 
 
502
 
    if options.start_checker:
503
 
        commands.append(command.StartChecker())
504
 
 
505
 
    if options.stop_checker:
506
 
        commands.append(command.StopChecker())
507
 
 
508
 
    if options.approved_by_default is not None:
509
 
        if options.approved_by_default:
510
 
            commands.append(command.ApproveByDefault())
 
687
    commands = list(options.commands)
 
688
 
 
689
    def find_cmd(cmd, commands):
 
690
        i = 0
 
691
        for i, c in enumerate(commands):
 
692
            if isinstance(c, cmd):
 
693
                return i
 
694
        return i+1
 
695
 
 
696
    # If command.Remove is present, move any instances of command.Deny
 
697
    # to occur ahead of command.Remove.
 
698
    index_of_remove = find_cmd(command.Remove, commands)
 
699
    before_remove = commands[:index_of_remove]
 
700
    after_remove = commands[index_of_remove:]
 
701
    cleaned_after = []
 
702
    for cmd in after_remove:
 
703
        if isinstance(cmd, command.Deny):
 
704
            before_remove.append(cmd)
511
705
        else:
512
 
            commands.append(command.DenyByDefault())
513
 
 
514
 
    if options.checker is not None:
515
 
        commands.append(command.SetChecker(options.checker))
516
 
 
517
 
    if options.host is not None:
518
 
        commands.append(command.SetHost(options.host))
519
 
 
520
 
    if options.secret is not None:
521
 
        commands.append(command.SetSecret(options.secret))
522
 
 
523
 
    if options.timeout is not None:
524
 
        commands.append(command.SetTimeout(options.timeout))
525
 
 
526
 
    if options.extended_timeout:
527
 
        commands.append(
528
 
            command.SetExtendedTimeout(options.extended_timeout))
529
 
 
530
 
    if options.interval is not None:
531
 
        commands.append(command.SetInterval(options.interval))
532
 
 
533
 
    if options.approval_delay is not None:
534
 
        commands.append(
535
 
            command.SetApprovalDelay(options.approval_delay))
536
 
 
537
 
    if options.approval_duration is not None:
538
 
        commands.append(
539
 
            command.SetApprovalDuration(options.approval_duration))
 
706
            cleaned_after.append(cmd)
 
707
    if cleaned_after != after_remove:
 
708
        commands = before_remove + cleaned_after
540
709
 
541
710
    # If no command option has been given, show table of clients,
542
711
    # optionally verbosely
546
715
    return commands
547
716
 
548
717
 
549
 
class command(object):
 
718
class command:
550
719
    """A namespace for command classes"""
551
720
 
552
 
    class Base(object):
 
721
    class Base:
553
722
        """Abstract base class for commands"""
554
 
        def run(self, clients, bus=None, mandos=None):
 
723
        def run(self, clients, bus=None):
555
724
            """Normal commands should implement run_on_one_client(),
556
725
but commands which want to operate on all clients at the same time can
557
726
override this run() method instead.
558
727
"""
559
 
            self.mandos = mandos
560
 
            for clientpath, properties in clients.items():
561
 
                log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
562
 
                          dbus_busname, str(clientpath))
563
 
                client = bus.get_object(dbus_busname, clientpath)
 
728
            self.bus = bus
 
729
            for client, properties in clients.items():
564
730
                self.run_on_one_client(client, properties)
565
731
 
566
732
 
567
733
    class IsEnabled(Base):
568
 
        def run(self, clients, bus=None, mandos=None):
569
 
            client, properties = next(iter(clients.items()))
570
 
            if self.is_enabled(client, properties):
 
734
        def run(self, clients, bus=None):
 
735
            properties = next(iter(clients.values()))
 
736
            if properties["Enabled"]:
571
737
                sys.exit(0)
572
738
            sys.exit(1)
573
 
        def is_enabled(self, client, properties):
574
 
            return properties["Enabled"]
575
739
 
576
740
 
577
741
    class Approve(Base):
578
742
        def run_on_one_client(self, client, properties):
579
 
            log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
580
 
                      client.__dbus_object_path__,
581
 
                      client_dbus_interface)
582
 
            client.Approve(dbus.Boolean(True),
583
 
                           dbus_interface=client_dbus_interface)
 
743
            self.bus.call_client_method(client, "Approve", True)
584
744
 
585
745
 
586
746
    class Deny(Base):
587
747
        def run_on_one_client(self, client, properties):
588
 
            log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
589
 
                      client.__dbus_object_path__,
590
 
                      client_dbus_interface)
591
 
            client.Approve(dbus.Boolean(False),
592
 
                           dbus_interface=client_dbus_interface)
 
748
            self.bus.call_client_method(client, "Approve", False)
593
749
 
594
750
 
595
751
    class Remove(Base):
596
 
        def run_on_one_client(self, client, properties):
597
 
            log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)",
598
 
                      dbus_busname, server_dbus_path,
599
 
                      server_dbus_interface,
600
 
                      str(client.__dbus_object_path__))
601
 
            self.mandos.RemoveClient(client.__dbus_object_path__)
 
752
        def run(self, clients, bus):
 
753
            for clientpath in frozenset(clients.keys()):
 
754
                bus.call_server_method("RemoveClient", clientpath)
602
755
 
603
756
 
604
757
    class Output(Base):
614
767
 
615
768
 
616
769
    class DumpJSON(Output):
617
 
        def run(self, clients, bus=None, mandos=None):
618
 
            data = {client["Name"]:
619
 
                    {key: self.dbus_boolean_to_bool(client[key])
 
770
        def run(self, clients, bus=None):
 
771
            data = {properties["Name"]:
 
772
                    {key: properties[key]
620
773
                     for key in self.all_keywords}
621
 
                    for client in clients.values()}
 
774
                    for properties in clients.values()}
622
775
            print(json.dumps(data, indent=4, separators=(',', ': ')))
623
776
 
624
 
        @staticmethod
625
 
        def dbus_boolean_to_bool(value):
626
 
            if isinstance(value, dbus.Boolean):
627
 
                value = bool(value)
628
 
            return value
629
 
 
630
777
 
631
778
    class PrintTable(Output):
632
779
        def __init__(self, verbose=False):
633
780
            self.verbose = verbose
634
781
 
635
 
        def run(self, clients, bus=None, mandos=None):
 
782
        def run(self, clients, bus=None):
636
783
            default_keywords = ("Name", "Enabled", "Timeout",
637
784
                                "LastCheckedOK")
638
785
            keywords = default_keywords
640
787
                keywords = self.all_keywords
641
788
            print(self.TableOfClients(clients.values(), keywords))
642
789
 
643
 
        class TableOfClients(object):
 
790
        class TableOfClients:
644
791
            tableheaders = {
645
792
                "Name": "Name",
646
793
                "Enabled": "Enabled",
699
846
 
700
847
            @classmethod
701
848
            def valuetostring(cls, value, keyword):
702
 
                if isinstance(value, dbus.Boolean):
 
849
                if isinstance(value, bool):
703
850
                    return "Yes" if value else "No"
704
851
                if keyword in ("Timeout", "Interval", "ApprovalDelay",
705
852
                               "ApprovalDuration", "ExtendedTimeout"):
728
875
    class PropertySetter(Base):
729
876
        "Abstract class for Actions for setting one client property"
730
877
 
731
 
        def run_on_one_client(self, client, properties):
 
878
        def run_on_one_client(self, client, properties=None):
732
879
            """Set the Client's D-Bus property"""
733
 
            log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
734
 
                      client.__dbus_object_path__,
735
 
                      dbus.PROPERTIES_IFACE, client_dbus_interface,
736
 
                      self.propname, self.value_to_set
737
 
                      if not isinstance(self.value_to_set,
738
 
                                        dbus.Boolean)
739
 
                      else bool(self.value_to_set))
740
 
            client.Set(client_dbus_interface, self.propname,
741
 
                       self.value_to_set,
742
 
                       dbus_interface=dbus.PROPERTIES_IFACE)
 
880
            self.bus.set_client_property(client, self.propname,
 
881
                                         self.value_to_set)
743
882
 
744
883
        @property
745
884
        def propname(self):
748
887
 
749
888
    class Enable(PropertySetter):
750
889
        propname = "Enabled"
751
 
        value_to_set = dbus.Boolean(True)
 
890
        value_to_set = True
752
891
 
753
892
 
754
893
    class Disable(PropertySetter):
755
894
        propname = "Enabled"
756
 
        value_to_set = dbus.Boolean(False)
 
895
        value_to_set = False
757
896
 
758
897
 
759
898
    class BumpTimeout(PropertySetter):
763
902
 
764
903
    class StartChecker(PropertySetter):
765
904
        propname = "CheckerRunning"
766
 
        value_to_set = dbus.Boolean(True)
 
905
        value_to_set = True
767
906
 
768
907
 
769
908
    class StopChecker(PropertySetter):
770
909
        propname = "CheckerRunning"
771
 
        value_to_set = dbus.Boolean(False)
 
910
        value_to_set = False
772
911
 
773
912
 
774
913
    class ApproveByDefault(PropertySetter):
775
914
        propname = "ApprovedByDefault"
776
 
        value_to_set = dbus.Boolean(True)
 
915
        value_to_set = True
777
916
 
778
917
 
779
918
    class DenyByDefault(PropertySetter):
780
919
        propname = "ApprovedByDefault"
781
 
        value_to_set = dbus.Boolean(False)
 
920
        value_to_set = False
782
921
 
783
922
 
784
923
    class PropertySetterValue(PropertySetter):
787
926
        def __init__(self, value):
788
927
            self.value_to_set = value
789
928
 
 
929
        @classmethod
 
930
        def argparse(cls, argtype):
 
931
            def cmdtype(arg):
 
932
                return cls(argtype(arg))
 
933
            return cmdtype
790
934
 
791
935
    class SetChecker(PropertySetterValue):
792
936
        propname = "Checker"
880
1024
                                                     "output"))
881
1025
 
882
1026
 
 
1027
class Unique:
 
1028
    """Class for objects which exist only to be unique objects, since
 
1029
unittest.mock.sentinel only exists in Python 3.3"""
 
1030
 
 
1031
 
883
1032
class Test_string_to_delta(TestCaseWithAssertLogs):
884
1033
    # Just test basic RFC 3339 functionality here, the doc string for
885
1034
    # rfc3339_duration_to_delta() already has more comprehensive
886
 
    # tests, which is run by doctest.
 
1035
    # tests, which are run by doctest.
887
1036
 
888
1037
    def test_rfc3339_zero_seconds(self):
889
1038
        self.assertEqual(datetime.timedelta(),
913
1062
 
914
1063
    def test_actions_requires_client_or_all(self):
915
1064
        for action, value in self.actions.items():
916
 
            options = self.parser.parse_args()
917
 
            setattr(options, action, value)
 
1065
            args = self.actionargs(action, value)
918
1066
            with self.assertParseError():
919
 
                self.check_option_syntax(options)
 
1067
                self.parse_args(args)
920
1068
 
921
 
    # This mostly corresponds to the definition from has_actions() in
 
1069
    # This mostly corresponds to the definition from has_commands() in
922
1070
    # check_option_syntax()
923
1071
    actions = {
924
 
        # The actual values set here are not that important, but we do
925
 
        # at least stick to the correct types, even though they are
926
 
        # never used
927
 
        "enable": True,
928
 
        "disable": True,
929
 
        "bump_timeout": True,
930
 
        "start_checker": True,
931
 
        "stop_checker": True,
932
 
        "is_enabled": True,
933
 
        "remove": True,
934
 
        "checker": "x",
935
 
        "timeout": datetime.timedelta(),
936
 
        "extended_timeout": datetime.timedelta(),
937
 
        "interval": datetime.timedelta(),
938
 
        "approved_by_default": True,
939
 
        "approval_delay": datetime.timedelta(),
940
 
        "approval_duration": datetime.timedelta(),
941
 
        "host": "x",
942
 
        "secret": io.BytesIO(b"x"),
943
 
        "approve": True,
944
 
        "deny": True,
 
1072
        "--enable": None,
 
1073
        "--disable": None,
 
1074
        "--bump-timeout": None,
 
1075
        "--start-checker": None,
 
1076
        "--stop-checker": None,
 
1077
        "--is-enabled": None,
 
1078
        "--remove": None,
 
1079
        "--checker": "x",
 
1080
        "--timeout": "PT0S",
 
1081
        "--extended-timeout": "PT0S",
 
1082
        "--interval": "PT0S",
 
1083
        "--approve-by-default": None,
 
1084
        "--deny-by-default": None,
 
1085
        "--approval-delay": "PT0S",
 
1086
        "--approval-duration": "PT0S",
 
1087
        "--host": "hostname",
 
1088
        "--secret": "/dev/null",
 
1089
        "--approve": None,
 
1090
        "--deny": None,
945
1091
    }
946
1092
 
 
1093
    @staticmethod
 
1094
    def actionargs(action, value, *args):
 
1095
        if value is not None:
 
1096
            return [action, value] + list(args)
 
1097
        else:
 
1098
            return [action] + list(args)
 
1099
 
947
1100
    @contextlib.contextmanager
948
1101
    def assertParseError(self):
949
1102
        with self.assertRaises(SystemExit) as e:
954
1107
        # /argparse.html#exiting-methods
955
1108
        self.assertEqual(2, e.exception.code)
956
1109
 
 
1110
    def parse_args(self, args):
 
1111
        options = self.parser.parse_args(args)
 
1112
        check_option_syntax(self.parser, options)
 
1113
 
957
1114
    @staticmethod
958
1115
    @contextlib.contextmanager
959
1116
    def redirect_stderr_to_devnull():
970
1127
 
971
1128
    def test_actions_all_conflicts_with_verbose(self):
972
1129
        for action, value in self.actions.items():
973
 
            options = self.parser.parse_args()
974
 
            setattr(options, action, value)
975
 
            options.all = True
976
 
            options.verbose = True
 
1130
            args = self.actionargs(action, value, "--all",
 
1131
                                   "--verbose")
977
1132
            with self.assertParseError():
978
 
                self.check_option_syntax(options)
 
1133
                self.parse_args(args)
979
1134
 
980
1135
    def test_actions_with_client_conflicts_with_verbose(self):
981
1136
        for action, value in self.actions.items():
982
 
            options = self.parser.parse_args()
983
 
            setattr(options, action, value)
984
 
            options.verbose = True
985
 
            options.client = ["client"]
 
1137
            args = self.actionargs(action, value, "--verbose",
 
1138
                                   "client")
986
1139
            with self.assertParseError():
987
 
                self.check_option_syntax(options)
 
1140
                self.parse_args(args)
988
1141
 
989
1142
    def test_dump_json_conflicts_with_verbose(self):
990
 
        options = self.parser.parse_args()
991
 
        options.dump_json = True
992
 
        options.verbose = True
 
1143
        args = ["--dump-json", "--verbose"]
993
1144
        with self.assertParseError():
994
 
            self.check_option_syntax(options)
 
1145
            self.parse_args(args)
995
1146
 
996
1147
    def test_dump_json_conflicts_with_action(self):
997
1148
        for action, value in self.actions.items():
998
 
            options = self.parser.parse_args()
999
 
            setattr(options, action, value)
1000
 
            options.dump_json = True
 
1149
            args = self.actionargs(action, value, "--dump-json")
1001
1150
            with self.assertParseError():
1002
 
                self.check_option_syntax(options)
 
1151
                self.parse_args(args)
1003
1152
 
1004
1153
    def test_all_can_not_be_alone(self):
1005
 
        options = self.parser.parse_args()
1006
 
        options.all = True
 
1154
        args = ["--all"]
1007
1155
        with self.assertParseError():
1008
 
            self.check_option_syntax(options)
 
1156
            self.parse_args(args)
1009
1157
 
1010
1158
    def test_all_is_ok_with_any_action(self):
1011
1159
        for action, value in self.actions.items():
1012
 
            options = self.parser.parse_args()
1013
 
            setattr(options, action, value)
1014
 
            options.all = True
1015
 
            self.check_option_syntax(options)
 
1160
            args = self.actionargs(action, value, "--all")
 
1161
            self.parse_args(args)
1016
1162
 
1017
1163
    def test_any_action_is_ok_with_one_client(self):
1018
1164
        for action, value in self.actions.items():
1019
 
            options = self.parser.parse_args()
1020
 
            setattr(options, action, value)
1021
 
            options.client = ["client"]
1022
 
            self.check_option_syntax(options)
 
1165
            args = self.actionargs(action, value, "client")
 
1166
            self.parse_args(args)
1023
1167
 
1024
1168
    def test_one_client_with_all_actions_except_is_enabled(self):
1025
 
        options = self.parser.parse_args()
1026
1169
        for action, value in self.actions.items():
1027
 
            if action == "is_enabled":
 
1170
            if action == "--is-enabled":
1028
1171
                continue
1029
 
            setattr(options, action, value)
1030
 
        options.client = ["client"]
1031
 
        self.check_option_syntax(options)
 
1172
            args = self.actionargs(action, value, "client")
 
1173
            self.parse_args(args)
1032
1174
 
1033
1175
    def test_two_clients_with_all_actions_except_is_enabled(self):
1034
 
        options = self.parser.parse_args()
1035
1176
        for action, value in self.actions.items():
1036
 
            if action == "is_enabled":
 
1177
            if action == "--is-enabled":
1037
1178
                continue
1038
 
            setattr(options, action, value)
1039
 
        options.client = ["client1", "client2"]
1040
 
        self.check_option_syntax(options)
 
1179
            args = self.actionargs(action, value, "client1",
 
1180
                                   "client2")
 
1181
            self.parse_args(args)
1041
1182
 
1042
1183
    def test_two_clients_are_ok_with_actions_except_is_enabled(self):
1043
1184
        for action, value in self.actions.items():
1044
 
            if action == "is_enabled":
 
1185
            if action == "--is-enabled":
1045
1186
                continue
1046
 
            options = self.parser.parse_args()
1047
 
            setattr(options, action, value)
1048
 
            options.client = ["client1", "client2"]
1049
 
            self.check_option_syntax(options)
 
1187
            args = self.actionargs(action, value, "client1",
 
1188
                                   "client2")
 
1189
            self.parse_args(args)
1050
1190
 
1051
1191
    def test_is_enabled_fails_without_client(self):
1052
 
        options = self.parser.parse_args()
1053
 
        options.is_enabled = True
 
1192
        args = ["--is-enabled"]
1054
1193
        with self.assertParseError():
1055
 
            self.check_option_syntax(options)
 
1194
            self.parse_args(args)
1056
1195
 
1057
1196
    def test_is_enabled_fails_with_two_clients(self):
1058
 
        options = self.parser.parse_args()
1059
 
        options.is_enabled = True
1060
 
        options.client = ["client1", "client2"]
 
1197
        args = ["--is-enabled", "client1", "client2"]
1061
1198
        with self.assertParseError():
1062
 
            self.check_option_syntax(options)
 
1199
            self.parse_args(args)
1063
1200
 
1064
1201
    def test_remove_can_only_be_combined_with_action_deny(self):
1065
1202
        for action, value in self.actions.items():
1066
 
            if action in {"remove", "deny"}:
 
1203
            if action in {"--remove", "--deny"}:
1067
1204
                continue
1068
 
            options = self.parser.parse_args()
1069
 
            setattr(options, action, value)
1070
 
            options.all = True
1071
 
            options.remove = True
 
1205
            args = self.actionargs(action, value, "--all",
 
1206
                                   "--remove")
1072
1207
            with self.assertParseError():
1073
 
                self.check_option_syntax(options)
1074
 
 
1075
 
 
1076
 
class Test_get_mandos_dbus_object(TestCaseWithAssertLogs):
1077
 
    def test_calls_and_returns_get_object_on_bus(self):
1078
 
        class MockBus(object):
1079
 
            called = False
1080
 
            def get_object(mockbus_self, busname, dbus_path):
1081
 
                # Note that "self" is still the testcase instance,
1082
 
                # this MockBus instance is in "mockbus_self".
1083
 
                self.assertEqual(dbus_busname, busname)
1084
 
                self.assertEqual(server_dbus_path, dbus_path)
1085
 
                mockbus_self.called = True
1086
 
                return mockbus_self
1087
 
 
1088
 
        mockbus = get_mandos_dbus_object(bus=MockBus())
1089
 
        self.assertIsInstance(mockbus, MockBus)
1090
 
        self.assertTrue(mockbus.called)
1091
 
 
1092
 
    def test_logs_and_exits_on_dbus_error(self):
1093
 
        class FailingBusStub(object):
1094
 
            def get_object(self, busname, dbus_path):
1095
 
                raise dbus.exceptions.DBusException("Test")
1096
 
 
1097
 
        with self.assertLogs(log, logging.CRITICAL):
1098
 
            with self.assertRaises(SystemExit) as e:
1099
 
                bus = get_mandos_dbus_object(bus=FailingBusStub())
1100
 
 
1101
 
        if isinstance(e.exception.code, int):
1102
 
            self.assertNotEqual(0, e.exception.code)
1103
 
        else:
1104
 
            self.assertIsNotNone(e.exception.code)
1105
 
 
1106
 
 
1107
 
class Test_get_managed_objects(TestCaseWithAssertLogs):
1108
 
    def test_calls_and_returns_GetManagedObjects(self):
1109
 
        managed_objects = {"/clients/client": { "Name": "client"}}
1110
 
        class ObjectManagerStub(object):
1111
 
            def GetManagedObjects(self):
1112
 
                return managed_objects
1113
 
        retval = get_managed_objects(ObjectManagerStub())
1114
 
        self.assertDictEqual(managed_objects, retval)
1115
 
 
1116
 
    def test_logs_and_exits_on_dbus_error(self):
 
1208
                self.parse_args(args)
 
1209
 
 
1210
 
 
1211
class Test_dbus_exceptions(unittest.TestCase):
 
1212
 
 
1213
    def test_dbus_ConnectFailed_is_Error(self):
 
1214
        with self.assertRaises(dbus.Error):
 
1215
            raise dbus.ConnectFailed()
 
1216
 
 
1217
 
 
1218
class Test_dbus_MandosBus(unittest.TestCase):
 
1219
 
 
1220
    class MockMandosBus(dbus.MandosBus):
 
1221
        def __init__(self):
 
1222
            self._name = "se.recompile.Mandos"
 
1223
            self._server_path = "/"
 
1224
            self._server_interface = "se.recompile.Mandos"
 
1225
            self._client_interface = "se.recompile.Mandos.Client"
 
1226
            self.calls = []
 
1227
            self.call_method_return = Unique()
 
1228
 
 
1229
        def call_method(self, methodname, busname, objectpath,
 
1230
                        interface, *args):
 
1231
            self.calls.append((methodname, busname, objectpath,
 
1232
                               interface, args))
 
1233
            return self.call_method_return
 
1234
 
 
1235
    def setUp(self):
 
1236
        self.bus = self.MockMandosBus()
 
1237
 
 
1238
    def test_set_client_property(self):
 
1239
        self.bus.set_client_property("objectpath", "key", "value")
 
1240
        expected_call = ("Set", self.bus._name, "objectpath",
 
1241
                         "org.freedesktop.DBus.Properties",
 
1242
                         (self.bus._client_interface, "key", "value"))
 
1243
        self.assertIn(expected_call, self.bus.calls)
 
1244
 
 
1245
    def test_call_client_method(self):
 
1246
        ret = self.bus.call_client_method("objectpath", "methodname")
 
1247
        self.assertIs(self.bus.call_method_return, ret)
 
1248
        expected_call = ("methodname", self.bus._name, "objectpath",
 
1249
                         self.bus._client_interface, ())
 
1250
        self.assertIn(expected_call, self.bus.calls)
 
1251
 
 
1252
    def test_call_client_method_with_args(self):
 
1253
        args = (Unique(), Unique())
 
1254
        ret = self.bus.call_client_method("objectpath", "methodname",
 
1255
                                          *args)
 
1256
        self.assertIs(self.bus.call_method_return, ret)
 
1257
        expected_call = ("methodname", self.bus._name, "objectpath",
 
1258
                         self.bus._client_interface,
 
1259
                         (args[0], args[1]))
 
1260
        self.assertIn(expected_call, self.bus.calls)
 
1261
 
 
1262
    def test_get_clients_and_properties(self):
 
1263
        managed_objects = {
 
1264
            "objectpath": {
 
1265
                self.bus._client_interface: {
 
1266
                    "key": "value",
 
1267
                    "bool": True,
 
1268
                },
 
1269
                "irrelevant_interface": {
 
1270
                    "key": "othervalue",
 
1271
                    "bool": False,
 
1272
                },
 
1273
            },
 
1274
            "other_objectpath": {
 
1275
                "other_irrelevant_interface": {
 
1276
                    "key": "value 3",
 
1277
                    "bool": None,
 
1278
                },
 
1279
            },
 
1280
        }
 
1281
        expected_clients_and_properties = {
 
1282
            "objectpath": {
 
1283
                "key": "value",
 
1284
                "bool": True,
 
1285
            }
 
1286
        }
 
1287
        self.bus.call_method_return = managed_objects
 
1288
        ret = self.bus.get_clients_and_properties()
 
1289
        self.assertDictEqual(expected_clients_and_properties, ret)
 
1290
        expected_call = ("GetManagedObjects", self.bus._name,
 
1291
                         self.bus._server_path,
 
1292
                         "org.freedesktop.DBus.ObjectManager", ())
 
1293
        self.assertIn(expected_call, self.bus.calls)
 
1294
 
 
1295
    def test_call_server_method(self):
 
1296
        ret = self.bus.call_server_method("methodname")
 
1297
        self.assertIs(self.bus.call_method_return, ret)
 
1298
        expected_call = ("methodname", self.bus._name,
 
1299
                         self.bus._server_path,
 
1300
                         self.bus._server_interface, ())
 
1301
        self.assertIn(expected_call, self.bus.calls)
 
1302
 
 
1303
    def test_call_server_method_with_args(self):
 
1304
        args = (Unique(), Unique())
 
1305
        ret = self.bus.call_server_method("methodname", *args)
 
1306
        self.assertIs(self.bus.call_method_return, ret)
 
1307
        expected_call = ("methodname", self.bus._name,
 
1308
                         self.bus._server_path,
 
1309
                         self.bus._server_interface,
 
1310
                         (args[0], args[1]))
 
1311
        self.assertIn(expected_call, self.bus.calls)
 
1312
 
 
1313
 
 
1314
class Test_dbus_python_adapter_SystemBus(TestCaseWithAssertLogs):
 
1315
 
 
1316
    def MockDBusPython_func(self, func):
 
1317
        class mock_dbus_python:
 
1318
            """mock dbus-python module"""
 
1319
            class exceptions:
 
1320
                """Pseudo-namespace"""
 
1321
                class DBusException(Exception):
 
1322
                    pass
 
1323
            class SystemBus:
 
1324
                @staticmethod
 
1325
                def get_object(busname, objectpath):
 
1326
                    DBusObject = collections.namedtuple(
 
1327
                        "DBusObject", ("methodname", "Set"))
 
1328
                    def method(*args, **kwargs):
 
1329
                        self.assertEqual({"dbus_interface":
 
1330
                                          "interface"},
 
1331
                                         kwargs)
 
1332
                        return func(*args)
 
1333
                    def set_property(interface, key, value,
 
1334
                                     dbus_interface=None):
 
1335
                        self.assertEqual(
 
1336
                            "org.freedesktop.DBus.Properties",
 
1337
                            dbus_interface)
 
1338
                        self.assertEqual("Secret", key)
 
1339
                        return func(interface, key, value,
 
1340
                                    dbus_interface=dbus_interface)
 
1341
                    return DBusObject(methodname=method,
 
1342
                                      Set=set_property)
 
1343
            class Boolean:
 
1344
                def __init__(self, value):
 
1345
                    self.value = bool(value)
 
1346
                def __bool__(self):
 
1347
                    return self.value
 
1348
                if sys.version_info.major == 2:
 
1349
                    __nonzero__ = __bool__
 
1350
            class ObjectPath(str):
 
1351
                pass
 
1352
            class Dictionary(dict):
 
1353
                pass
 
1354
            class ByteArray(bytes):
 
1355
                pass
 
1356
        return mock_dbus_python
 
1357
 
 
1358
    def call_method(self, bus, methodname, busname, objectpath,
 
1359
                    interface, *args):
 
1360
        with self.assertLogs(log, logging.DEBUG):
 
1361
            return bus.call_method(methodname, busname, objectpath,
 
1362
                                   interface, *args)
 
1363
 
 
1364
    def test_call_method_returns(self):
 
1365
        expected_method_return = Unique()
 
1366
        method_args = (Unique(), Unique())
 
1367
        def func(*args):
 
1368
            self.assertEqual(len(method_args), len(args))
 
1369
            for marg, arg in zip(method_args, args):
 
1370
                self.assertIs(marg, arg)
 
1371
            return expected_method_return
 
1372
        mock_dbus_python = self.MockDBusPython_func(func)
 
1373
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1374
        ret = self.call_method(bus, "methodname", "busname",
 
1375
                               "objectpath", "interface",
 
1376
                               *method_args)
 
1377
        self.assertIs(ret, expected_method_return)
 
1378
 
 
1379
    def test_call_method_filters_bool_true(self):
 
1380
        def func():
 
1381
            return method_return
 
1382
        mock_dbus_python = self.MockDBusPython_func(func)
 
1383
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1384
        method_return = mock_dbus_python.Boolean(True)
 
1385
        ret = self.call_method(bus, "methodname", "busname",
 
1386
                               "objectpath", "interface")
 
1387
        self.assertTrue(ret)
 
1388
        self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
 
1389
 
 
1390
    def test_call_method_filters_bool_false(self):
 
1391
        def func():
 
1392
            return method_return
 
1393
        mock_dbus_python = self.MockDBusPython_func(func)
 
1394
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1395
        method_return = mock_dbus_python.Boolean(False)
 
1396
        ret = self.call_method(bus, "methodname", "busname",
 
1397
                               "objectpath", "interface")
 
1398
        self.assertFalse(ret)
 
1399
        self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
 
1400
 
 
1401
    def test_call_method_filters_objectpath(self):
 
1402
        def func():
 
1403
            return method_return
 
1404
        mock_dbus_python = self.MockDBusPython_func(func)
 
1405
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1406
        method_return = mock_dbus_python.ObjectPath("objectpath")
 
1407
        ret = self.call_method(bus, "methodname", "busname",
 
1408
                               "objectpath", "interface")
 
1409
        self.assertEqual("objectpath", ret)
 
1410
        self.assertIsNot("objectpath", ret)
 
1411
        self.assertNotIsInstance(ret, mock_dbus_python.ObjectPath)
 
1412
 
 
1413
    def test_call_method_filters_booleans_in_dict(self):
 
1414
        def func():
 
1415
            return method_return
 
1416
        mock_dbus_python = self.MockDBusPython_func(func)
 
1417
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1418
        method_return = mock_dbus_python.Dictionary(
 
1419
        {mock_dbus_python.Boolean(True):
 
1420
         mock_dbus_python.Boolean(False),
 
1421
         mock_dbus_python.Boolean(False):
 
1422
         mock_dbus_python.Boolean(True)})
 
1423
        ret = self.call_method(bus, "methodname", "busname",
 
1424
                               "objectpath", "interface")
 
1425
        expected_method_return = {True: False,
 
1426
                                  False: True}
 
1427
        self.assertEqual(expected_method_return, ret)
 
1428
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
 
1429
 
 
1430
    def test_call_method_filters_objectpaths_in_dict(self):
 
1431
        def func():
 
1432
            return method_return
 
1433
        mock_dbus_python = self.MockDBusPython_func(func)
 
1434
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1435
        method_return = mock_dbus_python.Dictionary(
 
1436
        {mock_dbus_python.ObjectPath("objectpath_key_1"):
 
1437
         mock_dbus_python.ObjectPath("objectpath_value_1"),
 
1438
         mock_dbus_python.ObjectPath("objectpath_key_2"):
 
1439
         mock_dbus_python.ObjectPath("objectpath_value_2")})
 
1440
        ret = self.call_method(bus, "methodname", "busname",
 
1441
                               "objectpath", "interface")
 
1442
        expected_method_return = {str(key): str(value)
 
1443
                                  for key, value in
 
1444
                                  method_return.items()}
 
1445
        self.assertEqual(expected_method_return, ret)
 
1446
        self.assertIsInstance(ret, dict)
 
1447
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
 
1448
 
 
1449
    def test_call_method_filters_dict_in_dict(self):
 
1450
        def func():
 
1451
            return method_return
 
1452
        mock_dbus_python = self.MockDBusPython_func(func)
 
1453
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1454
        method_return = mock_dbus_python.Dictionary(
 
1455
        {"key1": mock_dbus_python.Dictionary({"key11": "value11",
 
1456
                                              "key12": "value12"}),
 
1457
         "key2": mock_dbus_python.Dictionary({"key21": "value21",
 
1458
                                              "key22": "value22"})})
 
1459
        ret = self.call_method(bus, "methodname", "busname",
 
1460
                               "objectpath", "interface")
 
1461
        expected_method_return = {
 
1462
            "key1": {"key11": "value11",
 
1463
                     "key12": "value12"},
 
1464
            "key2": {"key21": "value21",
 
1465
                     "key22": "value22"},
 
1466
        }
 
1467
        self.assertEqual(expected_method_return, ret)
 
1468
        self.assertIsInstance(ret, dict)
 
1469
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
 
1470
        for key, value in ret.items():
 
1471
            self.assertIsInstance(value, dict)
 
1472
            self.assertEqual(expected_method_return[key], value)
 
1473
            self.assertNotIsInstance(value,
 
1474
                                     mock_dbus_python.Dictionary)
 
1475
 
 
1476
    def test_call_method_filters_dict_three_deep(self):
 
1477
        def func():
 
1478
            return method_return
 
1479
        mock_dbus_python = self.MockDBusPython_func(func)
 
1480
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1481
        method_return = mock_dbus_python.Dictionary(
 
1482
            {"key1":
 
1483
             mock_dbus_python.Dictionary(
 
1484
                 {"key2":
 
1485
                  mock_dbus_python.Dictionary(
 
1486
                      {"key3":
 
1487
                       mock_dbus_python.Boolean(True),
 
1488
                       }),
 
1489
                  }),
 
1490
             })
 
1491
        ret = self.call_method(bus, "methodname", "busname",
 
1492
                               "objectpath", "interface")
 
1493
        expected_method_return = {"key1": {"key2": {"key3": True}}}
 
1494
        self.assertEqual(expected_method_return, ret)
 
1495
        self.assertIsInstance(ret, dict)
 
1496
        self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
 
1497
        self.assertIsInstance(ret["key1"], dict)
 
1498
        self.assertNotIsInstance(ret["key1"],
 
1499
                                 mock_dbus_python.Dictionary)
 
1500
        self.assertIsInstance(ret["key1"]["key2"], dict)
 
1501
        self.assertNotIsInstance(ret["key1"]["key2"],
 
1502
                                 mock_dbus_python.Dictionary)
 
1503
        self.assertTrue(ret["key1"]["key2"]["key3"])
 
1504
        self.assertNotIsInstance(ret["key1"]["key2"]["key3"],
 
1505
                                 mock_dbus_python.Boolean)
 
1506
 
 
1507
    def test_call_method_handles_exception(self):
1117
1508
        dbus_logger = logging.getLogger("dbus.proxies")
1118
1509
 
1119
 
        class ObjectManagerFailingStub(object):
1120
 
            def GetManagedObjects(self):
1121
 
                dbus_logger.error("Test")
1122
 
                raise dbus.exceptions.DBusException("Test")
 
1510
        def func():
 
1511
            dbus_logger.error("Test")
 
1512
            raise mock_dbus_python.exceptions.DBusException()
 
1513
 
 
1514
        mock_dbus_python = self.MockDBusPython_func(func)
 
1515
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1123
1516
 
1124
1517
        class CountingHandler(logging.Handler):
1125
1518
            count = 0
1131
1524
        dbus_logger.addHandler(counting_handler)
1132
1525
 
1133
1526
        try:
1134
 
            with self.assertLogs(log, logging.CRITICAL) as watcher:
1135
 
                with self.assertRaises(SystemExit) as e:
1136
 
                    get_managed_objects(ObjectManagerFailingStub())
 
1527
            with self.assertRaises(dbus.Error) as e:
 
1528
                self.call_method(bus, "methodname", "busname",
 
1529
                                 "objectpath", "interface")
1137
1530
        finally:
1138
1531
            dbus_logger.removeFilter(counting_handler)
1139
1532
 
 
1533
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1534
 
1140
1535
        # Make sure the dbus logger was suppressed
1141
1536
        self.assertEqual(0, counting_handler.count)
1142
1537
 
1143
 
        # Test that the dbus_logger still works
1144
 
        with self.assertLogs(dbus_logger, logging.ERROR):
1145
 
            dbus_logger.error("Test")
1146
 
 
1147
 
        if isinstance(e.exception.code, int):
1148
 
            self.assertNotEqual(0, e.exception.code)
1149
 
        else:
1150
 
            self.assertIsNotNone(e.exception.code)
 
1538
    def test_Set_Secret_sends_bytearray(self):
 
1539
        ret = [None]
 
1540
        def func(*args, **kwargs):
 
1541
            ret[0] = (args, kwargs)
 
1542
        mock_dbus_python = self.MockDBusPython_func(func)
 
1543
        bus = dbus_python_adapter.SystemBus(mock_dbus_python)
 
1544
        bus.set_client_property("objectpath", "Secret", "value")
 
1545
        expected_call = (("se.recompile.Mandos.Client", "Secret",
 
1546
                          mock_dbus_python.ByteArray(b"value")),
 
1547
                         {"dbus_interface":
 
1548
                          "org.freedesktop.DBus.Properties"})
 
1549
        self.assertEqual(expected_call, ret[0])
 
1550
        if sys.version_info.major == 2:
 
1551
            self.assertIsInstance(ret[0][0][-1],
 
1552
                                  mock_dbus_python.ByteArray)
 
1553
 
 
1554
    def test_get_object_converts_to_correct_exception(self):
 
1555
        bus = dbus_python_adapter.SystemBus(
 
1556
            self.fake_dbus_python_raises_exception_on_connect)
 
1557
        with self.assertRaises(dbus.ConnectFailed):
 
1558
            self.call_method(bus, "methodname", "busname",
 
1559
                             "objectpath", "interface")
 
1560
 
 
1561
    class fake_dbus_python_raises_exception_on_connect:
 
1562
        """fake dbus-python module"""
 
1563
        class exceptions:
 
1564
            """Pseudo-namespace"""
 
1565
            class DBusException(Exception):
 
1566
                pass
 
1567
 
 
1568
        @classmethod
 
1569
        def SystemBus(cls):
 
1570
            def get_object(busname, objectpath):
 
1571
                raise cls.exceptions.DBusException()
 
1572
            Bus = collections.namedtuple("Bus", ["get_object"])
 
1573
            return Bus(get_object=get_object)
 
1574
 
 
1575
 
 
1576
class Test_dbus_python_adapter_CachingBus(unittest.TestCase):
 
1577
    class mock_dbus_python:
 
1578
        """mock dbus-python modules"""
 
1579
        class SystemBus:
 
1580
            @staticmethod
 
1581
            def get_object(busname, objectpath):
 
1582
                return Unique()
 
1583
 
 
1584
    def setUp(self):
 
1585
        self.bus = dbus_python_adapter.CachingBus(
 
1586
            self.mock_dbus_python)
 
1587
 
 
1588
    def test_returns_distinct_objectpaths(self):
 
1589
        obj1 = self.bus.get_object("busname", "objectpath1")
 
1590
        self.assertIsInstance(obj1, Unique)
 
1591
        obj2 = self.bus.get_object("busname", "objectpath2")
 
1592
        self.assertIsInstance(obj2, Unique)
 
1593
        self.assertIsNot(obj1, obj2)
 
1594
 
 
1595
    def test_returns_distinct_busnames(self):
 
1596
        obj1 = self.bus.get_object("busname1", "objectpath")
 
1597
        self.assertIsInstance(obj1, Unique)
 
1598
        obj2 = self.bus.get_object("busname2", "objectpath")
 
1599
        self.assertIsInstance(obj2, Unique)
 
1600
        self.assertIsNot(obj1, obj2)
 
1601
 
 
1602
    def test_returns_distinct_both(self):
 
1603
        obj1 = self.bus.get_object("busname1", "objectpath")
 
1604
        self.assertIsInstance(obj1, Unique)
 
1605
        obj2 = self.bus.get_object("busname2", "objectpath")
 
1606
        self.assertIsInstance(obj2, Unique)
 
1607
        self.assertIsNot(obj1, obj2)
 
1608
 
 
1609
    def test_returns_same(self):
 
1610
        obj1 = self.bus.get_object("busname", "objectpath")
 
1611
        self.assertIsInstance(obj1, Unique)
 
1612
        obj2 = self.bus.get_object("busname", "objectpath")
 
1613
        self.assertIsInstance(obj2, Unique)
 
1614
        self.assertIs(obj1, obj2)
 
1615
 
 
1616
    def test_returns_same_old(self):
 
1617
        obj1 = self.bus.get_object("busname1", "objectpath1")
 
1618
        self.assertIsInstance(obj1, Unique)
 
1619
        obj2 = self.bus.get_object("busname2", "objectpath2")
 
1620
        self.assertIsInstance(obj2, Unique)
 
1621
        obj1b = self.bus.get_object("busname1", "objectpath1")
 
1622
        self.assertIsInstance(obj1b, Unique)
 
1623
        self.assertIsNot(obj1, obj2)
 
1624
        self.assertIsNot(obj2, obj1b)
 
1625
        self.assertIs(obj1, obj1b)
 
1626
 
 
1627
 
 
1628
class Test_pydbus_adapter_SystemBus(TestCaseWithAssertLogs):
 
1629
 
 
1630
    def Stub_pydbus_func(self, func):
 
1631
        class stub_pydbus:
 
1632
            """stub pydbus module"""
 
1633
            class SystemBus:
 
1634
                @staticmethod
 
1635
                def get(busname, objectpath):
 
1636
                    DBusObject = collections.namedtuple(
 
1637
                        "DBusObject", ("methodname",))
 
1638
                    return {"interface":
 
1639
                            DBusObject(methodname=func)}
 
1640
        return stub_pydbus
 
1641
 
 
1642
    def call_method(self, bus, methodname, busname, objectpath,
 
1643
                    interface, *args):
 
1644
        with self.assertLogs(log, logging.DEBUG):
 
1645
            return bus.call_method(methodname, busname, objectpath,
 
1646
                                   interface, *args)
 
1647
 
 
1648
    def test_call_method_returns(self):
 
1649
        expected_method_return = Unique()
 
1650
        method_args = (Unique(), Unique())
 
1651
        def func(*args):
 
1652
            self.assertEqual(len(method_args), len(args))
 
1653
            for marg, arg in zip(method_args, args):
 
1654
                self.assertIs(marg, arg)
 
1655
            return expected_method_return
 
1656
        stub_pydbus = self.Stub_pydbus_func(func)
 
1657
        bus = pydbus_adapter.SystemBus(stub_pydbus)
 
1658
        ret = self.call_method(bus, "methodname", "busname",
 
1659
                               "objectpath", "interface",
 
1660
                               *method_args)
 
1661
        self.assertIs(ret, expected_method_return)
 
1662
 
 
1663
    def test_call_method_handles_exception(self):
 
1664
        dbus_logger = logging.getLogger("dbus.proxies")
 
1665
 
 
1666
        def func():
 
1667
            raise gi.repository.GLib.Error()
 
1668
 
 
1669
        stub_pydbus = self.Stub_pydbus_func(func)
 
1670
        bus = pydbus_adapter.SystemBus(stub_pydbus)
 
1671
 
 
1672
        with self.assertRaises(dbus.Error) as e:
 
1673
            self.call_method(bus, "methodname", "busname",
 
1674
                             "objectpath", "interface")
 
1675
 
 
1676
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1677
 
 
1678
    def test_get_converts_to_correct_exception(self):
 
1679
        bus = pydbus_adapter.SystemBus(
 
1680
            self.fake_pydbus_raises_exception_on_connect)
 
1681
        with self.assertRaises(dbus.ConnectFailed):
 
1682
            self.call_method(bus, "methodname", "busname",
 
1683
                             "objectpath", "interface")
 
1684
 
 
1685
    class fake_pydbus_raises_exception_on_connect:
 
1686
        """fake dbus-python module"""
 
1687
        @classmethod
 
1688
        def SystemBus(cls):
 
1689
            def get(busname, objectpath):
 
1690
                raise gi.repository.GLib.Error()
 
1691
            Bus = collections.namedtuple("Bus", ["get"])
 
1692
            return Bus(get=get)
 
1693
 
 
1694
    def test_set_property_uses_setattr(self):
 
1695
        class Object:
 
1696
            pass
 
1697
        obj = Object()
 
1698
        class pydbus_spy:
 
1699
            class SystemBus:
 
1700
                @staticmethod
 
1701
                def get(busname, objectpath):
 
1702
                    return {"interface": obj}
 
1703
        bus = pydbus_adapter.SystemBus(pydbus_spy)
 
1704
        value = Unique()
 
1705
        bus.set_property("busname", "objectpath", "interface", "key",
 
1706
                         value)
 
1707
        self.assertIs(value, obj.key)
 
1708
 
 
1709
    def test_get_suppresses_xml_deprecation_warning(self):
 
1710
        if sys.version_info.major >= 3:
 
1711
            return
 
1712
        class stub_pydbus_get:
 
1713
            class SystemBus:
 
1714
                @staticmethod
 
1715
                def get(busname, objectpath):
 
1716
                    warnings.warn_explicit(
 
1717
                        "deprecated", DeprecationWarning,
 
1718
                        "xml.etree.ElementTree", 0)
 
1719
        bus = pydbus_adapter.SystemBus(stub_pydbus_get)
 
1720
        with warnings.catch_warnings(record=True) as w:
 
1721
            warnings.simplefilter("always")
 
1722
            bus.get("busname", "objectpath")
 
1723
            self.assertEqual(0, len(w))
 
1724
 
 
1725
 
 
1726
class Test_pydbus_adapter_CachingBus(unittest.TestCase):
 
1727
    class stub_pydbus:
 
1728
        """stub pydbus module"""
 
1729
        class SystemBus:
 
1730
            @staticmethod
 
1731
            def get(busname, objectpath):
 
1732
                return Unique()
 
1733
 
 
1734
    def setUp(self):
 
1735
        self.bus = pydbus_adapter.CachingBus(self.stub_pydbus)
 
1736
 
 
1737
    def test_returns_distinct_objectpaths(self):
 
1738
        obj1 = self.bus.get("busname", "objectpath1")
 
1739
        self.assertIsInstance(obj1, Unique)
 
1740
        obj2 = self.bus.get("busname", "objectpath2")
 
1741
        self.assertIsInstance(obj2, Unique)
 
1742
        self.assertIsNot(obj1, obj2)
 
1743
 
 
1744
    def test_returns_distinct_busnames(self):
 
1745
        obj1 = self.bus.get("busname1", "objectpath")
 
1746
        self.assertIsInstance(obj1, Unique)
 
1747
        obj2 = self.bus.get("busname2", "objectpath")
 
1748
        self.assertIsInstance(obj2, Unique)
 
1749
        self.assertIsNot(obj1, obj2)
 
1750
 
 
1751
    def test_returns_distinct_both(self):
 
1752
        obj1 = self.bus.get("busname1", "objectpath")
 
1753
        self.assertIsInstance(obj1, Unique)
 
1754
        obj2 = self.bus.get("busname2", "objectpath")
 
1755
        self.assertIsInstance(obj2, Unique)
 
1756
        self.assertIsNot(obj1, obj2)
 
1757
 
 
1758
    def test_returns_same(self):
 
1759
        obj1 = self.bus.get("busname", "objectpath")
 
1760
        self.assertIsInstance(obj1, Unique)
 
1761
        obj2 = self.bus.get("busname", "objectpath")
 
1762
        self.assertIsInstance(obj2, Unique)
 
1763
        self.assertIs(obj1, obj2)
 
1764
 
 
1765
    def test_returns_same_old(self):
 
1766
        obj1 = self.bus.get("busname1", "objectpath1")
 
1767
        self.assertIsInstance(obj1, Unique)
 
1768
        obj2 = self.bus.get("busname2", "objectpath2")
 
1769
        self.assertIsInstance(obj2, Unique)
 
1770
        obj1b = self.bus.get("busname1", "objectpath1")
 
1771
        self.assertIsInstance(obj1b, Unique)
 
1772
        self.assertIsNot(obj1, obj2)
 
1773
        self.assertIsNot(obj2, obj1b)
 
1774
        self.assertIs(obj1, obj1b)
1151
1775
 
1152
1776
 
1153
1777
class Test_commands_from_options(unittest.TestCase):
 
1778
 
1154
1779
    def setUp(self):
1155
1780
        self.parser = argparse.ArgumentParser()
1156
1781
        add_command_line_options(self.parser)
1159
1784
        self.assert_command_from_args(["--is-enabled", "client"],
1160
1785
                                      command.IsEnabled)
1161
1786
 
1162
 
    def assert_command_from_args(self, args, command_cls,
1163
 
                                 **cmd_attrs):
 
1787
    def assert_command_from_args(self, args, command_cls, length=1,
 
1788
                                 clients=None, **cmd_attrs):
1164
1789
        """Assert that parsing ARGS should result in an instance of
1165
1790
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
1166
1791
        options = self.parser.parse_args(args)
1167
1792
        check_option_syntax(self.parser, options)
1168
1793
        commands = commands_from_options(options)
1169
 
        self.assertEqual(1, len(commands))
1170
 
        command = commands[0]
1171
 
        self.assertIsInstance(command, command_cls)
 
1794
        self.assertEqual(length, len(commands))
 
1795
        for command in commands:
 
1796
            if isinstance(command, command_cls):
 
1797
                break
 
1798
        else:
 
1799
            self.assertIsInstance(command, command_cls)
 
1800
        if clients is not None:
 
1801
            self.assertEqual(clients, options.client)
1172
1802
        for key, value in cmd_attrs.items():
1173
1803
            self.assertEqual(value, getattr(command, key))
1174
1804
 
 
1805
    def assert_commands_from_args(self, args, commands, clients=None):
 
1806
        for cmd in commands:
 
1807
            self.assert_command_from_args(args, cmd,
 
1808
                                          length=len(commands),
 
1809
                                          clients=clients)
 
1810
 
1175
1811
    def test_is_enabled_short(self):
1176
1812
        self.assert_command_from_args(["-V", "client"],
1177
1813
                                      command.IsEnabled)
1368
2004
                                      verbose=True)
1369
2005
 
1370
2006
 
 
2007
    def test_manual_page_example_1(self):
 
2008
        self.assert_command_from_args("",
 
2009
                                      command.PrintTable,
 
2010
                                      clients=[],
 
2011
                                      verbose=False)
 
2012
 
 
2013
    def test_manual_page_example_2(self):
 
2014
        self.assert_command_from_args(
 
2015
            "--verbose foo1.example.org foo2.example.org".split(),
 
2016
            command.PrintTable, clients=["foo1.example.org",
 
2017
                                         "foo2.example.org"],
 
2018
            verbose=True)
 
2019
 
 
2020
    def test_manual_page_example_3(self):
 
2021
        self.assert_command_from_args("--enable --all".split(),
 
2022
                                      command.Enable,
 
2023
                                      clients=[])
 
2024
 
 
2025
    def test_manual_page_example_4(self):
 
2026
        self.assert_commands_from_args(
 
2027
            ("--timeout=PT5M --interval=PT1M foo1.example.org"
 
2028
             " foo2.example.org").split(),
 
2029
            [command.SetTimeout, command.SetInterval],
 
2030
            clients=["foo1.example.org", "foo2.example.org"])
 
2031
 
 
2032
    def test_manual_page_example_5(self):
 
2033
        self.assert_command_from_args("--approve --all".split(),
 
2034
                                      command.Approve,
 
2035
                                      clients=[])
 
2036
 
 
2037
 
1371
2038
class TestCommand(unittest.TestCase):
1372
2039
    """Abstract class for tests of command classes"""
1373
2040
 
 
2041
    class FakeMandosBus(dbus.MandosBus):
 
2042
        def __init__(self, testcase):
 
2043
            self.client_properties = {
 
2044
                "Name": "foo",
 
2045
                "KeyID": ("92ed150794387c03ce684574b1139a65"
 
2046
                          "94a34f895daaaf09fd8ea90a27cddb12"),
 
2047
                "Secret": b"secret",
 
2048
                "Host": "foo.example.org",
 
2049
                "Enabled": True,
 
2050
                "Timeout": 300000,
 
2051
                "LastCheckedOK": "2019-02-03T00:00:00",
 
2052
                "Created": "2019-01-02T00:00:00",
 
2053
                "Interval": 120000,
 
2054
                "Fingerprint": ("778827225BA7DE539C5A"
 
2055
                                "7CFA59CFF7CDBD9A5920"),
 
2056
                "CheckerRunning": False,
 
2057
                "LastEnabled": "2019-01-03T00:00:00",
 
2058
                "ApprovalPending": False,
 
2059
                "ApprovedByDefault": True,
 
2060
                "LastApprovalRequest": "",
 
2061
                "ApprovalDelay": 0,
 
2062
                "ApprovalDuration": 1000,
 
2063
                "Checker": "fping -q -- %(host)s",
 
2064
                "ExtendedTimeout": 900000,
 
2065
                "Expires": "2019-02-04T00:00:00",
 
2066
                "LastCheckerStatus": 0,
 
2067
            }
 
2068
            self.other_client_properties = {
 
2069
                "Name": "barbar",
 
2070
                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
 
2071
                          "6ab612cff5ad227247e46c2b020f441c"),
 
2072
                "Secret": b"secretbar",
 
2073
                "Host": "192.0.2.3",
 
2074
                "Enabled": True,
 
2075
                "Timeout": 300000,
 
2076
                "LastCheckedOK": "2019-02-04T00:00:00",
 
2077
                "Created": "2019-01-03T00:00:00",
 
2078
                "Interval": 120000,
 
2079
                "Fingerprint": ("3E393AEAEFB84C7E89E2"
 
2080
                                "F547B3A107558FCA3A27"),
 
2081
                "CheckerRunning": True,
 
2082
                "LastEnabled": "2019-01-04T00:00:00",
 
2083
                "ApprovalPending": False,
 
2084
                "ApprovedByDefault": False,
 
2085
                "LastApprovalRequest": "2019-01-03T00:00:00",
 
2086
                "ApprovalDelay": 30000,
 
2087
                "ApprovalDuration": 93785000,
 
2088
                "Checker": ":",
 
2089
                "ExtendedTimeout": 900000,
 
2090
                "Expires": "2019-02-05T00:00:00",
 
2091
                "LastCheckerStatus": -2,
 
2092
            }
 
2093
            self.clients =  collections.OrderedDict(
 
2094
                [
 
2095
                    ("client_objectpath", self.client_properties),
 
2096
                    ("other_client_objectpath",
 
2097
                     self.other_client_properties),
 
2098
                ])
 
2099
            self.one_client = {"client_objectpath":
 
2100
                               self.client_properties}
 
2101
            self.testcase = testcase
 
2102
            self.calls = []
 
2103
 
 
2104
        def call_method(self, methodname, busname, objectpath,
 
2105
                        interface, *args):
 
2106
            self.testcase.assertEqual("se.recompile.Mandos", busname)
 
2107
            self.calls.append((methodname, busname, objectpath,
 
2108
                               interface, args))
 
2109
            if interface == "org.freedesktop.DBus.Properties":
 
2110
                if methodname == "Set":
 
2111
                    self.testcase.assertEqual(3, len(args))
 
2112
                    interface, key, value = args
 
2113
                    self.testcase.assertEqual(
 
2114
                        "se.recompile.Mandos.Client", interface)
 
2115
                    self.clients[objectpath][key] = value
 
2116
                    return
 
2117
            elif interface == "se.recompile.Mandos":
 
2118
                self.testcase.assertEqual("RemoveClient", methodname)
 
2119
                self.testcase.assertEqual(1, len(args))
 
2120
                clientpath = args[0]
 
2121
                del self.clients[clientpath]
 
2122
                return
 
2123
            elif interface == "se.recompile.Mandos.Client":
 
2124
                if methodname == "Approve":
 
2125
                    self.testcase.assertEqual(1, len(args))
 
2126
                    return
 
2127
            raise ValueError()
 
2128
 
1374
2129
    def setUp(self):
1375
 
        testcase = self
1376
 
        class MockClient(object):
1377
 
            def __init__(self, name, **attributes):
1378
 
                self.__dbus_object_path__ = "/clients/{}".format(name)
1379
 
                self.attributes = attributes
1380
 
                self.attributes["Name"] = name
1381
 
                self.calls = []
1382
 
            def Set(self, interface, propname, value, dbus_interface):
1383
 
                testcase.assertEqual(client_dbus_interface, interface)
1384
 
                testcase.assertEqual(dbus.PROPERTIES_IFACE,
1385
 
                                     dbus_interface)
1386
 
                self.attributes[propname] = value
1387
 
            def Approve(self, approve, dbus_interface):
1388
 
                testcase.assertEqual(client_dbus_interface,
1389
 
                                     dbus_interface)
1390
 
                self.calls.append(("Approve", (approve,
1391
 
                                               dbus_interface)))
1392
 
        self.client = MockClient(
1393
 
            "foo",
1394
 
            KeyID=("92ed150794387c03ce684574b1139a65"
1395
 
                   "94a34f895daaaf09fd8ea90a27cddb12"),
1396
 
            Secret=b"secret",
1397
 
            Host="foo.example.org",
1398
 
            Enabled=dbus.Boolean(True),
1399
 
            Timeout=300000,
1400
 
            LastCheckedOK="2019-02-03T00:00:00",
1401
 
            Created="2019-01-02T00:00:00",
1402
 
            Interval=120000,
1403
 
            Fingerprint=("778827225BA7DE539C5A"
1404
 
                         "7CFA59CFF7CDBD9A5920"),
1405
 
            CheckerRunning=dbus.Boolean(False),
1406
 
            LastEnabled="2019-01-03T00:00:00",
1407
 
            ApprovalPending=dbus.Boolean(False),
1408
 
            ApprovedByDefault=dbus.Boolean(True),
1409
 
            LastApprovalRequest="",
1410
 
            ApprovalDelay=0,
1411
 
            ApprovalDuration=1000,
1412
 
            Checker="fping -q -- %(host)s",
1413
 
            ExtendedTimeout=900000,
1414
 
            Expires="2019-02-04T00:00:00",
1415
 
            LastCheckerStatus=0)
1416
 
        self.other_client = MockClient(
1417
 
            "barbar",
1418
 
            KeyID=("0558568eedd67d622f5c83b35a115f79"
1419
 
                   "6ab612cff5ad227247e46c2b020f441c"),
1420
 
            Secret=b"secretbar",
1421
 
            Host="192.0.2.3",
1422
 
            Enabled=dbus.Boolean(True),
1423
 
            Timeout=300000,
1424
 
            LastCheckedOK="2019-02-04T00:00:00",
1425
 
            Created="2019-01-03T00:00:00",
1426
 
            Interval=120000,
1427
 
            Fingerprint=("3E393AEAEFB84C7E89E2"
1428
 
                         "F547B3A107558FCA3A27"),
1429
 
            CheckerRunning=dbus.Boolean(True),
1430
 
            LastEnabled="2019-01-04T00:00:00",
1431
 
            ApprovalPending=dbus.Boolean(False),
1432
 
            ApprovedByDefault=dbus.Boolean(False),
1433
 
            LastApprovalRequest="2019-01-03T00:00:00",
1434
 
            ApprovalDelay=30000,
1435
 
            ApprovalDuration=93785000,
1436
 
            Checker=":",
1437
 
            ExtendedTimeout=900000,
1438
 
            Expires="2019-02-05T00:00:00",
1439
 
            LastCheckerStatus=-2)
1440
 
        self.clients =  collections.OrderedDict(
1441
 
            [
1442
 
                (self.client.__dbus_object_path__,
1443
 
                 self.client.attributes),
1444
 
                (self.other_client.__dbus_object_path__,
1445
 
                 self.other_client.attributes),
1446
 
            ])
1447
 
        self.one_client = {self.client.__dbus_object_path__:
1448
 
                           self.client.attributes}
1449
 
 
1450
 
    @property
1451
 
    def bus(self):
1452
 
        class MockBus(object):
1453
 
            @staticmethod
1454
 
            def get_object(client_bus_name, path):
1455
 
                self.assertEqual(dbus_busname, client_bus_name)
1456
 
                # Note: "self" here is the TestCmd instance, not the
1457
 
                # MockBus instance, since this is a static method!
1458
 
                if path == self.client.__dbus_object_path__:
1459
 
                    return self.client
1460
 
                elif path == self.other_client.__dbus_object_path__:
1461
 
                    return self.other_client
1462
 
        return MockBus()
 
2130
        self.bus = self.FakeMandosBus(self)
1463
2131
 
1464
2132
 
1465
2133
class TestBaseCommands(TestCommand):
1466
2134
 
1467
2135
    def test_IsEnabled_exits_successfully(self):
1468
2136
        with self.assertRaises(SystemExit) as e:
1469
 
            command.IsEnabled().run(self.one_client)
 
2137
            command.IsEnabled().run(self.bus.one_client)
1470
2138
        if e.exception.code is not None:
1471
2139
            self.assertEqual(0, e.exception.code)
1472
2140
        else:
1473
2141
            self.assertIsNone(e.exception.code)
1474
2142
 
1475
2143
    def test_IsEnabled_exits_with_failure(self):
1476
 
        self.client.attributes["Enabled"] = dbus.Boolean(False)
 
2144
        self.bus.client_properties["Enabled"] = False
1477
2145
        with self.assertRaises(SystemExit) as e:
1478
 
            command.IsEnabled().run(self.one_client)
 
2146
            command.IsEnabled().run(self.bus.one_client)
1479
2147
        if isinstance(e.exception.code, int):
1480
2148
            self.assertNotEqual(0, e.exception.code)
1481
2149
        else:
1482
2150
            self.assertIsNotNone(e.exception.code)
1483
2151
 
1484
2152
    def test_Approve(self):
1485
 
        command.Approve().run(self.clients, self.bus)
1486
 
        for clientpath in self.clients:
1487
 
            client = self.bus.get_object(dbus_busname, clientpath)
1488
 
            self.assertIn(("Approve", (True, client_dbus_interface)),
1489
 
                          client.calls)
 
2153
        busname = "se.recompile.Mandos"
 
2154
        client_interface = "se.recompile.Mandos.Client"
 
2155
        command.Approve().run(self.bus.clients, self.bus)
 
2156
        for clientpath in self.bus.clients:
 
2157
            self.assertIn(("Approve", busname, clientpath,
 
2158
                           client_interface, (True,)), self.bus.calls)
1490
2159
 
1491
2160
    def test_Deny(self):
1492
 
        command.Deny().run(self.clients, self.bus)
1493
 
        for clientpath in self.clients:
1494
 
            client = self.bus.get_object(dbus_busname, clientpath)
1495
 
            self.assertIn(("Approve", (False, client_dbus_interface)),
1496
 
                          client.calls)
 
2161
        busname = "se.recompile.Mandos"
 
2162
        client_interface = "se.recompile.Mandos.Client"
 
2163
        command.Deny().run(self.bus.clients, self.bus)
 
2164
        for clientpath in self.bus.clients:
 
2165
            self.assertIn(("Approve", busname, clientpath,
 
2166
                           client_interface, (False,)),
 
2167
                          self.bus.calls)
1497
2168
 
1498
2169
    def test_Remove(self):
1499
 
        class MandosSpy(object):
1500
 
            def __init__(self):
1501
 
                self.calls = []
1502
 
            def RemoveClient(self, dbus_path):
1503
 
                self.calls.append(("RemoveClient", (dbus_path,)))
1504
 
        mandos = MandosSpy()
1505
 
        command.Remove().run(self.clients, self.bus, mandos)
1506
 
        for clientpath in self.clients:
1507
 
            self.assertIn(("RemoveClient", (clientpath,)),
1508
 
                          mandos.calls)
 
2170
        command.Remove().run(self.bus.clients, self.bus)
 
2171
        for clientpath in self.bus.clients:
 
2172
            self.assertIn(("RemoveClient", dbus_busname,
 
2173
                           dbus_server_path, dbus_server_interface,
 
2174
                           (clientpath,)), self.bus.calls)
1509
2175
 
1510
2176
    expected_json = {
1511
2177
        "foo": {
1560
2226
 
1561
2227
    def test_DumpJSON_normal(self):
1562
2228
        with self.capture_stdout_to_buffer() as buffer:
1563
 
            command.DumpJSON().run(self.clients)
 
2229
            command.DumpJSON().run(self.bus.clients)
1564
2230
        json_data = json.loads(buffer.getvalue())
1565
2231
        self.assertDictEqual(self.expected_json, json_data)
1566
2232
 
1577
2243
 
1578
2244
    def test_DumpJSON_one_client(self):
1579
2245
        with self.capture_stdout_to_buffer() as buffer:
1580
 
            command.DumpJSON().run(self.one_client)
 
2246
            command.DumpJSON().run(self.bus.one_client)
1581
2247
        json_data = json.loads(buffer.getvalue())
1582
2248
        expected_json = {"foo": self.expected_json["foo"]}
1583
2249
        self.assertDictEqual(expected_json, json_data)
1584
2250
 
1585
2251
    def test_PrintTable_normal(self):
1586
2252
        with self.capture_stdout_to_buffer() as buffer:
1587
 
            command.PrintTable().run(self.clients)
 
2253
            command.PrintTable().run(self.bus.clients)
1588
2254
        expected_output = "\n".join((
1589
2255
            "Name   Enabled Timeout  Last Successful Check",
1590
2256
            "foo    Yes     00:05:00 2019-02-03T00:00:00  ",
1594
2260
 
1595
2261
    def test_PrintTable_verbose(self):
1596
2262
        with self.capture_stdout_to_buffer() as buffer:
1597
 
            command.PrintTable(verbose=True).run(self.clients)
 
2263
            command.PrintTable(verbose=True).run(self.bus.clients)
1598
2264
        columns = (
1599
2265
            (
1600
2266
                "Name   ",
1690
2356
 
1691
2357
    def test_PrintTable_one_client(self):
1692
2358
        with self.capture_stdout_to_buffer() as buffer:
1693
 
            command.PrintTable().run(self.one_client)
 
2359
            command.PrintTable().run(self.bus.one_client)
1694
2360
        expected_output = "\n".join((
1695
2361
            "Name Enabled Timeout  Last Successful Check",
1696
2362
            "foo  Yes     00:05:00 2019-02-03T00:00:00  ",
1700
2366
 
1701
2367
class TestPropertySetterCmd(TestCommand):
1702
2368
    """Abstract class for tests of command.PropertySetter classes"""
 
2369
 
1703
2370
    def runTest(self):
1704
2371
        if not hasattr(self, "command"):
1705
 
            return
1706
 
        values_to_get = getattr(self, "values_to_get",
1707
 
                                self.values_to_set)
1708
 
        for value_to_set, value_to_get in zip(self.values_to_set,
1709
 
                                              values_to_get):
1710
 
            for clientpath in self.clients:
1711
 
                client = self.bus.get_object(dbus_busname, clientpath)
1712
 
                old_value = client.attributes[self.propname]
1713
 
                client.attributes[self.propname] = self.Unique()
1714
 
            self.run_command(value_to_set, self.clients)
1715
 
            for clientpath in self.clients:
1716
 
                client = self.bus.get_object(dbus_busname, clientpath)
1717
 
                value = client.attributes[self.propname]
1718
 
                self.assertNotIsInstance(value, self.Unique)
 
2372
            return              # Abstract TestCase class
 
2373
 
 
2374
        if hasattr(self, "values_to_set"):
 
2375
            cmd_args = [(value,) for value in self.values_to_set]
 
2376
            values_to_get = getattr(self, "values_to_get",
 
2377
                                    self.values_to_set)
 
2378
        else:
 
2379
            cmd_args = [() for x in range(len(self.values_to_get))]
 
2380
            values_to_get = self.values_to_get
 
2381
        for value_to_get, cmd_arg in zip(values_to_get, cmd_args):
 
2382
            for clientpath in self.bus.clients:
 
2383
                self.bus.clients[clientpath][self.propname] = (
 
2384
                    Unique())
 
2385
            self.command(*cmd_arg).run(self.bus.clients, self.bus)
 
2386
            for clientpath in self.bus.clients:
 
2387
                value = (self.bus.clients[clientpath]
 
2388
                         [self.propname])
 
2389
                self.assertNotIsInstance(value, Unique)
1719
2390
                self.assertEqual(value_to_get, value)
1720
2391
 
1721
 
    class Unique(object):
1722
 
        """Class for objects which exist only to be unique objects,
1723
 
since unittest.mock.sentinel only exists in Python 3.3"""
1724
 
 
1725
 
    def run_command(self, value, clients):
1726
 
        self.command().run(clients, self.bus)
1727
 
 
1728
2392
 
1729
2393
class TestEnableCmd(TestPropertySetterCmd):
1730
2394
    command = command.Enable
1731
2395
    propname = "Enabled"
1732
 
    values_to_set = [dbus.Boolean(True)]
 
2396
    values_to_get = [True]
1733
2397
 
1734
2398
 
1735
2399
class TestDisableCmd(TestPropertySetterCmd):
1736
2400
    command = command.Disable
1737
2401
    propname = "Enabled"
1738
 
    values_to_set = [dbus.Boolean(False)]
 
2402
    values_to_get = [False]
1739
2403
 
1740
2404
 
1741
2405
class TestBumpTimeoutCmd(TestPropertySetterCmd):
1742
2406
    command = command.BumpTimeout
1743
2407
    propname = "LastCheckedOK"
1744
 
    values_to_set = [""]
 
2408
    values_to_get = [""]
1745
2409
 
1746
2410
 
1747
2411
class TestStartCheckerCmd(TestPropertySetterCmd):
1748
2412
    command = command.StartChecker
1749
2413
    propname = "CheckerRunning"
1750
 
    values_to_set = [dbus.Boolean(True)]
 
2414
    values_to_get = [True]
1751
2415
 
1752
2416
 
1753
2417
class TestStopCheckerCmd(TestPropertySetterCmd):
1754
2418
    command = command.StopChecker
1755
2419
    propname = "CheckerRunning"
1756
 
    values_to_set = [dbus.Boolean(False)]
 
2420
    values_to_get = [False]
1757
2421
 
1758
2422
 
1759
2423
class TestApproveByDefaultCmd(TestPropertySetterCmd):
1760
2424
    command = command.ApproveByDefault
1761
2425
    propname = "ApprovedByDefault"
1762
 
    values_to_set = [dbus.Boolean(True)]
 
2426
    values_to_get = [True]
1763
2427
 
1764
2428
 
1765
2429
class TestDenyByDefaultCmd(TestPropertySetterCmd):
1766
2430
    command = command.DenyByDefault
1767
2431
    propname = "ApprovedByDefault"
1768
 
    values_to_set = [dbus.Boolean(False)]
1769
 
 
1770
 
 
1771
 
class TestPropertySetterValueCmd(TestPropertySetterCmd):
1772
 
    """Abstract class for tests of PropertySetterValueCmd classes"""
1773
 
 
1774
 
    def runTest(self):
1775
 
        if type(self) is TestPropertySetterValueCmd:
1776
 
            return
1777
 
        return super(TestPropertySetterValueCmd, self).runTest()
1778
 
 
1779
 
    def run_command(self, value, clients):
1780
 
        self.command(value).run(clients, self.bus)
1781
 
 
1782
 
 
1783
 
class TestSetCheckerCmd(TestPropertySetterValueCmd):
 
2432
    values_to_get = [False]
 
2433
 
 
2434
 
 
2435
class TestSetCheckerCmd(TestPropertySetterCmd):
1784
2436
    command = command.SetChecker
1785
2437
    propname = "Checker"
1786
2438
    values_to_set = ["", ":", "fping -q -- %s"]
1787
2439
 
1788
2440
 
1789
 
class TestSetHostCmd(TestPropertySetterValueCmd):
 
2441
class TestSetHostCmd(TestPropertySetterCmd):
1790
2442
    command = command.SetHost
1791
2443
    propname = "Host"
1792
2444
    values_to_set = ["192.0.2.3", "client.example.org"]
1793
2445
 
1794
2446
 
1795
 
class TestSetSecretCmd(TestPropertySetterValueCmd):
 
2447
class TestSetSecretCmd(TestPropertySetterCmd):
1796
2448
    command = command.SetSecret
1797
2449
    propname = "Secret"
1798
2450
    values_to_set = [io.BytesIO(b""),
1800
2452
    values_to_get = [f.getvalue() for f in values_to_set]
1801
2453
 
1802
2454
 
1803
 
class TestSetTimeoutCmd(TestPropertySetterValueCmd):
 
2455
class TestSetTimeoutCmd(TestPropertySetterCmd):
1804
2456
    command = command.SetTimeout
1805
2457
    propname = "Timeout"
1806
2458
    values_to_set = [datetime.timedelta(),
1811
2463
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
1812
2464
 
1813
2465
 
1814
 
class TestSetExtendedTimeoutCmd(TestPropertySetterValueCmd):
 
2466
class TestSetExtendedTimeoutCmd(TestPropertySetterCmd):
1815
2467
    command = command.SetExtendedTimeout
1816
2468
    propname = "ExtendedTimeout"
1817
2469
    values_to_set = [datetime.timedelta(),
1822
2474
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
1823
2475
 
1824
2476
 
1825
 
class TestSetIntervalCmd(TestPropertySetterValueCmd):
 
2477
class TestSetIntervalCmd(TestPropertySetterCmd):
1826
2478
    command = command.SetInterval
1827
2479
    propname = "Interval"
1828
2480
    values_to_set = [datetime.timedelta(),
1833
2485
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
1834
2486
 
1835
2487
 
1836
 
class TestSetApprovalDelayCmd(TestPropertySetterValueCmd):
 
2488
class TestSetApprovalDelayCmd(TestPropertySetterCmd):
1837
2489
    command = command.SetApprovalDelay
1838
2490
    propname = "ApprovalDelay"
1839
2491
    values_to_set = [datetime.timedelta(),
1844
2496
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
1845
2497
 
1846
2498
 
1847
 
class TestSetApprovalDurationCmd(TestPropertySetterValueCmd):
 
2499
class TestSetApprovalDurationCmd(TestPropertySetterCmd):
1848
2500
    command = command.SetApprovalDuration
1849
2501
    propname = "ApprovalDuration"
1850
2502
    values_to_set = [datetime.timedelta(),