/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-03-12 20:37:00 UTC
  • 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
44
44
import logging
45
45
import io
46
46
import tempfile
 
47
import contextlib
47
48
 
48
49
import dbus
49
50
 
63
64
 
64
65
locale.setlocale(locale.LC_ALL, "")
65
66
 
66
 
domain = "se.recompile"
67
 
busname = domain + ".Mandos"
68
 
server_path = "/"
69
 
server_interface = domain + ".Mandos"
70
 
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
71
73
version = "1.8.3"
72
74
 
73
75
 
77
79
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
78
80
 
79
81
 
80
 
def milliseconds_to_string(ms):
81
 
    td = datetime.timedelta(0, 0, 0, ms)
82
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
83
 
            .format(days="{}T".format(td.days) if td.days else "",
84
 
                    hours=td.seconds // 3600,
85
 
                    minutes=(td.seconds % 3600) // 60,
86
 
                    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)
87
232
 
88
233
 
89
234
def rfc3339_duration_to_delta(duration):
216
361
    return value
217
362
 
218
363
 
219
 
def string_to_delta(interval):
220
 
    """Parse a string and return a datetime.timedelta"""
221
 
 
222
 
    try:
223
 
        return rfc3339_duration_to_delta(interval)
224
 
    except ValueError as e:
225
 
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
226
 
                    ' '.join(e.args))
227
 
    return parse_pre_1_6_1_interval(interval)
228
 
 
229
 
 
230
364
def parse_pre_1_6_1_interval(interval):
231
365
    """Parse an interval string as documented by Mandos before 1.6.1,
232
366
    and return a datetime.timedelta
270
404
    return value
271
405
 
272
406
 
273
 
## Classes for commands.
274
 
 
275
 
# 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
 
276
523
class Command(object):
277
524
    """Abstract class for commands"""
278
 
    def run(self, mandos, clients):
 
525
    def run(self, clients, bus=None, mandos=None):
279
526
        """Normal commands should implement run_on_one_client(), but
280
527
        commands which want to operate on all clients at the same time
281
528
        can override this run() method instead."""
282
529
        self.mandos = mandos
283
 
        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)
284
534
            self.run_on_one_client(client, properties)
285
535
 
286
 
class PrintCmd(Command):
287
 
    """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"""
288
573
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
289
574
                    "Created", "Interval", "Host", "KeyID",
290
575
                    "Fingerprint", "CheckerRunning", "LastEnabled",
292
577
                    "LastApprovalRequest", "ApprovalDelay",
293
578
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
294
579
                    "Expires", "LastCheckerStatus")
295
 
    def run(self, mandos, clients):
296
 
        print(self.output(clients))
297
 
 
298
 
class PropertyCmd(Command):
299
 
    """Abstract class for Actions for setting one client property"""
300
 
    def run_on_one_client(self, client, properties):
301
 
        """Set the Client's D-Bus property"""
302
 
        client.Set(client_interface, self.property, self.value_to_set,
303
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
304
 
 
305
 
class ValueArgumentMixIn(object):
306
 
    """Mixin class for commands taking a value as argument"""
307
 
    def __init__(self, value):
308
 
        self.value_to_set = value
309
 
 
310
 
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
311
 
    """Mixin class for commands taking a value argument as
312
 
    milliseconds."""
313
 
    @property
314
 
    def value_to_set(self):
315
 
        return self._vts
316
 
    @value_to_set.setter
317
 
    def value_to_set(self, value):
318
 
        """When setting, convert value to a datetime.timedelta"""
319
 
        self._vts = int(round(value.total_seconds() * 1000))
320
 
 
321
 
# Actual (non-abstract) command classes
322
 
 
323
 
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):
324
601
    def __init__(self, verbose=False):
325
602
        self.verbose = verbose
326
603
 
327
604
    def output(self, clients):
328
 
        default_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
 
605
        default_keywords = ("Name", "Enabled", "Timeout",
 
606
                            "LastCheckedOK")
329
607
        keywords = default_keywords
330
608
        if self.verbose:
331
609
            keywords = self.all_keywords
332
 
        return str(self.TableOfClients(clients.values(), keywords))
 
610
        return str(self.TableOfClients(clients, keywords))
333
611
 
334
612
    class TableOfClients(object):
335
613
        tableheaders = {
388
666
        def string_from_client(self, client, key):
389
667
            return self.valuetostring(client[key], key)
390
668
 
391
 
        @staticmethod
392
 
        def valuetostring(value, keyword):
 
669
        @classmethod
 
670
        def valuetostring(cls, value, keyword):
393
671
            if isinstance(value, dbus.Boolean):
394
672
                return "Yes" if value else "No"
395
673
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
396
674
                           "ApprovalDuration", "ExtendedTimeout"):
397
 
                return milliseconds_to_string(value)
 
675
                return cls.milliseconds_to_string(value)
398
676
            return str(value)
399
677
 
400
678
        def header_line(self, format_string):
405
683
                **{key: self.string_from_client(client, key)
406
684
                   for key in self.keywords})
407
685
 
408
 
 
409
 
 
410
 
class DumpJSONCmd(PrintCmd):
411
 
    def output(self, clients):
412
 
        data = {client["Name"]:
413
 
                {key: self.dbus_boolean_to_bool(client[key])
414
 
                 for key in self.all_keywords}
415
 
                for client in clients.values()}
416
 
        return json.dumps(data, indent=4, separators=(',', ': '))
417
 
    @staticmethod
418
 
    def dbus_boolean_to_bool(value):
419
 
        if isinstance(value, dbus.Boolean):
420
 
            value = bool(value)
421
 
        return value
422
 
 
423
 
class IsEnabledCmd(Command):
424
 
    def run_on_one_client(self, client, properties):
425
 
        if self.is_enabled(client, properties):
426
 
            sys.exit(0)
427
 
        sys.exit(1)
428
 
    def is_enabled(self, client, properties):
429
 
        return bool(properties["Enabled"])
430
 
 
431
 
class RemoveCmd(Command):
432
 
    def run_on_one_client(self, client, properties):
433
 
        self.mandos.RemoveClient(client.__dbus_object_path__)
434
 
 
435
 
class ApproveCmd(Command):
436
 
    def run_on_one_client(self, client, properties):
437
 
        client.Approve(dbus.Boolean(True),
438
 
                       dbus_interface=client_interface)
439
 
 
440
 
class DenyCmd(Command):
441
 
    def run_on_one_client(self, client, properties):
442
 
        client.Approve(dbus.Boolean(False),
443
 
                       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
 
444
714
 
445
715
class EnableCmd(PropertyCmd):
446
 
    property = "Enabled"
 
716
    propname = "Enabled"
447
717
    value_to_set = dbus.Boolean(True)
448
718
 
 
719
 
449
720
class DisableCmd(PropertyCmd):
450
 
    property = "Enabled"
 
721
    propname = "Enabled"
451
722
    value_to_set = dbus.Boolean(False)
452
723
 
 
724
 
453
725
class BumpTimeoutCmd(PropertyCmd):
454
 
    property = "LastCheckedOK"
 
726
    propname = "LastCheckedOK"
455
727
    value_to_set = ""
456
728
 
 
729
 
457
730
class StartCheckerCmd(PropertyCmd):
458
 
    property = "CheckerRunning"
 
731
    propname = "CheckerRunning"
459
732
    value_to_set = dbus.Boolean(True)
460
733
 
 
734
 
461
735
class StopCheckerCmd(PropertyCmd):
462
 
    property = "CheckerRunning"
 
736
    propname = "CheckerRunning"
463
737
    value_to_set = dbus.Boolean(False)
464
738
 
 
739
 
465
740
class ApproveByDefaultCmd(PropertyCmd):
466
 
    property = "ApprovedByDefault"
 
741
    propname = "ApprovedByDefault"
467
742
    value_to_set = dbus.Boolean(True)
468
743
 
 
744
 
469
745
class DenyByDefaultCmd(PropertyCmd):
470
 
    property = "ApprovedByDefault"
 
746
    propname = "ApprovedByDefault"
471
747
    value_to_set = dbus.Boolean(False)
472
748
 
473
 
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
474
 
    property = "Checker"
475
 
 
476
 
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
477
 
    property = "Host"
478
 
 
479
 
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"
480
766
    @property
481
767
    def value_to_set(self):
482
768
        return self._vts
485
771
        """When setting, read data from supplied file object"""
486
772
        self._vts = value.read()
487
773
        value.close()
488
 
    property = "Secret"
489
 
 
490
 
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
491
 
    property = "Timeout"
492
 
 
493
 
class SetExtendedTimeoutCmd(PropertyCmd,
494
 
                            MillisecondsValueArgumentMixIn):
495
 
    property = "ExtendedTimeout"
496
 
 
497
 
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
498
 
    property = "Interval"
499
 
 
500
 
class SetApprovalDelayCmd(PropertyCmd,
501
 
                          MillisecondsValueArgumentMixIn):
502
 
    property = "ApprovalDelay"
503
 
 
504
 
class SetApprovalDurationCmd(PropertyCmd,
505
 
                             MillisecondsValueArgumentMixIn):
506
 
    property = "ApprovalDuration"
507
 
 
508
 
def add_command_line_options(parser):
509
 
    parser.add_argument("--version", action="version",
510
 
                        version="%(prog)s {}".format(version),
511
 
                        help="show version number and exit")
512
 
    parser.add_argument("-a", "--all", action="store_true",
513
 
                        help="Select all clients")
514
 
    parser.add_argument("-v", "--verbose", action="store_true",
515
 
                        help="Print all fields")
516
 
    parser.add_argument("-j", "--dump-json", action="store_true",
517
 
                        help="Dump client data in JSON format")
518
 
    enable_disable = parser.add_mutually_exclusive_group()
519
 
    enable_disable.add_argument("-e", "--enable", action="store_true",
520
 
                                help="Enable client")
521
 
    enable_disable.add_argument("-d", "--disable",
522
 
                                action="store_true",
523
 
                                help="disable client")
524
 
    parser.add_argument("-b", "--bump-timeout", action="store_true",
525
 
                        help="Bump timeout for client")
526
 
    start_stop_checker = parser.add_mutually_exclusive_group()
527
 
    start_stop_checker.add_argument("--start-checker",
528
 
                                    action="store_true",
529
 
                                    help="Start checker for client")
530
 
    start_stop_checker.add_argument("--stop-checker",
531
 
                                    action="store_true",
532
 
                                    help="Stop checker for client")
533
 
    parser.add_argument("-V", "--is-enabled", action="store_true",
534
 
                        help="Check if client is enabled")
535
 
    parser.add_argument("-r", "--remove", action="store_true",
536
 
                        help="Remove client")
537
 
    parser.add_argument("-c", "--checker",
538
 
                        help="Set checker command for client")
539
 
    parser.add_argument("-t", "--timeout", type=string_to_delta,
540
 
                        help="Set timeout for client")
541
 
    parser.add_argument("--extended-timeout", type=string_to_delta,
542
 
                        help="Set extended timeout for client")
543
 
    parser.add_argument("-i", "--interval", type=string_to_delta,
544
 
                        help="Set checker interval for client")
545
 
    approve_deny_default = parser.add_mutually_exclusive_group()
546
 
    approve_deny_default.add_argument(
547
 
        "--approve-by-default", action="store_true",
548
 
        default=None, dest="approved_by_default",
549
 
        help="Set client to be approved by default")
550
 
    approve_deny_default.add_argument(
551
 
        "--deny-by-default", action="store_false",
552
 
        dest="approved_by_default",
553
 
        help="Set client to be denied by default")
554
 
    parser.add_argument("--approval-delay", type=string_to_delta,
555
 
                        help="Set delay before client approve/deny")
556
 
    parser.add_argument("--approval-duration", type=string_to_delta,
557
 
                        help="Set duration of one client approval")
558
 
    parser.add_argument("-H", "--host", help="Set host for client")
559
 
    parser.add_argument("-s", "--secret",
560
 
                        type=argparse.FileType(mode="rb"),
561
 
                        help="Set password blob (file) for client")
562
 
    approve_deny = parser.add_mutually_exclusive_group()
563
 
    approve_deny.add_argument(
564
 
        "-A", "--approve", action="store_true",
565
 
        help="Approve any current client request")
566
 
    approve_deny.add_argument("-D", "--deny", action="store_true",
567
 
                              help="Deny any current client request")
568
 
    parser.add_argument("--check", action="store_true",
569
 
                        help="Run self-test")
570
 
    parser.add_argument("client", nargs="*", help="Client name")
571
 
 
572
 
 
573
 
def commands_from_options(options):
574
 
 
575
 
    commands = []
576
 
 
577
 
    if options.dump_json:
578
 
        commands.append(DumpJSONCmd())
579
 
 
580
 
    if options.enable:
581
 
        commands.append(EnableCmd())
582
 
 
583
 
    if options.disable:
584
 
        commands.append(DisableCmd())
585
 
 
586
 
    if options.bump_timeout:
587
 
        commands.append(BumpTimeoutCmd())
588
 
 
589
 
    if options.start_checker:
590
 
        commands.append(StartCheckerCmd())
591
 
 
592
 
    if options.stop_checker:
593
 
        commands.append(StopCheckerCmd())
594
 
 
595
 
    if options.is_enabled:
596
 
        commands.append(IsEnabledCmd())
597
 
 
598
 
    if options.remove:
599
 
        commands.append(RemoveCmd())
600
 
 
601
 
    if options.checker is not None:
602
 
        commands.append(SetCheckerCmd(options.checker))
603
 
 
604
 
    if options.timeout is not None:
605
 
        commands.append(SetTimeoutCmd(options.timeout))
606
 
 
607
 
    if options.extended_timeout:
608
 
        commands.append(
609
 
            SetExtendedTimeoutCmd(options.extended_timeout))
610
 
 
611
 
    if options.interval is not None:
612
 
        commands.append(SetIntervalCmd(options.interval))
613
 
 
614
 
    if options.approved_by_default is not None:
615
 
        if options.approved_by_default:
616
 
            commands.append(ApproveByDefaultCmd())
617
 
        else:
618
 
            commands.append(DenyByDefaultCmd())
619
 
 
620
 
    if options.approval_delay is not None:
621
 
        commands.append(SetApprovalDelayCmd(options.approval_delay))
622
 
 
623
 
    if options.approval_duration is not None:
624
 
        commands.append(
625
 
            SetApprovalDurationCmd(options.approval_duration))
626
 
 
627
 
    if options.host is not None:
628
 
        commands.append(SetHostCmd(options.host))
629
 
 
630
 
    if options.secret is not None:
631
 
        commands.append(SetSecretCmd(options.secret))
632
 
 
633
 
    if options.approve:
634
 
        commands.append(ApproveCmd())
635
 
 
636
 
    if options.deny:
637
 
        commands.append(DenyCmd())
638
 
 
639
 
    # If no command option has been given, show table of clients,
640
 
    # optionally verbosely
641
 
    if not commands:
642
 
        commands.append(PrintTableCmd(verbose=options.verbose))
643
 
 
644
 
    return commands
645
 
 
646
 
 
647
 
def main():
648
 
    parser = argparse.ArgumentParser()
649
 
 
650
 
    add_command_line_options(parser)
651
 
 
652
 
    options = parser.parse_args()
653
 
 
654
 
    def has_actions(options):
655
 
        return any((options.enable,
656
 
                    options.disable,
657
 
                    options.bump_timeout,
658
 
                    options.start_checker,
659
 
                    options.stop_checker,
660
 
                    options.is_enabled,
661
 
                    options.remove,
662
 
                    options.checker is not None,
663
 
                    options.timeout is not None,
664
 
                    options.extended_timeout is not None,
665
 
                    options.interval is not None,
666
 
                    options.approved_by_default is not None,
667
 
                    options.approval_delay is not None,
668
 
                    options.approval_duration is not None,
669
 
                    options.host is not None,
670
 
                    options.secret is not None,
671
 
                    options.approve,
672
 
                    options.deny))
673
 
 
674
 
    if has_actions(options) and not (options.client or options.all):
675
 
        parser.error("Options require clients names or --all.")
676
 
    if options.verbose and has_actions(options):
677
 
        parser.error("--verbose can only be used alone.")
678
 
    if options.dump_json and (options.verbose
679
 
                              or has_actions(options)):
680
 
        parser.error("--dump-json can only be used alone.")
681
 
    if options.all and not has_actions(options):
682
 
        parser.error("--all requires an action.")
683
 
    if options.is_enabled and len(options.client) > 1:
684
 
        parser.error("--is-enabled requires exactly one client")
685
 
 
686
 
    clientnames = options.client
687
 
 
688
 
    try:
689
 
        bus = dbus.SystemBus()
690
 
        mandos_dbus_objc = bus.get_object(busname, server_path)
691
 
    except dbus.exceptions.DBusException:
692
 
        log.critical("Could not connect to Mandos server")
693
 
        sys.exit(1)
694
 
 
695
 
    mandos_serv = dbus.Interface(mandos_dbus_objc,
696
 
                                 dbus_interface=server_interface)
697
 
    mandos_serv_object_manager = dbus.Interface(
698
 
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
699
 
 
700
 
    # Filter out log message from dbus module
701
 
    dbus_logger = logging.getLogger("dbus.proxies")
702
 
    class NullFilter(logging.Filter):
703
 
        def filter(self, record):
704
 
            return False
705
 
    dbus_filter = NullFilter()
706
 
    try:
707
 
        dbus_logger.addFilter(dbus_filter)
708
 
        mandos_clients = {path: ifs_and_props[client_interface]
709
 
                          for path, ifs_and_props in
710
 
                          mandos_serv_object_manager
711
 
                          .GetManagedObjects().items()
712
 
                          if client_interface in ifs_and_props}
713
 
    except dbus.exceptions.DBusException as e:
714
 
        log.critical("Failed to access Mandos server through D-Bus:"
715
 
                     "\n%s", e)
716
 
        sys.exit(1)
717
 
    finally:
718
 
        # restore dbus logger
719
 
        dbus_logger.removeFilter(dbus_filter)
720
 
 
721
 
    # Compile dict of (clients: properties) to process
722
 
    clients = {}
723
 
 
724
 
    if not clientnames:
725
 
        clients = {bus.get_object(busname, path): properties
726
 
                   for path, properties in mandos_clients.items()}
727
 
    else:
728
 
        for name in clientnames:
729
 
            for path, client in mandos_clients.items():
730
 
                if client["Name"] == name:
731
 
                    client_objc = bus.get_object(busname, path)
732
 
                    clients[client_objc] = client
733
 
                    break
734
 
            else:
735
 
                log.critical("Client not found on server: %r", name)
736
 
                sys.exit(1)
737
 
 
738
 
    # Run all commands on clients
739
 
    commands = commands_from_options(options)
740
 
    for command in commands:
741
 
        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
 
742
807
 
743
808
 
744
 
class Test_milliseconds_to_string(unittest.TestCase):
745
 
    def test_all(self):
746
 
        self.assertEqual(milliseconds_to_string(93785000),
747
 
                         "1T02:03:05")
748
 
    def test_no_days(self):
749
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
750
 
    def test_all_zero(self):
751
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
752
 
    def test_no_fractional_seconds(self):
753
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
754
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
755
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
756
 
 
757
809
class Test_string_to_delta(unittest.TestCase):
758
810
    def test_handles_basic_rfc3339(self):
759
811
        self.assertEqual(string_to_delta("PT0S"),
787
839
        self.assertEqual(value, datetime.timedelta(0, 7200))
788
840
 
789
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
 
790
1172
class TestCmd(unittest.TestCase):
791
1173
    """Abstract class for tests of command classes"""
792
1174
    def setUp(self):
793
1175
        testcase = self
794
1176
        class MockClient(object):
795
1177
            def __init__(self, name, **attributes):
796
 
                self.__dbus_object_path__ = "objpath_{}".format(name)
 
1178
                self.__dbus_object_path__ = "/clients/{}".format(name)
797
1179
                self.attributes = attributes
798
1180
                self.attributes["Name"] = name
799
1181
                self.calls = []
800
 
            def Set(self, interface, property, value, dbus_interface):
801
 
                testcase.assertEqual(interface, client_interface)
802
 
                testcase.assertEqual(dbus_interface,
803
 
                                     dbus.PROPERTIES_IFACE)
804
 
                self.attributes[property] = value
805
 
            def Get(self, interface, property, dbus_interface):
806
 
                testcase.assertEqual(interface, client_interface)
807
 
                testcase.assertEqual(dbus_interface,
808
 
                                     dbus.PROPERTIES_IFACE)
809
 
                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]
810
1192
            def Approve(self, approve, dbus_interface):
811
 
                testcase.assertEqual(dbus_interface, client_interface)
 
1193
                testcase.assertEqual(dbus_interface,
 
1194
                                     client_dbus_interface)
812
1195
                self.calls.append(("Approve", (approve,
813
1196
                                               dbus_interface)))
814
1197
        self.client = MockClient(
854
1237
            ApprovedByDefault=dbus.Boolean(False),
855
1238
            LastApprovalRequest="2019-01-03T00:00:00",
856
1239
            ApprovalDelay=30000,
857
 
            ApprovalDuration=1000,
 
1240
            ApprovalDuration=93785000,
858
1241
            Checker=":",
859
1242
            ExtendedTimeout=900000,
860
1243
            Expires="2019-02-05T00:00:00",
861
1244
            LastCheckerStatus=-2)
862
1245
        self.clients =  collections.OrderedDict(
863
1246
            [
864
 
                (self.client, self.client.attributes),
865
 
                (self.other_client, self.other_client.attributes),
 
1247
                ("/clients/foo", self.client.attributes),
 
1248
                ("/clients/barbar", self.other_client.attributes),
866
1249
            ])
867
 
        self.one_client = {self.client: self.client.attributes}
868
 
 
869
 
class TestPrintTableCmd(TestCmd):
870
 
    def test_normal(self):
871
 
        output = PrintTableCmd().output(self.clients)
872
 
        expected_output = """
873
 
Name   Enabled Timeout  Last Successful Check
874
 
foo    Yes     00:05:00 2019-02-03T00:00:00  
875
 
barbar Yes     00:05:00 2019-02-04T00:00:00  
876
 
"""[1:-1]
877
 
        self.assertEqual(output, expected_output)
878
 
    def test_verbose(self):
879
 
        output = PrintTableCmd(verbose=True).output(self.clients)
880
 
        expected_output = """
881
 
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
882
 
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                  
883
 
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                 
884
 
"""[1:-1]
885
 
        self.assertEqual(output, expected_output)
886
 
    def test_one_client(self):
887
 
        output = PrintTableCmd().output(self.one_client)
888
 
        expected_output = """
889
 
Name Enabled Timeout  Last Successful Check
890
 
foo  Yes     00:05:00 2019-02-03T00:00:00  
891
 
"""[1:-1]
892
 
        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
 
893
1319
 
894
1320
class TestDumpJSONCmd(TestCmd):
895
1321
    def setUp(self):
936
1362
                "ApprovedByDefault": False,
937
1363
                "LastApprovalRequest": "2019-01-03T00:00:00",
938
1364
                "ApprovalDelay": 30000,
939
 
                "ApprovalDuration": 1000,
 
1365
                "ApprovalDuration": 93785000,
940
1366
                "Checker": ":",
941
1367
                "ExtendedTimeout": 900000,
942
1368
                "Expires": "2019-02-05T00:00:00",
953
1379
        expected_json = {"foo": self.expected_json["foo"]}
954
1380
        self.assertDictEqual(json_data, expected_json)
955
1381
 
956
 
class TestIsEnabledCmd(TestCmd):
957
 
    def test_is_enabled(self):
958
 
        self.assertTrue(all(IsEnabledCmd().is_enabled(client, properties)
959
 
                            for client, properties in self.clients.items()))
960
 
    def test_is_enabled_run_exits_successfully(self):
961
 
        with self.assertRaises(SystemExit) as e:
962
 
            IsEnabledCmd().run(None, self.one_client)
963
 
        if e.exception.code is not None:
964
 
            self.assertEqual(e.exception.code, 0)
965
 
        else:
966
 
            self.assertIsNone(e.exception.code)
967
 
    def test_is_enabled_run_exits_with_failure(self):
968
 
        self.client.attributes["Enabled"] = dbus.Boolean(False)
969
 
        with self.assertRaises(SystemExit) as e:
970
 
            IsEnabledCmd().run(None, self.one_client)
971
 
        if isinstance(e.exception.code, int):
972
 
            self.assertNotEqual(e.exception.code, 0)
973
 
        else:
974
 
            self.assertIsNotNone(e.exception.code)
975
 
 
976
 
class TestRemoveCmd(TestCmd):
977
 
    def test_remove(self):
978
 
        class MockMandos(object):
979
 
            def __init__(self):
980
 
                self.calls = []
981
 
            def RemoveClient(self, dbus_path):
982
 
                self.calls.append(("RemoveClient", (dbus_path,)))
983
 
        mandos = MockMandos()
984
 
        super(TestRemoveCmd, self).setUp()
985
 
        RemoveCmd().run(mandos, self.clients)
986
 
        self.assertEqual(len(mandos.calls), 2)
987
 
        for client in self.clients:
988
 
            self.assertIn(("RemoveClient",
989
 
                           (client.__dbus_object_path__,)),
990
 
                          mandos.calls)
991
 
 
992
 
class TestApproveCmd(TestCmd):
993
 
    def test_approve(self):
994
 
        ApproveCmd().run(None, self.clients)
995
 
        for client in self.clients:
996
 
            self.assertIn(("Approve", (True, client_interface)),
997
 
                          client.calls)
998
 
 
999
 
class TestDenyCmd(TestCmd):
1000
 
    def test_deny(self):
1001
 
        DenyCmd().run(None, self.clients)
1002
 
        for client in self.clients:
1003
 
            self.assertIn(("Approve", (False, client_interface)),
1004
 
                          client.calls)
1005
 
 
1006
 
class TestEnableCmd(TestCmd):
1007
 
    def test_enable(self):
1008
 
        for client in self.clients:
1009
 
            client.attributes["Enabled"] = False
1010
 
 
1011
 
        EnableCmd().run(None, self.clients)
1012
 
 
1013
 
        for client in self.clients:
1014
 
            self.assertTrue(client.attributes["Enabled"])
1015
 
 
1016
 
class TestDisableCmd(TestCmd):
1017
 
    def test_disable(self):
1018
 
        DisableCmd().run(None, self.clients)
1019
 
 
1020
 
        for client in self.clients:
1021
 
            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
 
1022
1494
 
1023
1495
class Unique(object):
1024
1496
    """Class for objects which exist only to be unique objects, since
1025
1497
unittest.mock.sentinel only exists in Python 3.3"""
1026
1498
 
 
1499
 
1027
1500
class TestPropertyCmd(TestCmd):
1028
1501
    """Abstract class for tests of PropertyCmd classes"""
1029
1502
    def runTest(self):
1033
1506
                                self.values_to_set)
1034
1507
        for value_to_set, value_to_get in zip(self.values_to_set,
1035
1508
                                              values_to_get):
1036
 
            for client in self.clients:
1037
 
                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]
1038
1512
                self.assertNotIsInstance(old_value, Unique)
1039
 
                client.attributes[self.property] = Unique()
 
1513
                client.attributes[self.propname] = Unique()
1040
1514
            self.run_command(value_to_set, self.clients)
1041
 
            for client in self.clients:
1042
 
                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]
1043
1518
                self.assertNotIsInstance(value, Unique)
1044
1519
                self.assertEqual(value, value_to_get)
1045
1520
    def run_command(self, value, clients):
1046
 
        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
 
1047
1535
 
1048
1536
class TestBumpTimeoutCmd(TestPropertyCmd):
1049
1537
    command = BumpTimeoutCmd
1050
 
    property = "LastCheckedOK"
 
1538
    propname = "LastCheckedOK"
1051
1539
    values_to_set = [""]
1052
1540
 
 
1541
 
1053
1542
class TestStartCheckerCmd(TestPropertyCmd):
1054
1543
    command = StartCheckerCmd
1055
 
    property = "CheckerRunning"
 
1544
    propname = "CheckerRunning"
1056
1545
    values_to_set = [dbus.Boolean(True)]
1057
1546
 
 
1547
 
1058
1548
class TestStopCheckerCmd(TestPropertyCmd):
1059
1549
    command = StopCheckerCmd
1060
 
    property = "CheckerRunning"
 
1550
    propname = "CheckerRunning"
1061
1551
    values_to_set = [dbus.Boolean(False)]
1062
1552
 
 
1553
 
1063
1554
class TestApproveByDefaultCmd(TestPropertyCmd):
1064
1555
    command = ApproveByDefaultCmd
1065
 
    property = "ApprovedByDefault"
 
1556
    propname = "ApprovedByDefault"
1066
1557
    values_to_set = [dbus.Boolean(True)]
1067
1558
 
 
1559
 
1068
1560
class TestDenyByDefaultCmd(TestPropertyCmd):
1069
1561
    command = DenyByDefaultCmd
1070
 
    property = "ApprovedByDefault"
 
1562
    propname = "ApprovedByDefault"
1071
1563
    values_to_set = [dbus.Boolean(False)]
1072
1564
 
1073
 
class TestValueArgumentPropertyCmd(TestPropertyCmd):
1074
 
    """Abstract class for tests of PropertyCmd classes using the
1075
 
ValueArgumentMixIn"""
 
1565
 
 
1566
class TestPropertyValueCmd(TestPropertyCmd):
 
1567
    """Abstract class for tests of PropertyValueCmd classes"""
1076
1568
    def runTest(self):
1077
 
        if type(self) is TestValueArgumentPropertyCmd:
 
1569
        if type(self) is TestPropertyValueCmd:
1078
1570
            return
1079
 
        return super(TestValueArgumentPropertyCmd, self).runTest()
 
1571
        return super(TestPropertyValueCmd, self).runTest()
1080
1572
    def run_command(self, value, clients):
1081
 
        self.command(value).run(None, clients)
1082
 
 
1083
 
class TestSetCheckerCmd(TestValueArgumentPropertyCmd):
 
1573
        self.command(value).run(clients, self.bus)
 
1574
 
 
1575
 
 
1576
class TestSetCheckerCmd(TestPropertyValueCmd):
1084
1577
    command = SetCheckerCmd
1085
 
    property = "Checker"
 
1578
    propname = "Checker"
1086
1579
    values_to_set = ["", ":", "fping -q -- %s"]
1087
1580
 
1088
 
class TestSetHostCmd(TestValueArgumentPropertyCmd):
 
1581
 
 
1582
class TestSetHostCmd(TestPropertyValueCmd):
1089
1583
    command = SetHostCmd
1090
 
    property = "Host"
 
1584
    propname = "Host"
1091
1585
    values_to_set = ["192.0.2.3", "foo.example.org"]
1092
1586
 
1093
 
class TestSetSecretCmd(TestValueArgumentPropertyCmd):
 
1587
 
 
1588
class TestSetSecretCmd(TestPropertyValueCmd):
1094
1589
    command = SetSecretCmd
1095
 
    property = "Secret"
1096
 
    values_to_set = [open("/dev/null", "rb"),
 
1590
    propname = "Secret"
 
1591
    values_to_set = [io.BytesIO(b""),
1097
1592
                     io.BytesIO(b"secret\0xyzzy\nbar")]
1098
1593
    values_to_get = [b"", b"secret\0xyzzy\nbar"]
1099
1594
 
1100
 
class TestSetTimeoutCmd(TestValueArgumentPropertyCmd):
 
1595
 
 
1596
class TestSetTimeoutCmd(TestPropertyValueCmd):
1101
1597
    command = SetTimeoutCmd
1102
 
    property = "Timeout"
 
1598
    propname = "Timeout"
1103
1599
    values_to_set = [datetime.timedelta(),
1104
1600
                     datetime.timedelta(minutes=5),
1105
1601
                     datetime.timedelta(seconds=1),
1107
1603
                     datetime.timedelta(weeks=52)]
1108
1604
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1109
1605
 
1110
 
class TestSetExtendedTimeoutCmd(TestValueArgumentPropertyCmd):
 
1606
 
 
1607
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
1111
1608
    command = SetExtendedTimeoutCmd
1112
 
    property = "ExtendedTimeout"
 
1609
    propname = "ExtendedTimeout"
1113
1610
    values_to_set = [datetime.timedelta(),
1114
1611
                     datetime.timedelta(minutes=5),
1115
1612
                     datetime.timedelta(seconds=1),
1117
1614
                     datetime.timedelta(weeks=52)]
1118
1615
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1119
1616
 
1120
 
class TestSetIntervalCmd(TestValueArgumentPropertyCmd):
 
1617
 
 
1618
class TestSetIntervalCmd(TestPropertyValueCmd):
1121
1619
    command = SetIntervalCmd
1122
 
    property = "Interval"
 
1620
    propname = "Interval"
1123
1621
    values_to_set = [datetime.timedelta(),
1124
1622
                     datetime.timedelta(minutes=5),
1125
1623
                     datetime.timedelta(seconds=1),
1127
1625
                     datetime.timedelta(weeks=52)]
1128
1626
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1129
1627
 
1130
 
class TestSetApprovalDelayCmd(TestValueArgumentPropertyCmd):
 
1628
 
 
1629
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
1131
1630
    command = SetApprovalDelayCmd
1132
 
    property = "ApprovalDelay"
 
1631
    propname = "ApprovalDelay"
1133
1632
    values_to_set = [datetime.timedelta(),
1134
1633
                     datetime.timedelta(minutes=5),
1135
1634
                     datetime.timedelta(seconds=1),
1137
1636
                     datetime.timedelta(weeks=52)]
1138
1637
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1139
1638
 
1140
 
class TestSetApprovalDurationCmd(TestValueArgumentPropertyCmd):
 
1639
 
 
1640
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
1141
1641
    command = SetApprovalDurationCmd
1142
 
    property = "ApprovalDuration"
 
1642
    propname = "ApprovalDuration"
1143
1643
    values_to_set = [datetime.timedelta(),
1144
1644
                     datetime.timedelta(minutes=5),
1145
1645
                     datetime.timedelta(seconds=1),
1147
1647
                     datetime.timedelta(weeks=52)]
1148
1648
    values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1149
1649
 
1150
 
class Test_command_from_options(unittest.TestCase):
1151
 
    def setUp(self):
1152
 
        self.parser = argparse.ArgumentParser()
1153
 
        add_command_line_options(self.parser)
1154
 
    def assert_command_from_args(self, args, command_cls, **cmd_attrs):
1155
 
        """Assert that parsing ARGS should result in an instance of
1156
 
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
1157
 
        options = self.parser.parse_args(args)
1158
 
        commands = commands_from_options(options)
1159
 
        self.assertEqual(len(commands), 1)
1160
 
        command = commands[0]
1161
 
        self.assertIsInstance(command, command_cls)
1162
 
        for key, value in cmd_attrs.items():
1163
 
            self.assertEqual(getattr(command, key), value)
1164
 
    def test_print_table(self):
1165
 
        self.assert_command_from_args([], PrintTableCmd,
1166
 
                                      verbose=False)
1167
 
 
1168
 
    def test_print_table_verbose(self):
1169
 
        self.assert_command_from_args(["--verbose"], PrintTableCmd,
1170
 
                                      verbose=True)
1171
 
 
1172
 
    def test_enable(self):
1173
 
        self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1174
 
 
1175
 
    def test_disable(self):
1176
 
        self.assert_command_from_args(["--disable", "foo"],
1177
 
                                      DisableCmd)
1178
 
 
1179
 
    def test_bump_timeout(self):
1180
 
        self.assert_command_from_args(["--bump-timeout", "foo"],
1181
 
                                      BumpTimeoutCmd)
1182
 
 
1183
 
    def test_start_checker(self):
1184
 
        self.assert_command_from_args(["--start-checker", "foo"],
1185
 
                                      StartCheckerCmd)
1186
 
 
1187
 
    def test_stop_checker(self):
1188
 
        self.assert_command_from_args(["--stop-checker", "foo"],
1189
 
                                      StopCheckerCmd)
1190
 
 
1191
 
    def test_remove(self):
1192
 
        self.assert_command_from_args(["--remove", "foo"],
1193
 
                                      RemoveCmd)
1194
 
 
1195
 
    def test_checker(self):
1196
 
        self.assert_command_from_args(["--checker", ":", "foo"],
1197
 
                                      SetCheckerCmd, value_to_set=":")
1198
 
 
1199
 
    def test_checker_empty(self):
1200
 
        self.assert_command_from_args(["--checker", "", "foo"],
1201
 
                                      SetCheckerCmd, value_to_set="")
1202
 
 
1203
 
    def test_timeout(self):
1204
 
        self.assert_command_from_args(["--timeout", "PT5M", "foo"],
1205
 
                                      SetTimeoutCmd,
1206
 
                                      value_to_set=300000)
1207
 
 
1208
 
    def test_extended_timeout(self):
1209
 
        self.assert_command_from_args(["--extended-timeout", "PT15M",
1210
 
                                       "foo"],
1211
 
                                      SetExtendedTimeoutCmd,
1212
 
                                      value_to_set=900000)
1213
 
 
1214
 
    def test_interval(self):
1215
 
        self.assert_command_from_args(["--interval", "PT2M", "foo"],
1216
 
                                      SetIntervalCmd,
1217
 
                                      value_to_set=120000)
1218
 
 
1219
 
    def test_approve_by_default(self):
1220
 
        self.assert_command_from_args(["--approve-by-default", "foo"],
1221
 
                                      ApproveByDefaultCmd)
1222
 
 
1223
 
    def test_deny_by_default(self):
1224
 
        self.assert_command_from_args(["--deny-by-default", "foo"],
1225
 
                                      DenyByDefaultCmd)
1226
 
 
1227
 
    def test_approval_delay(self):
1228
 
        self.assert_command_from_args(["--approval-delay", "PT30S",
1229
 
                                       "foo"], SetApprovalDelayCmd,
1230
 
                                      value_to_set=30000)
1231
 
 
1232
 
    def test_approval_duration(self):
1233
 
        self.assert_command_from_args(["--approval-duration", "PT1S",
1234
 
                                       "foo"], SetApprovalDurationCmd,
1235
 
                                      value_to_set=1000)
1236
 
 
1237
 
    def test_host(self):
1238
 
        self.assert_command_from_args(["--host", "foo.example.org",
1239
 
                                       "foo"], SetHostCmd,
1240
 
                                      value_to_set="foo.example.org")
1241
 
 
1242
 
    def test_secret_devnull(self):
1243
 
        self.assert_command_from_args(["--secret", os.path.devnull,
1244
 
                                       "foo"], SetSecretCmd,
1245
 
                                      value_to_set=b"")
1246
 
 
1247
 
    def test_secret_tempfile(self):
1248
 
        with tempfile.NamedTemporaryFile(mode="r+b") as f:
1249
 
            value = b"secret\0xyzzy\nbar"
1250
 
            f.write(value)
1251
 
            f.seek(0)
1252
 
            self.assert_command_from_args(["--secret", f.name,
1253
 
                                           "foo"], SetSecretCmd,
1254
 
                                          value_to_set=value)
1255
 
 
1256
 
    def test_approve(self):
1257
 
        self.assert_command_from_args(["--approve", "foo"],
1258
 
                                      ApproveCmd)
1259
 
 
1260
 
    def test_deny(self):
1261
 
        self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1262
 
 
1263
 
    def test_dump_json(self):
1264
 
        self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1265
 
 
1266
 
    def test_is_enabled(self):
1267
 
        self.assert_command_from_args(["--is-enabled", "foo"],
1268
 
                                      IsEnabledCmd)
1269
 
 
1270
1650
 
1271
1651
 
1272
1652
def should_only_run_tests():