/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-03-15 21:59:44 UTC
  • Revision ID: teddy@recompile.se-20190315215944-lomtn36y7o3jphp8
mandos-ctl: Refactor

* mandos-ctl (main): Call get_mandos_dbus_object() to get
                     "mandos_dbus_objc", and rename it to
                     "mandos_dbus_object".
  (get_mandos_dbus_object): New.
  (Test_get_mandos_dbus_object): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 -*-
 
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*")))); -*-
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
 
if sys.version_info.major == 2:
50
 
    __metaclass__ = type
51
 
    str = unicode
52
 
 
53
 
try:
54
 
    import pydbus
55
 
    import gi
56
 
    dbus_python = None
57
 
except ImportError:
58
 
    import dbus as dbus_python
59
 
    pydbus = None
60
 
    class gi:
61
 
        """Dummy gi module, for the tests"""
62
 
        class repository:
63
 
            class GLib:
64
 
                class Error(Exception):
65
 
                    pass
 
49
import dbus
66
50
 
67
51
# Show warnings by default
68
52
if not sys.warnoptions:
76
60
logging.captureWarnings(True)   # Show warnings via the logging system
77
61
 
78
62
if sys.version_info.major == 2:
79
 
    import StringIO
80
 
    io.StringIO = StringIO.StringIO
 
63
    str = unicode
81
64
 
82
65
locale.setlocale(locale.LC_ALL, "")
83
66
 
84
 
version = "1.8.9"
 
67
dbus_busname_domain = "se.recompile"
 
68
dbus_busname = dbus_busname_domain + ".Mandos"
 
69
server_dbus_path = "/"
 
70
server_dbus_interface = dbus_busname_domain + ".Mandos"
 
71
client_dbus_interface = dbus_busname_domain + ".Mandos.Client"
 
72
del dbus_busname_domain
 
73
version = "1.8.3"
 
74
 
 
75
 
 
76
try:
 
77
    dbus.OBJECT_MANAGER_IFACE
 
78
except AttributeError:
 
79
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
85
80
 
86
81
 
87
82
def main():
88
83
    parser = argparse.ArgumentParser()
 
84
 
89
85
    add_command_line_options(parser)
90
86
 
91
87
    options = parser.parse_args()
 
88
 
92
89
    check_option_syntax(parser, options)
93
90
 
94
91
    clientnames = options.client
96
93
    if options.debug:
97
94
        log.setLevel(logging.DEBUG)
98
95
 
99
 
    if pydbus is not None:
100
 
        bus = pydbus_adapter.CachingBus(pydbus)
101
 
    else:
102
 
        bus = dbus_python_adapter.CachingBus(dbus_python)
 
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)
103
104
 
104
105
    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
 
 
114
 
    # Compile dict of (clientpath: properties) to process
 
106
        log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", dbus_busname,
 
107
                  server_dbus_path, dbus.OBJECT_MANAGER_IFACE)
 
108
        with SilenceLogger("dbus.proxies"):
 
109
            all_clients = {path: ifs_and_props[client_dbus_interface]
 
110
                              for path, ifs_and_props in
 
111
                              mandos_serv_object_manager
 
112
                              .GetManagedObjects().items()
 
113
                              if client_dbus_interface in ifs_and_props}
 
114
    except dbus.exceptions.DBusException as e:
 
115
        log.critical("Failed to access Mandos server through D-Bus:"
 
116
                     "\n%s", e)
 
117
        sys.exit(1)
 
118
 
 
119
    # Compile dict of (clients: properties) to process
 
120
    clients = {}
 
121
 
115
122
    if not clientnames:
116
123
        clients = all_clients
117
124
    else:
118
 
        clients = {}
119
125
        for name in clientnames:
120
126
            for objpath, properties in all_clients.items():
121
127
                if properties["Name"] == name:
125
131
                log.critical("Client not found on server: %r", name)
126
132
                sys.exit(1)
127
133
 
 
134
    # Run all commands on clients
128
135
    commands = commands_from_options(options)
129
 
 
130
136
    for command in commands:
131
 
        command.run(clients, bus)
 
137
        command.run(clients, bus, mandos_serv)
132
138
 
133
139
 
134
140
def add_command_line_options(parser):
139
145
                        help="Select all clients")
140
146
    parser.add_argument("-v", "--verbose", action="store_true",
141
147
                        help="Print all fields")
142
 
    parser.add_argument("-j", "--dump-json", dest="commands",
143
 
                        action="append_const", default=[],
144
 
                        const=command.DumpJSON(),
 
148
    parser.add_argument("-j", "--dump-json", action="store_true",
145
149
                        help="Dump client data in JSON format")
146
150
    enable_disable = parser.add_mutually_exclusive_group()
147
 
    enable_disable.add_argument("-e", "--enable", dest="commands",
148
 
                                action="append_const", default=[],
149
 
                                const=command.Enable(),
 
151
    enable_disable.add_argument("-e", "--enable", action="store_true",
150
152
                                help="Enable client")
151
 
    enable_disable.add_argument("-d", "--disable", dest="commands",
152
 
                                action="append_const", default=[],
153
 
                                const=command.Disable(),
 
153
    enable_disable.add_argument("-d", "--disable",
 
154
                                action="store_true",
154
155
                                help="disable client")
155
 
    parser.add_argument("-b", "--bump-timeout", dest="commands",
156
 
                        action="append_const", default=[],
157
 
                        const=command.BumpTimeout(),
 
156
    parser.add_argument("-b", "--bump-timeout", action="store_true",
158
157
                        help="Bump timeout for client")
159
158
    start_stop_checker = parser.add_mutually_exclusive_group()
160
159
    start_stop_checker.add_argument("--start-checker",
161
 
                                    dest="commands",
162
 
                                    action="append_const", default=[],
163
 
                                    const=command.StartChecker(),
 
160
                                    action="store_true",
164
161
                                    help="Start checker for client")
165
 
    start_stop_checker.add_argument("--stop-checker", dest="commands",
166
 
                                    action="append_const", default=[],
167
 
                                    const=command.StopChecker(),
 
162
    start_stop_checker.add_argument("--stop-checker",
 
163
                                    action="store_true",
168
164
                                    help="Stop checker for client")
169
 
    parser.add_argument("-V", "--is-enabled", dest="commands",
170
 
                        action="append_const", default=[],
171
 
                        const=command.IsEnabled(),
 
165
    parser.add_argument("-V", "--is-enabled", action="store_true",
172
166
                        help="Check if client is enabled")
173
 
    parser.add_argument("-r", "--remove", dest="commands",
174
 
                        action="append_const", default=[],
175
 
                        const=command.Remove(),
 
167
    parser.add_argument("-r", "--remove", action="store_true",
176
168
                        help="Remove client")
177
 
    parser.add_argument("-c", "--checker", dest="commands",
178
 
                        action="append", default=[],
179
 
                        metavar="COMMAND", type=command.SetChecker,
 
169
    parser.add_argument("-c", "--checker",
180
170
                        help="Set checker command 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
    parser.add_argument("-t", "--timeout", type=string_to_delta,
 
172
                        help="Set timeout for client")
 
173
    parser.add_argument("--extended-timeout", type=string_to_delta,
 
174
                        help="Set extended timeout for client")
 
175
    parser.add_argument("-i", "--interval", type=string_to_delta,
 
176
                        help="Set checker interval for client")
196
177
    approve_deny_default = parser.add_mutually_exclusive_group()
197
178
    approve_deny_default.add_argument(
198
 
        "--approve-by-default", dest="commands",
199
 
        action="append_const", default=[],
200
 
        const=command.ApproveByDefault(),
 
179
        "--approve-by-default", action="store_true",
 
180
        default=None, dest="approved_by_default",
201
181
        help="Set client to be approved by default")
202
182
    approve_deny_default.add_argument(
203
 
        "--deny-by-default", dest="commands",
204
 
        action="append_const", default=[],
205
 
        const=command.DenyByDefault(),
 
183
        "--deny-by-default", action="store_false",
 
184
        dest="approved_by_default",
206
185
        help="Set client to be denied by default")
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")
 
186
    parser.add_argument("--approval-delay", type=string_to_delta,
 
187
                        help="Set delay before client approve/deny")
 
188
    parser.add_argument("--approval-duration", type=string_to_delta,
 
189
                        help="Set duration of one client approval")
 
190
    parser.add_argument("-H", "--host", help="Set host for client")
 
191
    parser.add_argument("-s", "--secret",
 
192
                        type=argparse.FileType(mode="rb"),
 
193
                        help="Set password blob (file) for client")
226
194
    approve_deny = parser.add_mutually_exclusive_group()
227
195
    approve_deny.add_argument(
228
 
        "-A", "--approve", dest="commands", action="append_const",
229
 
        default=[], const=command.Approve(),
 
196
        "-A", "--approve", action="store_true",
230
197
        help="Approve any current client request")
231
 
    approve_deny.add_argument("-D", "--deny", dest="commands",
232
 
                              action="append_const", default=[],
233
 
                              const=command.Deny(),
 
198
    approve_deny.add_argument("-D", "--deny", action="store_true",
234
199
                              help="Deny any current client request")
235
200
    parser.add_argument("--debug", action="store_true",
236
201
                        help="Debug mode (show D-Bus commands)")
253
218
def rfc3339_duration_to_delta(duration):
254
219
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
255
220
 
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
 
221
    >>> rfc3339_duration_to_delta("P7D")
 
222
    datetime.timedelta(7)
 
223
    >>> rfc3339_duration_to_delta("PT60S")
 
224
    datetime.timedelta(0, 60)
 
225
    >>> rfc3339_duration_to_delta("PT60M")
 
226
    datetime.timedelta(0, 3600)
 
227
    >>> rfc3339_duration_to_delta("P60M")
 
228
    datetime.timedelta(1680)
 
229
    >>> rfc3339_duration_to_delta("PT24H")
 
230
    datetime.timedelta(1)
 
231
    >>> rfc3339_duration_to_delta("P1W")
 
232
    datetime.timedelta(7)
 
233
    >>> rfc3339_duration_to_delta("PT5M30S")
 
234
    datetime.timedelta(0, 330)
 
235
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
236
    datetime.timedelta(1, 200)
273
237
    >>> # Can not be empty:
274
238
    >>> rfc3339_duration_to_delta("")
275
239
    Traceback (most recent call last):
276
240
    ...
277
 
    ValueError: Invalid RFC 3339 duration: ""
 
241
    ValueError: Invalid RFC 3339 duration: u''
278
242
    >>> # Must start with "P":
279
243
    >>> rfc3339_duration_to_delta("1D")
280
244
    Traceback (most recent call last):
281
245
    ...
282
 
    ValueError: Invalid RFC 3339 duration: "1D"
 
246
    ValueError: Invalid RFC 3339 duration: u'1D'
283
247
    >>> # Must use correct order
284
248
    >>> rfc3339_duration_to_delta("PT1S2M")
285
249
    Traceback (most recent call last):
286
250
    ...
287
 
    ValueError: Invalid RFC 3339 duration: "PT1S2M"
 
251
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
288
252
    >>> # Time needs time marker
289
253
    >>> rfc3339_duration_to_delta("P1H2S")
290
254
    Traceback (most recent call last):
291
255
    ...
292
 
    ValueError: Invalid RFC 3339 duration: "P1H2S"
 
256
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
293
257
    >>> # Weeks can not be combined with anything else
294
258
    >>> rfc3339_duration_to_delta("P1D2W")
295
259
    Traceback (most recent call last):
296
260
    ...
297
 
    ValueError: Invalid RFC 3339 duration: "P1D2W"
 
261
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
298
262
    >>> rfc3339_duration_to_delta("P2W2H")
299
263
    Traceback (most recent call last):
300
264
    ...
301
 
    ValueError: Invalid RFC 3339 duration: "P2W2H"
 
265
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
302
266
    """
303
267
 
304
268
    # Parsing an RFC 3339 duration with regular expressions is not
375
339
                break
376
340
        else:
377
341
            # No currently valid tokens were found
378
 
            raise ValueError("Invalid RFC 3339 duration: \"{}\""
 
342
            raise ValueError("Invalid RFC 3339 duration: {!r}"
379
343
                             .format(duration))
380
344
    # End token found
381
345
    return value
385
349
    """Parse an interval string as documented by Mandos before 1.6.1,
386
350
    and return a datetime.timedelta
387
351
 
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
 
352
    >>> parse_pre_1_6_1_interval('7d')
 
353
    datetime.timedelta(7)
 
354
    >>> parse_pre_1_6_1_interval('60s')
 
355
    datetime.timedelta(0, 60)
 
356
    >>> parse_pre_1_6_1_interval('60m')
 
357
    datetime.timedelta(0, 3600)
 
358
    >>> parse_pre_1_6_1_interval('24h')
 
359
    datetime.timedelta(1)
 
360
    >>> parse_pre_1_6_1_interval('1w')
 
361
    datetime.timedelta(7)
 
362
    >>> parse_pre_1_6_1_interval('5m 30s')
 
363
    datetime.timedelta(0, 330)
 
364
    >>> parse_pre_1_6_1_interval('')
 
365
    datetime.timedelta(0)
402
366
    >>> # Ignore unknown characters, allow any order and repetitions
403
 
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m') == datetime.timedelta(2, 480, 18000)
404
 
    True
 
367
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
 
368
    datetime.timedelta(2, 480, 18000)
405
369
 
406
370
    """
407
371
 
428
392
    """Apply additional restrictions on options, not expressible in
429
393
argparse"""
430
394
 
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)
 
395
    def has_actions(options):
 
396
        return any((options.enable,
 
397
                    options.disable,
 
398
                    options.bump_timeout,
 
399
                    options.start_checker,
 
400
                    options.stop_checker,
 
401
                    options.is_enabled,
 
402
                    options.remove,
 
403
                    options.checker is not None,
 
404
                    options.timeout is not None,
 
405
                    options.extended_timeout is not None,
 
406
                    options.interval is not None,
 
407
                    options.approved_by_default is not None,
 
408
                    options.approval_delay is not None,
 
409
                    options.approval_duration is not None,
 
410
                    options.host is not None,
 
411
                    options.secret is not None,
 
412
                    options.approve,
 
413
                    options.deny))
454
414
 
455
 
    if has_commands(options) and not (options.client or options.all):
 
415
    if has_actions(options) and not (options.client or options.all):
456
416
        parser.error("Options require clients names or --all.")
457
 
    if options.verbose and has_commands(options):
 
417
    if options.verbose and has_actions(options):
458
418
        parser.error("--verbose can only be used alone.")
459
 
    if (has_commands(options, (command.DumpJSON,))
460
 
        and (options.verbose or len(options.commands) > 1)):
 
419
    if options.dump_json and (options.verbose
 
420
                              or has_actions(options)):
461
421
        parser.error("--dump-json can only be used alone.")
462
 
    if options.all and not has_commands(options):
 
422
    if options.all and not has_actions(options):
463
423
        parser.error("--all requires an action.")
464
 
    if (has_commands(options, (command.IsEnabled,))
465
 
        and len(options.client) > 1):
 
424
    if options.is_enabled and len(options.client) > 1:
466
425
        parser.error("--is-enabled requires exactly one client")
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
 
426
    if options.remove:
 
427
        options.remove = False
 
428
        if has_actions(options) and not options.deny:
 
429
            parser.error("--remove can only be combined with --deny")
 
430
        options.remove = True
 
431
 
 
432
 
 
433
def get_mandos_dbus_object(bus):
 
434
    try:
 
435
        log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
436
                  dbus_busname, server_dbus_path)
 
437
        mandos_dbus_object = bus.get_object(dbus_busname,
 
438
                                            server_dbus_path)
 
439
    except dbus.exceptions.DBusException:
 
440
        log.critical("Could not connect to Mandos server")
 
441
        sys.exit(1)
 
442
 
 
443
    return mandos_dbus_object
 
444
 
 
445
 
 
446
class SilenceLogger(object):
 
447
    "Simple context manager to silence a particular logger"
 
448
    def __init__(self, loggername):
 
449
        self.logger = logging.getLogger(loggername)
 
450
 
 
451
    def __enter__(self):
 
452
        self.logger.addFilter(self.nullfilter)
 
453
        return self
 
454
 
 
455
    class NullFilter(logging.Filter):
 
456
        def filter(self, record):
 
457
            return False
 
458
 
 
459
    nullfilter = NullFilter()
 
460
 
 
461
    def __exit__(self, exc_type, exc_val, exc_tb):
 
462
        self.logger.removeFilter(self.nullfilter)
683
463
 
684
464
 
685
465
def commands_from_options(options):
686
466
 
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)
 
467
    commands = []
 
468
 
 
469
    if options.is_enabled:
 
470
        commands.append(IsEnabledCmd())
 
471
 
 
472
    if options.approve:
 
473
        commands.append(ApproveCmd())
 
474
 
 
475
    if options.deny:
 
476
        commands.append(DenyCmd())
 
477
 
 
478
    if options.remove:
 
479
        commands.append(RemoveCmd())
 
480
 
 
481
    if options.dump_json:
 
482
        commands.append(DumpJSONCmd())
 
483
 
 
484
    if options.enable:
 
485
        commands.append(EnableCmd())
 
486
 
 
487
    if options.disable:
 
488
        commands.append(DisableCmd())
 
489
 
 
490
    if options.bump_timeout:
 
491
        commands.append(BumpTimeoutCmd())
 
492
 
 
493
    if options.start_checker:
 
494
        commands.append(StartCheckerCmd())
 
495
 
 
496
    if options.stop_checker:
 
497
        commands.append(StopCheckerCmd())
 
498
 
 
499
    if options.approved_by_default is not None:
 
500
        if options.approved_by_default:
 
501
            commands.append(ApproveByDefaultCmd())
705
502
        else:
706
 
            cleaned_after.append(cmd)
707
 
    if cleaned_after != after_remove:
708
 
        commands = before_remove + cleaned_after
 
503
            commands.append(DenyByDefaultCmd())
 
504
 
 
505
    if options.checker is not None:
 
506
        commands.append(SetCheckerCmd(options.checker))
 
507
 
 
508
    if options.host is not None:
 
509
        commands.append(SetHostCmd(options.host))
 
510
 
 
511
    if options.secret is not None:
 
512
        commands.append(SetSecretCmd(options.secret))
 
513
 
 
514
    if options.timeout is not None:
 
515
        commands.append(SetTimeoutCmd(options.timeout))
 
516
 
 
517
    if options.extended_timeout:
 
518
        commands.append(
 
519
            SetExtendedTimeoutCmd(options.extended_timeout))
 
520
 
 
521
    if options.interval is not None:
 
522
        commands.append(SetIntervalCmd(options.interval))
 
523
 
 
524
    if options.approval_delay is not None:
 
525
        commands.append(SetApprovalDelayCmd(options.approval_delay))
 
526
 
 
527
    if options.approval_duration is not None:
 
528
        commands.append(
 
529
            SetApprovalDurationCmd(options.approval_duration))
709
530
 
710
531
    # If no command option has been given, show table of clients,
711
532
    # optionally verbosely
712
533
    if not commands:
713
 
        commands.append(command.PrintTable(verbose=options.verbose))
 
534
        commands.append(PrintTableCmd(verbose=options.verbose))
714
535
 
715
536
    return commands
716
537
 
717
538
 
718
 
class command:
719
 
    """A namespace for command classes"""
720
 
 
721
 
    class Base:
722
 
        """Abstract base class for commands"""
723
 
        def run(self, clients, bus=None):
724
 
            """Normal commands should implement run_on_one_client(),
725
 
but commands which want to operate on all clients at the same time can
726
 
override this run() method instead.
727
 
"""
728
 
            self.bus = bus
729
 
            for client, properties in clients.items():
730
 
                self.run_on_one_client(client, properties)
731
 
 
732
 
 
733
 
    class IsEnabled(Base):
734
 
        def run(self, clients, bus=None):
735
 
            properties = next(iter(clients.values()))
736
 
            if properties["Enabled"]:
737
 
                sys.exit(0)
738
 
            sys.exit(1)
739
 
 
740
 
 
741
 
    class Approve(Base):
742
 
        def run_on_one_client(self, client, properties):
743
 
            self.bus.call_client_method(client, "Approve", True)
744
 
 
745
 
 
746
 
    class Deny(Base):
747
 
        def run_on_one_client(self, client, properties):
748
 
            self.bus.call_client_method(client, "Approve", False)
749
 
 
750
 
 
751
 
    class Remove(Base):
752
 
        def run(self, clients, bus):
753
 
            for clientpath in frozenset(clients.keys()):
754
 
                bus.call_server_method("RemoveClient", clientpath)
755
 
 
756
 
 
757
 
    class Output(Base):
758
 
        """Abstract class for commands outputting client details"""
759
 
        all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
760
 
                        "Created", "Interval", "Host", "KeyID",
761
 
                        "Fingerprint", "CheckerRunning",
762
 
                        "LastEnabled", "ApprovalPending",
763
 
                        "ApprovedByDefault", "LastApprovalRequest",
764
 
                        "ApprovalDelay", "ApprovalDuration",
765
 
                        "Checker", "ExtendedTimeout", "Expires",
766
 
                        "LastCheckerStatus")
767
 
 
768
 
 
769
 
    class DumpJSON(Output):
770
 
        def run(self, clients, bus=None):
771
 
            data = {properties["Name"]:
772
 
                    {key: properties[key]
773
 
                     for key in self.all_keywords}
774
 
                    for properties in clients.values()}
775
 
            print(json.dumps(data, indent=4, separators=(',', ': ')))
776
 
 
777
 
 
778
 
    class PrintTable(Output):
779
 
        def __init__(self, verbose=False):
780
 
            self.verbose = verbose
781
 
 
782
 
        def run(self, clients, bus=None):
783
 
            default_keywords = ("Name", "Enabled", "Timeout",
784
 
                                "LastCheckedOK")
785
 
            keywords = default_keywords
786
 
            if self.verbose:
787
 
                keywords = self.all_keywords
788
 
            print(self.TableOfClients(clients.values(), keywords))
789
 
 
790
 
        class TableOfClients:
791
 
            tableheaders = {
792
 
                "Name": "Name",
793
 
                "Enabled": "Enabled",
794
 
                "Timeout": "Timeout",
795
 
                "LastCheckedOK": "Last Successful Check",
796
 
                "LastApprovalRequest": "Last Approval Request",
797
 
                "Created": "Created",
798
 
                "Interval": "Interval",
799
 
                "Host": "Host",
800
 
                "Fingerprint": "Fingerprint",
801
 
                "KeyID": "Key ID",
802
 
                "CheckerRunning": "Check Is Running",
803
 
                "LastEnabled": "Last Enabled",
804
 
                "ApprovalPending": "Approval Is Pending",
805
 
                "ApprovedByDefault": "Approved By Default",
806
 
                "ApprovalDelay": "Approval Delay",
807
 
                "ApprovalDuration": "Approval Duration",
808
 
                "Checker": "Checker",
809
 
                "ExtendedTimeout": "Extended Timeout",
810
 
                "Expires": "Expires",
811
 
                "LastCheckerStatus": "Last Checker Status",
812
 
            }
813
 
 
814
 
            def __init__(self, clients, keywords):
815
 
                self.clients = clients
816
 
                self.keywords = keywords
817
 
 
 
539
class Command(object):
 
540
    """Abstract class for commands"""
 
541
    def run(self, clients, bus=None, mandos=None):
 
542
        """Normal commands should implement run_on_one_client(), but
 
543
        commands which want to operate on all clients at the same time
 
544
        can override this run() method instead."""
 
545
        self.mandos = mandos
 
546
        for clientpath, properties in clients.items():
 
547
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
548
                      dbus_busname, str(clientpath))
 
549
            client = bus.get_object(dbus_busname, clientpath)
 
550
            self.run_on_one_client(client, properties)
 
551
 
 
552
 
 
553
class IsEnabledCmd(Command):
 
554
    def run(self, clients, bus=None, mandos=None):
 
555
        client, properties = next(iter(clients.items()))
 
556
        if self.is_enabled(client, properties):
 
557
            sys.exit(0)
 
558
        sys.exit(1)
 
559
    def is_enabled(self, client, properties):
 
560
        return properties["Enabled"]
 
561
 
 
562
 
 
563
class ApproveCmd(Command):
 
564
    def run_on_one_client(self, client, properties):
 
565
        log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
 
566
                  client.__dbus_object_path__, client_dbus_interface)
 
567
        client.Approve(dbus.Boolean(True),
 
568
                       dbus_interface=client_dbus_interface)
 
569
 
 
570
 
 
571
class DenyCmd(Command):
 
572
    def run_on_one_client(self, client, properties):
 
573
        log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
 
574
                  client.__dbus_object_path__, client_dbus_interface)
 
575
        client.Approve(dbus.Boolean(False),
 
576
                       dbus_interface=client_dbus_interface)
 
577
 
 
578
 
 
579
class RemoveCmd(Command):
 
580
    def run_on_one_client(self, client, properties):
 
581
        log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
 
582
                  server_dbus_path, server_dbus_interface,
 
583
                  str(client.__dbus_object_path__))
 
584
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
585
 
 
586
 
 
587
class OutputCmd(Command):
 
588
    """Abstract class for commands outputting client details"""
 
589
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
590
                    "Created", "Interval", "Host", "KeyID",
 
591
                    "Fingerprint", "CheckerRunning", "LastEnabled",
 
592
                    "ApprovalPending", "ApprovedByDefault",
 
593
                    "LastApprovalRequest", "ApprovalDelay",
 
594
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
 
595
                    "Expires", "LastCheckerStatus")
 
596
 
 
597
    def run(self, clients, bus=None, mandos=None):
 
598
        print(self.output(clients.values()))
 
599
 
 
600
    def output(self, clients):
 
601
        raise NotImplementedError()
 
602
 
 
603
 
 
604
class DumpJSONCmd(OutputCmd):
 
605
    def output(self, clients):
 
606
        data = {client["Name"]:
 
607
                {key: self.dbus_boolean_to_bool(client[key])
 
608
                 for key in self.all_keywords}
 
609
                for client in clients}
 
610
        return json.dumps(data, indent=4, separators=(',', ': '))
 
611
 
 
612
    @staticmethod
 
613
    def dbus_boolean_to_bool(value):
 
614
        if isinstance(value, dbus.Boolean):
 
615
            value = bool(value)
 
616
        return value
 
617
 
 
618
 
 
619
class PrintTableCmd(OutputCmd):
 
620
    def __init__(self, verbose=False):
 
621
        self.verbose = verbose
 
622
 
 
623
    def output(self, clients):
 
624
        default_keywords = ("Name", "Enabled", "Timeout",
 
625
                            "LastCheckedOK")
 
626
        keywords = default_keywords
 
627
        if self.verbose:
 
628
            keywords = self.all_keywords
 
629
        return str(self.TableOfClients(clients, keywords))
 
630
 
 
631
    class TableOfClients(object):
 
632
        tableheaders = {
 
633
            "Name": "Name",
 
634
            "Enabled": "Enabled",
 
635
            "Timeout": "Timeout",
 
636
            "LastCheckedOK": "Last Successful Check",
 
637
            "LastApprovalRequest": "Last Approval Request",
 
638
            "Created": "Created",
 
639
            "Interval": "Interval",
 
640
            "Host": "Host",
 
641
            "Fingerprint": "Fingerprint",
 
642
            "KeyID": "Key ID",
 
643
            "CheckerRunning": "Check Is Running",
 
644
            "LastEnabled": "Last Enabled",
 
645
            "ApprovalPending": "Approval Is Pending",
 
646
            "ApprovedByDefault": "Approved By Default",
 
647
            "ApprovalDelay": "Approval Delay",
 
648
            "ApprovalDuration": "Approval Duration",
 
649
            "Checker": "Checker",
 
650
            "ExtendedTimeout": "Extended Timeout",
 
651
            "Expires": "Expires",
 
652
            "LastCheckerStatus": "Last Checker Status",
 
653
        }
 
654
 
 
655
        def __init__(self, clients, keywords):
 
656
            self.clients = clients
 
657
            self.keywords = keywords
 
658
 
 
659
        def __str__(self):
 
660
            return "\n".join(self.rows())
 
661
 
 
662
        if sys.version_info.major == 2:
 
663
            __unicode__ = __str__
818
664
            def __str__(self):
819
 
                return "\n".join(self.rows())
820
 
 
821
 
            if sys.version_info.major == 2:
822
 
                __unicode__ = __str__
823
 
                def __str__(self):
824
 
                    return str(self).encode(
825
 
                        locale.getpreferredencoding())
826
 
 
827
 
            def rows(self):
828
 
                format_string = self.row_formatting_string()
829
 
                rows = [self.header_line(format_string)]
830
 
                rows.extend(self.client_line(client, format_string)
831
 
                            for client in self.clients)
832
 
                return rows
833
 
 
834
 
            def row_formatting_string(self):
835
 
                "Format string used to format table rows"
836
 
                return " ".join("{{{key}:{width}}}".format(
837
 
                    width=max(len(self.tableheaders[key]),
838
 
                              *(len(self.string_from_client(client,
839
 
                                                            key))
840
 
                                for client in self.clients)),
841
 
                    key=key)
842
 
                                for key in self.keywords)
843
 
 
844
 
            def string_from_client(self, client, key):
845
 
                return self.valuetostring(client[key], key)
846
 
 
847
 
            @classmethod
848
 
            def valuetostring(cls, value, keyword):
849
 
                if isinstance(value, bool):
850
 
                    return "Yes" if value else "No"
851
 
                if keyword in ("Timeout", "Interval", "ApprovalDelay",
852
 
                               "ApprovalDuration", "ExtendedTimeout"):
853
 
                    return cls.milliseconds_to_string(value)
854
 
                return str(value)
855
 
 
856
 
            def header_line(self, format_string):
857
 
                return format_string.format(**self.tableheaders)
858
 
 
859
 
            def client_line(self, client, format_string):
860
 
                return format_string.format(
861
 
                    **{key: self.string_from_client(client, key)
862
 
                       for key in self.keywords})
863
 
 
864
 
            @staticmethod
865
 
            def milliseconds_to_string(ms):
866
 
                td = datetime.timedelta(0, 0, 0, ms)
867
 
                return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
868
 
                        .format(days="{}T".format(td.days)
869
 
                                if td.days else "",
870
 
                                hours=td.seconds // 3600,
871
 
                                minutes=(td.seconds % 3600) // 60,
872
 
                                seconds=td.seconds % 60))
873
 
 
874
 
 
875
 
    class PropertySetter(Base):
876
 
        "Abstract class for Actions for setting one client property"
877
 
 
878
 
        def run_on_one_client(self, client, properties=None):
879
 
            """Set the Client's D-Bus property"""
880
 
            self.bus.set_client_property(client, self.propname,
881
 
                                         self.value_to_set)
882
 
 
883
 
        @property
884
 
        def propname(self):
885
 
            raise NotImplementedError()
886
 
 
887
 
 
888
 
    class Enable(PropertySetter):
889
 
        propname = "Enabled"
890
 
        value_to_set = True
891
 
 
892
 
 
893
 
    class Disable(PropertySetter):
894
 
        propname = "Enabled"
895
 
        value_to_set = False
896
 
 
897
 
 
898
 
    class BumpTimeout(PropertySetter):
899
 
        propname = "LastCheckedOK"
900
 
        value_to_set = ""
901
 
 
902
 
 
903
 
    class StartChecker(PropertySetter):
904
 
        propname = "CheckerRunning"
905
 
        value_to_set = True
906
 
 
907
 
 
908
 
    class StopChecker(PropertySetter):
909
 
        propname = "CheckerRunning"
910
 
        value_to_set = False
911
 
 
912
 
 
913
 
    class ApproveByDefault(PropertySetter):
914
 
        propname = "ApprovedByDefault"
915
 
        value_to_set = True
916
 
 
917
 
 
918
 
    class DenyByDefault(PropertySetter):
919
 
        propname = "ApprovedByDefault"
920
 
        value_to_set = False
921
 
 
922
 
 
923
 
    class PropertySetterValue(PropertySetter):
924
 
        """Abstract class for PropertySetter recieving a value as
925
 
constructor argument instead of a class attribute."""
926
 
        def __init__(self, value):
927
 
            self.value_to_set = value
 
665
                return str(self).encode(locale.getpreferredencoding())
 
666
 
 
667
        def rows(self):
 
668
            format_string = self.row_formatting_string()
 
669
            rows = [self.header_line(format_string)]
 
670
            rows.extend(self.client_line(client, format_string)
 
671
                        for client in self.clients)
 
672
            return rows
 
673
 
 
674
        def row_formatting_string(self):
 
675
            "Format string used to format table rows"
 
676
            return " ".join("{{{key}:{width}}}".format(
 
677
                width=max(len(self.tableheaders[key]),
 
678
                          *(len(self.string_from_client(client, key))
 
679
                            for client in self.clients)),
 
680
                key=key)
 
681
                            for key in self.keywords)
 
682
 
 
683
        def string_from_client(self, client, key):
 
684
            return self.valuetostring(client[key], key)
928
685
 
929
686
        @classmethod
930
 
        def argparse(cls, argtype):
931
 
            def cmdtype(arg):
932
 
                return cls(argtype(arg))
933
 
            return cmdtype
934
 
 
935
 
    class SetChecker(PropertySetterValue):
936
 
        propname = "Checker"
937
 
 
938
 
 
939
 
    class SetHost(PropertySetterValue):
940
 
        propname = "Host"
941
 
 
942
 
 
943
 
    class SetSecret(PropertySetterValue):
944
 
        propname = "Secret"
945
 
 
946
 
        @property
947
 
        def value_to_set(self):
948
 
            return self._vts
949
 
 
950
 
        @value_to_set.setter
951
 
        def value_to_set(self, value):
952
 
            """When setting, read data from supplied file object"""
953
 
            self._vts = value.read()
954
 
            value.close()
955
 
 
956
 
 
957
 
    class PropertySetterValueMilliseconds(PropertySetterValue):
958
 
        """Abstract class for PropertySetterValue taking a value
959
 
argument as a datetime.timedelta() but should store it as
960
 
milliseconds."""
961
 
 
962
 
        @property
963
 
        def value_to_set(self):
964
 
            return self._vts
965
 
 
966
 
        @value_to_set.setter
967
 
        def value_to_set(self, value):
968
 
            "When setting, convert value from a datetime.timedelta"
969
 
            self._vts = int(round(value.total_seconds() * 1000))
970
 
 
971
 
 
972
 
    class SetTimeout(PropertySetterValueMilliseconds):
973
 
        propname = "Timeout"
974
 
 
975
 
 
976
 
    class SetExtendedTimeout(PropertySetterValueMilliseconds):
977
 
        propname = "ExtendedTimeout"
978
 
 
979
 
 
980
 
    class SetInterval(PropertySetterValueMilliseconds):
981
 
        propname = "Interval"
982
 
 
983
 
 
984
 
    class SetApprovalDelay(PropertySetterValueMilliseconds):
985
 
        propname = "ApprovalDelay"
986
 
 
987
 
 
988
 
    class SetApprovalDuration(PropertySetterValueMilliseconds):
989
 
        propname = "ApprovalDuration"
 
687
        def valuetostring(cls, value, keyword):
 
688
            if isinstance(value, dbus.Boolean):
 
689
                return "Yes" if value else "No"
 
690
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
 
691
                           "ApprovalDuration", "ExtendedTimeout"):
 
692
                return cls.milliseconds_to_string(value)
 
693
            return str(value)
 
694
 
 
695
        def header_line(self, format_string):
 
696
            return format_string.format(**self.tableheaders)
 
697
 
 
698
        def client_line(self, client, format_string):
 
699
            return format_string.format(
 
700
                **{key: self.string_from_client(client, key)
 
701
                   for key in self.keywords})
 
702
 
 
703
        @staticmethod
 
704
        def milliseconds_to_string(ms):
 
705
            td = datetime.timedelta(0, 0, 0, ms)
 
706
            return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
707
                    .format(days="{}T".format(td.days)
 
708
                            if td.days else "",
 
709
                            hours=td.seconds // 3600,
 
710
                            minutes=(td.seconds % 3600) // 60,
 
711
                            seconds=td.seconds % 60))
 
712
 
 
713
 
 
714
class PropertyCmd(Command):
 
715
    """Abstract class for Actions for setting one client property"""
 
716
 
 
717
    def run_on_one_client(self, client, properties):
 
718
        """Set the Client's D-Bus property"""
 
719
        log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
 
720
                  client.__dbus_object_path__,
 
721
                  dbus.PROPERTIES_IFACE, client_dbus_interface,
 
722
                  self.propname, self.value_to_set
 
723
                  if not isinstance(self.value_to_set, dbus.Boolean)
 
724
                  else bool(self.value_to_set))
 
725
        client.Set(client_dbus_interface, self.propname,
 
726
                   self.value_to_set,
 
727
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
728
 
 
729
    @property
 
730
    def propname(self):
 
731
        raise NotImplementedError()
 
732
 
 
733
 
 
734
class EnableCmd(PropertyCmd):
 
735
    propname = "Enabled"
 
736
    value_to_set = dbus.Boolean(True)
 
737
 
 
738
 
 
739
class DisableCmd(PropertyCmd):
 
740
    propname = "Enabled"
 
741
    value_to_set = dbus.Boolean(False)
 
742
 
 
743
 
 
744
class BumpTimeoutCmd(PropertyCmd):
 
745
    propname = "LastCheckedOK"
 
746
    value_to_set = ""
 
747
 
 
748
 
 
749
class StartCheckerCmd(PropertyCmd):
 
750
    propname = "CheckerRunning"
 
751
    value_to_set = dbus.Boolean(True)
 
752
 
 
753
 
 
754
class StopCheckerCmd(PropertyCmd):
 
755
    propname = "CheckerRunning"
 
756
    value_to_set = dbus.Boolean(False)
 
757
 
 
758
 
 
759
class ApproveByDefaultCmd(PropertyCmd):
 
760
    propname = "ApprovedByDefault"
 
761
    value_to_set = dbus.Boolean(True)
 
762
 
 
763
 
 
764
class DenyByDefaultCmd(PropertyCmd):
 
765
    propname = "ApprovedByDefault"
 
766
    value_to_set = dbus.Boolean(False)
 
767
 
 
768
 
 
769
class PropertyValueCmd(PropertyCmd):
 
770
    """Abstract class for PropertyCmd recieving a value as argument"""
 
771
    def __init__(self, value):
 
772
        self.value_to_set = value
 
773
 
 
774
 
 
775
class SetCheckerCmd(PropertyValueCmd):
 
776
    propname = "Checker"
 
777
 
 
778
 
 
779
class SetHostCmd(PropertyValueCmd):
 
780
    propname = "Host"
 
781
 
 
782
 
 
783
class SetSecretCmd(PropertyValueCmd):
 
784
    propname = "Secret"
 
785
 
 
786
    @property
 
787
    def value_to_set(self):
 
788
        return self._vts
 
789
 
 
790
    @value_to_set.setter
 
791
    def value_to_set(self, value):
 
792
        """When setting, read data from supplied file object"""
 
793
        self._vts = value.read()
 
794
        value.close()
 
795
 
 
796
 
 
797
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
 
798
    """Abstract class for PropertyValueCmd taking a value argument as
 
799
a datetime.timedelta() but should store it as milliseconds."""
 
800
 
 
801
    @property
 
802
    def value_to_set(self):
 
803
        return self._vts
 
804
 
 
805
    @value_to_set.setter
 
806
    def value_to_set(self, value):
 
807
        """When setting, convert value from a datetime.timedelta"""
 
808
        self._vts = int(round(value.total_seconds() * 1000))
 
809
 
 
810
 
 
811
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
 
812
    propname = "Timeout"
 
813
 
 
814
 
 
815
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
 
816
    propname = "ExtendedTimeout"
 
817
 
 
818
 
 
819
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
 
820
    propname = "Interval"
 
821
 
 
822
 
 
823
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
 
824
    propname = "ApprovalDelay"
 
825
 
 
826
 
 
827
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
 
828
    propname = "ApprovalDuration"
990
829
 
991
830
 
992
831
 
993
 
class TestCaseWithAssertLogs(unittest.TestCase):
994
 
    """unittest.TestCase.assertLogs only exists in Python 3.4"""
995
 
 
996
 
    if not hasattr(unittest.TestCase, "assertLogs"):
997
 
        @contextlib.contextmanager
998
 
        def assertLogs(self, logger, level=logging.INFO):
999
 
            capturing_handler = self.CapturingLevelHandler(level)
1000
 
            old_level = logger.level
1001
 
            old_propagate = logger.propagate
1002
 
            logger.addHandler(capturing_handler)
1003
 
            logger.setLevel(level)
1004
 
            logger.propagate = False
1005
 
            try:
1006
 
                yield capturing_handler.watcher
1007
 
            finally:
1008
 
                logger.propagate = old_propagate
1009
 
                logger.removeHandler(capturing_handler)
1010
 
                logger.setLevel(old_level)
1011
 
            self.assertGreater(len(capturing_handler.watcher.records),
1012
 
                               0)
1013
 
 
1014
 
        class CapturingLevelHandler(logging.Handler):
1015
 
            def __init__(self, level, *args, **kwargs):
1016
 
                logging.Handler.__init__(self, *args, **kwargs)
1017
 
                self.watcher = self.LoggingWatcher([], [])
1018
 
            def emit(self, record):
1019
 
                self.watcher.records.append(record)
1020
 
                self.watcher.output.append(self.format(record))
1021
 
 
1022
 
            LoggingWatcher = collections.namedtuple("LoggingWatcher",
1023
 
                                                    ("records",
1024
 
                                                     "output"))
1025
 
 
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
 
 
1032
 
class Test_string_to_delta(TestCaseWithAssertLogs):
1033
 
    # Just test basic RFC 3339 functionality here, the doc string for
1034
 
    # rfc3339_duration_to_delta() already has more comprehensive
1035
 
    # tests, which are run by doctest.
1036
 
 
1037
 
    def test_rfc3339_zero_seconds(self):
1038
 
        self.assertEqual(datetime.timedelta(),
1039
 
                         string_to_delta("PT0S"))
1040
 
 
1041
 
    def test_rfc3339_zero_days(self):
1042
 
        self.assertEqual(datetime.timedelta(), string_to_delta("P0D"))
1043
 
 
1044
 
    def test_rfc3339_one_second(self):
1045
 
        self.assertEqual(datetime.timedelta(0, 1),
1046
 
                         string_to_delta("PT1S"))
1047
 
 
1048
 
    def test_rfc3339_two_hours(self):
1049
 
        self.assertEqual(datetime.timedelta(0, 7200),
1050
 
                         string_to_delta("PT2H"))
 
832
class Test_string_to_delta(unittest.TestCase):
 
833
    def test_handles_basic_rfc3339(self):
 
834
        self.assertEqual(string_to_delta("PT0S"),
 
835
                         datetime.timedelta())
 
836
        self.assertEqual(string_to_delta("P0D"),
 
837
                         datetime.timedelta())
 
838
        self.assertEqual(string_to_delta("PT1S"),
 
839
                         datetime.timedelta(0, 1))
 
840
        self.assertEqual(string_to_delta("PT2H"),
 
841
                         datetime.timedelta(0, 7200))
1051
842
 
1052
843
    def test_falls_back_to_pre_1_6_1_with_warning(self):
1053
 
        with self.assertLogs(log, logging.WARNING):
1054
 
            value = string_to_delta("2h")
1055
 
        self.assertEqual(datetime.timedelta(0, 7200), value)
 
844
        # assertLogs only exists in Python 3.4
 
845
        if hasattr(self, "assertLogs"):
 
846
            with self.assertLogs(log, logging.WARNING):
 
847
                value = string_to_delta("2h")
 
848
        else:
 
849
            class WarningFilter(logging.Filter):
 
850
                """Don't show, but record the presence of, warnings"""
 
851
                def filter(self, record):
 
852
                    is_warning = record.levelno >= logging.WARNING
 
853
                    self.found = is_warning or getattr(self, "found",
 
854
                                                       False)
 
855
                    return not is_warning
 
856
            warning_filter = WarningFilter()
 
857
            log.addFilter(warning_filter)
 
858
            try:
 
859
                value = string_to_delta("2h")
 
860
            finally:
 
861
                log.removeFilter(warning_filter)
 
862
            self.assertTrue(getattr(warning_filter, "found", False))
 
863
        self.assertEqual(value, datetime.timedelta(0, 7200))
1056
864
 
1057
865
 
1058
866
class Test_check_option_syntax(unittest.TestCase):
1062
870
 
1063
871
    def test_actions_requires_client_or_all(self):
1064
872
        for action, value in self.actions.items():
1065
 
            args = self.actionargs(action, value)
 
873
            options = self.parser.parse_args()
 
874
            setattr(options, action, value)
1066
875
            with self.assertParseError():
1067
 
                self.parse_args(args)
 
876
                self.check_option_syntax(options)
1068
877
 
1069
 
    # This mostly corresponds to the definition from has_commands() in
 
878
    # This mostly corresponds to the definition from has_actions() in
1070
879
    # check_option_syntax()
1071
880
    actions = {
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,
 
881
        # The actual values set here are not that important, but we do
 
882
        # at least stick to the correct types, even though they are
 
883
        # never used
 
884
        "enable": True,
 
885
        "disable": True,
 
886
        "bump_timeout": True,
 
887
        "start_checker": True,
 
888
        "stop_checker": True,
 
889
        "is_enabled": True,
 
890
        "remove": True,
 
891
        "checker": "x",
 
892
        "timeout": datetime.timedelta(),
 
893
        "extended_timeout": datetime.timedelta(),
 
894
        "interval": datetime.timedelta(),
 
895
        "approved_by_default": True,
 
896
        "approval_delay": datetime.timedelta(),
 
897
        "approval_duration": datetime.timedelta(),
 
898
        "host": "x",
 
899
        "secret": io.BytesIO(b"x"),
 
900
        "approve": True,
 
901
        "deny": True,
1091
902
    }
1092
903
 
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
 
 
1100
904
    @contextlib.contextmanager
1101
905
    def assertParseError(self):
1102
906
        with self.assertRaises(SystemExit) as e:
1103
 
            with self.redirect_stderr_to_devnull():
 
907
            with self.temporarily_suppress_stderr():
1104
908
                yield
1105
909
        # Exit code from argparse is guaranteed to be "2".  Reference:
1106
910
        # https://docs.python.org/3/library
1107
911
        # /argparse.html#exiting-methods
1108
 
        self.assertEqual(2, e.exception.code)
1109
 
 
1110
 
    def parse_args(self, args):
1111
 
        options = self.parser.parse_args(args)
1112
 
        check_option_syntax(self.parser, options)
 
912
        self.assertEqual(e.exception.code, 2)
1113
913
 
1114
914
    @staticmethod
1115
915
    @contextlib.contextmanager
1116
 
    def redirect_stderr_to_devnull():
1117
 
        old_stderr = sys.stderr
1118
 
        with contextlib.closing(open(os.devnull, "w")) as null:
1119
 
            sys.stderr = null
1120
 
            try:
1121
 
                yield
1122
 
            finally:
1123
 
                sys.stderr = old_stderr
 
916
    def temporarily_suppress_stderr():
 
917
        null = os.open(os.path.devnull, os.O_RDWR)
 
918
        stderrcopy = os.dup(sys.stderr.fileno())
 
919
        os.dup2(null, sys.stderr.fileno())
 
920
        os.close(null)
 
921
        try:
 
922
            yield
 
923
        finally:
 
924
            # restore stderr
 
925
            os.dup2(stderrcopy, sys.stderr.fileno())
 
926
            os.close(stderrcopy)
1124
927
 
1125
928
    def check_option_syntax(self, options):
1126
929
        check_option_syntax(self.parser, options)
1127
930
 
1128
 
    def test_actions_all_conflicts_with_verbose(self):
1129
 
        for action, value in self.actions.items():
1130
 
            args = self.actionargs(action, value, "--all",
1131
 
                                   "--verbose")
1132
 
            with self.assertParseError():
1133
 
                self.parse_args(args)
1134
 
 
1135
 
    def test_actions_with_client_conflicts_with_verbose(self):
1136
 
        for action, value in self.actions.items():
1137
 
            args = self.actionargs(action, value, "--verbose",
1138
 
                                   "client")
1139
 
            with self.assertParseError():
1140
 
                self.parse_args(args)
 
931
    def test_actions_conflicts_with_verbose(self):
 
932
        for action, value in self.actions.items():
 
933
            options = self.parser.parse_args()
 
934
            setattr(options, action, value)
 
935
            options.verbose = True
 
936
            with self.assertParseError():
 
937
                self.check_option_syntax(options)
1141
938
 
1142
939
    def test_dump_json_conflicts_with_verbose(self):
1143
 
        args = ["--dump-json", "--verbose"]
 
940
        options = self.parser.parse_args()
 
941
        options.dump_json = True
 
942
        options.verbose = True
1144
943
        with self.assertParseError():
1145
 
            self.parse_args(args)
 
944
            self.check_option_syntax(options)
1146
945
 
1147
946
    def test_dump_json_conflicts_with_action(self):
1148
947
        for action, value in self.actions.items():
1149
 
            args = self.actionargs(action, value, "--dump-json")
 
948
            options = self.parser.parse_args()
 
949
            setattr(options, action, value)
 
950
            options.dump_json = True
1150
951
            with self.assertParseError():
1151
 
                self.parse_args(args)
 
952
                self.check_option_syntax(options)
1152
953
 
1153
954
    def test_all_can_not_be_alone(self):
1154
 
        args = ["--all"]
 
955
        options = self.parser.parse_args()
 
956
        options.all = True
1155
957
        with self.assertParseError():
1156
 
            self.parse_args(args)
 
958
            self.check_option_syntax(options)
1157
959
 
1158
960
    def test_all_is_ok_with_any_action(self):
1159
961
        for action, value in self.actions.items():
1160
 
            args = self.actionargs(action, value, "--all")
1161
 
            self.parse_args(args)
1162
 
 
1163
 
    def test_any_action_is_ok_with_one_client(self):
1164
 
        for action, value in self.actions.items():
1165
 
            args = self.actionargs(action, value, "client")
1166
 
            self.parse_args(args)
1167
 
 
1168
 
    def test_one_client_with_all_actions_except_is_enabled(self):
1169
 
        for action, value in self.actions.items():
1170
 
            if action == "--is-enabled":
1171
 
                continue
1172
 
            args = self.actionargs(action, value, "client")
1173
 
            self.parse_args(args)
1174
 
 
1175
 
    def test_two_clients_with_all_actions_except_is_enabled(self):
1176
 
        for action, value in self.actions.items():
1177
 
            if action == "--is-enabled":
1178
 
                continue
1179
 
            args = self.actionargs(action, value, "client1",
1180
 
                                   "client2")
1181
 
            self.parse_args(args)
1182
 
 
1183
 
    def test_two_clients_are_ok_with_actions_except_is_enabled(self):
1184
 
        for action, value in self.actions.items():
1185
 
            if action == "--is-enabled":
1186
 
                continue
1187
 
            args = self.actionargs(action, value, "client1",
1188
 
                                   "client2")
1189
 
            self.parse_args(args)
 
962
            options = self.parser.parse_args()
 
963
            setattr(options, action, value)
 
964
            options.all = True
 
965
            self.check_option_syntax(options)
1190
966
 
1191
967
    def test_is_enabled_fails_without_client(self):
1192
 
        args = ["--is-enabled"]
 
968
        options = self.parser.parse_args()
 
969
        options.is_enabled = True
1193
970
        with self.assertParseError():
1194
 
            self.parse_args(args)
 
971
            self.check_option_syntax(options)
 
972
 
 
973
    def test_is_enabled_works_with_one_client(self):
 
974
        options = self.parser.parse_args()
 
975
        options.is_enabled = True
 
976
        options.client = ["foo"]
 
977
        self.check_option_syntax(options)
1195
978
 
1196
979
    def test_is_enabled_fails_with_two_clients(self):
1197
 
        args = ["--is-enabled", "client1", "client2"]
 
980
        options = self.parser.parse_args()
 
981
        options.is_enabled = True
 
982
        options.client = ["foo", "barbar"]
1198
983
        with self.assertParseError():
1199
 
            self.parse_args(args)
 
984
            self.check_option_syntax(options)
1200
985
 
1201
986
    def test_remove_can_only_be_combined_with_action_deny(self):
1202
987
        for action, value in self.actions.items():
1203
 
            if action in {"--remove", "--deny"}:
 
988
            if action in {"remove", "deny"}:
1204
989
                continue
1205
 
            args = self.actionargs(action, value, "--all",
1206
 
                                   "--remove")
 
990
            options = self.parser.parse_args()
 
991
            setattr(options, action, value)
 
992
            options.all = True
 
993
            options.remove = True
1207
994
            with self.assertParseError():
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
 
995
                self.check_option_syntax(options)
 
996
 
 
997
 
 
998
class Test_get_mandos_dbus_object(unittest.TestCase):
 
999
    def test_calls_and_returns_get_object_on_bus(self):
 
1000
        class MockBus(object):
 
1001
            called = False
 
1002
            def get_object(mockbus_self, busname, dbus_path):
 
1003
                # Note that "self" is still the testcase instance,
 
1004
                # this MockBus instance is in "mockbus_self".
 
1005
                self.assertEqual(busname, dbus_busname)
 
1006
                self.assertEqual(dbus_path, server_dbus_path)
 
1007
                mockbus_self.called = True
 
1008
                return mockbus_self
 
1009
 
 
1010
        mockbus = get_mandos_dbus_object(bus=MockBus())
 
1011
        self.assertIsInstance(mockbus, MockBus)
 
1012
        self.assertTrue(mockbus.called)
 
1013
 
 
1014
    def test_logs_and_exits_on_dbus_error(self):
 
1015
        class MockBusFailing(object):
 
1016
            def get_object(self, busname, dbus_path):
 
1017
                raise dbus.exceptions.DBusException("Test")
 
1018
 
 
1019
        # assertLogs only exists in Python 3.4
 
1020
        if hasattr(self, "assertLogs"):
 
1021
            with self.assertLogs(log, logging.CRITICAL):
 
1022
                with self.assertRaises(SystemExit) as e:
 
1023
                    bus = get_mandos_dbus_object(bus=MockBus())
 
1024
        else:
 
1025
            critical_filter = self.CriticalFilter()
 
1026
            log.addFilter(critical_filter)
 
1027
            try:
 
1028
                with self.assertRaises(SystemExit) as e:
 
1029
                    get_mandos_dbus_object(bus=MockBusFailing())
 
1030
            finally:
 
1031
                log.removeFilter(critical_filter)
 
1032
            self.assertTrue(critical_filter.found)
 
1033
        if isinstance(e.exception.code, int):
 
1034
            self.assertNotEqual(e.exception.code, 0)
 
1035
        else:
 
1036
            self.assertIsNotNone(e.exception.code)
 
1037
 
 
1038
    class CriticalFilter(logging.Filter):
 
1039
        """Don't show, but register, critical messages"""
 
1040
        found = False
 
1041
        def filter(self, record):
 
1042
            is_critical = record.levelno >= logging.CRITICAL
 
1043
            self.found = is_critical or self.found
 
1044
            return not is_critical
 
1045
 
 
1046
 
 
1047
class Test_SilenceLogger(unittest.TestCase):
 
1048
    loggername = "mandos-ctl.Test_SilenceLogger"
 
1049
    log = logging.getLogger(loggername)
 
1050
    log.propagate = False
 
1051
    log.addHandler(logging.NullHandler())
1234
1052
 
1235
1053
    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):
1508
 
        dbus_logger = logging.getLogger("dbus.proxies")
1509
 
 
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)
1516
 
 
1517
 
        class CountingHandler(logging.Handler):
1518
 
            count = 0
1519
 
            def emit(self, record):
1520
 
                self.count += 1
1521
 
 
1522
 
        counting_handler = CountingHandler()
1523
 
 
1524
 
        dbus_logger.addHandler(counting_handler)
1525
 
 
 
1054
        self.counting_filter = self.CountingFilter()
 
1055
 
 
1056
    class CountingFilter(logging.Filter):
 
1057
        "Count number of records"
 
1058
        count = 0
 
1059
        def filter(self, record):
 
1060
            self.count += 1
 
1061
            return True
 
1062
 
 
1063
    def test_should_filter_records_only_when_active(self):
1526
1064
        try:
1527
 
            with self.assertRaises(dbus.Error) as e:
1528
 
                self.call_method(bus, "methodname", "busname",
1529
 
                                 "objectpath", "interface")
 
1065
            with SilenceLogger(self.loggername):
 
1066
                self.log.addFilter(self.counting_filter)
 
1067
                self.log.info("Filtered log message 1")
 
1068
            self.log.info("Non-filtered message 2")
 
1069
            self.log.info("Non-filtered message 3")
1530
1070
        finally:
1531
 
            dbus_logger.removeFilter(counting_handler)
1532
 
 
1533
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
1534
 
 
1535
 
        # Make sure the dbus logger was suppressed
1536
 
        self.assertEqual(0, counting_handler.count)
1537
 
 
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)
 
1071
            self.log.removeFilter(self.counting_filter)
 
1072
        self.assertEqual(self.counting_filter.count, 2)
1775
1073
 
1776
1074
 
1777
1075
class Test_commands_from_options(unittest.TestCase):
1778
 
 
1779
1076
    def setUp(self):
1780
1077
        self.parser = argparse.ArgumentParser()
1781
1078
        add_command_line_options(self.parser)
1782
1079
 
1783
1080
    def test_is_enabled(self):
1784
 
        self.assert_command_from_args(["--is-enabled", "client"],
1785
 
                                      command.IsEnabled)
 
1081
        self.assert_command_from_args(["--is-enabled", "foo"],
 
1082
                                      IsEnabledCmd)
1786
1083
 
1787
 
    def assert_command_from_args(self, args, command_cls, length=1,
1788
 
                                 clients=None, **cmd_attrs):
 
1084
    def assert_command_from_args(self, args, command_cls,
 
1085
                                 **cmd_attrs):
1789
1086
        """Assert that parsing ARGS should result in an instance of
1790
1087
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
1791
1088
        options = self.parser.parse_args(args)
1792
1089
        check_option_syntax(self.parser, options)
1793
1090
        commands = commands_from_options(options)
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)
 
1091
        self.assertEqual(len(commands), 1)
 
1092
        command = commands[0]
 
1093
        self.assertIsInstance(command, command_cls)
1802
1094
        for key, value in cmd_attrs.items():
1803
 
            self.assertEqual(value, getattr(command, key))
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)
 
1095
            self.assertEqual(getattr(command, key), value)
1810
1096
 
1811
1097
    def test_is_enabled_short(self):
1812
 
        self.assert_command_from_args(["-V", "client"],
1813
 
                                      command.IsEnabled)
 
1098
        self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
1814
1099
 
1815
1100
    def test_approve(self):
1816
 
        self.assert_command_from_args(["--approve", "client"],
1817
 
                                      command.Approve)
 
1101
        self.assert_command_from_args(["--approve", "foo"],
 
1102
                                      ApproveCmd)
1818
1103
 
1819
1104
    def test_approve_short(self):
1820
 
        self.assert_command_from_args(["-A", "client"],
1821
 
                                      command.Approve)
 
1105
        self.assert_command_from_args(["-A", "foo"], ApproveCmd)
1822
1106
 
1823
1107
    def test_deny(self):
1824
 
        self.assert_command_from_args(["--deny", "client"],
1825
 
                                      command.Deny)
 
1108
        self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1826
1109
 
1827
1110
    def test_deny_short(self):
1828
 
        self.assert_command_from_args(["-D", "client"], command.Deny)
 
1111
        self.assert_command_from_args(["-D", "foo"], DenyCmd)
1829
1112
 
1830
1113
    def test_remove(self):
1831
 
        self.assert_command_from_args(["--remove", "client"],
1832
 
                                      command.Remove)
 
1114
        self.assert_command_from_args(["--remove", "foo"],
 
1115
                                      RemoveCmd)
1833
1116
 
1834
1117
    def test_deny_before_remove(self):
1835
1118
        options = self.parser.parse_args(["--deny", "--remove",
1836
 
                                          "client"])
 
1119
                                          "foo"])
1837
1120
        check_option_syntax(self.parser, options)
1838
1121
        commands = commands_from_options(options)
1839
 
        self.assertEqual(2, len(commands))
1840
 
        self.assertIsInstance(commands[0], command.Deny)
1841
 
        self.assertIsInstance(commands[1], command.Remove)
 
1122
        self.assertEqual(len(commands), 2)
 
1123
        self.assertIsInstance(commands[0], DenyCmd)
 
1124
        self.assertIsInstance(commands[1], RemoveCmd)
1842
1125
 
1843
1126
    def test_deny_before_remove_reversed(self):
1844
1127
        options = self.parser.parse_args(["--remove", "--deny",
1845
1128
                                          "--all"])
1846
1129
        check_option_syntax(self.parser, options)
1847
1130
        commands = commands_from_options(options)
1848
 
        self.assertEqual(2, len(commands))
1849
 
        self.assertIsInstance(commands[0], command.Deny)
1850
 
        self.assertIsInstance(commands[1], command.Remove)
 
1131
        self.assertEqual(len(commands), 2)
 
1132
        self.assertIsInstance(commands[0], DenyCmd)
 
1133
        self.assertIsInstance(commands[1], RemoveCmd)
1851
1134
 
1852
1135
    def test_remove_short(self):
1853
 
        self.assert_command_from_args(["-r", "client"],
1854
 
                                      command.Remove)
 
1136
        self.assert_command_from_args(["-r", "foo"], RemoveCmd)
1855
1137
 
1856
1138
    def test_dump_json(self):
1857
 
        self.assert_command_from_args(["--dump-json"],
1858
 
                                      command.DumpJSON)
 
1139
        self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1859
1140
 
1860
1141
    def test_enable(self):
1861
 
        self.assert_command_from_args(["--enable", "client"],
1862
 
                                      command.Enable)
 
1142
        self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1863
1143
 
1864
1144
    def test_enable_short(self):
1865
 
        self.assert_command_from_args(["-e", "client"],
1866
 
                                      command.Enable)
 
1145
        self.assert_command_from_args(["-e", "foo"], EnableCmd)
1867
1146
 
1868
1147
    def test_disable(self):
1869
 
        self.assert_command_from_args(["--disable", "client"],
1870
 
                                      command.Disable)
 
1148
        self.assert_command_from_args(["--disable", "foo"],
 
1149
                                      DisableCmd)
1871
1150
 
1872
1151
    def test_disable_short(self):
1873
 
        self.assert_command_from_args(["-d", "client"],
1874
 
                                      command.Disable)
 
1152
        self.assert_command_from_args(["-d", "foo"], DisableCmd)
1875
1153
 
1876
1154
    def test_bump_timeout(self):
1877
 
        self.assert_command_from_args(["--bump-timeout", "client"],
1878
 
                                      command.BumpTimeout)
 
1155
        self.assert_command_from_args(["--bump-timeout", "foo"],
 
1156
                                      BumpTimeoutCmd)
1879
1157
 
1880
1158
    def test_bump_timeout_short(self):
1881
 
        self.assert_command_from_args(["-b", "client"],
1882
 
                                      command.BumpTimeout)
 
1159
        self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
1883
1160
 
1884
1161
    def test_start_checker(self):
1885
 
        self.assert_command_from_args(["--start-checker", "client"],
1886
 
                                      command.StartChecker)
 
1162
        self.assert_command_from_args(["--start-checker", "foo"],
 
1163
                                      StartCheckerCmd)
1887
1164
 
1888
1165
    def test_stop_checker(self):
1889
 
        self.assert_command_from_args(["--stop-checker", "client"],
1890
 
                                      command.StopChecker)
 
1166
        self.assert_command_from_args(["--stop-checker", "foo"],
 
1167
                                      StopCheckerCmd)
1891
1168
 
1892
1169
    def test_approve_by_default(self):
1893
 
        self.assert_command_from_args(["--approve-by-default",
1894
 
                                       "client"],
1895
 
                                      command.ApproveByDefault)
 
1170
        self.assert_command_from_args(["--approve-by-default", "foo"],
 
1171
                                      ApproveByDefaultCmd)
1896
1172
 
1897
1173
    def test_deny_by_default(self):
1898
 
        self.assert_command_from_args(["--deny-by-default", "client"],
1899
 
                                      command.DenyByDefault)
 
1174
        self.assert_command_from_args(["--deny-by-default", "foo"],
 
1175
                                      DenyByDefaultCmd)
1900
1176
 
1901
1177
    def test_checker(self):
1902
 
        self.assert_command_from_args(["--checker", ":", "client"],
1903
 
                                      command.SetChecker,
1904
 
                                      value_to_set=":")
 
1178
        self.assert_command_from_args(["--checker", ":", "foo"],
 
1179
                                      SetCheckerCmd, value_to_set=":")
1905
1180
 
1906
1181
    def test_checker_empty(self):
1907
 
        self.assert_command_from_args(["--checker", "", "client"],
1908
 
                                      command.SetChecker,
1909
 
                                      value_to_set="")
 
1182
        self.assert_command_from_args(["--checker", "", "foo"],
 
1183
                                      SetCheckerCmd, value_to_set="")
1910
1184
 
1911
1185
    def test_checker_short(self):
1912
 
        self.assert_command_from_args(["-c", ":", "client"],
1913
 
                                      command.SetChecker,
1914
 
                                      value_to_set=":")
 
1186
        self.assert_command_from_args(["-c", ":", "foo"],
 
1187
                                      SetCheckerCmd, value_to_set=":")
1915
1188
 
1916
1189
    def test_host(self):
1917
 
        self.assert_command_from_args(
1918
 
            ["--host", "client.example.org", "client"],
1919
 
            command.SetHost, value_to_set="client.example.org")
 
1190
        self.assert_command_from_args(["--host", "foo.example.org",
 
1191
                                       "foo"], SetHostCmd,
 
1192
                                      value_to_set="foo.example.org")
1920
1193
 
1921
1194
    def test_host_short(self):
1922
 
        self.assert_command_from_args(
1923
 
            ["-H", "client.example.org", "client"], command.SetHost,
1924
 
            value_to_set="client.example.org")
 
1195
        self.assert_command_from_args(["-H", "foo.example.org",
 
1196
                                       "foo"], SetHostCmd,
 
1197
                                      value_to_set="foo.example.org")
1925
1198
 
1926
1199
    def test_secret_devnull(self):
1927
1200
        self.assert_command_from_args(["--secret", os.path.devnull,
1928
 
                                       "client"], command.SetSecret,
 
1201
                                       "foo"], SetSecretCmd,
1929
1202
                                      value_to_set=b"")
1930
1203
 
1931
1204
    def test_secret_tempfile(self):
1934
1207
            f.write(value)
1935
1208
            f.seek(0)
1936
1209
            self.assert_command_from_args(["--secret", f.name,
1937
 
                                           "client"],
1938
 
                                          command.SetSecret,
 
1210
                                           "foo"], SetSecretCmd,
1939
1211
                                          value_to_set=value)
1940
1212
 
1941
1213
    def test_secret_devnull_short(self):
1942
 
        self.assert_command_from_args(["-s", os.path.devnull,
1943
 
                                       "client"], command.SetSecret,
1944
 
                                      value_to_set=b"")
 
1214
        self.assert_command_from_args(["-s", os.path.devnull, "foo"],
 
1215
                                      SetSecretCmd, value_to_set=b"")
1945
1216
 
1946
1217
    def test_secret_tempfile_short(self):
1947
1218
        with tempfile.NamedTemporaryFile(mode="r+b") as f:
1948
1219
            value = b"secret\0xyzzy\nbar"
1949
1220
            f.write(value)
1950
1221
            f.seek(0)
1951
 
            self.assert_command_from_args(["-s", f.name, "client"],
1952
 
                                          command.SetSecret,
 
1222
            self.assert_command_from_args(["-s", f.name, "foo"],
 
1223
                                          SetSecretCmd,
1953
1224
                                          value_to_set=value)
1954
1225
 
1955
1226
    def test_timeout(self):
1956
 
        self.assert_command_from_args(["--timeout", "PT5M", "client"],
1957
 
                                      command.SetTimeout,
 
1227
        self.assert_command_from_args(["--timeout", "PT5M", "foo"],
 
1228
                                      SetTimeoutCmd,
1958
1229
                                      value_to_set=300000)
1959
1230
 
1960
1231
    def test_timeout_short(self):
1961
 
        self.assert_command_from_args(["-t", "PT5M", "client"],
1962
 
                                      command.SetTimeout,
 
1232
        self.assert_command_from_args(["-t", "PT5M", "foo"],
 
1233
                                      SetTimeoutCmd,
1963
1234
                                      value_to_set=300000)
1964
1235
 
1965
1236
    def test_extended_timeout(self):
1966
1237
        self.assert_command_from_args(["--extended-timeout", "PT15M",
1967
 
                                       "client"],
1968
 
                                      command.SetExtendedTimeout,
 
1238
                                       "foo"],
 
1239
                                      SetExtendedTimeoutCmd,
1969
1240
                                      value_to_set=900000)
1970
1241
 
1971
1242
    def test_interval(self):
1972
 
        self.assert_command_from_args(["--interval", "PT2M",
1973
 
                                       "client"], command.SetInterval,
 
1243
        self.assert_command_from_args(["--interval", "PT2M", "foo"],
 
1244
                                      SetIntervalCmd,
1974
1245
                                      value_to_set=120000)
1975
1246
 
1976
1247
    def test_interval_short(self):
1977
 
        self.assert_command_from_args(["-i", "PT2M", "client"],
1978
 
                                      command.SetInterval,
 
1248
        self.assert_command_from_args(["-i", "PT2M", "foo"],
 
1249
                                      SetIntervalCmd,
1979
1250
                                      value_to_set=120000)
1980
1251
 
1981
1252
    def test_approval_delay(self):
1982
1253
        self.assert_command_from_args(["--approval-delay", "PT30S",
1983
 
                                       "client"],
1984
 
                                      command.SetApprovalDelay,
 
1254
                                       "foo"], SetApprovalDelayCmd,
1985
1255
                                      value_to_set=30000)
1986
1256
 
1987
1257
    def test_approval_duration(self):
1988
1258
        self.assert_command_from_args(["--approval-duration", "PT1S",
1989
 
                                       "client"],
1990
 
                                      command.SetApprovalDuration,
 
1259
                                       "foo"], SetApprovalDurationCmd,
1991
1260
                                      value_to_set=1000)
1992
1261
 
1993
1262
    def test_print_table(self):
1994
 
        self.assert_command_from_args([], command.PrintTable,
 
1263
        self.assert_command_from_args([], PrintTableCmd,
1995
1264
                                      verbose=False)
1996
1265
 
1997
1266
    def test_print_table_verbose(self):
1998
 
        self.assert_command_from_args(["--verbose"],
1999
 
                                      command.PrintTable,
 
1267
        self.assert_command_from_args(["--verbose"], PrintTableCmd,
2000
1268
                                      verbose=True)
2001
1269
 
2002
1270
    def test_print_table_verbose_short(self):
2003
 
        self.assert_command_from_args(["-v"], command.PrintTable,
 
1271
        self.assert_command_from_args(["-v"], PrintTableCmd,
2004
1272
                                      verbose=True)
2005
1273
 
2006
1274
 
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
 
 
2038
 
class TestCommand(unittest.TestCase):
 
1275
class TestCmd(unittest.TestCase):
2039
1276
    """Abstract class for tests of command classes"""
2040
1277
 
2041
 
    class FakeMandosBus(dbus.MandosBus):
2042
 
        def __init__(self, testcase):
2043
 
            self.client_properties = {
 
1278
    def setUp(self):
 
1279
        testcase = self
 
1280
        class MockClient(object):
 
1281
            def __init__(self, name, **attributes):
 
1282
                self.__dbus_object_path__ = "/clients/{}".format(name)
 
1283
                self.attributes = attributes
 
1284
                self.attributes["Name"] = name
 
1285
                self.calls = []
 
1286
            def Set(self, interface, propname, value, dbus_interface):
 
1287
                testcase.assertEqual(interface, client_dbus_interface)
 
1288
                testcase.assertEqual(dbus_interface,
 
1289
                                     dbus.PROPERTIES_IFACE)
 
1290
                self.attributes[propname] = value
 
1291
            def Get(self, interface, propname, dbus_interface):
 
1292
                testcase.assertEqual(interface, client_dbus_interface)
 
1293
                testcase.assertEqual(dbus_interface,
 
1294
                                     dbus.PROPERTIES_IFACE)
 
1295
                return self.attributes[propname]
 
1296
            def Approve(self, approve, dbus_interface):
 
1297
                testcase.assertEqual(dbus_interface,
 
1298
                                     client_dbus_interface)
 
1299
                self.calls.append(("Approve", (approve,
 
1300
                                               dbus_interface)))
 
1301
        self.client = MockClient(
 
1302
            "foo",
 
1303
            KeyID=("92ed150794387c03ce684574b1139a65"
 
1304
                   "94a34f895daaaf09fd8ea90a27cddb12"),
 
1305
            Secret=b"secret",
 
1306
            Host="foo.example.org",
 
1307
            Enabled=dbus.Boolean(True),
 
1308
            Timeout=300000,
 
1309
            LastCheckedOK="2019-02-03T00:00:00",
 
1310
            Created="2019-01-02T00:00:00",
 
1311
            Interval=120000,
 
1312
            Fingerprint=("778827225BA7DE539C5A"
 
1313
                         "7CFA59CFF7CDBD9A5920"),
 
1314
            CheckerRunning=dbus.Boolean(False),
 
1315
            LastEnabled="2019-01-03T00:00:00",
 
1316
            ApprovalPending=dbus.Boolean(False),
 
1317
            ApprovedByDefault=dbus.Boolean(True),
 
1318
            LastApprovalRequest="",
 
1319
            ApprovalDelay=0,
 
1320
            ApprovalDuration=1000,
 
1321
            Checker="fping -q -- %(host)s",
 
1322
            ExtendedTimeout=900000,
 
1323
            Expires="2019-02-04T00:00:00",
 
1324
            LastCheckerStatus=0)
 
1325
        self.other_client = MockClient(
 
1326
            "barbar",
 
1327
            KeyID=("0558568eedd67d622f5c83b35a115f79"
 
1328
                   "6ab612cff5ad227247e46c2b020f441c"),
 
1329
            Secret=b"secretbar",
 
1330
            Host="192.0.2.3",
 
1331
            Enabled=dbus.Boolean(True),
 
1332
            Timeout=300000,
 
1333
            LastCheckedOK="2019-02-04T00:00:00",
 
1334
            Created="2019-01-03T00:00:00",
 
1335
            Interval=120000,
 
1336
            Fingerprint=("3E393AEAEFB84C7E89E2"
 
1337
                         "F547B3A107558FCA3A27"),
 
1338
            CheckerRunning=dbus.Boolean(True),
 
1339
            LastEnabled="2019-01-04T00:00:00",
 
1340
            ApprovalPending=dbus.Boolean(False),
 
1341
            ApprovedByDefault=dbus.Boolean(False),
 
1342
            LastApprovalRequest="2019-01-03T00:00:00",
 
1343
            ApprovalDelay=30000,
 
1344
            ApprovalDuration=93785000,
 
1345
            Checker=":",
 
1346
            ExtendedTimeout=900000,
 
1347
            Expires="2019-02-05T00:00:00",
 
1348
            LastCheckerStatus=-2)
 
1349
        self.clients =  collections.OrderedDict(
 
1350
            [
 
1351
                ("/clients/foo", self.client.attributes),
 
1352
                ("/clients/barbar", self.other_client.attributes),
 
1353
            ])
 
1354
        self.one_client = {"/clients/foo": self.client.attributes}
 
1355
 
 
1356
    @property
 
1357
    def bus(self):
 
1358
        class Bus(object):
 
1359
            @staticmethod
 
1360
            def get_object(client_bus_name, path):
 
1361
                self.assertEqual(client_bus_name, dbus_busname)
 
1362
                return {
 
1363
                    # Note: "self" here is the TestCmd instance, not
 
1364
                    # the Bus instance, since this is a static method!
 
1365
                    "/clients/foo": self.client,
 
1366
                    "/clients/barbar": self.other_client,
 
1367
                }[path]
 
1368
        return Bus()
 
1369
 
 
1370
 
 
1371
class TestIsEnabledCmd(TestCmd):
 
1372
    def test_is_enabled(self):
 
1373
        self.assertTrue(all(IsEnabledCmd().is_enabled(client,
 
1374
                                                      properties)
 
1375
                            for client, properties
 
1376
                            in self.clients.items()))
 
1377
 
 
1378
    def test_is_enabled_run_exits_successfully(self):
 
1379
        with self.assertRaises(SystemExit) as e:
 
1380
            IsEnabledCmd().run(self.one_client)
 
1381
        if e.exception.code is not None:
 
1382
            self.assertEqual(e.exception.code, 0)
 
1383
        else:
 
1384
            self.assertIsNone(e.exception.code)
 
1385
 
 
1386
    def test_is_enabled_run_exits_with_failure(self):
 
1387
        self.client.attributes["Enabled"] = dbus.Boolean(False)
 
1388
        with self.assertRaises(SystemExit) as e:
 
1389
            IsEnabledCmd().run(self.one_client)
 
1390
        if isinstance(e.exception.code, int):
 
1391
            self.assertNotEqual(e.exception.code, 0)
 
1392
        else:
 
1393
            self.assertIsNotNone(e.exception.code)
 
1394
 
 
1395
 
 
1396
class TestApproveCmd(TestCmd):
 
1397
    def test_approve(self):
 
1398
        ApproveCmd().run(self.clients, self.bus)
 
1399
        for clientpath in self.clients:
 
1400
            client = self.bus.get_object(dbus_busname, clientpath)
 
1401
            self.assertIn(("Approve", (True, client_dbus_interface)),
 
1402
                          client.calls)
 
1403
 
 
1404
 
 
1405
class TestDenyCmd(TestCmd):
 
1406
    def test_deny(self):
 
1407
        DenyCmd().run(self.clients, self.bus)
 
1408
        for clientpath in self.clients:
 
1409
            client = self.bus.get_object(dbus_busname, clientpath)
 
1410
            self.assertIn(("Approve", (False, client_dbus_interface)),
 
1411
                          client.calls)
 
1412
 
 
1413
 
 
1414
class TestRemoveCmd(TestCmd):
 
1415
    def test_remove(self):
 
1416
        class MockMandos(object):
 
1417
            def __init__(self):
 
1418
                self.calls = []
 
1419
            def RemoveClient(self, dbus_path):
 
1420
                self.calls.append(("RemoveClient", (dbus_path,)))
 
1421
        mandos = MockMandos()
 
1422
        super(TestRemoveCmd, self).setUp()
 
1423
        RemoveCmd().run(self.clients, self.bus, mandos)
 
1424
        self.assertEqual(len(mandos.calls), 2)
 
1425
        for clientpath in self.clients:
 
1426
            self.assertIn(("RemoveClient", (clientpath,)),
 
1427
                          mandos.calls)
 
1428
 
 
1429
 
 
1430
class TestDumpJSONCmd(TestCmd):
 
1431
    def setUp(self):
 
1432
        self.expected_json = {
 
1433
            "foo": {
2044
1434
                "Name": "foo",
2045
1435
                "KeyID": ("92ed150794387c03ce684574b1139a65"
2046
1436
                          "94a34f895daaaf09fd8ea90a27cddb12"),
2047
 
                "Secret": b"secret",
2048
1437
                "Host": "foo.example.org",
2049
1438
                "Enabled": True,
2050
1439
                "Timeout": 300000,
2064
1453
                "ExtendedTimeout": 900000,
2065
1454
                "Expires": "2019-02-04T00:00:00",
2066
1455
                "LastCheckerStatus": 0,
2067
 
            }
2068
 
            self.other_client_properties = {
 
1456
            },
 
1457
            "barbar": {
2069
1458
                "Name": "barbar",
2070
1459
                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
2071
1460
                          "6ab612cff5ad227247e46c2b020f441c"),
2072
 
                "Secret": b"secretbar",
2073
1461
                "Host": "192.0.2.3",
2074
1462
                "Enabled": True,
2075
1463
                "Timeout": 300000,
2089
1477
                "ExtendedTimeout": 900000,
2090
1478
                "Expires": "2019-02-05T00:00:00",
2091
1479
                "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
 
 
2129
 
    def setUp(self):
2130
 
        self.bus = self.FakeMandosBus(self)
2131
 
 
2132
 
 
2133
 
class TestBaseCommands(TestCommand):
2134
 
 
2135
 
    def test_IsEnabled_exits_successfully(self):
2136
 
        with self.assertRaises(SystemExit) as e:
2137
 
            command.IsEnabled().run(self.bus.one_client)
2138
 
        if e.exception.code is not None:
2139
 
            self.assertEqual(0, e.exception.code)
2140
 
        else:
2141
 
            self.assertIsNone(e.exception.code)
2142
 
 
2143
 
    def test_IsEnabled_exits_with_failure(self):
2144
 
        self.bus.client_properties["Enabled"] = False
2145
 
        with self.assertRaises(SystemExit) as e:
2146
 
            command.IsEnabled().run(self.bus.one_client)
2147
 
        if isinstance(e.exception.code, int):
2148
 
            self.assertNotEqual(0, e.exception.code)
2149
 
        else:
2150
 
            self.assertIsNotNone(e.exception.code)
2151
 
 
2152
 
    def test_Approve(self):
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)
2159
 
 
2160
 
    def test_Deny(self):
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)
2168
 
 
2169
 
    def test_Remove(self):
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)
2175
 
 
2176
 
    expected_json = {
2177
 
        "foo": {
2178
 
            "Name": "foo",
2179
 
            "KeyID": ("92ed150794387c03ce684574b1139a65"
2180
 
                      "94a34f895daaaf09fd8ea90a27cddb12"),
2181
 
            "Host": "foo.example.org",
2182
 
            "Enabled": True,
2183
 
            "Timeout": 300000,
2184
 
            "LastCheckedOK": "2019-02-03T00:00:00",
2185
 
            "Created": "2019-01-02T00:00:00",
2186
 
            "Interval": 120000,
2187
 
            "Fingerprint": ("778827225BA7DE539C5A"
2188
 
                            "7CFA59CFF7CDBD9A5920"),
2189
 
            "CheckerRunning": False,
2190
 
            "LastEnabled": "2019-01-03T00:00:00",
2191
 
            "ApprovalPending": False,
2192
 
            "ApprovedByDefault": True,
2193
 
            "LastApprovalRequest": "",
2194
 
            "ApprovalDelay": 0,
2195
 
            "ApprovalDuration": 1000,
2196
 
            "Checker": "fping -q -- %(host)s",
2197
 
            "ExtendedTimeout": 900000,
2198
 
            "Expires": "2019-02-04T00:00:00",
2199
 
            "LastCheckerStatus": 0,
2200
 
        },
2201
 
        "barbar": {
2202
 
            "Name": "barbar",
2203
 
            "KeyID": ("0558568eedd67d622f5c83b35a115f79"
2204
 
                      "6ab612cff5ad227247e46c2b020f441c"),
2205
 
            "Host": "192.0.2.3",
2206
 
            "Enabled": True,
2207
 
            "Timeout": 300000,
2208
 
            "LastCheckedOK": "2019-02-04T00:00:00",
2209
 
            "Created": "2019-01-03T00:00:00",
2210
 
            "Interval": 120000,
2211
 
            "Fingerprint": ("3E393AEAEFB84C7E89E2"
2212
 
                            "F547B3A107558FCA3A27"),
2213
 
            "CheckerRunning": True,
2214
 
            "LastEnabled": "2019-01-04T00:00:00",
2215
 
            "ApprovalPending": False,
2216
 
            "ApprovedByDefault": False,
2217
 
            "LastApprovalRequest": "2019-01-03T00:00:00",
2218
 
            "ApprovalDelay": 30000,
2219
 
            "ApprovalDuration": 93785000,
2220
 
            "Checker": ":",
2221
 
            "ExtendedTimeout": 900000,
2222
 
            "Expires": "2019-02-05T00:00:00",
2223
 
            "LastCheckerStatus": -2,
2224
 
        },
2225
 
    }
2226
 
 
2227
 
    def test_DumpJSON_normal(self):
2228
 
        with self.capture_stdout_to_buffer() as buffer:
2229
 
            command.DumpJSON().run(self.bus.clients)
2230
 
        json_data = json.loads(buffer.getvalue())
2231
 
        self.assertDictEqual(self.expected_json, json_data)
2232
 
 
2233
 
    @staticmethod
2234
 
    @contextlib.contextmanager
2235
 
    def capture_stdout_to_buffer():
2236
 
        capture_buffer = io.StringIO()
2237
 
        old_stdout = sys.stdout
2238
 
        sys.stdout = capture_buffer
2239
 
        try:
2240
 
            yield capture_buffer
2241
 
        finally:
2242
 
            sys.stdout = old_stdout
2243
 
 
2244
 
    def test_DumpJSON_one_client(self):
2245
 
        with self.capture_stdout_to_buffer() as buffer:
2246
 
            command.DumpJSON().run(self.bus.one_client)
2247
 
        json_data = json.loads(buffer.getvalue())
 
1480
            },
 
1481
        }
 
1482
        return super(TestDumpJSONCmd, self).setUp()
 
1483
 
 
1484
    def test_normal(self):
 
1485
        output = DumpJSONCmd().output(self.clients.values())
 
1486
        json_data = json.loads(output)
 
1487
        self.assertDictEqual(json_data, self.expected_json)
 
1488
 
 
1489
    def test_one_client(self):
 
1490
        output = DumpJSONCmd().output(self.one_client.values())
 
1491
        json_data = json.loads(output)
2248
1492
        expected_json = {"foo": self.expected_json["foo"]}
2249
 
        self.assertDictEqual(expected_json, json_data)
2250
 
 
2251
 
    def test_PrintTable_normal(self):
2252
 
        with self.capture_stdout_to_buffer() as buffer:
2253
 
            command.PrintTable().run(self.bus.clients)
 
1493
        self.assertDictEqual(json_data, expected_json)
 
1494
 
 
1495
 
 
1496
class TestPrintTableCmd(TestCmd):
 
1497
    def test_normal(self):
 
1498
        output = PrintTableCmd().output(self.clients.values())
2254
1499
        expected_output = "\n".join((
2255
1500
            "Name   Enabled Timeout  Last Successful Check",
2256
1501
            "foo    Yes     00:05:00 2019-02-03T00:00:00  ",
2257
1502
            "barbar Yes     00:05:00 2019-02-04T00:00:00  ",
2258
 
        )) + "\n"
2259
 
        self.assertEqual(expected_output, buffer.getvalue())
 
1503
        ))
 
1504
        self.assertEqual(output, expected_output)
2260
1505
 
2261
 
    def test_PrintTable_verbose(self):
2262
 
        with self.capture_stdout_to_buffer() as buffer:
2263
 
            command.PrintTable(verbose=True).run(self.bus.clients)
 
1506
    def test_verbose(self):
 
1507
        output = PrintTableCmd(verbose=True).output(
 
1508
            self.clients.values())
2264
1509
        columns = (
2265
1510
            (
2266
1511
                "Name   ",
2348
1593
            )
2349
1594
        )
2350
1595
        num_lines = max(len(rows) for rows in columns)
2351
 
        expected_output = ("\n".join("".join(rows[line]
2352
 
                                             for rows in columns)
2353
 
                                     for line in range(num_lines))
2354
 
                           + "\n")
2355
 
        self.assertEqual(expected_output, buffer.getvalue())
 
1596
        expected_output = "\n".join("".join(rows[line]
 
1597
                                            for rows in columns)
 
1598
                                    for line in range(num_lines))
 
1599
        self.assertEqual(output, expected_output)
2356
1600
 
2357
 
    def test_PrintTable_one_client(self):
2358
 
        with self.capture_stdout_to_buffer() as buffer:
2359
 
            command.PrintTable().run(self.bus.one_client)
 
1601
    def test_one_client(self):
 
1602
        output = PrintTableCmd().output(self.one_client.values())
2360
1603
        expected_output = "\n".join((
2361
1604
            "Name Enabled Timeout  Last Successful Check",
2362
1605
            "foo  Yes     00:05:00 2019-02-03T00:00:00  ",
2363
 
        )) + "\n"
2364
 
        self.assertEqual(expected_output, buffer.getvalue())
2365
 
 
2366
 
 
2367
 
class TestPropertySetterCmd(TestCommand):
2368
 
    """Abstract class for tests of command.PropertySetter classes"""
2369
 
 
 
1606
        ))
 
1607
        self.assertEqual(output, expected_output)
 
1608
 
 
1609
 
 
1610
class TestPropertyCmd(TestCmd):
 
1611
    """Abstract class for tests of PropertyCmd classes"""
2370
1612
    def runTest(self):
2371
1613
        if not hasattr(self, "command"):
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)
2390
 
                self.assertEqual(value_to_get, value)
2391
 
 
2392
 
 
2393
 
class TestEnableCmd(TestPropertySetterCmd):
2394
 
    command = command.Enable
2395
 
    propname = "Enabled"
2396
 
    values_to_get = [True]
2397
 
 
2398
 
 
2399
 
class TestDisableCmd(TestPropertySetterCmd):
2400
 
    command = command.Disable
2401
 
    propname = "Enabled"
2402
 
    values_to_get = [False]
2403
 
 
2404
 
 
2405
 
class TestBumpTimeoutCmd(TestPropertySetterCmd):
2406
 
    command = command.BumpTimeout
 
1614
            return
 
1615
        values_to_get = getattr(self, "values_to_get",
 
1616
                                self.values_to_set)
 
1617
        for value_to_set, value_to_get in zip(self.values_to_set,
 
1618
                                              values_to_get):
 
1619
            for clientpath in self.clients:
 
1620
                client = self.bus.get_object(dbus_busname, clientpath)
 
1621
                old_value = client.attributes[self.propname]
 
1622
                self.assertNotIsInstance(old_value, self.Unique)
 
1623
                client.attributes[self.propname] = self.Unique()
 
1624
            self.run_command(value_to_set, self.clients)
 
1625
            for clientpath in self.clients:
 
1626
                client = self.bus.get_object(dbus_busname, clientpath)
 
1627
                value = client.attributes[self.propname]
 
1628
                self.assertNotIsInstance(value, self.Unique)
 
1629
                self.assertEqual(value, value_to_get)
 
1630
 
 
1631
    class Unique(object):
 
1632
        """Class for objects which exist only to be unique objects,
 
1633
since unittest.mock.sentinel only exists in Python 3.3"""
 
1634
 
 
1635
    def run_command(self, value, clients):
 
1636
        self.command().run(clients, self.bus)
 
1637
 
 
1638
 
 
1639
class TestEnableCmd(TestPropertyCmd):
 
1640
    command = EnableCmd
 
1641
    propname = "Enabled"
 
1642
    values_to_set = [dbus.Boolean(True)]
 
1643
 
 
1644
 
 
1645
class TestDisableCmd(TestPropertyCmd):
 
1646
    command = DisableCmd
 
1647
    propname = "Enabled"
 
1648
    values_to_set = [dbus.Boolean(False)]
 
1649
 
 
1650
 
 
1651
class TestBumpTimeoutCmd(TestPropertyCmd):
 
1652
    command = BumpTimeoutCmd
2407
1653
    propname = "LastCheckedOK"
2408
 
    values_to_get = [""]
2409
 
 
2410
 
 
2411
 
class TestStartCheckerCmd(TestPropertySetterCmd):
2412
 
    command = command.StartChecker
2413
 
    propname = "CheckerRunning"
2414
 
    values_to_get = [True]
2415
 
 
2416
 
 
2417
 
class TestStopCheckerCmd(TestPropertySetterCmd):
2418
 
    command = command.StopChecker
2419
 
    propname = "CheckerRunning"
2420
 
    values_to_get = [False]
2421
 
 
2422
 
 
2423
 
class TestApproveByDefaultCmd(TestPropertySetterCmd):
2424
 
    command = command.ApproveByDefault
2425
 
    propname = "ApprovedByDefault"
2426
 
    values_to_get = [True]
2427
 
 
2428
 
 
2429
 
class TestDenyByDefaultCmd(TestPropertySetterCmd):
2430
 
    command = command.DenyByDefault
2431
 
    propname = "ApprovedByDefault"
2432
 
    values_to_get = [False]
2433
 
 
2434
 
 
2435
 
class TestSetCheckerCmd(TestPropertySetterCmd):
2436
 
    command = command.SetChecker
 
1654
    values_to_set = [""]
 
1655
 
 
1656
 
 
1657
class TestStartCheckerCmd(TestPropertyCmd):
 
1658
    command = StartCheckerCmd
 
1659
    propname = "CheckerRunning"
 
1660
    values_to_set = [dbus.Boolean(True)]
 
1661
 
 
1662
 
 
1663
class TestStopCheckerCmd(TestPropertyCmd):
 
1664
    command = StopCheckerCmd
 
1665
    propname = "CheckerRunning"
 
1666
    values_to_set = [dbus.Boolean(False)]
 
1667
 
 
1668
 
 
1669
class TestApproveByDefaultCmd(TestPropertyCmd):
 
1670
    command = ApproveByDefaultCmd
 
1671
    propname = "ApprovedByDefault"
 
1672
    values_to_set = [dbus.Boolean(True)]
 
1673
 
 
1674
 
 
1675
class TestDenyByDefaultCmd(TestPropertyCmd):
 
1676
    command = DenyByDefaultCmd
 
1677
    propname = "ApprovedByDefault"
 
1678
    values_to_set = [dbus.Boolean(False)]
 
1679
 
 
1680
 
 
1681
class TestPropertyValueCmd(TestPropertyCmd):
 
1682
    """Abstract class for tests of PropertyValueCmd classes"""
 
1683
 
 
1684
    def runTest(self):
 
1685
        if type(self) is TestPropertyValueCmd:
 
1686
            return
 
1687
        return super(TestPropertyValueCmd, self).runTest()
 
1688
 
 
1689
    def run_command(self, value, clients):
 
1690
        self.command(value).run(clients, self.bus)
 
1691
 
 
1692
 
 
1693
class TestSetCheckerCmd(TestPropertyValueCmd):
 
1694
    command = SetCheckerCmd
2437
1695
    propname = "Checker"
2438
1696
    values_to_set = ["", ":", "fping -q -- %s"]
2439
1697
 
2440
1698
 
2441
 
class TestSetHostCmd(TestPropertySetterCmd):
2442
 
    command = command.SetHost
 
1699
class TestSetHostCmd(TestPropertyValueCmd):
 
1700
    command = SetHostCmd
2443
1701
    propname = "Host"
2444
 
    values_to_set = ["192.0.2.3", "client.example.org"]
2445
 
 
2446
 
 
2447
 
class TestSetSecretCmd(TestPropertySetterCmd):
2448
 
    command = command.SetSecret
 
1702
    values_to_set = ["192.0.2.3", "foo.example.org"]
 
1703
 
 
1704
 
 
1705
class TestSetSecretCmd(TestPropertyValueCmd):
 
1706
    command = SetSecretCmd
2449
1707
    propname = "Secret"
2450
1708
    values_to_set = [io.BytesIO(b""),
2451
1709
                     io.BytesIO(b"secret\0xyzzy\nbar")]
2452
 
    values_to_get = [f.getvalue() for f in values_to_set]
2453
 
 
2454
 
 
2455
 
class TestSetTimeoutCmd(TestPropertySetterCmd):
2456
 
    command = command.SetTimeout
 
1710
    values_to_get = [b"", b"secret\0xyzzy\nbar"]
 
1711
 
 
1712
 
 
1713
class TestSetTimeoutCmd(TestPropertyValueCmd):
 
1714
    command = SetTimeoutCmd
2457
1715
    propname = "Timeout"
2458
1716
    values_to_set = [datetime.timedelta(),
2459
1717
                     datetime.timedelta(minutes=5),
2460
1718
                     datetime.timedelta(seconds=1),
2461
1719
                     datetime.timedelta(weeks=1),
2462
1720
                     datetime.timedelta(weeks=52)]
2463
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2464
 
 
2465
 
 
2466
 
class TestSetExtendedTimeoutCmd(TestPropertySetterCmd):
2467
 
    command = command.SetExtendedTimeout
 
1721
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1722
 
 
1723
 
 
1724
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
 
1725
    command = SetExtendedTimeoutCmd
2468
1726
    propname = "ExtendedTimeout"
2469
1727
    values_to_set = [datetime.timedelta(),
2470
1728
                     datetime.timedelta(minutes=5),
2471
1729
                     datetime.timedelta(seconds=1),
2472
1730
                     datetime.timedelta(weeks=1),
2473
1731
                     datetime.timedelta(weeks=52)]
2474
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2475
 
 
2476
 
 
2477
 
class TestSetIntervalCmd(TestPropertySetterCmd):
2478
 
    command = command.SetInterval
 
1732
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1733
 
 
1734
 
 
1735
class TestSetIntervalCmd(TestPropertyValueCmd):
 
1736
    command = SetIntervalCmd
2479
1737
    propname = "Interval"
2480
1738
    values_to_set = [datetime.timedelta(),
2481
1739
                     datetime.timedelta(minutes=5),
2482
1740
                     datetime.timedelta(seconds=1),
2483
1741
                     datetime.timedelta(weeks=1),
2484
1742
                     datetime.timedelta(weeks=52)]
2485
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2486
 
 
2487
 
 
2488
 
class TestSetApprovalDelayCmd(TestPropertySetterCmd):
2489
 
    command = command.SetApprovalDelay
 
1743
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1744
 
 
1745
 
 
1746
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
 
1747
    command = SetApprovalDelayCmd
2490
1748
    propname = "ApprovalDelay"
2491
1749
    values_to_set = [datetime.timedelta(),
2492
1750
                     datetime.timedelta(minutes=5),
2493
1751
                     datetime.timedelta(seconds=1),
2494
1752
                     datetime.timedelta(weeks=1),
2495
1753
                     datetime.timedelta(weeks=52)]
2496
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2497
 
 
2498
 
 
2499
 
class TestSetApprovalDurationCmd(TestPropertySetterCmd):
2500
 
    command = command.SetApprovalDuration
 
1754
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1755
 
 
1756
 
 
1757
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
 
1758
    command = SetApprovalDurationCmd
2501
1759
    propname = "ApprovalDuration"
2502
1760
    values_to_set = [datetime.timedelta(),
2503
1761
                     datetime.timedelta(minutes=5),
2504
1762
                     datetime.timedelta(seconds=1),
2505
1763
                     datetime.timedelta(weeks=1),
2506
1764
                     datetime.timedelta(weeks=52)]
2507
 
    values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
 
1765
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
2508
1766
 
2509
1767
 
2510
1768