/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-02 02:33:00 UTC
  • Revision ID: teddy@recompile.se-20190302023300-cgss6bf71mwfb0ma
mandos-ctl: Refactor

* mandos-ctl (TableOfClients.__str__): New.
  (TableOfClients.__unicode__): New.
  (print_clients): Remove.
  (main): Create and print TableOfClients object directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
1
1
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8 -*-
 
2
# -*- mode: python; coding: utf-8; after-save-hook: (lambda () (let ((command (if (and (boundp 'tramp-file-name-structure) (string-match (car tramp-file-name-structure) (buffer-file-name))) (tramp-file-name-localname (tramp-dissect-file-name (buffer-file-name))) (buffer-file-name)))) (if (= (shell-command (format "%s --check" (shell-quote-argument command)) "*Test*") 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w)) (kill-buffer "*Test*")) (display-buffer "*Test*")))); -*-
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
 
# Copyright © 2008-2018 Teddy Hogeborn
7
 
# Copyright © 2008-2018 Björn Påhlsson
 
6
# Copyright © 2008-2019 Teddy Hogeborn
 
7
# Copyright © 2008-2019 Björn Påhlsson
8
8
#
9
9
# This file is part of Mandos.
10
10
#
40
40
import os
41
41
import collections
42
42
import json
 
43
import unittest
 
44
import logging
43
45
 
44
46
import dbus
45
47
 
 
48
# Show warnings by default
 
49
if not sys.warnoptions:
 
50
    import warnings
 
51
    warnings.simplefilter("default")
 
52
 
 
53
log = logging.getLogger(sys.argv[0])
 
54
logging.basicConfig(level="INFO", # Show info level messages
 
55
                    format="%(message)s") # Show basic log messages
 
56
 
 
57
logging.captureWarnings(True)   # Show warnings via the logging system
 
58
 
46
59
if sys.version_info.major == 2:
47
60
    str = unicode
48
61
 
49
62
locale.setlocale(locale.LC_ALL, "")
50
63
 
51
 
tablewords = {
52
 
    "Name": "Name",
53
 
    "Enabled": "Enabled",
54
 
    "Timeout": "Timeout",
55
 
    "LastCheckedOK": "Last Successful Check",
56
 
    "LastApprovalRequest": "Last Approval Request",
57
 
    "Created": "Created",
58
 
    "Interval": "Interval",
59
 
    "Host": "Host",
60
 
    "Fingerprint": "Fingerprint",
61
 
    "KeyID": "Key ID",
62
 
    "CheckerRunning": "Check Is Running",
63
 
    "LastEnabled": "Last Enabled",
64
 
    "ApprovalPending": "Approval Is Pending",
65
 
    "ApprovedByDefault": "Approved By Default",
66
 
    "ApprovalDelay": "Approval Delay",
67
 
    "ApprovalDuration": "Approval Duration",
68
 
    "Checker": "Checker",
69
 
    "ExtendedTimeout": "Extended Timeout",
70
 
    "Expires": "Expires",
71
 
    "LastCheckerStatus": "Last Checker Status",
72
 
}
73
64
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
74
65
domain = "se.recompile"
75
66
busname = domain + ".Mandos"
76
67
server_path = "/"
77
68
server_interface = domain + ".Mandos"
78
69
client_interface = domain + ".Mandos.Client"
79
 
version = "1.7.20"
 
70
version = "1.8.3"
80
71
 
81
72
 
82
73
try:
103
94
    datetime.timedelta(0, 60)
104
95
    >>> rfc3339_duration_to_delta("PT60M")
105
96
    datetime.timedelta(0, 3600)
 
97
    >>> rfc3339_duration_to_delta("P60M")
 
98
    datetime.timedelta(1680)
106
99
    >>> rfc3339_duration_to_delta("PT24H")
107
100
    datetime.timedelta(1)
108
101
    >>> rfc3339_duration_to_delta("P1W")
111
104
    datetime.timedelta(0, 330)
112
105
    >>> rfc3339_duration_to_delta("P1DT3M20S")
113
106
    datetime.timedelta(1, 200)
 
107
    >>> # Can not be empty:
 
108
    >>> rfc3339_duration_to_delta("")
 
109
    Traceback (most recent call last):
 
110
    ...
 
111
    ValueError: Invalid RFC 3339 duration: u''
 
112
    >>> # Must start with "P":
 
113
    >>> rfc3339_duration_to_delta("1D")
 
114
    Traceback (most recent call last):
 
115
    ...
 
116
    ValueError: Invalid RFC 3339 duration: u'1D'
 
117
    >>> # Must use correct order
 
118
    >>> rfc3339_duration_to_delta("PT1S2M")
 
119
    Traceback (most recent call last):
 
120
    ...
 
121
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
 
122
    >>> # Time needs time marker
 
123
    >>> rfc3339_duration_to_delta("P1H2S")
 
124
    Traceback (most recent call last):
 
125
    ...
 
126
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
 
127
    >>> # Weeks can not be combined with anything else
 
128
    >>> rfc3339_duration_to_delta("P1D2W")
 
129
    Traceback (most recent call last):
 
130
    ...
 
131
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
 
132
    >>> rfc3339_duration_to_delta("P2W2H")
 
133
    Traceback (most recent call last):
 
134
    ...
 
135
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
114
136
    """
115
137
 
116
138
    # Parsing an RFC 3339 duration with regular expressions is not
195
217
 
196
218
def string_to_delta(interval):
197
219
    """Parse a string and return a datetime.timedelta
198
 
 
199
 
    >>> string_to_delta('7d')
200
 
    datetime.timedelta(7)
201
 
    >>> string_to_delta('60s')
202
 
    datetime.timedelta(0, 60)
203
 
    >>> string_to_delta('60m')
204
 
    datetime.timedelta(0, 3600)
205
 
    >>> string_to_delta('24h')
206
 
    datetime.timedelta(1)
207
 
    >>> string_to_delta('1w')
208
 
    datetime.timedelta(7)
209
 
    >>> string_to_delta('5m 30s')
210
 
    datetime.timedelta(0, 330)
211
220
    """
212
221
 
213
222
    try:
214
223
        return rfc3339_duration_to_delta(interval)
215
 
    except ValueError:
216
 
        pass
 
224
    except ValueError as e:
 
225
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
 
226
                    ' '.join(e.args))
 
227
    return parse_pre_1_6_1_interval(interval)
 
228
 
 
229
 
 
230
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
 
233
    >>> parse_pre_1_6_1_interval('7d')
 
234
    datetime.timedelta(7)
 
235
    >>> parse_pre_1_6_1_interval('60s')
 
236
    datetime.timedelta(0, 60)
 
237
    >>> parse_pre_1_6_1_interval('60m')
 
238
    datetime.timedelta(0, 3600)
 
239
    >>> parse_pre_1_6_1_interval('24h')
 
240
    datetime.timedelta(1)
 
241
    >>> parse_pre_1_6_1_interval('1w')
 
242
    datetime.timedelta(7)
 
243
    >>> parse_pre_1_6_1_interval('5m 30s')
 
244
    datetime.timedelta(0, 330)
 
245
    >>> parse_pre_1_6_1_interval('')
 
246
    datetime.timedelta(0)
 
247
    >>> # Ignore unknown characters, allow any order and repetitions
 
248
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
 
249
    datetime.timedelta(2, 480, 18000)
 
250
 
 
251
    """
217
252
 
218
253
    value = datetime.timedelta(0)
219
254
    regexp = re.compile(r"(\d+)([dsmhw]?)")
234
269
    return value
235
270
 
236
271
 
237
 
def print_clients(clients, keywords):
 
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__
 
307
        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
 
 
329
    @staticmethod
238
330
    def valuetostring(value, keyword):
239
 
        if type(value) is dbus.Boolean:
 
331
        if isinstance(value, dbus.Boolean):
240
332
            return "Yes" if value else "No"
241
333
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
242
334
                       "ApprovalDuration", "ExtendedTimeout"):
243
335
            return milliseconds_to_string(value)
244
336
        return str(value)
245
337
 
246
 
    # Create format string to print table rows
247
 
    format_string = " ".join("{{{key}:{width}}}".format(
248
 
        width=max(len(tablewords[key]),
249
 
                  max(len(valuetostring(client[key], key))
250
 
                      for client in clients)),
251
 
        key=key)
252
 
                             for key in keywords)
253
 
    # Print header line
254
 
    print(format_string.format(**tablewords))
255
 
    for client in clients:
256
 
        print(format_string
257
 
              .format(**{key: valuetostring(client[key], key)
258
 
                         for key in keywords}))
 
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})
259
345
 
260
346
 
261
347
def has_actions(options):
345
431
    if options.all and not has_actions(options):
346
432
        parser.error("--all requires an action.")
347
433
 
348
 
    if options.check:
349
 
        import doctest
350
 
        fail_count, test_count = doctest.testmod()
351
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
352
 
 
353
434
    try:
354
435
        bus = dbus.SystemBus()
355
436
        mandos_dbus_objc = bus.get_object(busname, server_path)
356
437
    except dbus.exceptions.DBusException:
357
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
438
        log.critical("Could not connect to Mandos server")
358
439
        sys.exit(1)
359
440
 
360
441
    mandos_serv = dbus.Interface(mandos_dbus_objc,
379
460
            os.dup2(stderrcopy, sys.stderr.fileno())
380
461
            os.close(stderrcopy)
381
462
    except dbus.exceptions.DBusException as e:
382
 
        print("Access denied: "
383
 
              "Accessing mandos server through D-Bus: {}".format(e),
384
 
              file=sys.stderr)
 
463
        log.critical("Failed to access Mandos server through D-Bus:"
 
464
                     "\n%s", e)
385
465
        sys.exit(1)
386
466
 
387
467
    # Compile dict of (clients: properties) to process
398
478
                    clients[client_objc] = client
399
479
                    break
400
480
            else:
401
 
                print("Client not found on server: {!r}"
402
 
                      .format(name), file=sys.stderr)
 
481
                log.critical("Client not found on server: %r", name)
403
482
                sys.exit(1)
404
483
 
405
484
    if not has_actions(options) and clients:
427
506
                      separators=(',', ': '))
428
507
            print()
429
508
        else:
430
 
            print_clients(clients.values(), keywords)
 
509
            print(TableOfClients(clients.values(), keywords))
431
510
    else:
432
511
        # Process each client in the list by all selected options
433
512
        for client in clients:
493
572
                client.Approve(dbus.Boolean(False),
494
573
                               dbus_interface=client_interface)
495
574
 
 
575
 
 
576
class Test_milliseconds_to_string(unittest.TestCase):
 
577
    def test_all(self):
 
578
        self.assertEqual(milliseconds_to_string(93785000),
 
579
                         "1T02:03:05")
 
580
    def test_no_days(self):
 
581
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
 
582
    def test_all_zero(self):
 
583
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
 
584
    def test_no_fractional_seconds(self):
 
585
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
 
586
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
 
587
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
 
588
 
 
589
class Test_string_to_delta(unittest.TestCase):
 
590
    def test_handles_basic_rfc3339(self):
 
591
        self.assertEqual(string_to_delta("PT2H"),
 
592
                         datetime.timedelta(0, 7200))
 
593
    def test_falls_back_to_pre_1_6_1_with_warning(self):
 
594
        # assertLogs only exists in Python 3.4
 
595
        if hasattr(self, "assertLogs"):
 
596
            with self.assertLogs(log, logging.WARNING):
 
597
                value = string_to_delta("2h")
 
598
        else:
 
599
            value = string_to_delta("2h")
 
600
        self.assertEqual(value, datetime.timedelta(0, 7200))
 
601
 
 
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",
 
617
        }
 
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)
 
690
 
 
691
 
 
692
 
 
693
def should_only_run_tests():
 
694
    parser = argparse.ArgumentParser(add_help=False)
 
695
    parser.add_argument("--check", action='store_true')
 
696
    args, unknown_args = parser.parse_known_args()
 
697
    run_tests = args.check
 
698
    if run_tests:
 
699
        # Remove --check argument from sys.argv
 
700
        sys.argv[1:] = unknown_args
 
701
    return run_tests
 
702
 
 
703
# Add all tests from doctest strings
 
704
def load_tests(loader, tests, none):
 
705
    import doctest
 
706
    tests.addTests(doctest.DocTestSuite())
 
707
    return tests
496
708
 
497
709
if __name__ == "__main__":
498
 
    main()
 
710
    if should_only_run_tests():
 
711
        # Call using ./tdd-python-script --check [--verbose]
 
712
        unittest.main()
 
713
    else:
 
714
        main()