/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:13:34 UTC
  • Revision ID: teddy@recompile.se-20190312201334-my3htrprewjosuw5
mandos-ctl: Refactor

* mandos-ctl: Reorder everything into logical order; put main() first,
              and put every subsequent definition as soon as possible
              after its first use, except superclasses which need to
              be placed before the classes inheriting from them.
              Reorder all tests to match.

Show diffs side-by-side

added added

removed removed

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