/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 at recompile
  • Date: 2019-12-04 23:52:20 UTC
  • Revision ID: teddy@recompile.se-20191204235220-yn88brp0scmqwy2t
Remove non-project-specific pattern from .bzrignore

Only project-specific patterns should be in the .bzrignore file.
Other generic patterns should be in the ~/.config/breezy/ignore and
~/.bazaar/ignore files.

* .bzrignore (.tramp_history): Remove.

Show diffs side-by-side

added added

removed removed

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