/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-03-12 20:37:00 UTC
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190312203700-psenofay84b3szip
mandos-ctl: Refactor

* mandos-ctl (TestEnableCmd, TestDisableCmd): Rewrite to inherit from
                                              TestPropertyCmd instead
                                              of TestCmd.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
43
43
import unittest
44
44
import logging
45
45
import io
 
46
import tempfile
 
47
import contextlib
46
48
 
47
49
import dbus
48
50
 
62
64
 
63
65
locale.setlocale(locale.LC_ALL, "")
64
66
 
65
 
domain = "se.recompile"
66
 
busname = domain + ".Mandos"
67
 
server_path = "/"
68
 
server_interface = domain + ".Mandos"
69
 
client_interface = domain + ".Mandos.Client"
 
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
70
73
version = "1.8.3"
71
74
 
72
75
 
76
79
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
77
80
 
78
81
 
79
 
def milliseconds_to_string(ms):
80
 
    td = datetime.timedelta(0, 0, 0, ms)
81
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
82
 
            .format(days="{}T".format(td.days) if td.days else "",
83
 
                    hours=td.seconds // 3600,
84
 
                    minutes=(td.seconds % 3600) // 60,
85
 
                    seconds=td.seconds % 60))
 
82
def main():
 
83
    parser = argparse.ArgumentParser()
 
84
 
 
85
    add_command_line_options(parser)
 
86
 
 
87
    options = parser.parse_args()
 
88
 
 
89
    check_option_syntax(parser, options)
 
90
 
 
91
    clientnames = options.client
 
92
 
 
93
    if options.debug:
 
94
        log.setLevel(logging.DEBUG)
 
95
 
 
96
    try:
 
97
        bus = dbus.SystemBus()
 
98
        log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
99
                  dbus_busname, server_dbus_path)
 
100
        mandos_dbus_objc = bus.get_object(dbus_busname,
 
101
                                          server_dbus_path)
 
102
    except dbus.exceptions.DBusException:
 
103
        log.critical("Could not connect to Mandos server")
 
104
        sys.exit(1)
 
105
 
 
106
    mandos_serv = dbus.Interface(mandos_dbus_objc,
 
107
                                 dbus_interface=server_dbus_interface)
 
108
    mandos_serv_object_manager = dbus.Interface(
 
109
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
110
 
 
111
    # Filter out log message from dbus module
 
112
    dbus_logger = logging.getLogger("dbus.proxies")
 
113
    class NullFilter(logging.Filter):
 
114
        def filter(self, record):
 
115
            return False
 
116
    dbus_filter = NullFilter()
 
117
    try:
 
118
        dbus_logger.addFilter(dbus_filter)
 
119
        log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", dbus_busname,
 
120
                  server_dbus_path, dbus.OBJECT_MANAGER_IFACE)
 
121
        mandos_clients = {path: ifs_and_props[client_dbus_interface]
 
122
                          for path, ifs_and_props in
 
123
                          mandos_serv_object_manager
 
124
                          .GetManagedObjects().items()
 
125
                          if client_dbus_interface in ifs_and_props}
 
126
    except dbus.exceptions.DBusException as e:
 
127
        log.critical("Failed to access Mandos server through D-Bus:"
 
128
                     "\n%s", e)
 
129
        sys.exit(1)
 
130
    finally:
 
131
        # restore dbus logger
 
132
        dbus_logger.removeFilter(dbus_filter)
 
133
 
 
134
    # Compile dict of (clients: properties) to process
 
135
    clients = {}
 
136
 
 
137
    if not clientnames:
 
138
        clients = {objpath: properties
 
139
                   for objpath, properties in mandos_clients.items()}
 
140
    else:
 
141
        for name in clientnames:
 
142
            for objpath, properties in mandos_clients.items():
 
143
                if properties["Name"] == name:
 
144
                    clients[objpath] = properties
 
145
                    break
 
146
            else:
 
147
                log.critical("Client not found on server: %r", name)
 
148
                sys.exit(1)
 
149
 
 
150
    # Run all commands on clients
 
151
    commands = commands_from_options(options)
 
152
    for command in commands:
 
153
        command.run(clients, bus, mandos_serv)
 
154
 
 
155
 
 
156
def add_command_line_options(parser):
 
157
    parser.add_argument("--version", action="version",
 
158
                        version="%(prog)s {}".format(version),
 
159
                        help="show version number and exit")
 
160
    parser.add_argument("-a", "--all", action="store_true",
 
161
                        help="Select all clients")
 
162
    parser.add_argument("-v", "--verbose", action="store_true",
 
163
                        help="Print all fields")
 
164
    parser.add_argument("-j", "--dump-json", action="store_true",
 
165
                        help="Dump client data in JSON format")
 
166
    enable_disable = parser.add_mutually_exclusive_group()
 
167
    enable_disable.add_argument("-e", "--enable", action="store_true",
 
168
                                help="Enable client")
 
169
    enable_disable.add_argument("-d", "--disable",
 
170
                                action="store_true",
 
171
                                help="disable client")
 
172
    parser.add_argument("-b", "--bump-timeout", action="store_true",
 
173
                        help="Bump timeout for client")
 
174
    start_stop_checker = parser.add_mutually_exclusive_group()
 
175
    start_stop_checker.add_argument("--start-checker",
 
176
                                    action="store_true",
 
177
                                    help="Start checker for client")
 
178
    start_stop_checker.add_argument("--stop-checker",
 
179
                                    action="store_true",
 
180
                                    help="Stop checker for client")
 
181
    parser.add_argument("-V", "--is-enabled", action="store_true",
 
182
                        help="Check if client is enabled")
 
183
    parser.add_argument("-r", "--remove", action="store_true",
 
184
                        help="Remove client")
 
185
    parser.add_argument("-c", "--checker",
 
186
                        help="Set checker command for client")
 
187
    parser.add_argument("-t", "--timeout", type=string_to_delta,
 
188
                        help="Set timeout for client")
 
189
    parser.add_argument("--extended-timeout", type=string_to_delta,
 
190
                        help="Set extended timeout for client")
 
191
    parser.add_argument("-i", "--interval", type=string_to_delta,
 
192
                        help="Set checker interval for client")
 
193
    approve_deny_default = parser.add_mutually_exclusive_group()
 
194
    approve_deny_default.add_argument(
 
195
        "--approve-by-default", action="store_true",
 
196
        default=None, dest="approved_by_default",
 
197
        help="Set client to be approved by default")
 
198
    approve_deny_default.add_argument(
 
199
        "--deny-by-default", action="store_false",
 
200
        dest="approved_by_default",
 
201
        help="Set client to be denied by default")
 
202
    parser.add_argument("--approval-delay", type=string_to_delta,
 
203
                        help="Set delay before client approve/deny")
 
204
    parser.add_argument("--approval-duration", type=string_to_delta,
 
205
                        help="Set duration of one client approval")
 
206
    parser.add_argument("-H", "--host", help="Set host for client")
 
207
    parser.add_argument("-s", "--secret",
 
208
                        type=argparse.FileType(mode="rb"),
 
209
                        help="Set password blob (file) for client")
 
210
    approve_deny = parser.add_mutually_exclusive_group()
 
211
    approve_deny.add_argument(
 
212
        "-A", "--approve", action="store_true",
 
213
        help="Approve any current client request")
 
214
    approve_deny.add_argument("-D", "--deny", action="store_true",
 
215
                              help="Deny any current client request")
 
216
    parser.add_argument("--debug", action="store_true",
 
217
                        help="Debug mode (show D-Bus commands)")
 
218
    parser.add_argument("--check", action="store_true",
 
219
                        help="Run self-test")
 
220
    parser.add_argument("client", nargs="*", help="Client name")
 
221
 
 
222
 
 
223
def string_to_delta(interval):
 
224
    """Parse a string and return a datetime.timedelta"""
 
225
 
 
226
    try:
 
227
        return rfc3339_duration_to_delta(interval)
 
228
    except ValueError as e:
 
229
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
 
230
                    ' '.join(e.args))
 
231
    return parse_pre_1_6_1_interval(interval)
86
232
 
87
233
 
88
234
def rfc3339_duration_to_delta(duration):
215
361
    return value
216
362
 
217
363
 
218
 
def string_to_delta(interval):
219
 
    """Parse a string and return a datetime.timedelta"""
220
 
 
221
 
    try:
222
 
        return rfc3339_duration_to_delta(interval)
223
 
    except ValueError as e:
224
 
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
225
 
                    ' '.join(e.args))
226
 
    return parse_pre_1_6_1_interval(interval)
227
 
 
228
 
 
229
364
def parse_pre_1_6_1_interval(interval):
230
365
    """Parse an interval string as documented by Mandos before 1.6.1,
231
366
    and return a datetime.timedelta
269
404
    return value
270
405
 
271
406
 
272
 
## Classes for commands.
273
 
 
274
 
# Abstract classes first
 
407
def check_option_syntax(parser, options):
 
408
    """Apply additional restrictions on options, not expressible in
 
409
argparse"""
 
410
 
 
411
    def has_actions(options):
 
412
        return any((options.enable,
 
413
                    options.disable,
 
414
                    options.bump_timeout,
 
415
                    options.start_checker,
 
416
                    options.stop_checker,
 
417
                    options.is_enabled,
 
418
                    options.remove,
 
419
                    options.checker is not None,
 
420
                    options.timeout is not None,
 
421
                    options.extended_timeout is not None,
 
422
                    options.interval is not None,
 
423
                    options.approved_by_default is not None,
 
424
                    options.approval_delay is not None,
 
425
                    options.approval_duration is not None,
 
426
                    options.host is not None,
 
427
                    options.secret is not None,
 
428
                    options.approve,
 
429
                    options.deny))
 
430
 
 
431
    if has_actions(options) and not (options.client or options.all):
 
432
        parser.error("Options require clients names or --all.")
 
433
    if options.verbose and has_actions(options):
 
434
        parser.error("--verbose can only be used alone.")
 
435
    if options.dump_json and (options.verbose
 
436
                              or has_actions(options)):
 
437
        parser.error("--dump-json can only be used alone.")
 
438
    if options.all and not has_actions(options):
 
439
        parser.error("--all requires an action.")
 
440
    if options.is_enabled and len(options.client) > 1:
 
441
        parser.error("--is-enabled requires exactly one client")
 
442
    if options.remove:
 
443
        options.remove = False
 
444
        if has_actions(options) and not options.deny:
 
445
            parser.error("--remove can only be combined with --deny")
 
446
        options.remove = True
 
447
 
 
448
 
 
449
def commands_from_options(options):
 
450
 
 
451
    commands = []
 
452
 
 
453
    if options.is_enabled:
 
454
        commands.append(IsEnabledCmd())
 
455
 
 
456
    if options.approve:
 
457
        commands.append(ApproveCmd())
 
458
 
 
459
    if options.deny:
 
460
        commands.append(DenyCmd())
 
461
 
 
462
    if options.remove:
 
463
        commands.append(RemoveCmd())
 
464
 
 
465
    if options.dump_json:
 
466
        commands.append(DumpJSONCmd())
 
467
 
 
468
    if options.enable:
 
469
        commands.append(EnableCmd())
 
470
 
 
471
    if options.disable:
 
472
        commands.append(DisableCmd())
 
473
 
 
474
    if options.bump_timeout:
 
475
        commands.append(BumpTimeoutCmd())
 
476
 
 
477
    if options.start_checker:
 
478
        commands.append(StartCheckerCmd())
 
479
 
 
480
    if options.stop_checker:
 
481
        commands.append(StopCheckerCmd())
 
482
 
 
483
    if options.approved_by_default is not None:
 
484
        if options.approved_by_default:
 
485
            commands.append(ApproveByDefaultCmd())
 
486
        else:
 
487
            commands.append(DenyByDefaultCmd())
 
488
 
 
489
    if options.checker is not None:
 
490
        commands.append(SetCheckerCmd(options.checker))
 
491
 
 
492
    if options.host is not None:
 
493
        commands.append(SetHostCmd(options.host))
 
494
 
 
495
    if options.secret is not None:
 
496
        commands.append(SetSecretCmd(options.secret))
 
497
 
 
498
    if options.timeout is not None:
 
499
        commands.append(SetTimeoutCmd(options.timeout))
 
500
 
 
501
    if options.extended_timeout:
 
502
        commands.append(
 
503
            SetExtendedTimeoutCmd(options.extended_timeout))
 
504
 
 
505
    if options.interval is not None:
 
506
        commands.append(SetIntervalCmd(options.interval))
 
507
 
 
508
    if options.approval_delay is not None:
 
509
        commands.append(SetApprovalDelayCmd(options.approval_delay))
 
510
 
 
511
    if options.approval_duration is not None:
 
512
        commands.append(
 
513
            SetApprovalDurationCmd(options.approval_duration))
 
514
 
 
515
    # If no command option has been given, show table of clients,
 
516
    # optionally verbosely
 
517
    if not commands:
 
518
        commands.append(PrintTableCmd(verbose=options.verbose))
 
519
 
 
520
    return commands
 
521
 
 
522
 
275
523
class Command(object):
276
524
    """Abstract class for commands"""
277
 
    def run(self, mandos, clients):
 
525
    def run(self, clients, bus=None, mandos=None):
278
526
        """Normal commands should implement run_on_one_client(), but
279
527
        commands which want to operate on all clients at the same time
280
528
        can override this run() method instead."""
281
529
        self.mandos = mandos
282
 
        for client, properties in clients.items():
 
530
        for clientpath, properties in clients.items():
 
531
            log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
 
532
                      dbus_busname, str(clientpath))
 
533
            client = bus.get_object(dbus_busname, clientpath)
283
534
            self.run_on_one_client(client, properties)
284
535
 
285
 
class PrintCmd(Command):
286
 
    """Abstract class for commands printing client details"""
 
536
 
 
537
class IsEnabledCmd(Command):
 
538
    def run(self, clients, bus=None, mandos=None):
 
539
        client, properties = next(iter(clients.items()))
 
540
        if self.is_enabled(client, properties):
 
541
            sys.exit(0)
 
542
        sys.exit(1)
 
543
    def is_enabled(self, client, properties):
 
544
        return properties["Enabled"]
 
545
 
 
546
 
 
547
class ApproveCmd(Command):
 
548
    def run_on_one_client(self, client, properties):
 
549
        log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
 
550
                  client.__dbus_object_path__, client_dbus_interface)
 
551
        client.Approve(dbus.Boolean(True),
 
552
                       dbus_interface=client_dbus_interface)
 
553
 
 
554
 
 
555
class DenyCmd(Command):
 
556
    def run_on_one_client(self, client, properties):
 
557
        log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
 
558
                  client.__dbus_object_path__, client_dbus_interface)
 
559
        client.Approve(dbus.Boolean(False),
 
560
                       dbus_interface=client_dbus_interface)
 
561
 
 
562
 
 
563
class RemoveCmd(Command):
 
564
    def run_on_one_client(self, client, properties):
 
565
        log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
 
566
                  server_dbus_path, server_dbus_interface,
 
567
                  str(client.__dbus_object_path__))
 
568
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
569
 
 
570
 
 
571
class OutputCmd(Command):
 
572
    """Abstract class for commands outputting client details"""
287
573
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
288
574
                    "Created", "Interval", "Host", "KeyID",
289
575
                    "Fingerprint", "CheckerRunning", "LastEnabled",
291
577
                    "LastApprovalRequest", "ApprovalDelay",
292
578
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
293
579
                    "Expires", "LastCheckerStatus")
294
 
    def run(self, mandos, clients):
295
 
        print(self.output(clients))
296
 
 
297
 
class PropertyCmd(Command):
298
 
    """Abstract class for Actions for setting one client property"""
299
 
    def run_on_one_client(self, client, properties):
300
 
        """Set the Client's D-Bus property"""
301
 
        client.Set(client_interface, self.property, self.value_to_set,
302
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
303
 
 
304
 
class ValueArgumentMixIn(object):
305
 
    """Mixin class for commands taking a value as argument"""
306
 
    def __init__(self, value):
307
 
        self.value_to_set = value
308
 
 
309
 
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
310
 
    """Mixin class for commands taking a value argument as
311
 
    milliseconds."""
312
 
    @property
313
 
    def value_to_set(self):
314
 
        return self._vts
315
 
    @value_to_set.setter
316
 
    def value_to_set(self, value):
317
 
        """When setting, convert value to a datetime.timedelta"""
318
 
        self._vts = string_to_delta(value).total_seconds() * 1000
319
 
 
320
 
# Actual (non-abstract) command classes
321
 
 
322
 
class PrintTableCmd(PrintCmd):
 
580
    def run(self, clients, bus=None, mandos=None):
 
581
        print(self.output(clients.values()))
 
582
    def output(self, clients):
 
583
        raise NotImplementedError()
 
584
 
 
585
 
 
586
class DumpJSONCmd(OutputCmd):
 
587
    def output(self, clients):
 
588
        data = {client["Name"]:
 
589
                {key: self.dbus_boolean_to_bool(client[key])
 
590
                 for key in self.all_keywords}
 
591
                for client in clients.values()}
 
592
        return json.dumps(data, indent=4, separators=(',', ': '))
 
593
    @staticmethod
 
594
    def dbus_boolean_to_bool(value):
 
595
        if isinstance(value, dbus.Boolean):
 
596
            value = bool(value)
 
597
        return value
 
598
 
 
599
 
 
600
class PrintTableCmd(OutputCmd):
323
601
    def __init__(self, verbose=False):
324
602
        self.verbose = verbose
325
603
 
326
604
    def output(self, clients):
327
 
        default_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
 
605
        default_keywords = ("Name", "Enabled", "Timeout",
 
606
                            "LastCheckedOK")
328
607
        keywords = default_keywords
329
608
        if self.verbose:
330
609
            keywords = self.all_keywords
331
 
        return str(self.TableOfClients(clients.values(), keywords))
 
610
        return str(self.TableOfClients(clients, keywords))
332
611
 
333
612
    class TableOfClients(object):
334
613
        tableheaders = {
387
666
        def string_from_client(self, client, key):
388
667
            return self.valuetostring(client[key], key)
389
668
 
390
 
        @staticmethod
391
 
        def valuetostring(value, keyword):
 
669
        @classmethod
 
670
        def valuetostring(cls, value, keyword):
392
671
            if isinstance(value, dbus.Boolean):
393
672
                return "Yes" if value else "No"
394
673
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
395
674
                           "ApprovalDuration", "ExtendedTimeout"):
396
 
                return milliseconds_to_string(value)
 
675
                return cls.milliseconds_to_string(value)
397
676
            return str(value)
398
677
 
399
678
        def header_line(self, format_string):
404
683
                **{key: self.string_from_client(client, key)
405
684
                   for key in self.keywords})
406
685
 
407
 
 
408
 
 
409
 
class DumpJSONCmd(PrintCmd):
410
 
    def output(self, clients):
411
 
        data = {client["Name"]:
412
 
                {key: self.dbus_boolean_to_bool(client[key])
413
 
                 for key in self.all_keywords}
414
 
                for client in clients.values()}
415
 
        return json.dumps(data, indent=4, separators=(',', ': '))
416
 
    @staticmethod
417
 
    def dbus_boolean_to_bool(value):
418
 
        if isinstance(value, dbus.Boolean):
419
 
            value = bool(value)
420
 
        return value
421
 
 
422
 
class IsEnabledCmd(Command):
423
 
    def run_on_one_client(self, client, properties):
424
 
        if self.is_enabled(client, properties):
425
 
            sys.exit(0)
426
 
        sys.exit(1)
427
 
    def is_enabled(self, client, properties):
428
 
        return bool(properties["Enabled"])
429
 
 
430
 
class RemoveCmd(Command):
431
 
    def run_on_one_client(self, client, properties):
432
 
        self.mandos.RemoveClient(client.__dbus_object_path__)
433
 
 
434
 
class ApproveCmd(Command):
435
 
    def run_on_one_client(self, client, properties):
436
 
        client.Approve(dbus.Boolean(True),
437
 
                       dbus_interface=client_interface)
438
 
 
439
 
class DenyCmd(Command):
440
 
    def run_on_one_client(self, client, properties):
441
 
        client.Approve(dbus.Boolean(False),
442
 
                       dbus_interface=client_interface)
 
686
        @staticmethod
 
687
        def milliseconds_to_string(ms):
 
688
            td = datetime.timedelta(0, 0, 0, ms)
 
689
            return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
690
                    .format(days="{}T".format(td.days)
 
691
                            if td.days else "",
 
692
                            hours=td.seconds // 3600,
 
693
                            minutes=(td.seconds % 3600) // 60,
 
694
                            seconds=td.seconds % 60))
 
695
 
 
696
 
 
697
class PropertyCmd(Command):
 
698
    """Abstract class for Actions for setting one client property"""
 
699
    def run_on_one_client(self, client, properties):
 
700
        """Set the Client's D-Bus property"""
 
701
        log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
 
702
                  client.__dbus_object_path__,
 
703
                  dbus.PROPERTIES_IFACE, client_dbus_interface,
 
704
                  self.propname, self.value_to_set
 
705
                  if not isinstance(self.value_to_set, dbus.Boolean)
 
706
                  else bool(self.value_to_set))
 
707
        client.Set(client_dbus_interface, self.propname,
 
708
                   self.value_to_set,
 
709
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
710
    @property
 
711
    def propname(self):
 
712
        raise NotImplementedError()
 
713
 
443
714
 
444
715
class EnableCmd(PropertyCmd):
445
 
    property = "Enabled"
 
716
    propname = "Enabled"
446
717
    value_to_set = dbus.Boolean(True)
447
718
 
 
719
 
448
720
class DisableCmd(PropertyCmd):
449
 
    property = "Enabled"
 
721
    propname = "Enabled"
450
722
    value_to_set = dbus.Boolean(False)
451
723
 
 
724
 
452
725
class BumpTimeoutCmd(PropertyCmd):
453
 
    property = "LastCheckedOK"
 
726
    propname = "LastCheckedOK"
454
727
    value_to_set = ""
455
728
 
 
729
 
456
730
class StartCheckerCmd(PropertyCmd):
457
 
    property = "CheckerRunning"
 
731
    propname = "CheckerRunning"
458
732
    value_to_set = dbus.Boolean(True)
459
733
 
 
734
 
460
735
class StopCheckerCmd(PropertyCmd):
461
 
    property = "CheckerRunning"
 
736
    propname = "CheckerRunning"
462
737
    value_to_set = dbus.Boolean(False)
463
738
 
 
739
 
464
740
class ApproveByDefaultCmd(PropertyCmd):
465
 
    property = "ApprovedByDefault"
 
741
    propname = "ApprovedByDefault"
466
742
    value_to_set = dbus.Boolean(True)
467
743
 
 
744
 
468
745
class DenyByDefaultCmd(PropertyCmd):
469
 
    property = "ApprovedByDefault"
 
746
    propname = "ApprovedByDefault"
470
747
    value_to_set = dbus.Boolean(False)
471
748
 
472
 
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
473
 
    property = "Checker"
474
 
 
475
 
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
476
 
    property = "Host"
477
 
 
478
 
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
 
749
 
 
750
class PropertyValueCmd(PropertyCmd):
 
751
    """Abstract class for PropertyCmd recieving a value as argument"""
 
752
    def __init__(self, value):
 
753
        self.value_to_set = value
 
754
 
 
755
 
 
756
class SetCheckerCmd(PropertyValueCmd):
 
757
    propname = "Checker"
 
758
 
 
759
 
 
760
class SetHostCmd(PropertyValueCmd):
 
761
    propname = "Host"
 
762
 
 
763
 
 
764
class SetSecretCmd(PropertyValueCmd):
 
765
    propname = "Secret"
479
766
    @property
480
767
    def value_to_set(self):
481
768
        return self._vts
484
771
        """When setting, read data from supplied file object"""
485
772
        self._vts = value.read()
486
773
        value.close()
487
 
    property = "Secret"
488
 
 
489
 
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
490
 
    property = "Timeout"
491
 
 
492
 
class SetExtendedTimeoutCmd(PropertyCmd,
493
 
                            MillisecondsValueArgumentMixIn):
494
 
    property = "ExtendedTimeout"
495
 
 
496
 
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
497
 
    property = "Interval"
498
 
 
499
 
class SetApprovalDelayCmd(PropertyCmd,
500
 
                          MillisecondsValueArgumentMixIn):
501
 
    property = "ApprovalDelay"
502
 
 
503
 
class SetApprovalDurationCmd(PropertyCmd,
504
 
                             MillisecondsValueArgumentMixIn):
505
 
    property = "ApprovalDuration"
506
 
 
507
 
def has_actions(options):
508
 
    return any((options.enable,
509
 
                options.disable,
510
 
                options.bump_timeout,
511
 
                options.start_checker,
512
 
                options.stop_checker,
513
 
                options.is_enabled,
514
 
                options.remove,
515
 
                options.checker is not None,
516
 
                options.timeout is not None,
517
 
                options.extended_timeout is not None,
518
 
                options.interval is not None,
519
 
                options.approved_by_default is not None,
520
 
                options.approval_delay is not None,
521
 
                options.approval_duration is not None,
522
 
                options.host is not None,
523
 
                options.secret is not None,
524
 
                options.approve,
525
 
                options.deny))
526
 
 
527
 
def add_command_line_options(parser):
528
 
    parser.add_argument("--version", action="version",
529
 
                        version="%(prog)s {}".format(version),
530
 
                        help="show version number and exit")
531
 
    parser.add_argument("-a", "--all", action="store_true",
532
 
                        help="Select all clients")
533
 
    parser.add_argument("-v", "--verbose", action="store_true",
534
 
                        help="Print all fields")
535
 
    parser.add_argument("-j", "--dump-json", action="store_true",
536
 
                        help="Dump client data in JSON format")
537
 
    enable_disable = parser.add_mutually_exclusive_group()
538
 
    enable_disable.add_argument("-e", "--enable", action="store_true",
539
 
                                help="Enable client")
540
 
    enable_disable.add_argument("-d", "--disable",
541
 
                                action="store_true",
542
 
                                help="disable client")
543
 
    parser.add_argument("-b", "--bump-timeout", action="store_true",
544
 
                        help="Bump timeout for client")
545
 
    start_stop_checker = parser.add_mutually_exclusive_group()
546
 
    start_stop_checker.add_argument("--start-checker",
547
 
                                    action="store_true",
548
 
                                    help="Start checker for client")
549
 
    start_stop_checker.add_argument("--stop-checker",
550
 
                                    action="store_true",
551
 
                                    help="Stop checker for client")
552
 
    parser.add_argument("-V", "--is-enabled", action="store_true",
553
 
                        help="Check if client is enabled")
554
 
    parser.add_argument("-r", "--remove", action="store_true",
555
 
                        help="Remove client")
556
 
    parser.add_argument("-c", "--checker",
557
 
                        help="Set checker command for client")
558
 
    parser.add_argument("-t", "--timeout",
559
 
                        help="Set timeout for client")
560
 
    parser.add_argument("--extended-timeout",
561
 
                        help="Set extended timeout for client")
562
 
    parser.add_argument("-i", "--interval",
563
 
                        help="Set checker interval for client")
564
 
    approve_deny_default = parser.add_mutually_exclusive_group()
565
 
    approve_deny_default.add_argument(
566
 
        "--approve-by-default", action="store_true",
567
 
        default=None, dest="approved_by_default",
568
 
        help="Set client to be approved by default")
569
 
    approve_deny_default.add_argument(
570
 
        "--deny-by-default", action="store_false",
571
 
        dest="approved_by_default",
572
 
        help="Set client to be denied by default")
573
 
    parser.add_argument("--approval-delay",
574
 
                        help="Set delay before client approve/deny")
575
 
    parser.add_argument("--approval-duration",
576
 
                        help="Set duration of one client approval")
577
 
    parser.add_argument("-H", "--host", help="Set host for client")
578
 
    parser.add_argument("-s", "--secret",
579
 
                        type=argparse.FileType(mode="rb"),
580
 
                        help="Set password blob (file) for client")
581
 
    approve_deny = parser.add_mutually_exclusive_group()
582
 
    approve_deny.add_argument(
583
 
        "-A", "--approve", action="store_true",
584
 
        help="Approve any current client request")
585
 
    approve_deny.add_argument("-D", "--deny", action="store_true",
586
 
                              help="Deny any current client request")
587
 
    parser.add_argument("--check", action="store_true",
588
 
                        help="Run self-test")
589
 
    parser.add_argument("client", nargs="*", help="Client name")
590
 
 
591
 
 
592
 
def commands_from_options(options):
593
 
 
594
 
    commands = []
595
 
 
596
 
    if options.dump_json:
597
 
        commands.append(DumpJSONCmd())
598
 
 
599
 
    if options.enable:
600
 
        commands.append(EnableCmd())
601
 
 
602
 
    if options.disable:
603
 
        commands.append(DisableCmd())
604
 
 
605
 
    if options.bump_timeout:
606
 
        commands.append(BumpTimeoutCmd())
607
 
 
608
 
    if options.start_checker:
609
 
        commands.append(StartCheckerCmd())
610
 
 
611
 
    if options.stop_checker:
612
 
        commands.append(StopCheckerCmd())
613
 
 
614
 
    if options.is_enabled:
615
 
        commands.append(IsEnabledCmd())
616
 
 
617
 
    if options.remove:
618
 
        commands.append(RemoveCmd())
619
 
 
620
 
    if options.checker is not None:
621
 
        commands.append(SetCheckerCmd(options.checker))
622
 
 
623
 
    if options.timeout is not None:
624
 
        commands.append(SetTimeoutCmd(options.timeout))
625
 
 
626
 
    if options.extended_timeout:
627
 
        commands.append(
628
 
            SetExtendedTimeoutCmd(options.extended_timeout))
629
 
 
630
 
    if options.interval is not None:
631
 
        commands.append(SetIntervalCmd(options.interval))
632
 
 
633
 
    if options.approved_by_default is not None:
634
 
        if options.approved_by_default:
635
 
            commands.append(ApproveByDefaultCmd())
636
 
        else:
637
 
            commands.append(DenyByDefaultCmd())
638
 
 
639
 
    if options.approval_delay is not None:
640
 
        commands.append(SetApprovalDelayCmd(options.approval_delay))
641
 
 
642
 
    if options.approval_duration is not None:
643
 
        commands.append(
644
 
            SetApprovalDurationCmd(options.approval_duration))
645
 
 
646
 
    if options.host is not None:
647
 
        commands.append(SetHostCmd(options.host))
648
 
 
649
 
    if options.secret is not None:
650
 
        commands.append(SetSecretCmd(options.secret))
651
 
 
652
 
    if options.approve:
653
 
        commands.append(ApproveCmd())
654
 
 
655
 
    if options.deny:
656
 
        commands.append(DenyCmd())
657
 
 
658
 
    # If no command option has been given, show table of clients,
659
 
    # optionally verbosely
660
 
    if not commands:
661
 
        commands.append(PrintTableCmd(verbose=options.verbose))
662
 
 
663
 
    return commands
664
 
 
665
 
 
666
 
def main():
667
 
    parser = argparse.ArgumentParser()
668
 
 
669
 
    add_command_line_options(parser)
670
 
 
671
 
    options = parser.parse_args()
672
 
 
673
 
    if has_actions(options) and not (options.client or options.all):
674
 
        parser.error("Options require clients names or --all.")
675
 
    if options.verbose and has_actions(options):
676
 
        parser.error("--verbose can only be used alone.")
677
 
    if options.dump_json and (options.verbose
678
 
                              or has_actions(options)):
679
 
        parser.error("--dump-json can only be used alone.")
680
 
    if options.all and not has_actions(options):
681
 
        parser.error("--all requires an action.")
682
 
    if options.is_enabled and len(options.client) > 1:
683
 
        parser.error("--is-enabled requires exactly one client")
684
 
 
685
 
    clientnames = options.client
686
 
 
687
 
    try:
688
 
        bus = dbus.SystemBus()
689
 
        mandos_dbus_objc = bus.get_object(busname, server_path)
690
 
    except dbus.exceptions.DBusException:
691
 
        log.critical("Could not connect to Mandos server")
692
 
        sys.exit(1)
693
 
 
694
 
    mandos_serv = dbus.Interface(mandos_dbus_objc,
695
 
                                 dbus_interface=server_interface)
696
 
    mandos_serv_object_manager = dbus.Interface(
697
 
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
698
 
 
699
 
    # Filter out log message from dbus module
700
 
    dbus_logger = logging.getLogger("dbus.proxies")
701
 
    class NullFilter(logging.Filter):
702
 
        def filter(self, record):
703
 
            return False
704
 
    dbus_filter = NullFilter()
705
 
    try:
706
 
        dbus_logger.addFilter(dbus_filter)
707
 
        mandos_clients = {path: ifs_and_props[client_interface]
708
 
                          for path, ifs_and_props in
709
 
                          mandos_serv_object_manager
710
 
                          .GetManagedObjects().items()
711
 
                          if client_interface in ifs_and_props}
712
 
    except dbus.exceptions.DBusException as e:
713
 
        log.critical("Failed to access Mandos server through D-Bus:"
714
 
                     "\n%s", e)
715
 
        sys.exit(1)
716
 
    finally:
717
 
        # restore dbus logger
718
 
        dbus_logger.removeFilter(dbus_filter)
719
 
 
720
 
    # Compile dict of (clients: properties) to process
721
 
    clients = {}
722
 
 
723
 
    if not clientnames:
724
 
        clients = {bus.get_object(busname, path): properties
725
 
                   for path, properties in mandos_clients.items()}
726
 
    else:
727
 
        for name in clientnames:
728
 
            for path, client in mandos_clients.items():
729
 
                if client["Name"] == name:
730
 
                    client_objc = bus.get_object(busname, path)
731
 
                    clients[client_objc] = client
732
 
                    break
733
 
            else:
734
 
                log.critical("Client not found on server: %r", name)
735
 
                sys.exit(1)
736
 
 
737
 
    # Run all commands on clients
738
 
    commands = commands_from_options(options)
739
 
    for command in commands:
740
 
        command.run(mandos_serv, clients)
 
774
 
 
775
 
 
776
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
 
777
    """Abstract class for PropertyValueCmd taking a value argument as
 
778
a datetime.timedelta() but should store it as milliseconds."""
 
779
    @property
 
780
    def value_to_set(self):
 
781
        return self._vts
 
782
    @value_to_set.setter
 
783
    def value_to_set(self, value):
 
784
        """When setting, convert value from a datetime.timedelta"""
 
785
        self._vts = int(round(value.total_seconds() * 1000))
 
786
 
 
787
 
 
788
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
 
789
    propname = "Timeout"
 
790
 
 
791
 
 
792
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
 
793
    propname = "ExtendedTimeout"
 
794
 
 
795
 
 
796
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
 
797
    propname = "Interval"
 
798
 
 
799
 
 
800
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
 
801
    propname = "ApprovalDelay"
 
802
 
 
803
 
 
804
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
 
805
    propname = "ApprovalDuration"
 
806
 
741
807
 
742
808
 
743
 
class Test_milliseconds_to_string(unittest.TestCase):
744
 
    def test_all(self):
745
 
        self.assertEqual(milliseconds_to_string(93785000),
746
 
                         "1T02:03:05")
747
 
    def test_no_days(self):
748
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
749
 
    def test_all_zero(self):
750
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
751
 
    def test_no_fractional_seconds(self):
752
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
753
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
754
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
755
 
 
756
809
class Test_string_to_delta(unittest.TestCase):
757
810
    def test_handles_basic_rfc3339(self):
758
811
        self.assertEqual(string_to_delta("PT0S"),
786
839
        self.assertEqual(value, datetime.timedelta(0, 7200))
787
840
 
788
841
 
 
842
class Test_check_option_syntax(unittest.TestCase):
 
843
    # This mostly corresponds to the definition from has_actions() in
 
844
    # check_option_syntax()
 
845
    actions = {
 
846
        # The actual values set here are not that important, but we do
 
847
        # at least stick to the correct types, even though they are
 
848
        # never used
 
849
        "enable": True,
 
850
        "disable": True,
 
851
        "bump_timeout": True,
 
852
        "start_checker": True,
 
853
        "stop_checker": True,
 
854
        "is_enabled": True,
 
855
        "remove": True,
 
856
        "checker": "x",
 
857
        "timeout": datetime.timedelta(),
 
858
        "extended_timeout": datetime.timedelta(),
 
859
        "interval": datetime.timedelta(),
 
860
        "approved_by_default": True,
 
861
        "approval_delay": datetime.timedelta(),
 
862
        "approval_duration": datetime.timedelta(),
 
863
        "host": "x",
 
864
        "secret": io.BytesIO(b"x"),
 
865
        "approve": True,
 
866
        "deny": True,
 
867
    }
 
868
 
 
869
    def setUp(self):
 
870
        self.parser = argparse.ArgumentParser()
 
871
        add_command_line_options(self.parser)
 
872
 
 
873
    @contextlib.contextmanager
 
874
    def assertParseError(self):
 
875
        with self.assertRaises(SystemExit) as e:
 
876
            with self.temporarily_suppress_stderr():
 
877
                yield
 
878
        # Exit code from argparse is guaranteed to be "2".  Reference:
 
879
        # https://docs.python.org/3/library
 
880
        # /argparse.html#exiting-methods
 
881
        self.assertEqual(e.exception.code, 2)
 
882
 
 
883
    @staticmethod
 
884
    @contextlib.contextmanager
 
885
    def temporarily_suppress_stderr():
 
886
        null = os.open(os.path.devnull, os.O_RDWR)
 
887
        stderrcopy = os.dup(sys.stderr.fileno())
 
888
        os.dup2(null, sys.stderr.fileno())
 
889
        os.close(null)
 
890
        try:
 
891
            yield
 
892
        finally:
 
893
            # restore stderr
 
894
            os.dup2(stderrcopy, sys.stderr.fileno())
 
895
            os.close(stderrcopy)
 
896
 
 
897
    def check_option_syntax(self, options):
 
898
        check_option_syntax(self.parser, options)
 
899
 
 
900
    def test_actions_requires_client_or_all(self):
 
901
        for action, value in self.actions.items():
 
902
            options = self.parser.parse_args()
 
903
            setattr(options, action, value)
 
904
            with self.assertParseError():
 
905
                self.check_option_syntax(options)
 
906
 
 
907
    def test_actions_conflicts_with_verbose(self):
 
908
        for action, value in self.actions.items():
 
909
            options = self.parser.parse_args()
 
910
            setattr(options, action, value)
 
911
            options.verbose = True
 
912
            with self.assertParseError():
 
913
                self.check_option_syntax(options)
 
914
 
 
915
    def test_dump_json_conflicts_with_verbose(self):
 
916
        options = self.parser.parse_args()
 
917
        options.dump_json = True
 
918
        options.verbose = True
 
919
        with self.assertParseError():
 
920
            self.check_option_syntax(options)
 
921
 
 
922
    def test_dump_json_conflicts_with_action(self):
 
923
        for action, value in self.actions.items():
 
924
            options = self.parser.parse_args()
 
925
            setattr(options, action, value)
 
926
            options.dump_json = True
 
927
            with self.assertParseError():
 
928
                self.check_option_syntax(options)
 
929
 
 
930
    def test_all_can_not_be_alone(self):
 
931
        options = self.parser.parse_args()
 
932
        options.all = True
 
933
        with self.assertParseError():
 
934
            self.check_option_syntax(options)
 
935
 
 
936
    def test_all_is_ok_with_any_action(self):
 
937
        for action, value in self.actions.items():
 
938
            options = self.parser.parse_args()
 
939
            setattr(options, action, value)
 
940
            options.all = True
 
941
            self.check_option_syntax(options)
 
942
 
 
943
    def test_is_enabled_fails_without_client(self):
 
944
        options = self.parser.parse_args()
 
945
        options.is_enabled = True
 
946
        with self.assertParseError():
 
947
            self.check_option_syntax(options)
 
948
 
 
949
    def test_is_enabled_works_with_one_client(self):
 
950
        options = self.parser.parse_args()
 
951
        options.is_enabled = True
 
952
        options.client = ["foo"]
 
953
        self.check_option_syntax(options)
 
954
 
 
955
    def test_is_enabled_fails_with_two_clients(self):
 
956
        options = self.parser.parse_args()
 
957
        options.is_enabled = True
 
958
        options.client = ["foo", "barbar"]
 
959
        with self.assertParseError():
 
960
            self.check_option_syntax(options)
 
961
 
 
962
    def test_remove_can_only_be_combined_with_action_deny(self):
 
963
        for action, value in self.actions.items():
 
964
            if action in {"remove", "deny"}:
 
965
                continue
 
966
            options = self.parser.parse_args()
 
967
            setattr(options, action, value)
 
968
            options.all = True
 
969
            options.remove = True
 
970
            with self.assertParseError():
 
971
                self.check_option_syntax(options)
 
972
 
 
973
 
 
974
class Test_command_from_options(unittest.TestCase):
 
975
    def setUp(self):
 
976
        self.parser = argparse.ArgumentParser()
 
977
        add_command_line_options(self.parser)
 
978
    def assert_command_from_args(self, args, command_cls,
 
979
                                 **cmd_attrs):
 
980
        """Assert that parsing ARGS should result in an instance of
 
981
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
 
982
        options = self.parser.parse_args(args)
 
983
        check_option_syntax(self.parser, options)
 
984
        commands = commands_from_options(options)
 
985
        self.assertEqual(len(commands), 1)
 
986
        command = commands[0]
 
987
        self.assertIsInstance(command, command_cls)
 
988
        for key, value in cmd_attrs.items():
 
989
            self.assertEqual(getattr(command, key), value)
 
990
    def test_print_table(self):
 
991
        self.assert_command_from_args([], PrintTableCmd,
 
992
                                      verbose=False)
 
993
 
 
994
    def test_print_table_verbose(self):
 
995
        self.assert_command_from_args(["--verbose"], PrintTableCmd,
 
996
                                      verbose=True)
 
997
 
 
998
    def test_print_table_verbose_short(self):
 
999
        self.assert_command_from_args(["-v"], PrintTableCmd,
 
1000
                                      verbose=True)
 
1001
 
 
1002
    def test_enable(self):
 
1003
        self.assert_command_from_args(["--enable", "foo"], EnableCmd)
 
1004
 
 
1005
    def test_enable_short(self):
 
1006
        self.assert_command_from_args(["-e", "foo"], EnableCmd)
 
1007
 
 
1008
    def test_disable(self):
 
1009
        self.assert_command_from_args(["--disable", "foo"],
 
1010
                                      DisableCmd)
 
1011
 
 
1012
    def test_disable_short(self):
 
1013
        self.assert_command_from_args(["-d", "foo"], DisableCmd)
 
1014
 
 
1015
    def test_bump_timeout(self):
 
1016
        self.assert_command_from_args(["--bump-timeout", "foo"],
 
1017
                                      BumpTimeoutCmd)
 
1018
 
 
1019
    def test_bump_timeout_short(self):
 
1020
        self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
 
1021
 
 
1022
    def test_start_checker(self):
 
1023
        self.assert_command_from_args(["--start-checker", "foo"],
 
1024
                                      StartCheckerCmd)
 
1025
 
 
1026
    def test_stop_checker(self):
 
1027
        self.assert_command_from_args(["--stop-checker", "foo"],
 
1028
                                      StopCheckerCmd)
 
1029
 
 
1030
    def test_remove(self):
 
1031
        self.assert_command_from_args(["--remove", "foo"],
 
1032
                                      RemoveCmd)
 
1033
 
 
1034
    def test_remove_short(self):
 
1035
        self.assert_command_from_args(["-r", "foo"], RemoveCmd)
 
1036
 
 
1037
    def test_checker(self):
 
1038
        self.assert_command_from_args(["--checker", ":", "foo"],
 
1039
                                      SetCheckerCmd, value_to_set=":")
 
1040
 
 
1041
    def test_checker_empty(self):
 
1042
        self.assert_command_from_args(["--checker", "", "foo"],
 
1043
                                      SetCheckerCmd, value_to_set="")
 
1044
 
 
1045
    def test_checker_short(self):
 
1046
        self.assert_command_from_args(["-c", ":", "foo"],
 
1047
                                      SetCheckerCmd, value_to_set=":")
 
1048
 
 
1049
    def test_timeout(self):
 
1050
        self.assert_command_from_args(["--timeout", "PT5M", "foo"],
 
1051
                                      SetTimeoutCmd,
 
1052
                                      value_to_set=300000)
 
1053
 
 
1054
    def test_timeout_short(self):
 
1055
        self.assert_command_from_args(["-t", "PT5M", "foo"],
 
1056
                                      SetTimeoutCmd,
 
1057
                                      value_to_set=300000)
 
1058
 
 
1059
    def test_extended_timeout(self):
 
1060
        self.assert_command_from_args(["--extended-timeout", "PT15M",
 
1061
                                       "foo"],
 
1062
                                      SetExtendedTimeoutCmd,
 
1063
                                      value_to_set=900000)
 
1064
 
 
1065
    def test_interval(self):
 
1066
        self.assert_command_from_args(["--interval", "PT2M", "foo"],
 
1067
                                      SetIntervalCmd,
 
1068
                                      value_to_set=120000)
 
1069
 
 
1070
    def test_interval_short(self):
 
1071
        self.assert_command_from_args(["-i", "PT2M", "foo"],
 
1072
                                      SetIntervalCmd,
 
1073
                                      value_to_set=120000)
 
1074
 
 
1075
    def test_approve_by_default(self):
 
1076
        self.assert_command_from_args(["--approve-by-default", "foo"],
 
1077
                                      ApproveByDefaultCmd)
 
1078
 
 
1079
    def test_deny_by_default(self):
 
1080
        self.assert_command_from_args(["--deny-by-default", "foo"],
 
1081
                                      DenyByDefaultCmd)
 
1082
 
 
1083
    def test_approval_delay(self):
 
1084
        self.assert_command_from_args(["--approval-delay", "PT30S",
 
1085
                                       "foo"], SetApprovalDelayCmd,
 
1086
                                      value_to_set=30000)
 
1087
 
 
1088
    def test_approval_duration(self):
 
1089
        self.assert_command_from_args(["--approval-duration", "PT1S",
 
1090
                                       "foo"], SetApprovalDurationCmd,
 
1091
                                      value_to_set=1000)
 
1092
 
 
1093
    def test_host(self):
 
1094
        self.assert_command_from_args(["--host", "foo.example.org",
 
1095
                                       "foo"], SetHostCmd,
 
1096
                                      value_to_set="foo.example.org")
 
1097
 
 
1098
    def test_host_short(self):
 
1099
        self.assert_command_from_args(["-H", "foo.example.org",
 
1100
                                       "foo"], SetHostCmd,
 
1101
                                      value_to_set="foo.example.org")
 
1102
 
 
1103
    def test_secret_devnull(self):
 
1104
        self.assert_command_from_args(["--secret", os.path.devnull,
 
1105
                                       "foo"], SetSecretCmd,
 
1106
                                      value_to_set=b"")
 
1107
 
 
1108
    def test_secret_tempfile(self):
 
1109
        with tempfile.NamedTemporaryFile(mode="r+b") as f:
 
1110
            value = b"secret\0xyzzy\nbar"
 
1111
            f.write(value)
 
1112
            f.seek(0)
 
1113
            self.assert_command_from_args(["--secret", f.name,
 
1114
                                           "foo"], SetSecretCmd,
 
1115
                                          value_to_set=value)
 
1116
 
 
1117
    def test_secret_devnull_short(self):
 
1118
        self.assert_command_from_args(["-s", os.path.devnull, "foo"],
 
1119
                                      SetSecretCmd, value_to_set=b"")
 
1120
 
 
1121
    def test_secret_tempfile_short(self):
 
1122
        with tempfile.NamedTemporaryFile(mode="r+b") as f:
 
1123
            value = b"secret\0xyzzy\nbar"
 
1124
            f.write(value)
 
1125
            f.seek(0)
 
1126
            self.assert_command_from_args(["-s", f.name, "foo"],
 
1127
                                          SetSecretCmd,
 
1128
                                          value_to_set=value)
 
1129
 
 
1130
    def test_approve(self):
 
1131
        self.assert_command_from_args(["--approve", "foo"],
 
1132
                                      ApproveCmd)
 
1133
 
 
1134
    def test_approve_short(self):
 
1135
        self.assert_command_from_args(["-A", "foo"], ApproveCmd)
 
1136
 
 
1137
    def test_deny(self):
 
1138
        self.assert_command_from_args(["--deny", "foo"], DenyCmd)
 
1139
 
 
1140
    def test_deny_short(self):
 
1141
        self.assert_command_from_args(["-D", "foo"], DenyCmd)
 
1142
 
 
1143
    def test_dump_json(self):
 
1144
        self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
 
1145
 
 
1146
    def test_is_enabled(self):
 
1147
        self.assert_command_from_args(["--is-enabled", "foo"],
 
1148
                                      IsEnabledCmd)
 
1149
 
 
1150
    def test_is_enabled_short(self):
 
1151
        self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
 
1152
 
 
1153
    def test_deny_before_remove(self):
 
1154
        options = self.parser.parse_args(["--deny", "--remove",
 
1155
                                          "foo"])
 
1156
        check_option_syntax(self.parser, options)
 
1157
        commands = commands_from_options(options)
 
1158
        self.assertEqual(len(commands), 2)
 
1159
        self.assertIsInstance(commands[0], DenyCmd)
 
1160
        self.assertIsInstance(commands[1], RemoveCmd)
 
1161
 
 
1162
    def test_deny_before_remove_reversed(self):
 
1163
        options = self.parser.parse_args(["--remove", "--deny",
 
1164
                                          "--all"])
 
1165
        check_option_syntax(self.parser, options)
 
1166
        commands = commands_from_options(options)
 
1167
        self.assertEqual(len(commands), 2)
 
1168
        self.assertIsInstance(commands[0], DenyCmd)
 
1169
        self.assertIsInstance(commands[1], RemoveCmd)
 
1170
 
 
1171
 
789
1172
class TestCmd(unittest.TestCase):
790
1173
    """Abstract class for tests of command classes"""
791
1174
    def setUp(self):
792
1175
        testcase = self
793
1176
        class MockClient(object):
794
1177
            def __init__(self, name, **attributes):
795
 
                self.__dbus_object_path__ = "objpath_{}".format(name)
 
1178
                self.__dbus_object_path__ = "/clients/{}".format(name)
796
1179
                self.attributes = attributes
797
1180
                self.attributes["Name"] = name
798
1181
                self.calls = []
799
 
            def Set(self, interface, property, value, dbus_interface):
800
 
                testcase.assertEqual(interface, client_interface)
801
 
                testcase.assertEqual(dbus_interface,
802
 
                                     dbus.PROPERTIES_IFACE)
803
 
                self.attributes[property] = value
804
 
            def Get(self, interface, property, dbus_interface):
805
 
                testcase.assertEqual(interface, client_interface)
806
 
                testcase.assertEqual(dbus_interface,
807
 
                                     dbus.PROPERTIES_IFACE)
808
 
                return self.attributes[property]
 
1182
            def Set(self, interface, propname, value, dbus_interface):
 
1183
                testcase.assertEqual(interface, client_dbus_interface)
 
1184
                testcase.assertEqual(dbus_interface,
 
1185
                                     dbus.PROPERTIES_IFACE)
 
1186
                self.attributes[propname] = value
 
1187
            def Get(self, interface, propname, dbus_interface):
 
1188
                testcase.assertEqual(interface, client_dbus_interface)
 
1189
                testcase.assertEqual(dbus_interface,
 
1190
                                     dbus.PROPERTIES_IFACE)
 
1191
                return self.attributes[propname]
809
1192
            def Approve(self, approve, dbus_interface):
810
 
                testcase.assertEqual(dbus_interface, client_interface)
 
1193
                testcase.assertEqual(dbus_interface,
 
1194
                                     client_dbus_interface)
811
1195
                self.calls.append(("Approve", (approve,
812
1196
                                               dbus_interface)))
813
1197
        self.client = MockClient(
853
1237
            ApprovedByDefault=dbus.Boolean(False),
854
1238
            LastApprovalRequest="2019-01-03T00:00:00",
855
1239
            ApprovalDelay=30000,
856
 
            ApprovalDuration=1000,
 
1240
            ApprovalDuration=93785000,
857
1241
            Checker=":",
858
1242
            ExtendedTimeout=900000,
859
1243
            Expires="2019-02-05T00:00:00",
860
1244
            LastCheckerStatus=-2)
861
1245
        self.clients =  collections.OrderedDict(
862
1246
            [
863
 
                (self.client, self.client.attributes),
864
 
                (self.other_client, self.other_client.attributes),
 
1247
                ("/clients/foo", self.client.attributes),
 
1248
                ("/clients/barbar", self.other_client.attributes),
865
1249
            ])
866
 
        self.one_client = {self.client: self.client.attributes}
867
 
 
868
 
class TestPrintTableCmd(TestCmd):
869
 
    def test_normal(self):
870
 
        output = PrintTableCmd().output(self.clients)
871
 
        expected_output = """
872
 
Name   Enabled Timeout  Last Successful Check
873
 
foo    Yes     00:05:00 2019-02-03T00:00:00  
874
 
barbar Yes     00:05:00 2019-02-04T00:00:00  
875
 
"""[1:-1]
876
 
        self.assertEqual(output, expected_output)
877
 
    def test_verbose(self):
878
 
        output = PrintTableCmd(verbose=True).output(self.clients)
879
 
        expected_output = """
880
 
Name   Enabled Timeout  Last Successful Check Created             Interval Host            Key ID                                                           Fingerprint                              Check Is Running Last Enabled        Approval Is Pending Approved By Default Last Approval Request Approval Delay Approval Duration Checker              Extended Timeout Expires             Last Checker Status
881
 
foo    Yes     00:05:00 2019-02-03T00:00:00   2019-01-02T00:00:00 00:02:00 foo.example.org 92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8ea90a27cddb12 778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 No               2019-01-03T00:00:00 No                  Yes                                       00:00:00       00:00:01          fping -q -- %(host)s 00:15:00         2019-02-04T00:00:00 0                  
882
 
barbar Yes     00:05:00 2019-02-04T00:00:00   2019-01-03T00:00:00 00:02:00 192.0.2.3       0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e46c2b020f441c 3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 Yes              2019-01-04T00:00:00 No                  No                  2019-01-03T00:00:00   00:00:30       00:00:01          :                    00:15:00         2019-02-05T00:00:00 -2                 
883
 
"""[1:-1]
884
 
        self.assertEqual(output, expected_output)
885
 
    def test_one_client(self):
886
 
        output = PrintTableCmd().output(self.one_client)
887
 
        expected_output = """
888
 
Name Enabled Timeout  Last Successful Check
889
 
foo  Yes     00:05:00 2019-02-03T00:00:00  
890
 
"""[1:-1]
891
 
        self.assertEqual(output, expected_output)
 
1250
        self.one_client = {"/clients/foo": self.client.attributes}
 
1251
    @property
 
1252
    def bus(self):
 
1253
        class Bus(object):
 
1254
            @staticmethod
 
1255
            def get_object(client_bus_name, path):
 
1256
                self.assertEqual(client_bus_name, dbus_busname)
 
1257
                return {
 
1258
                    "/clients/foo": self.client,
 
1259
                    "/clients/barbar": self.other_client,
 
1260
                }[path]
 
1261
        return Bus()
 
1262
 
 
1263
 
 
1264
class TestIsEnabledCmd(TestCmd):
 
1265
    def test_is_enabled(self):
 
1266
        self.assertTrue(all(IsEnabledCmd().is_enabled(client,
 
1267
                                                      properties)
 
1268
                            for client, properties
 
1269
                            in self.clients.items()))
 
1270
    def test_is_enabled_run_exits_successfully(self):
 
1271
        with self.assertRaises(SystemExit) as e:
 
1272
            IsEnabledCmd().run(self.one_client)
 
1273
        if e.exception.code is not None:
 
1274
            self.assertEqual(e.exception.code, 0)
 
1275
        else:
 
1276
            self.assertIsNone(e.exception.code)
 
1277
    def test_is_enabled_run_exits_with_failure(self):
 
1278
        self.client.attributes["Enabled"] = dbus.Boolean(False)
 
1279
        with self.assertRaises(SystemExit) as e:
 
1280
            IsEnabledCmd().run(self.one_client)
 
1281
        if isinstance(e.exception.code, int):
 
1282
            self.assertNotEqual(e.exception.code, 0)
 
1283
        else:
 
1284
            self.assertIsNotNone(e.exception.code)
 
1285
 
 
1286
 
 
1287
class TestApproveCmd(TestCmd):
 
1288
    def test_approve(self):
 
1289
        ApproveCmd().run(self.clients, self.bus)
 
1290
        for clientpath in self.clients:
 
1291
            client = self.bus.get_object(dbus_busname, clientpath)
 
1292
            self.assertIn(("Approve", (True, client_dbus_interface)),
 
1293
                          client.calls)
 
1294
 
 
1295
 
 
1296
class TestDenyCmd(TestCmd):
 
1297
    def test_deny(self):
 
1298
        DenyCmd().run(self.clients, self.bus)
 
1299
        for clientpath in self.clients:
 
1300
            client = self.bus.get_object(dbus_busname, clientpath)
 
1301
            self.assertIn(("Approve", (False, client_dbus_interface)),
 
1302
                          client.calls)
 
1303
 
 
1304
class TestRemoveCmd(TestCmd):
 
1305
    def test_remove(self):
 
1306
        class MockMandos(object):
 
1307
            def __init__(self):
 
1308
                self.calls = []
 
1309
            def RemoveClient(self, dbus_path):
 
1310
                self.calls.append(("RemoveClient", (dbus_path,)))
 
1311
        mandos = MockMandos()
 
1312
        super(TestRemoveCmd, self).setUp()
 
1313
        RemoveCmd().run(self.clients, self.bus, mandos)
 
1314
        self.assertEqual(len(mandos.calls), 2)
 
1315
        for clientpath in self.clients:
 
1316
            self.assertIn(("RemoveClient", (clientpath,)),
 
1317
                          mandos.calls)
 
1318
 
892
1319
 
893
1320
class TestDumpJSONCmd(TestCmd):
894
1321
    def setUp(self):
935
1362
                "ApprovedByDefault": False,
936
1363
                "LastApprovalRequest": "2019-01-03T00:00:00",
937
1364
                "ApprovalDelay": 30000,
938
 
                "ApprovalDuration": 1000,
 
1365
                "ApprovalDuration": 93785000,
939
1366
                "Checker": ":",
940
1367
                "ExtendedTimeout": 900000,
941
1368
                "Expires": "2019-02-05T00:00:00",
952
1379
        expected_json = {"foo": self.expected_json["foo"]}
953
1380
        self.assertDictEqual(json_data, expected_json)
954
1381
 
955
 
class TestIsEnabledCmd(TestCmd):
956
 
    def test_is_enabled(self):
957
 
        self.assertTrue(all(IsEnabledCmd().is_enabled(client, properties)
958
 
                            for client, properties in self.clients.items()))
959
 
    def test_is_enabled_run_exits_successfully(self):
960
 
        with self.assertRaises(SystemExit) as e:
961
 
            IsEnabledCmd().run(None, self.one_client)
962
 
        if e.exception.code is not None:
963
 
            self.assertEqual(e.exception.code, 0)
964
 
        else:
965
 
            self.assertIsNone(e.exception.code)
966
 
    def test_is_enabled_run_exits_with_failure(self):
967
 
        self.client.attributes["Enabled"] = dbus.Boolean(False)
968
 
        with self.assertRaises(SystemExit) as e:
969
 
            IsEnabledCmd().run(None, self.one_client)
970
 
        if isinstance(e.exception.code, int):
971
 
            self.assertNotEqual(e.exception.code, 0)
972
 
        else:
973
 
            self.assertIsNotNone(e.exception.code)
974
 
 
975
 
class TestRemoveCmd(TestCmd):
976
 
    def test_remove(self):
977
 
        class MockMandos(object):
978
 
            def __init__(self):
979
 
                self.calls = []
980
 
            def RemoveClient(self, dbus_path):
981
 
                self.calls.append(("RemoveClient", (dbus_path,)))
982
 
        mandos = MockMandos()
983
 
        super(TestRemoveCmd, self).setUp()
984
 
        RemoveCmd().run(mandos, self.clients)
985
 
        self.assertEqual(len(mandos.calls), 2)
986
 
        for client in self.clients:
987
 
            self.assertIn(("RemoveClient",
988
 
                           (client.__dbus_object_path__,)),
989
 
                          mandos.calls)
990
 
 
991
 
class TestApproveCmd(TestCmd):
992
 
    def test_approve(self):
993
 
        ApproveCmd().run(None, self.clients)
994
 
        for client in self.clients:
995
 
            self.assertIn(("Approve", (True, client_interface)),
996
 
                          client.calls)
997
 
 
998
 
class TestDenyCmd(TestCmd):
999
 
    def test_deny(self):
1000
 
        DenyCmd().run(None, self.clients)
1001
 
        for client in self.clients:
1002
 
            self.assertIn(("Approve", (False, client_interface)),
1003
 
                          client.calls)
1004
 
 
1005
 
class TestEnableCmd(TestCmd):
1006
 
    def test_enable(self):
1007
 
        for client in self.clients:
1008
 
            client.attributes["Enabled"] = False
1009
 
 
1010
 
        EnableCmd().run(None, self.clients)
1011
 
 
1012
 
        for client in self.clients:
1013
 
            self.assertTrue(client.attributes["Enabled"])
1014
 
 
1015
 
class TestDisableCmd(TestCmd):
1016
 
    def test_disable(self):
1017
 
        DisableCmd().run(None, self.clients)
1018
 
 
1019
 
        for client in self.clients:
1020
 
            self.assertFalse(client.attributes["Enabled"])
 
1382
 
 
1383
class TestPrintTableCmd(TestCmd):
 
1384
    def test_normal(self):
 
1385
        output = PrintTableCmd().output(self.clients.values())
 
1386
        expected_output = "\n".join((
 
1387
            "Name   Enabled Timeout  Last Successful Check",
 
1388
            "foo    Yes     00:05:00 2019-02-03T00:00:00  ",
 
1389
            "barbar Yes     00:05:00 2019-02-04T00:00:00  ",
 
1390
        ))
 
1391
        self.assertEqual(output, expected_output)
 
1392
    def test_verbose(self):
 
1393
        output = PrintTableCmd(verbose=True).output(
 
1394
            self.clients.values())
 
1395
        columns = (
 
1396
            (
 
1397
                "Name   ",
 
1398
                "foo    ",
 
1399
                "barbar ",
 
1400
            ),(
 
1401
                "Enabled ",
 
1402
                "Yes     ",
 
1403
                "Yes     ",
 
1404
            ),(
 
1405
                "Timeout  ",
 
1406
                "00:05:00 ",
 
1407
                "00:05:00 ",
 
1408
            ),(
 
1409
                "Last Successful Check ",
 
1410
                "2019-02-03T00:00:00   ",
 
1411
                "2019-02-04T00:00:00   ",
 
1412
            ),(
 
1413
                "Created             ",
 
1414
                "2019-01-02T00:00:00 ",
 
1415
                "2019-01-03T00:00:00 ",
 
1416
            ),(
 
1417
                "Interval ",
 
1418
                "00:02:00 ",
 
1419
                "00:02:00 ",
 
1420
            ),(
 
1421
                "Host            ",
 
1422
                "foo.example.org ",
 
1423
                "192.0.2.3       ",
 
1424
            ),(
 
1425
                ("Key ID                                             "
 
1426
                 "              "),
 
1427
                ("92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8"
 
1428
                 "ea90a27cddb12 "),
 
1429
                ("0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e"
 
1430
                 "46c2b020f441c "),
 
1431
            ),(
 
1432
                "Fingerprint                              ",
 
1433
                "778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 ",
 
1434
                "3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 ",
 
1435
            ),(
 
1436
                "Check Is Running ",
 
1437
                "No               ",
 
1438
                "Yes              ",
 
1439
            ),(
 
1440
                "Last Enabled        ",
 
1441
                "2019-01-03T00:00:00 ",
 
1442
                "2019-01-04T00:00:00 ",
 
1443
            ),(
 
1444
                "Approval Is Pending ",
 
1445
                "No                  ",
 
1446
                "No                  ",
 
1447
            ),(
 
1448
                "Approved By Default ",
 
1449
                "Yes                 ",
 
1450
                "No                  ",
 
1451
            ),(
 
1452
                "Last Approval Request ",
 
1453
                "                      ",
 
1454
                "2019-01-03T00:00:00   ",
 
1455
            ),(
 
1456
                "Approval Delay ",
 
1457
                "00:00:00       ",
 
1458
                "00:00:30       ",
 
1459
            ),(
 
1460
                "Approval Duration ",
 
1461
                "00:00:01          ",
 
1462
                "1T02:03:05        ",
 
1463
            ),(
 
1464
                "Checker              ",
 
1465
                "fping -q -- %(host)s ",
 
1466
                ":                    ",
 
1467
            ),(
 
1468
                "Extended Timeout ",
 
1469
                "00:15:00         ",
 
1470
                "00:15:00         ",
 
1471
            ),(
 
1472
                "Expires             ",
 
1473
                "2019-02-04T00:00:00 ",
 
1474
                "2019-02-05T00:00:00 ",
 
1475
            ),(
 
1476
                "Last Checker Status",
 
1477
                "0                  ",
 
1478
                "-2                 ",
 
1479
            )
 
1480
        )
 
1481
        num_lines = max(len(rows) for rows in columns)
 
1482
        expected_output = "\n".join("".join(rows[line]
 
1483
                                            for rows in columns)
 
1484
                                    for line in range(num_lines))
 
1485
        self.assertEqual(output, expected_output)
 
1486
    def test_one_client(self):
 
1487
        output = PrintTableCmd().output(self.one_client.values())
 
1488
        expected_output = "\n".join((
 
1489
            "Name Enabled Timeout  Last Successful Check",
 
1490
            "foo  Yes     00:05:00 2019-02-03T00:00:00  ",
 
1491
        ))
 
1492
        self.assertEqual(output, expected_output)
 
1493
 
1021
1494
 
1022
1495
class Unique(object):
1023
1496
    """Class for objects which exist only to be unique objects, since
1024
1497
unittest.mock.sentinel only exists in Python 3.3"""
1025
1498
 
 
1499
 
1026
1500
class TestPropertyCmd(TestCmd):
1027
1501
    """Abstract class for tests of PropertyCmd classes"""
1028
1502
    def runTest(self):
1032
1506
                                self.values_to_set)
1033
1507
        for value_to_set, value_to_get in zip(self.values_to_set,
1034
1508
                                              values_to_get):
1035
 
            for client in self.clients:
1036
 
                old_value = client.attributes[self.property]
 
1509
            for clientpath in self.clients:
 
1510
                client = self.bus.get_object(dbus_busname, clientpath)
 
1511
                old_value = client.attributes[self.propname]
1037
1512
                self.assertNotIsInstance(old_value, Unique)
1038
 
                client.attributes[self.property] = Unique()
 
1513
                client.attributes[self.propname] = Unique()
1039
1514
            self.run_command(value_to_set, self.clients)
1040
 
            for client in self.clients:
1041
 
                value = client.attributes[self.property]
 
1515
            for clientpath in self.clients:
 
1516
                client = self.bus.get_object(dbus_busname, clientpath)
 
1517
                value = client.attributes[self.propname]
1042
1518
                self.assertNotIsInstance(value, Unique)
1043
1519
                self.assertEqual(value, value_to_get)
1044
1520
    def run_command(self, value, clients):
1045
 
        self.command().run(None, clients)
 
1521
        self.command().run(clients, self.bus)
 
1522
 
 
1523
 
 
1524
class TestEnableCmd(TestPropertyCmd):
 
1525
    command = EnableCmd
 
1526
    propname = "Enabled"
 
1527
    values_to_set = [dbus.Boolean(True)]
 
1528
 
 
1529
 
 
1530
class TestDisableCmd(TestPropertyCmd):
 
1531
    command = DisableCmd
 
1532
    propname = "Enabled"
 
1533
    values_to_set = [dbus.Boolean(False)]
 
1534
 
1046
1535
 
1047
1536
class TestBumpTimeoutCmd(TestPropertyCmd):
1048
1537
    command = BumpTimeoutCmd
1049
 
    property = "LastCheckedOK"
 
1538
    propname = "LastCheckedOK"
1050
1539
    values_to_set = [""]
1051
1540
 
 
1541
 
1052
1542
class TestStartCheckerCmd(TestPropertyCmd):
1053
1543
    command = StartCheckerCmd
1054
 
    property = "CheckerRunning"
 
1544
    propname = "CheckerRunning"
1055
1545
    values_to_set = [dbus.Boolean(True)]
1056
1546
 
 
1547
 
1057
1548
class TestStopCheckerCmd(TestPropertyCmd):
1058
1549
    command = StopCheckerCmd
1059
 
    property = "CheckerRunning"
 
1550
    propname = "CheckerRunning"
1060
1551
    values_to_set = [dbus.Boolean(False)]
1061
1552
 
 
1553
 
1062
1554
class TestApproveByDefaultCmd(TestPropertyCmd):
1063
1555
    command = ApproveByDefaultCmd
1064
 
    property = "ApprovedByDefault"
 
1556
    propname = "ApprovedByDefault"
1065
1557
    values_to_set = [dbus.Boolean(True)]
1066
1558
 
 
1559
 
1067
1560
class TestDenyByDefaultCmd(TestPropertyCmd):
1068
1561
    command = DenyByDefaultCmd
1069
 
    property = "ApprovedByDefault"
 
1562
    propname = "ApprovedByDefault"
1070
1563
    values_to_set = [dbus.Boolean(False)]
1071
1564
 
1072
 
class TestValueArgumentPropertyCmd(TestPropertyCmd):
1073
 
    """Abstract class for tests of PropertyCmd classes using the
1074
 
ValueArgumentMixIn"""
 
1565
 
 
1566
class TestPropertyValueCmd(TestPropertyCmd):
 
1567
    """Abstract class for tests of PropertyValueCmd classes"""
1075
1568
    def runTest(self):
1076
 
        if type(self) is TestValueArgumentPropertyCmd:
 
1569
        if type(self) is TestPropertyValueCmd:
1077
1570
            return
1078
 
        return super(TestValueArgumentPropertyCmd, self).runTest()
 
1571
        return super(TestPropertyValueCmd, self).runTest()
1079
1572
    def run_command(self, value, clients):
1080
 
        self.command(value).run(None, clients)
1081
 
 
1082
 
class TestSetCheckerCmd(TestValueArgumentPropertyCmd):
 
1573
        self.command(value).run(clients, self.bus)
 
1574
 
 
1575
 
 
1576
class TestSetCheckerCmd(TestPropertyValueCmd):
1083
1577
    command = SetCheckerCmd
1084
 
    property = "Checker"
 
1578
    propname = "Checker"
1085
1579
    values_to_set = ["", ":", "fping -q -- %s"]
1086
1580
 
1087
 
class TestSetHostCmd(TestValueArgumentPropertyCmd):
 
1581
 
 
1582
class TestSetHostCmd(TestPropertyValueCmd):
1088
1583
    command = SetHostCmd
1089
 
    property = "Host"
 
1584
    propname = "Host"
1090
1585
    values_to_set = ["192.0.2.3", "foo.example.org"]
1091
1586
 
1092
 
class TestSetSecretCmd(TestValueArgumentPropertyCmd):
 
1587
 
 
1588
class TestSetSecretCmd(TestPropertyValueCmd):
1093
1589
    command = SetSecretCmd
1094
 
    property = "Secret"
1095
 
    values_to_set = [open("/dev/null", "rb"),
 
1590
    propname = "Secret"
 
1591
    values_to_set = [io.BytesIO(b""),
1096
1592
                     io.BytesIO(b"secret\0xyzzy\nbar")]
1097
1593
    values_to_get = [b"", b"secret\0xyzzy\nbar"]
1098
1594
 
1099
 
class TestSetTimeoutCmd(TestValueArgumentPropertyCmd):
 
1595
 
 
1596
class TestSetTimeoutCmd(TestPropertyValueCmd):
1100
1597
    command = SetTimeoutCmd
1101
 
    property = "Timeout"
1102
 
    values_to_set = ["P0D", "PT5M", "PT1S", "PT120S", "P1Y"]
1103
 
    values_to_get = [0, 300000, 1000, 120000, 31449600000]
1104
 
 
1105
 
class TestSetExtendedTimeoutCmd(TestValueArgumentPropertyCmd):
 
1598
    propname = "Timeout"
 
1599
    values_to_set = [datetime.timedelta(),
 
1600
                     datetime.timedelta(minutes=5),
 
1601
                     datetime.timedelta(seconds=1),
 
1602
                     datetime.timedelta(weeks=1),
 
1603
                     datetime.timedelta(weeks=52)]
 
1604
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1605
 
 
1606
 
 
1607
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
1106
1608
    command = SetExtendedTimeoutCmd
1107
 
    property = "ExtendedTimeout"
1108
 
    values_to_set = ["P0D", "PT5M", "PT1S", "PT120S", "P1Y"]
1109
 
    values_to_get = [0, 300000, 1000, 120000, 31449600000]
1110
 
 
1111
 
class TestSetIntervalCmd(TestValueArgumentPropertyCmd):
 
1609
    propname = "ExtendedTimeout"
 
1610
    values_to_set = [datetime.timedelta(),
 
1611
                     datetime.timedelta(minutes=5),
 
1612
                     datetime.timedelta(seconds=1),
 
1613
                     datetime.timedelta(weeks=1),
 
1614
                     datetime.timedelta(weeks=52)]
 
1615
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1616
 
 
1617
 
 
1618
class TestSetIntervalCmd(TestPropertyValueCmd):
1112
1619
    command = SetIntervalCmd
1113
 
    property = "Interval"
1114
 
    values_to_set = ["P0D", "PT5M", "PT1S", "PT120S", "P1Y"]
1115
 
    values_to_get = [0, 300000, 1000, 120000, 31449600000]
1116
 
 
1117
 
class TestSetApprovalDelayCmd(TestValueArgumentPropertyCmd):
 
1620
    propname = "Interval"
 
1621
    values_to_set = [datetime.timedelta(),
 
1622
                     datetime.timedelta(minutes=5),
 
1623
                     datetime.timedelta(seconds=1),
 
1624
                     datetime.timedelta(weeks=1),
 
1625
                     datetime.timedelta(weeks=52)]
 
1626
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1627
 
 
1628
 
 
1629
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
1118
1630
    command = SetApprovalDelayCmd
1119
 
    property = "ApprovalDelay"
1120
 
    values_to_set = ["P0D", "PT5M", "PT1S", "PT120S", "P1Y"]
1121
 
    values_to_get = [0, 300000, 1000, 120000, 31449600000]
1122
 
 
1123
 
class TestSetApprovalDurationCmd(TestValueArgumentPropertyCmd):
 
1631
    propname = "ApprovalDelay"
 
1632
    values_to_set = [datetime.timedelta(),
 
1633
                     datetime.timedelta(minutes=5),
 
1634
                     datetime.timedelta(seconds=1),
 
1635
                     datetime.timedelta(weeks=1),
 
1636
                     datetime.timedelta(weeks=52)]
 
1637
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
 
1638
 
 
1639
 
 
1640
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
1124
1641
    command = SetApprovalDurationCmd
1125
 
    property = "ApprovalDuration"
1126
 
    values_to_set = ["P0D", "PT5M", "PT1S", "PT120S", "P1Y"]
1127
 
    values_to_get = [0, 300000, 1000, 120000, 31449600000]
1128
 
 
1129
 
class TestOptions(unittest.TestCase):
1130
 
    def setUp(self):
1131
 
        self.parser = argparse.ArgumentParser()
1132
 
        add_command_line_options(self.parser)
1133
 
    def assert_command_from_args(self, args, command_cls, **cmd_attrs):
1134
 
        """Assert that parsing ARGS should result in an instance of
1135
 
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
1136
 
        options = self.parser.parse_args(args)
1137
 
        commands = commands_from_options(options)
1138
 
        self.assertEqual(len(commands), 1)
1139
 
        command = commands[0]
1140
 
        self.assertIsInstance(command, command_cls)
1141
 
        for key, value in cmd_attrs.items():
1142
 
            self.assertEqual(getattr(command, key), value)
1143
 
    def test_default_is_show_table(self):
1144
 
        self.assert_command_from_args([], PrintTableCmd,
1145
 
                                      verbose=False)
1146
 
    def test_show_table_verbose(self):
1147
 
        self.assert_command_from_args(["--verbose"], PrintTableCmd,
1148
 
                                      verbose=True)
1149
 
    def test_enable(self):
1150
 
        self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1151
 
    def test_disable(self):
1152
 
        self.assert_command_from_args(["--disable", "foo"],
1153
 
                                      DisableCmd)
 
1642
    propname = "ApprovalDuration"
 
1643
    values_to_set = [datetime.timedelta(),
 
1644
                     datetime.timedelta(minutes=5),
 
1645
                     datetime.timedelta(seconds=1),
 
1646
                     datetime.timedelta(weeks=1),
 
1647
                     datetime.timedelta(weeks=52)]
 
1648
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1154
1649
 
1155
1650
 
1156
1651