/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-03-03 18:11:39 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190303181139-f8r50k8bgirs3d5f
mandos-ctl: Add test for IsEnabledCmd class

* mandos-ctl (TestCmd.setUp.MockClient.Set,
              TestCmd.setUp.MockClient.Get): Fix bugs.
  (TestCmd.setUp.MockClient.__setitem__): New.
  (TestIsEnabledCmd): New.

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 in clients:
 
282
            self.run_on_one_client(client)
 
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):
 
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):
 
423
        if self.is_enabled(client):
 
424
            sys.exit(0)
 
425
        sys.exit(1)
 
426
    def is_enabled(self, client):
 
427
        return client.Get(client_interface, "Enabled",
 
428
                          dbus_interface=dbus.PROPERTIES_IFACE)
 
429
 
 
430
class RemoveCmd(Command):
 
431
    def run_on_one_client(self, client):
 
432
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
433
 
 
434
class ApproveCmd(Command):
 
435
    def run_on_one_client(self, client):
 
436
        client.Approve(dbus.Boolean(True),
 
437
                       dbus_interface=client_interface)
 
438
 
 
439
class DenyCmd(Command):
 
440
    def run_on_one_client(self, client):
 
441
        client.Approve(dbus.Boolean(False),
 
442
                       dbus_interface=client_interface)
 
443
 
 
444
class EnableCmd(PropertyCmd):
 
445
    property = "Enabled"
 
446
    value_to_set = dbus.Boolean(True)
 
447
 
 
448
class DisableCmd(PropertyCmd):
 
449
    property = "Enabled"
 
450
    value_to_set = dbus.Boolean(False)
 
451
 
 
452
class BumpTimeoutCmd(PropertyCmd):
 
453
    property = "LastCheckedOK"
 
454
    value_to_set = ""
 
455
 
 
456
class StartCheckerCmd(PropertyCmd):
 
457
    property = "CheckerRunning"
 
458
    value_to_set = dbus.Boolean(True)
 
459
 
 
460
class StopCheckerCmd(PropertyCmd):
 
461
    property = "CheckerRunning"
 
462
    value_to_set = dbus.Boolean(False)
 
463
 
 
464
class ApproveByDefaultCmd(PropertyCmd):
 
465
    property = "ApprovedByDefault"
 
466
    value_to_set = dbus.Boolean(True)
 
467
 
 
468
class DenyByDefaultCmd(PropertyCmd):
 
469
    property = "ApprovedByDefault"
 
470
    value_to_set = dbus.Boolean(False)
 
471
 
 
472
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
 
473
    property = "Checker"
 
474
 
 
475
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
 
476
    property = "Host"
 
477
 
 
478
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
 
479
    property = "Secret"
 
480
 
 
481
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
482
    property = "Timeout"
 
483
 
 
484
class SetExtendedTimeoutCmd(PropertyCmd,
 
485
                            MillisecondsValueArgumentMixIn):
 
486
    property = "ExtendedTimeout"
 
487
 
 
488
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
489
    property = "Interval"
 
490
 
 
491
class SetApprovalDelayCmd(PropertyCmd,
 
492
                          MillisecondsValueArgumentMixIn):
 
493
    property = "ApprovalDelay"
 
494
 
 
495
class SetApprovalDurationCmd(PropertyCmd,
 
496
                             MillisecondsValueArgumentMixIn):
 
497
    property = "ApprovalDuration"
346
498
 
347
499
def has_actions(options):
348
500
    return any((options.enable,
365
517
                options.deny))
366
518
 
367
519
 
368
 
def main():
 
520
def commands_and_clients_from_options(args=None):
 
521
    if args is None:
 
522
        args=sys.argv[1:]
369
523
    parser = argparse.ArgumentParser()
370
524
    parser.add_argument("--version", action="version",
371
525
                        version="%(prog)s {}".format(version),
376
530
                        help="Print all fields")
377
531
    parser.add_argument("-j", "--dump-json", action="store_true",
378
532
                        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")
 
533
    enable_disable = parser.add_mutually_exclusive_group()
 
534
    enable_disable.add_argument("-e", "--enable", action="store_true",
 
535
                                help="Enable client")
 
536
    enable_disable.add_argument("-d", "--disable",
 
537
                                action="store_true",
 
538
                                help="disable client")
383
539
    parser.add_argument("-b", "--bump-timeout", action="store_true",
384
540
                        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")
 
541
    start_stop_checker = parser.add_mutually_exclusive_group()
 
542
    start_stop_checker.add_argument("--start-checker",
 
543
                                    action="store_true",
 
544
                                    help="Start checker for client")
 
545
    start_stop_checker.add_argument("--stop-checker",
 
546
                                    action="store_true",
 
547
                                    help="Stop checker for client")
389
548
    parser.add_argument("-V", "--is-enabled", action="store_true",
390
549
                        help="Check if client is enabled")
391
550
    parser.add_argument("-r", "--remove", action="store_true",
398
557
                        help="Set extended timeout for client")
399
558
    parser.add_argument("-i", "--interval",
400
559
                        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")
 
560
    approve_deny_default = parser.add_mutually_exclusive_group()
 
561
    approve_deny_default.add_argument(
 
562
        "--approve-by-default", action="store_true",
 
563
        default=None, dest="approved_by_default",
 
564
        help="Set client to be approved by default")
 
565
    approve_deny_default.add_argument(
 
566
        "--deny-by-default", action="store_false",
 
567
        dest="approved_by_default",
 
568
        help="Set client to be denied by default")
407
569
    parser.add_argument("--approval-delay",
408
570
                        help="Set delay before client approve/deny")
409
571
    parser.add_argument("--approval-duration",
412
574
    parser.add_argument("-s", "--secret",
413
575
                        type=argparse.FileType(mode="rb"),
414
576
                        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")
 
577
    approve_deny = parser.add_mutually_exclusive_group()
 
578
    approve_deny.add_argument(
 
579
        "-A", "--approve", action="store_true",
 
580
        help="Approve any current client request")
 
581
    approve_deny.add_argument("-D", "--deny", action="store_true",
 
582
                              help="Deny any current client request")
419
583
    parser.add_argument("--check", action="store_true",
420
584
                        help="Run self-test")
421
585
    parser.add_argument("client", nargs="*", help="Client name")
422
 
    options = parser.parse_args()
 
586
    options = parser.parse_args(args=args)
423
587
 
424
588
    if has_actions(options) and not (options.client or options.all):
425
589
        parser.error("Options require clients names or --all.")
430
594
        parser.error("--dump-json can only be used alone.")
431
595
    if options.all and not has_actions(options):
432
596
        parser.error("--all requires an action.")
 
597
    if options.is_enabled and len(options.client) > 1:
 
598
            parser.error("--is-enabled requires exactly one client")
 
599
 
 
600
    commands = []
 
601
 
 
602
    if options.dump_json:
 
603
        commands.append(DumpJSONCmd())
 
604
 
 
605
    if options.enable:
 
606
        commands.append(EnableCmd())
 
607
 
 
608
    if options.disable:
 
609
        commands.append(DisableCmd())
 
610
 
 
611
    if options.bump_timeout:
 
612
        commands.append(BumpTimeoutCmd(options.bump_timeout))
 
613
 
 
614
    if options.start_checker:
 
615
        commands.append(StartCheckerCmd())
 
616
 
 
617
    if options.stop_checker:
 
618
        commands.append(StopCheckerCmd())
 
619
 
 
620
    if options.is_enabled:
 
621
        commands.append(IsEnabledCmd())
 
622
 
 
623
    if options.remove:
 
624
        commands.append(RemoveCmd())
 
625
 
 
626
    if options.checker is not None:
 
627
        commands.append(SetCheckerCmd())
 
628
 
 
629
    if options.timeout is not None:
 
630
        commands.append(SetTimeoutCmd(options.timeout))
 
631
 
 
632
    if options.extended_timeout:
 
633
        commands.append(
 
634
            SetExtendedTimeoutCmd(options.extended_timeout))
 
635
 
 
636
    if options.interval is not None:
 
637
        command.append(SetIntervalCmd(options.interval))
 
638
 
 
639
    if options.approved_by_default is not None:
 
640
        if options.approved_by_default:
 
641
            command.append(ApproveByDefaultCmd())
 
642
        else:
 
643
            command.append(DenyByDefaultCmd())
 
644
 
 
645
    if options.approval_delay is not None:
 
646
        command.append(SetApprovalDelayCmd(options.approval_delay))
 
647
 
 
648
    if options.approval_duration is not None:
 
649
        command.append(
 
650
            SetApprovalDurationCmd(options.approval_duration))
 
651
 
 
652
    if options.host is not None:
 
653
        command.append(SetHostCmd(options.host))
 
654
 
 
655
    if options.secret is not None:
 
656
        command.append(SetSecretCmd(options.secret))
 
657
 
 
658
    if options.approve:
 
659
        commands.append(ApproveCmd())
 
660
 
 
661
    if options.deny:
 
662
        commands.append(DenyCmd())
 
663
 
 
664
    # If no command option has been given, show table of clients,
 
665
    # optionally verbosely
 
666
    if not commands:
 
667
        commands.append(PrintTableCmd(verbose=options.verbose))
 
668
 
 
669
    return commands, options.client
 
670
 
 
671
 
 
672
def main():
 
673
    commands, clientnames = commands_and_clients_from_options()
433
674
 
434
675
    try:
435
676
        bus = dbus.SystemBus()
443
684
    mandos_serv_object_manager = dbus.Interface(
444
685
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
445
686
 
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)
 
687
    # Filter out log message from dbus module
 
688
    dbus_logger = logging.getLogger("dbus.proxies")
 
689
    class NullFilter(logging.Filter):
 
690
        def filter(self, record):
 
691
            return False
 
692
    dbus_filter = NullFilter()
 
693
    dbus_logger.addFilter(dbus_filter)
451
694
    try:
452
695
        try:
453
696
            mandos_clients = {path: ifs_and_props[client_interface]
456
699
                              .GetManagedObjects().items()
457
700
                              if client_interface in ifs_and_props}
458
701
        finally:
459
 
            # restore stderr
460
 
            os.dup2(stderrcopy, sys.stderr.fileno())
461
 
            os.close(stderrcopy)
 
702
            # restore dbus logger
 
703
            dbus_logger.removeFilter(dbus_filter)
462
704
    except dbus.exceptions.DBusException as e:
463
705
        log.critical("Failed to access Mandos server through D-Bus:"
464
706
                     "\n%s", e)
467
709
    # Compile dict of (clients: properties) to process
468
710
    clients = {}
469
711
 
470
 
    if options.all or not options.client:
 
712
    if not clientnames:
471
713
        clients = {bus.get_object(busname, path): properties
472
714
                   for path, properties in mandos_clients.items()}
473
715
    else:
474
 
        for name in options.client:
 
716
        for name in clientnames:
475
717
            for path, client in mandos_clients.items():
476
718
                if client["Name"] == name:
477
719
                    client_objc = bus.get_object(busname, path)
481
723
                log.critical("Client not found on server: %r", name)
482
724
                sys.exit(1)
483
725
 
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)
 
726
    # Run all commands on clients
 
727
    for command in commands:
 
728
        command.run(mandos_serv, clients)
574
729
 
575
730
 
576
731
class Test_milliseconds_to_string(unittest.TestCase):
596
751
            with self.assertLogs(log, logging.WARNING):
597
752
                value = string_to_delta("2h")
598
753
        else:
599
 
            value = string_to_delta("2h")
 
754
            class WarningFilter(logging.Filter):
 
755
                """Don't show, but record the presence of, warnings"""
 
756
                def filter(self, record):
 
757
                    is_warning = record.levelno >= logging.WARNING
 
758
                    self.found = is_warning or getattr(self, "found",
 
759
                                                       False)
 
760
                    return not is_warning
 
761
            warning_filter = WarningFilter()
 
762
            log.addFilter(warning_filter)
 
763
            try:
 
764
                value = string_to_delta("2h")
 
765
            finally:
 
766
                log.removeFilter(warning_filter)
 
767
            self.assertTrue(getattr(warning_filter, "found", False))
600
768
        self.assertEqual(value, datetime.timedelta(0, 7200))
601
769
 
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",
 
770
 
 
771
class TestCmd(unittest.TestCase):
 
772
    """Abstract class for tests of command classes"""
 
773
    def setUp(self):
 
774
        testcase = self
 
775
        class MockClient(object):
 
776
            def __init__(self, name, **attributes):
 
777
                self.__dbus_object_path__ = "objpath_{}".format(name)
 
778
                self.attributes = attributes
 
779
                self.attributes["Name"] = name
 
780
                self.calls = []
 
781
            def Set(self, interface, property, value, dbus_interface):
 
782
                testcase.assertEqual(interface, client_interface)
 
783
                testcase.assertEqual(dbus_interface,
 
784
                                     dbus.PROPERTIES_IFACE)
 
785
                self.attributes[property] = value
 
786
                self.calls.append(("Set", (interface, property, value,
 
787
                                           dbus_interface)))
 
788
            def Get(self, interface, property, dbus_interface):
 
789
                testcase.assertEqual(interface, client_interface)
 
790
                testcase.assertEqual(dbus_interface,
 
791
                                     dbus.PROPERTIES_IFACE)
 
792
                self.calls.append(("Get", (interface, property,
 
793
                                           dbus_interface)))
 
794
                return self.attributes[property]
 
795
            def __getitem__(self, key):
 
796
                return self.attributes[key]
 
797
            def __setitem__(self, key, value):
 
798
                self.attributes[key] = value
 
799
        self.clients = collections.OrderedDict([
 
800
            ("foo",
 
801
             MockClient(
 
802
                 "foo",
 
803
                 KeyID=("92ed150794387c03ce684574b1139a65"
 
804
                        "94a34f895daaaf09fd8ea90a27cddb12"),
 
805
                 Secret=b"secret",
 
806
                 Host="foo.example.org",
 
807
                 Enabled=dbus.Boolean(True),
 
808
                 Timeout=300000,
 
809
                 LastCheckedOK="2019-02-03T00:00:00",
 
810
                 Created="2019-01-02T00:00:00",
 
811
                 Interval=120000,
 
812
                 Fingerprint=("778827225BA7DE539C5A"
 
813
                              "7CFA59CFF7CDBD9A5920"),
 
814
                 CheckerRunning=dbus.Boolean(False),
 
815
                 LastEnabled="2019-01-03T00:00:00",
 
816
                 ApprovalPending=dbus.Boolean(False),
 
817
                 ApprovedByDefault=dbus.Boolean(True),
 
818
                 LastApprovalRequest="",
 
819
                 ApprovalDelay=0,
 
820
                 ApprovalDuration=1000,
 
821
                 Checker="fping -q -- %(host)s",
 
822
                 ExtendedTimeout=900000,
 
823
                 Expires="2019-02-04T00:00:00",
 
824
                 LastCheckerStatus=0)),
 
825
            ("barbar",
 
826
             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
            ])
 
851
 
 
852
class TestPrintTableCmd(TestCmd):
 
853
    def test_normal(self):
 
854
        output = PrintTableCmd().output(self.clients)
 
855
        expected_output = """
 
856
Name   Enabled Timeout  Last Successful Check
 
857
foo    Yes     00:05:00 2019-02-03T00:00:00  
 
858
barbar Yes     00:05:00 2019-02-04T00:00:00  
 
859
"""[1:-1]
 
860
        self.assertEqual(output, expected_output)
 
861
    def test_verbose(self):
 
862
        output = PrintTableCmd(verbose=True).output(self.clients)
 
863
        expected_output = """
 
864
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
 
865
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                  
 
866
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                 
 
867
"""[1:-1]
 
868
        self.assertEqual(output, expected_output)
 
869
    def test_one_client(self):
 
870
        output = PrintTableCmd().output({"foo": self.clients["foo"]})
 
871
        expected_output = """
 
872
Name Enabled Timeout  Last Successful Check
 
873
foo  Yes     00:05:00 2019-02-03T00:00:00  
 
874
"""[1:-1]
 
875
        self.assertEqual(output, expected_output)
 
876
 
 
877
class TestDumpJSONCmd(TestCmd):
 
878
    def setUp(self):
 
879
        self.expected_json = {
 
880
            "foo": {
 
881
                "Name": "foo",
 
882
                "KeyID": ("92ed150794387c03ce684574b1139a65"
 
883
                          "94a34f895daaaf09fd8ea90a27cddb12"),
 
884
                "Host": "foo.example.org",
 
885
                "Enabled": True,
 
886
                "Timeout": 300000,
 
887
                "LastCheckedOK": "2019-02-03T00:00:00",
 
888
                "Created": "2019-01-02T00:00:00",
 
889
                "Interval": 120000,
 
890
                "Fingerprint": ("778827225BA7DE539C5A"
 
891
                                "7CFA59CFF7CDBD9A5920"),
 
892
                "CheckerRunning": False,
 
893
                "LastEnabled": "2019-01-03T00:00:00",
 
894
                "ApprovalPending": False,
 
895
                "ApprovedByDefault": True,
 
896
                "LastApprovalRequest": "",
 
897
                "ApprovalDelay": 0,
 
898
                "ApprovalDuration": 1000,
 
899
                "Checker": "fping -q -- %(host)s",
 
900
                "ExtendedTimeout": 900000,
 
901
                "Expires": "2019-02-04T00:00:00",
 
902
                "LastCheckerStatus": 0,
 
903
            },
 
904
            "barbar": {
 
905
                "Name": "barbar",
 
906
                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
 
907
                          "6ab612cff5ad227247e46c2b020f441c"),
 
908
                "Host": "192.0.2.3",
 
909
                "Enabled": True,
 
910
                "Timeout": 300000,
 
911
                "LastCheckedOK": "2019-02-04T00:00:00",
 
912
                "Created": "2019-01-03T00:00:00",
 
913
                "Interval": 120000,
 
914
                "Fingerprint": ("3E393AEAEFB84C7E89E2"
 
915
                                "F547B3A107558FCA3A27"),
 
916
                "CheckerRunning": True,
 
917
                "LastEnabled": "2019-01-04T00:00:00",
 
918
                "ApprovalPending": False,
 
919
                "ApprovedByDefault": False,
 
920
                "LastApprovalRequest": "2019-01-03T00:00:00",
 
921
                "ApprovalDelay": 30000,
 
922
                "ApprovalDuration": 1000,
 
923
                "Checker": ":",
 
924
                "ExtendedTimeout": 900000,
 
925
                "Expires": "2019-02-05T00:00:00",
 
926
                "LastCheckerStatus": -2,
 
927
            },
617
928
        }
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
 
        text = str(TableOfClients(self.clients, self.keywords,
651
 
                                  self.tablewords))
652
 
        expected_text = """
653
 
X  Yy
654
 
x1 y1
655
 
x2 y2
656
 
"""[1:-1]
657
 
        self.assertEqual(text, expected_text)
658
 
    def test_booleans(self):
659
 
        keywords = ["Bool", "NonDbusBoolean"]
660
 
        text = str(TableOfClients(self.clients, keywords,
661
 
                                  self.tablewords))
662
 
        expected_text = """
663
 
A D-BUS Boolean A Non-D-BUS Boolean
664
 
No              False              
665
 
Yes             True               
666
 
"""[1:-1]
667
 
        self.assertEqual(text, expected_text)
668
 
    def test_milliseconds_detection(self):
669
 
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
670
 
                    "ApprovalDuration", "ExtendedTimeout"]
671
 
        text = str(TableOfClients(self.clients, keywords,
672
 
                                  self.tablewords))
673
 
        expected_text = """
674
 
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
675
 
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
676
 
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
677
 
"""[1:-1]
678
 
        self.assertEqual(text, expected_text)
679
 
    def test_empty_and_long_string_values(self):
680
 
        keywords = ["String"]
681
 
        text = str(TableOfClients(self.clients, keywords,
682
 
                                  self.tablewords))
683
 
        expected_text = """
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
 
"""[1:-1]
688
 
        self.assertEqual(text, expected_text)
 
929
        return super(TestDumpJSONCmd, self).setUp()
 
930
    def test_normal(self):
 
931
        json_data = json.loads(DumpJSONCmd().output(self.clients))
 
932
        self.assertDictEqual(json_data, self.expected_json)
 
933
    def test_one_client(self):
 
934
        clients = {"foo": self.clients["foo"]}
 
935
        json_data = json.loads(DumpJSONCmd().output(clients))
 
936
        expected_json = {"foo": self.expected_json["foo"]}
 
937
        self.assertDictEqual(json_data, expected_json)
 
938
 
 
939
class TestIsEnabledCmd(TestCmd):
 
940
    def test_is_enabled(self):
 
941
        self.assertTrue(all(IsEnabledCmd().is_enabled(client)
 
942
                            for client in self.clients.values()))
 
943
    def test_is_enabled_does_get_attribute(self):
 
944
        client = self.clients["foo"]
 
945
        self.assertTrue(IsEnabledCmd().is_enabled(client))
 
946
        self.assertListEqual(client.calls,
 
947
                             [("Get",
 
948
                               ("se.recompile.Mandos.Client",
 
949
                                "Enabled",
 
950
                                "org.freedesktop.DBus.Properties"))])
 
951
    def test_is_enabled_run_exits_successfully(self):
 
952
        client = self.clients["foo"]
 
953
        with self.assertRaises(SystemExit) as e:
 
954
            IsEnabledCmd().run_on_one_client(client)
 
955
        if e.exception.code is not None:
 
956
            self.assertEqual(e.exception.code, 0)
 
957
        else:
 
958
            self.assertIsNone(e.exception.code)
 
959
    def test_is_enabled_run_exits_with_failure(self):
 
960
        client = self.clients["foo"]
 
961
        client["Enabled"] = dbus.Boolean(False)
 
962
        with self.assertRaises(SystemExit) as e:
 
963
            IsEnabledCmd().run_on_one_client(client)
 
964
        if isinstance(e.exception.code, int):
 
965
            self.assertNotEqual(e.exception.code, 0)
 
966
        else:
 
967
            self.assertIsNotNone(e.exception.code)
689
968
 
690
969
 
691
970