/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-05 19:14:51 UTC
  • Revision ID: teddy@recompile.se-20190305191451-jikzc84nv6h53l5u
mandos-ctl: Refactor

* mandos-ctl (commands_and_clients_from_options): Rename to
                         "commands_from_options"; all clients changed.
  (main): Get "clientnames" directly from "options.client", and move
          invocation of commands_from_options() to after "clients" is
          available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
 
62
62
locale.setlocale(locale.LC_ALL, "")
63
63
 
64
 
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
65
64
domain = "se.recompile"
66
65
busname = domain + ".Mandos"
67
66
server_path = "/"
216
215
 
217
216
 
218
217
def string_to_delta(interval):
219
 
    """Parse a string and return a datetime.timedelta
220
 
    """
 
218
    """Parse a string and return a datetime.timedelta"""
221
219
 
222
220
    try:
223
221
        return rfc3339_duration_to_delta(interval)
228
226
 
229
227
 
230
228
def parse_pre_1_6_1_interval(interval):
231
 
    """Parse an interval string as documented by Mandos before 1.6.1, and
232
 
    return a datetime.timedelta
 
229
    """Parse an interval string as documented by Mandos before 1.6.1,
 
230
    and return a datetime.timedelta
 
231
 
233
232
    >>> parse_pre_1_6_1_interval('7d')
234
233
    datetime.timedelta(7)
235
234
    >>> parse_pre_1_6_1_interval('60s')
269
268
    return value
270
269
 
271
270
 
272
 
class TableOfClients(object):
273
 
    tablewords = {
274
 
        "Name": "Name",
275
 
        "Enabled": "Enabled",
276
 
        "Timeout": "Timeout",
277
 
        "LastCheckedOK": "Last Successful Check",
278
 
        "LastApprovalRequest": "Last Approval Request",
279
 
        "Created": "Created",
280
 
        "Interval": "Interval",
281
 
        "Host": "Host",
282
 
        "Fingerprint": "Fingerprint",
283
 
        "KeyID": "Key ID",
284
 
        "CheckerRunning": "Check Is Running",
285
 
        "LastEnabled": "Last Enabled",
286
 
        "ApprovalPending": "Approval Is Pending",
287
 
        "ApprovedByDefault": "Approved By Default",
288
 
        "ApprovalDelay": "Approval Delay",
289
 
        "ApprovalDuration": "Approval Duration",
290
 
        "Checker": "Checker",
291
 
        "ExtendedTimeout": "Extended Timeout",
292
 
        "Expires": "Expires",
293
 
        "LastCheckerStatus": "Last Checker Status",
294
 
    }
295
 
 
296
 
    def __init__(self, clients, keywords, tablewords=None):
297
 
        self.clients = clients
298
 
        self.keywords = keywords
299
 
        if tablewords is not None:
300
 
            self.tablewords = tablewords
301
 
 
302
 
    def __str__(self):
303
 
        return "\n".join(self.rows())
304
 
 
305
 
    if sys.version_info.major == 2:
306
 
        __unicode__ = __str__
 
271
## Classes for commands.
 
272
 
 
273
# Abstract classes first
 
274
class Command(object):
 
275
    """Abstract class for commands"""
 
276
    def run(self, mandos, clients):
 
277
        """Normal commands should implement run_on_one_client(), but
 
278
        commands which want to operate on all clients at the same time
 
279
        can override this run() method instead."""
 
280
        self.mandos = mandos
 
281
        for client, properties in clients.items():
 
282
            self.run_on_one_client(client, properties)
 
283
 
 
284
class PrintCmd(Command):
 
285
    """Abstract class for commands printing client details"""
 
286
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
287
                    "Created", "Interval", "Host", "KeyID",
 
288
                    "Fingerprint", "CheckerRunning", "LastEnabled",
 
289
                    "ApprovalPending", "ApprovedByDefault",
 
290
                    "LastApprovalRequest", "ApprovalDelay",
 
291
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
 
292
                    "Expires", "LastCheckerStatus")
 
293
    def run(self, mandos, clients):
 
294
        print(self.output(clients))
 
295
 
 
296
class PropertyCmd(Command):
 
297
    """Abstract class for Actions for setting one client property"""
 
298
    def run_on_one_client(self, client, properties):
 
299
        """Set the Client's D-Bus property"""
 
300
        client.Set(client_interface, self.property, self.value_to_set,
 
301
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
302
 
 
303
class ValueArgumentMixIn(object):
 
304
    """Mixin class for commands taking a value as argument"""
 
305
    def __init__(self, value):
 
306
        self.value_to_set = value
 
307
 
 
308
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
 
309
    """Mixin class for commands taking a value argument as
 
310
    milliseconds."""
 
311
    @property
 
312
    def value_to_set(self):
 
313
        return self._vts
 
314
    @value_to_set.setter
 
315
    def value_to_set(self, value):
 
316
        """When setting, convert value to a datetime.timedelta"""
 
317
        self._vts = string_to_delta(value).total_seconds() * 1000
 
318
 
 
319
# Actual (non-abstract) command classes
 
320
 
 
321
class PrintTableCmd(PrintCmd):
 
322
    def __init__(self, verbose=False):
 
323
        self.verbose = verbose
 
324
 
 
325
    def output(self, clients):
 
326
        if self.verbose:
 
327
            keywords = self.all_keywords
 
328
        else:
 
329
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
 
330
        return str(self.TableOfClients(clients.values(), keywords))
 
331
 
 
332
    class TableOfClients(object):
 
333
        tableheaders = {
 
334
            "Name": "Name",
 
335
            "Enabled": "Enabled",
 
336
            "Timeout": "Timeout",
 
337
            "LastCheckedOK": "Last Successful Check",
 
338
            "LastApprovalRequest": "Last Approval Request",
 
339
            "Created": "Created",
 
340
            "Interval": "Interval",
 
341
            "Host": "Host",
 
342
            "Fingerprint": "Fingerprint",
 
343
            "KeyID": "Key ID",
 
344
            "CheckerRunning": "Check Is Running",
 
345
            "LastEnabled": "Last Enabled",
 
346
            "ApprovalPending": "Approval Is Pending",
 
347
            "ApprovedByDefault": "Approved By Default",
 
348
            "ApprovalDelay": "Approval Delay",
 
349
            "ApprovalDuration": "Approval Duration",
 
350
            "Checker": "Checker",
 
351
            "ExtendedTimeout": "Extended Timeout",
 
352
            "Expires": "Expires",
 
353
            "LastCheckerStatus": "Last Checker Status",
 
354
        }
 
355
 
 
356
        def __init__(self, clients, keywords, tableheaders=None):
 
357
            self.clients = clients
 
358
            self.keywords = keywords
 
359
            if tableheaders is not None:
 
360
                self.tableheaders = tableheaders
 
361
 
307
362
        def __str__(self):
308
 
            return str(self).encode(locale.getpreferredencoding())
309
 
 
310
 
    def rows(self):
311
 
        format_string = self.row_formatting_string()
312
 
        rows = [self.header_line(format_string)]
313
 
        rows.extend(self.client_line(client, format_string)
314
 
                    for client in self.clients)
315
 
        return rows
316
 
 
317
 
    def row_formatting_string(self):
318
 
        "Format string used to format table rows"
319
 
        return " ".join("{{{key}:{width}}}".format(
320
 
            width=max(len(self.tablewords[key]),
321
 
                      max(len(self.string_from_client(client, key))
322
 
                          for client in self.clients)),
323
 
            key=key)
324
 
                                 for key in self.keywords)
325
 
 
326
 
    def string_from_client(self, client, key):
327
 
        return self.valuetostring(client[key], key)
328
 
 
 
363
            return "\n".join(self.rows())
 
364
 
 
365
        if sys.version_info.major == 2:
 
366
            __unicode__ = __str__
 
367
            def __str__(self):
 
368
                return str(self).encode(locale.getpreferredencoding())
 
369
 
 
370
        def rows(self):
 
371
            format_string = self.row_formatting_string()
 
372
            rows = [self.header_line(format_string)]
 
373
            rows.extend(self.client_line(client, format_string)
 
374
                        for client in self.clients)
 
375
            return rows
 
376
 
 
377
        def row_formatting_string(self):
 
378
            "Format string used to format table rows"
 
379
            return " ".join("{{{key}:{width}}}".format(
 
380
                width=max(len(self.tableheaders[key]),
 
381
                          *(len(self.string_from_client(client, key))
 
382
                            for client in self.clients)),
 
383
                key=key)
 
384
                            for key in self.keywords)
 
385
 
 
386
        def string_from_client(self, client, key):
 
387
            return self.valuetostring(client[key], key)
 
388
 
 
389
        @staticmethod
 
390
        def valuetostring(value, keyword):
 
391
            if isinstance(value, dbus.Boolean):
 
392
                return "Yes" if value else "No"
 
393
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
 
394
                           "ApprovalDuration", "ExtendedTimeout"):
 
395
                return milliseconds_to_string(value)
 
396
            return str(value)
 
397
 
 
398
        def header_line(self, format_string):
 
399
            return format_string.format(**self.tableheaders)
 
400
 
 
401
        def client_line(self, client, format_string):
 
402
            return format_string.format(
 
403
                **{key: self.string_from_client(client, key)
 
404
                   for key in self.keywords})
 
405
 
 
406
 
 
407
 
 
408
class DumpJSONCmd(PrintCmd):
 
409
    def output(self, clients):
 
410
        data = {client["Name"]:
 
411
                {key: self.dbus_boolean_to_bool(client[key])
 
412
                 for key in self.all_keywords}
 
413
                for client in clients.values()}
 
414
        return json.dumps(data, indent=4, separators=(',', ': '))
329
415
    @staticmethod
330
 
    def valuetostring(value, keyword):
 
416
    def dbus_boolean_to_bool(value):
331
417
        if isinstance(value, dbus.Boolean):
332
 
            return "Yes" if value else "No"
333
 
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
334
 
                       "ApprovalDuration", "ExtendedTimeout"):
335
 
            return milliseconds_to_string(value)
336
 
        return str(value)
337
 
 
338
 
    def header_line(self, format_string):
339
 
        return format_string.format(**self.tablewords)
340
 
 
341
 
    def client_line(self, client, format_string):
342
 
        return format_string.format(
343
 
            **{key: self.string_from_client(client, key)
344
 
               for key in self.keywords})
345
 
 
 
418
            value = bool(value)
 
419
        return value
 
420
 
 
421
class IsEnabledCmd(Command):
 
422
    def run_on_one_client(self, client, properties):
 
423
        if self.is_enabled(client, properties):
 
424
            sys.exit(0)
 
425
        sys.exit(1)
 
426
    def is_enabled(self, client, properties):
 
427
        return bool(properties["Enabled"])
 
428
 
 
429
class RemoveCmd(Command):
 
430
    def run_on_one_client(self, client, properties):
 
431
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
432
 
 
433
class ApproveCmd(Command):
 
434
    def run_on_one_client(self, client, properties):
 
435
        client.Approve(dbus.Boolean(True),
 
436
                       dbus_interface=client_interface)
 
437
 
 
438
class DenyCmd(Command):
 
439
    def run_on_one_client(self, client, properties):
 
440
        client.Approve(dbus.Boolean(False),
 
441
                       dbus_interface=client_interface)
 
442
 
 
443
class EnableCmd(PropertyCmd):
 
444
    property = "Enabled"
 
445
    value_to_set = dbus.Boolean(True)
 
446
 
 
447
class DisableCmd(PropertyCmd):
 
448
    property = "Enabled"
 
449
    value_to_set = dbus.Boolean(False)
 
450
 
 
451
class BumpTimeoutCmd(PropertyCmd):
 
452
    property = "LastCheckedOK"
 
453
    value_to_set = ""
 
454
 
 
455
class StartCheckerCmd(PropertyCmd):
 
456
    property = "CheckerRunning"
 
457
    value_to_set = dbus.Boolean(True)
 
458
 
 
459
class StopCheckerCmd(PropertyCmd):
 
460
    property = "CheckerRunning"
 
461
    value_to_set = dbus.Boolean(False)
 
462
 
 
463
class ApproveByDefaultCmd(PropertyCmd):
 
464
    property = "ApprovedByDefault"
 
465
    value_to_set = dbus.Boolean(True)
 
466
 
 
467
class DenyByDefaultCmd(PropertyCmd):
 
468
    property = "ApprovedByDefault"
 
469
    value_to_set = dbus.Boolean(False)
 
470
 
 
471
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
 
472
    property = "Checker"
 
473
 
 
474
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
 
475
    property = "Host"
 
476
 
 
477
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
 
478
    property = "Secret"
 
479
 
 
480
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
481
    property = "Timeout"
 
482
 
 
483
class SetExtendedTimeoutCmd(PropertyCmd,
 
484
                            MillisecondsValueArgumentMixIn):
 
485
    property = "ExtendedTimeout"
 
486
 
 
487
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
488
    property = "Interval"
 
489
 
 
490
class SetApprovalDelayCmd(PropertyCmd,
 
491
                          MillisecondsValueArgumentMixIn):
 
492
    property = "ApprovalDelay"
 
493
 
 
494
class SetApprovalDurationCmd(PropertyCmd,
 
495
                             MillisecondsValueArgumentMixIn):
 
496
    property = "ApprovalDuration"
346
497
 
347
498
def has_actions(options):
348
499
    return any((options.enable,
364
515
                options.approve,
365
516
                options.deny))
366
517
 
367
 
 
368
 
def main():
369
 
    parser = argparse.ArgumentParser()
 
518
def add_command_line_options(parser):
370
519
    parser.add_argument("--version", action="version",
371
520
                        version="%(prog)s {}".format(version),
372
521
                        help="show version number and exit")
376
525
                        help="Print all fields")
377
526
    parser.add_argument("-j", "--dump-json", action="store_true",
378
527
                        help="Dump client data in JSON format")
379
 
    parser.add_argument("-e", "--enable", action="store_true",
380
 
                        help="Enable client")
381
 
    parser.add_argument("-d", "--disable", action="store_true",
382
 
                        help="disable client")
 
528
    enable_disable = parser.add_mutually_exclusive_group()
 
529
    enable_disable.add_argument("-e", "--enable", action="store_true",
 
530
                                help="Enable client")
 
531
    enable_disable.add_argument("-d", "--disable",
 
532
                                action="store_true",
 
533
                                help="disable client")
383
534
    parser.add_argument("-b", "--bump-timeout", action="store_true",
384
535
                        help="Bump timeout for client")
385
 
    parser.add_argument("--start-checker", action="store_true",
386
 
                        help="Start checker for client")
387
 
    parser.add_argument("--stop-checker", action="store_true",
388
 
                        help="Stop checker for client")
 
536
    start_stop_checker = parser.add_mutually_exclusive_group()
 
537
    start_stop_checker.add_argument("--start-checker",
 
538
                                    action="store_true",
 
539
                                    help="Start checker for client")
 
540
    start_stop_checker.add_argument("--stop-checker",
 
541
                                    action="store_true",
 
542
                                    help="Stop checker for client")
389
543
    parser.add_argument("-V", "--is-enabled", action="store_true",
390
544
                        help="Check if client is enabled")
391
545
    parser.add_argument("-r", "--remove", action="store_true",
398
552
                        help="Set extended timeout for client")
399
553
    parser.add_argument("-i", "--interval",
400
554
                        help="Set checker interval for client")
401
 
    parser.add_argument("--approve-by-default", action="store_true",
402
 
                        default=None, dest="approved_by_default",
403
 
                        help="Set client to be approved by default")
404
 
    parser.add_argument("--deny-by-default", action="store_false",
405
 
                        dest="approved_by_default",
406
 
                        help="Set client to be denied by default")
 
555
    approve_deny_default = parser.add_mutually_exclusive_group()
 
556
    approve_deny_default.add_argument(
 
557
        "--approve-by-default", action="store_true",
 
558
        default=None, dest="approved_by_default",
 
559
        help="Set client to be approved by default")
 
560
    approve_deny_default.add_argument(
 
561
        "--deny-by-default", action="store_false",
 
562
        dest="approved_by_default",
 
563
        help="Set client to be denied by default")
407
564
    parser.add_argument("--approval-delay",
408
565
                        help="Set delay before client approve/deny")
409
566
    parser.add_argument("--approval-duration",
412
569
    parser.add_argument("-s", "--secret",
413
570
                        type=argparse.FileType(mode="rb"),
414
571
                        help="Set password blob (file) for client")
415
 
    parser.add_argument("-A", "--approve", action="store_true",
416
 
                        help="Approve any current client request")
417
 
    parser.add_argument("-D", "--deny", action="store_true",
418
 
                        help="Deny any current client request")
 
572
    approve_deny = parser.add_mutually_exclusive_group()
 
573
    approve_deny.add_argument(
 
574
        "-A", "--approve", action="store_true",
 
575
        help="Approve any current client request")
 
576
    approve_deny.add_argument("-D", "--deny", action="store_true",
 
577
                              help="Deny any current client request")
419
578
    parser.add_argument("--check", action="store_true",
420
579
                        help="Run self-test")
421
580
    parser.add_argument("client", nargs="*", help="Client name")
 
581
 
 
582
 
 
583
def commands_from_options(options):
 
584
 
 
585
    commands = []
 
586
 
 
587
    if options.dump_json:
 
588
        commands.append(DumpJSONCmd())
 
589
 
 
590
    if options.enable:
 
591
        commands.append(EnableCmd())
 
592
 
 
593
    if options.disable:
 
594
        commands.append(DisableCmd())
 
595
 
 
596
    if options.bump_timeout:
 
597
        commands.append(BumpTimeoutCmd())
 
598
 
 
599
    if options.start_checker:
 
600
        commands.append(StartCheckerCmd())
 
601
 
 
602
    if options.stop_checker:
 
603
        commands.append(StopCheckerCmd())
 
604
 
 
605
    if options.is_enabled:
 
606
        commands.append(IsEnabledCmd())
 
607
 
 
608
    if options.remove:
 
609
        commands.append(RemoveCmd())
 
610
 
 
611
    if options.checker is not None:
 
612
        commands.append(SetCheckerCmd())
 
613
 
 
614
    if options.timeout is not None:
 
615
        commands.append(SetTimeoutCmd(options.timeout))
 
616
 
 
617
    if options.extended_timeout:
 
618
        commands.append(
 
619
            SetExtendedTimeoutCmd(options.extended_timeout))
 
620
 
 
621
    if options.interval is not None:
 
622
        command.append(SetIntervalCmd(options.interval))
 
623
 
 
624
    if options.approved_by_default is not None:
 
625
        if options.approved_by_default:
 
626
            command.append(ApproveByDefaultCmd())
 
627
        else:
 
628
            command.append(DenyByDefaultCmd())
 
629
 
 
630
    if options.approval_delay is not None:
 
631
        command.append(SetApprovalDelayCmd(options.approval_delay))
 
632
 
 
633
    if options.approval_duration is not None:
 
634
        command.append(
 
635
            SetApprovalDurationCmd(options.approval_duration))
 
636
 
 
637
    if options.host is not None:
 
638
        command.append(SetHostCmd(options.host))
 
639
 
 
640
    if options.secret is not None:
 
641
        command.append(SetSecretCmd(options.secret))
 
642
 
 
643
    if options.approve:
 
644
        commands.append(ApproveCmd())
 
645
 
 
646
    if options.deny:
 
647
        commands.append(DenyCmd())
 
648
 
 
649
    # If no command option has been given, show table of clients,
 
650
    # optionally verbosely
 
651
    if not commands:
 
652
        commands.append(PrintTableCmd(verbose=options.verbose))
 
653
 
 
654
    return commands
 
655
 
 
656
 
 
657
def main():
 
658
    parser = argparse.ArgumentParser()
 
659
 
 
660
    add_command_line_options(parser)
 
661
 
422
662
    options = parser.parse_args()
423
663
 
424
664
    if has_actions(options) and not (options.client or options.all):
430
670
        parser.error("--dump-json can only be used alone.")
431
671
    if options.all and not has_actions(options):
432
672
        parser.error("--all requires an action.")
 
673
    if options.is_enabled and len(options.client) > 1:
 
674
        parser.error("--is-enabled requires exactly one client")
 
675
 
 
676
    clientnames = options.client
433
677
 
434
678
    try:
435
679
        bus = dbus.SystemBus()
443
687
    mandos_serv_object_manager = dbus.Interface(
444
688
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
445
689
 
446
 
    # block stderr since dbus library prints to stderr
447
 
    null = os.open(os.path.devnull, os.O_RDWR)
448
 
    stderrcopy = os.dup(sys.stderr.fileno())
449
 
    os.dup2(null, sys.stderr.fileno())
450
 
    os.close(null)
 
690
    # Filter out log message from dbus module
 
691
    dbus_logger = logging.getLogger("dbus.proxies")
 
692
    class NullFilter(logging.Filter):
 
693
        def filter(self, record):
 
694
            return False
 
695
    dbus_filter = NullFilter()
451
696
    try:
452
 
        try:
453
 
            mandos_clients = {path: ifs_and_props[client_interface]
454
 
                              for path, ifs_and_props in
455
 
                              mandos_serv_object_manager
456
 
                              .GetManagedObjects().items()
457
 
                              if client_interface in ifs_and_props}
458
 
        finally:
459
 
            # restore stderr
460
 
            os.dup2(stderrcopy, sys.stderr.fileno())
461
 
            os.close(stderrcopy)
 
697
        dbus_logger.addFilter(dbus_filter)
 
698
        mandos_clients = {path: ifs_and_props[client_interface]
 
699
                          for path, ifs_and_props in
 
700
                          mandos_serv_object_manager
 
701
                          .GetManagedObjects().items()
 
702
                          if client_interface in ifs_and_props}
462
703
    except dbus.exceptions.DBusException as e:
463
704
        log.critical("Failed to access Mandos server through D-Bus:"
464
705
                     "\n%s", e)
465
706
        sys.exit(1)
 
707
    finally:
 
708
        # restore dbus logger
 
709
        dbus_logger.removeFilter(dbus_filter)
466
710
 
467
711
    # Compile dict of (clients: properties) to process
468
712
    clients = {}
469
713
 
470
 
    if options.all or not options.client:
 
714
    if not clientnames:
471
715
        clients = {bus.get_object(busname, path): properties
472
716
                   for path, properties in mandos_clients.items()}
473
717
    else:
474
 
        for name in options.client:
 
718
        for name in clientnames:
475
719
            for path, client in mandos_clients.items():
476
720
                if client["Name"] == name:
477
721
                    client_objc = bus.get_object(busname, path)
481
725
                log.critical("Client not found on server: %r", name)
482
726
                sys.exit(1)
483
727
 
484
 
    if not has_actions(options) and clients:
485
 
        if options.verbose or options.dump_json:
486
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
487
 
                        "Created", "Interval", "Host", "KeyID",
488
 
                        "Fingerprint", "CheckerRunning",
489
 
                        "LastEnabled", "ApprovalPending",
490
 
                        "ApprovedByDefault", "LastApprovalRequest",
491
 
                        "ApprovalDelay", "ApprovalDuration",
492
 
                        "Checker", "ExtendedTimeout", "Expires",
493
 
                        "LastCheckerStatus")
494
 
        else:
495
 
            keywords = defaultkeywords
496
 
 
497
 
        if options.dump_json:
498
 
            json.dump({client["Name"]: {key:
499
 
                                        bool(client[key])
500
 
                                        if isinstance(client[key],
501
 
                                                      dbus.Boolean)
502
 
                                        else client[key]
503
 
                                        for key in keywords}
504
 
                       for client in clients.values()},
505
 
                      fp=sys.stdout, indent=4,
506
 
                      separators=(',', ': '))
507
 
            print()
508
 
        else:
509
 
            print(TableOfClients(clients.values(), keywords))
510
 
    else:
511
 
        # Process each client in the list by all selected options
512
 
        for client in clients:
513
 
 
514
 
            def set_client_prop(prop, value):
515
 
                """Set a Client D-Bus property"""
516
 
                client.Set(client_interface, prop, value,
517
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
518
 
 
519
 
            def set_client_prop_ms(prop, value):
520
 
                """Set a Client D-Bus property, converted
521
 
                from a string to milliseconds."""
522
 
                set_client_prop(prop,
523
 
                                string_to_delta(value).total_seconds()
524
 
                                * 1000)
525
 
 
526
 
            if options.remove:
527
 
                mandos_serv.RemoveClient(client.__dbus_object_path__)
528
 
            if options.enable:
529
 
                set_client_prop("Enabled", dbus.Boolean(True))
530
 
            if options.disable:
531
 
                set_client_prop("Enabled", dbus.Boolean(False))
532
 
            if options.bump_timeout:
533
 
                set_client_prop("LastCheckedOK", "")
534
 
            if options.start_checker:
535
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
536
 
            if options.stop_checker:
537
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
538
 
            if options.is_enabled:
539
 
                if client.Get(client_interface, "Enabled",
540
 
                              dbus_interface=dbus.PROPERTIES_IFACE):
541
 
                    sys.exit(0)
542
 
                else:
543
 
                    sys.exit(1)
544
 
            if options.checker is not None:
545
 
                set_client_prop("Checker", options.checker)
546
 
            if options.host is not None:
547
 
                set_client_prop("Host", options.host)
548
 
            if options.interval is not None:
549
 
                set_client_prop_ms("Interval", options.interval)
550
 
            if options.approval_delay is not None:
551
 
                set_client_prop_ms("ApprovalDelay",
552
 
                                   options.approval_delay)
553
 
            if options.approval_duration is not None:
554
 
                set_client_prop_ms("ApprovalDuration",
555
 
                                   options.approval_duration)
556
 
            if options.timeout is not None:
557
 
                set_client_prop_ms("Timeout", options.timeout)
558
 
            if options.extended_timeout is not None:
559
 
                set_client_prop_ms("ExtendedTimeout",
560
 
                                   options.extended_timeout)
561
 
            if options.secret is not None:
562
 
                set_client_prop("Secret",
563
 
                                dbus.ByteArray(options.secret.read()))
564
 
            if options.approved_by_default is not None:
565
 
                set_client_prop("ApprovedByDefault",
566
 
                                dbus.Boolean(options
567
 
                                             .approved_by_default))
568
 
            if options.approve:
569
 
                client.Approve(dbus.Boolean(True),
570
 
                               dbus_interface=client_interface)
571
 
            elif options.deny:
572
 
                client.Approve(dbus.Boolean(False),
573
 
                               dbus_interface=client_interface)
 
728
    # Run all commands on clients
 
729
    commands = commands_from_options(options)
 
730
    for command in commands:
 
731
        command.run(mandos_serv, clients)
574
732
 
575
733
 
576
734
class Test_milliseconds_to_string(unittest.TestCase):
596
754
            with self.assertLogs(log, logging.WARNING):
597
755
                value = string_to_delta("2h")
598
756
        else:
599
 
            value = string_to_delta("2h")
 
757
            class WarningFilter(logging.Filter):
 
758
                """Don't show, but record the presence of, warnings"""
 
759
                def filter(self, record):
 
760
                    is_warning = record.levelno >= logging.WARNING
 
761
                    self.found = is_warning or getattr(self, "found",
 
762
                                                       False)
 
763
                    return not is_warning
 
764
            warning_filter = WarningFilter()
 
765
            log.addFilter(warning_filter)
 
766
            try:
 
767
                value = string_to_delta("2h")
 
768
            finally:
 
769
                log.removeFilter(warning_filter)
 
770
            self.assertTrue(getattr(warning_filter, "found", False))
600
771
        self.assertEqual(value, datetime.timedelta(0, 7200))
601
772
 
602
 
class Test_TableOfClients(unittest.TestCase):
603
 
    def setUp(self):
604
 
        self.tablewords = {
605
 
            "Attr1": "X",
606
 
            "AttrTwo": "Yy",
607
 
            "AttrThree": "Zzz",
608
 
            "Bool": "A D-BUS Boolean",
609
 
            "NonDbusBoolean": "A Non-D-BUS Boolean",
610
 
            "Integer": "An Integer",
611
 
            "Timeout": "Timedelta 1",
612
 
            "Interval": "Timedelta 2",
613
 
            "ApprovalDelay": "Timedelta 3",
614
 
            "ApprovalDuration": "Timedelta 4",
615
 
            "ExtendedTimeout": "Timedelta 5",
616
 
            "String": "A String",
 
773
 
 
774
class TestCmd(unittest.TestCase):
 
775
    """Abstract class for tests of command classes"""
 
776
    def setUp(self):
 
777
        testcase = self
 
778
        class MockClient(object):
 
779
            def __init__(self, name, **attributes):
 
780
                self.__dbus_object_path__ = "objpath_{}".format(name)
 
781
                self.attributes = attributes
 
782
                self.attributes["Name"] = name
 
783
                self.calls = []
 
784
            def Set(self, interface, property, value, dbus_interface):
 
785
                testcase.assertEqual(interface, client_interface)
 
786
                testcase.assertEqual(dbus_interface,
 
787
                                     dbus.PROPERTIES_IFACE)
 
788
                self.attributes[property] = value
 
789
                self.calls.append(("Set", (interface, property, value,
 
790
                                           dbus_interface)))
 
791
            def Get(self, interface, property, dbus_interface):
 
792
                testcase.assertEqual(interface, client_interface)
 
793
                testcase.assertEqual(dbus_interface,
 
794
                                     dbus.PROPERTIES_IFACE)
 
795
                self.calls.append(("Get", (interface, property,
 
796
                                           dbus_interface)))
 
797
                return self.attributes[property]
 
798
            def Approve(self, approve, dbus_interface):
 
799
                testcase.assertEqual(dbus_interface, client_interface)
 
800
                self.calls.append(("Approve", (approve,
 
801
                                               dbus_interface)))
 
802
        self.client = MockClient(
 
803
            "foo",
 
804
            KeyID=("92ed150794387c03ce684574b1139a65"
 
805
                   "94a34f895daaaf09fd8ea90a27cddb12"),
 
806
            Secret=b"secret",
 
807
            Host="foo.example.org",
 
808
            Enabled=dbus.Boolean(True),
 
809
            Timeout=300000,
 
810
            LastCheckedOK="2019-02-03T00:00:00",
 
811
            Created="2019-01-02T00:00:00",
 
812
            Interval=120000,
 
813
            Fingerprint=("778827225BA7DE539C5A"
 
814
                         "7CFA59CFF7CDBD9A5920"),
 
815
            CheckerRunning=dbus.Boolean(False),
 
816
            LastEnabled="2019-01-03T00:00:00",
 
817
            ApprovalPending=dbus.Boolean(False),
 
818
            ApprovedByDefault=dbus.Boolean(True),
 
819
            LastApprovalRequest="",
 
820
            ApprovalDelay=0,
 
821
            ApprovalDuration=1000,
 
822
            Checker="fping -q -- %(host)s",
 
823
            ExtendedTimeout=900000,
 
824
            Expires="2019-02-04T00:00:00",
 
825
            LastCheckerStatus=0)
 
826
        self.other_client = MockClient(
 
827
            "barbar",
 
828
            KeyID=("0558568eedd67d622f5c83b35a115f79"
 
829
                   "6ab612cff5ad227247e46c2b020f441c"),
 
830
            Secret=b"secretbar",
 
831
            Host="192.0.2.3",
 
832
            Enabled=dbus.Boolean(True),
 
833
            Timeout=300000,
 
834
            LastCheckedOK="2019-02-04T00:00:00",
 
835
            Created="2019-01-03T00:00:00",
 
836
            Interval=120000,
 
837
            Fingerprint=("3E393AEAEFB84C7E89E2"
 
838
                         "F547B3A107558FCA3A27"),
 
839
            CheckerRunning=dbus.Boolean(True),
 
840
            LastEnabled="2019-01-04T00:00:00",
 
841
            ApprovalPending=dbus.Boolean(False),
 
842
            ApprovedByDefault=dbus.Boolean(False),
 
843
            LastApprovalRequest="2019-01-03T00:00:00",
 
844
            ApprovalDelay=30000,
 
845
            ApprovalDuration=1000,
 
846
            Checker=":",
 
847
            ExtendedTimeout=900000,
 
848
            Expires="2019-02-05T00:00:00",
 
849
            LastCheckerStatus=-2)
 
850
        self.clients =  collections.OrderedDict(
 
851
            [
 
852
                (self.client, self.client.attributes),
 
853
                (self.other_client, self.other_client.attributes),
 
854
            ])
 
855
        self.one_client = {self.client: self.client.attributes}
 
856
 
 
857
class TestPrintTableCmd(TestCmd):
 
858
    def test_normal(self):
 
859
        output = PrintTableCmd().output(self.clients)
 
860
        expected_output = """
 
861
Name   Enabled Timeout  Last Successful Check
 
862
foo    Yes     00:05:00 2019-02-03T00:00:00  
 
863
barbar Yes     00:05:00 2019-02-04T00:00:00  
 
864
"""[1:-1]
 
865
        self.assertEqual(output, expected_output)
 
866
    def test_verbose(self):
 
867
        output = PrintTableCmd(verbose=True).output(self.clients)
 
868
        expected_output = """
 
869
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
 
870
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                  
 
871
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                 
 
872
"""[1:-1]
 
873
        self.assertEqual(output, expected_output)
 
874
    def test_one_client(self):
 
875
        output = PrintTableCmd().output(self.one_client)
 
876
        expected_output = """
 
877
Name Enabled Timeout  Last Successful Check
 
878
foo  Yes     00:05:00 2019-02-03T00:00:00  
 
879
"""[1:-1]
 
880
        self.assertEqual(output, expected_output)
 
881
 
 
882
class TestDumpJSONCmd(TestCmd):
 
883
    def setUp(self):
 
884
        self.expected_json = {
 
885
            "foo": {
 
886
                "Name": "foo",
 
887
                "KeyID": ("92ed150794387c03ce684574b1139a65"
 
888
                          "94a34f895daaaf09fd8ea90a27cddb12"),
 
889
                "Host": "foo.example.org",
 
890
                "Enabled": True,
 
891
                "Timeout": 300000,
 
892
                "LastCheckedOK": "2019-02-03T00:00:00",
 
893
                "Created": "2019-01-02T00:00:00",
 
894
                "Interval": 120000,
 
895
                "Fingerprint": ("778827225BA7DE539C5A"
 
896
                                "7CFA59CFF7CDBD9A5920"),
 
897
                "CheckerRunning": False,
 
898
                "LastEnabled": "2019-01-03T00:00:00",
 
899
                "ApprovalPending": False,
 
900
                "ApprovedByDefault": True,
 
901
                "LastApprovalRequest": "",
 
902
                "ApprovalDelay": 0,
 
903
                "ApprovalDuration": 1000,
 
904
                "Checker": "fping -q -- %(host)s",
 
905
                "ExtendedTimeout": 900000,
 
906
                "Expires": "2019-02-04T00:00:00",
 
907
                "LastCheckerStatus": 0,
 
908
            },
 
909
            "barbar": {
 
910
                "Name": "barbar",
 
911
                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
 
912
                          "6ab612cff5ad227247e46c2b020f441c"),
 
913
                "Host": "192.0.2.3",
 
914
                "Enabled": True,
 
915
                "Timeout": 300000,
 
916
                "LastCheckedOK": "2019-02-04T00:00:00",
 
917
                "Created": "2019-01-03T00:00:00",
 
918
                "Interval": 120000,
 
919
                "Fingerprint": ("3E393AEAEFB84C7E89E2"
 
920
                                "F547B3A107558FCA3A27"),
 
921
                "CheckerRunning": True,
 
922
                "LastEnabled": "2019-01-04T00:00:00",
 
923
                "ApprovalPending": False,
 
924
                "ApprovedByDefault": False,
 
925
                "LastApprovalRequest": "2019-01-03T00:00:00",
 
926
                "ApprovalDelay": 30000,
 
927
                "ApprovalDuration": 1000,
 
928
                "Checker": ":",
 
929
                "ExtendedTimeout": 900000,
 
930
                "Expires": "2019-02-05T00:00:00",
 
931
                "LastCheckerStatus": -2,
 
932
            },
617
933
        }
618
 
        self.keywords = ["Attr1", "AttrTwo"]
619
 
        self.clients = [
620
 
            {
621
 
                "Attr1": "x1",
622
 
                "AttrTwo": "y1",
623
 
                "AttrThree": "z1",
624
 
                "Bool": dbus.Boolean(False),
625
 
                "NonDbusBoolean": False,
626
 
                "Integer": 0,
627
 
                "Timeout": 0,
628
 
                "Interval": 1000,
629
 
                "ApprovalDelay": 2000,
630
 
                "ApprovalDuration": 3000,
631
 
                "ExtendedTimeout": 4000,
632
 
                "String": "",
633
 
            },
634
 
            {
635
 
                "Attr1": "x2",
636
 
                "AttrTwo": "y2",
637
 
                "AttrThree": "z2",
638
 
                "Bool": dbus.Boolean(True),
639
 
                "NonDbusBoolean": True,
640
 
                "Integer": 1,
641
 
                "Timeout": 93785000,
642
 
                "Interval": 93786000,
643
 
                "ApprovalDelay": 93787000,
644
 
                "ApprovalDuration": 93788000,
645
 
                "ExtendedTimeout": 93789000,
646
 
                "String": "A huge string which will not fit," * 10,
647
 
            },
648
 
        ]
649
 
    def test_short_header(self):
650
 
        rows = TableOfClients(self.clients, self.keywords,
651
 
                              self.tablewords).rows()
652
 
        expected_rows = [
653
 
            "X  Yy",
654
 
            "x1 y1",
655
 
            "x2 y2"]
656
 
        self.assertEqual(rows, expected_rows)
657
 
    def test_booleans(self):
658
 
        keywords = ["Bool", "NonDbusBoolean"]
659
 
        rows = TableOfClients(self.clients, keywords,
660
 
                              self.tablewords).rows()
661
 
        expected_rows = [
662
 
            "A D-BUS Boolean A Non-D-BUS Boolean",
663
 
            "No              False              ",
664
 
            "Yes             True               ",
665
 
        ]
666
 
        self.assertEqual(rows, expected_rows)
667
 
    def test_milliseconds_detection(self):
668
 
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
669
 
                    "ApprovalDuration", "ExtendedTimeout"]
670
 
        rows = TableOfClients(self.clients, keywords,
671
 
                              self.tablewords).rows()
672
 
        expected_rows = ("""
673
 
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
674
 
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
675
 
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
676
 
"""
677
 
        ).splitlines()[1:]
678
 
        self.assertEqual(rows, expected_rows)
679
 
    def test_empty_and_long_string_values(self):
680
 
        keywords = ["String"]
681
 
        rows = TableOfClients(self.clients, keywords,
682
 
                              self.tablewords).rows()
683
 
        expected_rows = ("""
684
 
A String                                                                                                                                                                                                                                                                                                                                  
685
 
                                                                                                                                                                                                                                                                                                                                          
686
 
A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,
687
 
"""
688
 
        ).splitlines()[1:]
689
 
        self.assertEqual(rows, expected_rows)
 
934
        return super(TestDumpJSONCmd, self).setUp()
 
935
    def test_normal(self):
 
936
        json_data = json.loads(DumpJSONCmd().output(self.clients))
 
937
        self.assertDictEqual(json_data, self.expected_json)
 
938
    def test_one_client(self):
 
939
        clients = self.one_client
 
940
        json_data = json.loads(DumpJSONCmd().output(clients))
 
941
        expected_json = {"foo": self.expected_json["foo"]}
 
942
        self.assertDictEqual(json_data, expected_json)
 
943
 
 
944
class TestIsEnabledCmd(TestCmd):
 
945
    def test_is_enabled(self):
 
946
        self.assertTrue(all(IsEnabledCmd().is_enabled(client, properties)
 
947
                            for client, properties in self.clients.items()))
 
948
    def test_is_enabled_run_exits_successfully(self):
 
949
        with self.assertRaises(SystemExit) as e:
 
950
            IsEnabledCmd().run(None, self.one_client)
 
951
        if e.exception.code is not None:
 
952
            self.assertEqual(e.exception.code, 0)
 
953
        else:
 
954
            self.assertIsNone(e.exception.code)
 
955
    def test_is_enabled_run_exits_with_failure(self):
 
956
        self.client.attributes["Enabled"] = dbus.Boolean(False)
 
957
        with self.assertRaises(SystemExit) as e:
 
958
            IsEnabledCmd().run(None, self.one_client)
 
959
        if isinstance(e.exception.code, int):
 
960
            self.assertNotEqual(e.exception.code, 0)
 
961
        else:
 
962
            self.assertIsNotNone(e.exception.code)
 
963
 
 
964
class TestRemoveCmd(TestCmd):
 
965
    def test_remove(self):
 
966
        class MockMandos(object):
 
967
            def __init__(self):
 
968
                self.calls = []
 
969
            def RemoveClient(self, dbus_path):
 
970
                self.calls.append(("RemoveClient", (dbus_path,)))
 
971
        mandos = MockMandos()
 
972
        super(TestRemoveCmd, self).setUp()
 
973
        RemoveCmd().run(mandos, self.clients)
 
974
        self.assertEqual(len(mandos.calls), 2)
 
975
        for client in self.clients:
 
976
            self.assertIn(("RemoveClient",
 
977
                           (client.__dbus_object_path__,)),
 
978
                          mandos.calls)
 
979
 
 
980
class TestApproveCmd(TestCmd):
 
981
    def test_approve(self):
 
982
        ApproveCmd().run(None, self.clients)
 
983
        for client in self.clients:
 
984
            self.assertIn(("Approve", (True, client_interface)),
 
985
                          client.calls)
 
986
 
 
987
class TestDenyCmd(TestCmd):
 
988
    def test_deny(self):
 
989
        DenyCmd().run(None, self.clients)
 
990
        for client in self.clients:
 
991
            self.assertIn(("Approve", (False, client_interface)),
 
992
                          client.calls)
 
993
 
 
994
class TestEnableCmd(TestCmd):
 
995
    def test_enable(self):
 
996
        for client in self.clients:
 
997
            client.attributes["Enabled"] = False
 
998
 
 
999
        EnableCmd().run(None, self.clients)
 
1000
 
 
1001
        for client in self.clients:
 
1002
            self.assertTrue(client.attributes["Enabled"])
 
1003
 
 
1004
class TestDisableCmd(TestCmd):
 
1005
    def test_disable(self):
 
1006
        DisableCmd().run(None, self.clients)
 
1007
 
 
1008
        for client in self.clients:
 
1009
            self.assertFalse(client.attributes["Enabled"])
690
1010
 
691
1011
 
692
1012