/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-02 01:56:35 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190302015635-xgodxd3ivltju7qn
mandos-ctl: Refactor

* mandos-ctl (global tablewords): Refactor into TableOfClients.
  (TableOfClients.tablewords): New overrideable class attribute.

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
#
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.8.0"
 
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]?)")
235
270
 
236
271
 
237
272
def print_clients(clients, keywords):
 
273
    print('\n'.join(TableOfClients(clients, keywords).rows()))
 
274
 
 
275
class TableOfClients(object):
 
276
    tablewords = {
 
277
        "Name": "Name",
 
278
        "Enabled": "Enabled",
 
279
        "Timeout": "Timeout",
 
280
        "LastCheckedOK": "Last Successful Check",
 
281
        "LastApprovalRequest": "Last Approval Request",
 
282
        "Created": "Created",
 
283
        "Interval": "Interval",
 
284
        "Host": "Host",
 
285
        "Fingerprint": "Fingerprint",
 
286
        "KeyID": "Key ID",
 
287
        "CheckerRunning": "Check Is Running",
 
288
        "LastEnabled": "Last Enabled",
 
289
        "ApprovalPending": "Approval Is Pending",
 
290
        "ApprovedByDefault": "Approved By Default",
 
291
        "ApprovalDelay": "Approval Delay",
 
292
        "ApprovalDuration": "Approval Duration",
 
293
        "Checker": "Checker",
 
294
        "ExtendedTimeout": "Extended Timeout",
 
295
        "Expires": "Expires",
 
296
        "LastCheckerStatus": "Last Checker Status",
 
297
    }
 
298
 
 
299
    def __init__(self, clients, keywords, tablewords=None):
 
300
        self.clients = clients
 
301
        self.keywords = keywords
 
302
        if tablewords is not None:
 
303
            self.tablewords = tablewords
 
304
 
 
305
    @staticmethod
238
306
    def valuetostring(value, keyword):
239
 
        if type(value) is dbus.Boolean:
 
307
        if isinstance(value, dbus.Boolean):
240
308
            return "Yes" if value else "No"
241
309
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
242
310
                       "ApprovalDuration", "ExtendedTimeout"):
243
311
            return milliseconds_to_string(value)
244
312
        return str(value)
245
313
 
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}))
 
314
    def rows(self):
 
315
        # Create format string to format table rows
 
316
        format_string = " ".join("{{{key}:{width}}}".format(
 
317
            width=max(len(self.tablewords[key]),
 
318
                      max(len(self.valuetostring(client[key], key))
 
319
                          for client in self.clients)),
 
320
            key=key)
 
321
                                 for key in self.keywords)
 
322
        # Start with header line
 
323
        rows = [format_string.format(**self.tablewords)]
 
324
        for client in self.clients:
 
325
            rows.append(format_string
 
326
                        .format(**{key: self.valuetostring(client[key], key)
 
327
                                   for key in self.keywords}))
 
328
        return rows
259
329
 
260
330
 
261
331
def has_actions(options):
345
415
    if options.all and not has_actions(options):
346
416
        parser.error("--all requires an action.")
347
417
 
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
418
    try:
354
419
        bus = dbus.SystemBus()
355
420
        mandos_dbus_objc = bus.get_object(busname, server_path)
356
421
    except dbus.exceptions.DBusException:
357
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
422
        log.critical("Could not connect to Mandos server")
358
423
        sys.exit(1)
359
424
 
360
425
    mandos_serv = dbus.Interface(mandos_dbus_objc,
379
444
            os.dup2(stderrcopy, sys.stderr.fileno())
380
445
            os.close(stderrcopy)
381
446
    except dbus.exceptions.DBusException as e:
382
 
        print("Access denied: "
383
 
              "Accessing mandos server through D-Bus: {}".format(e),
384
 
              file=sys.stderr)
 
447
        log.critical("Failed to access Mandos server through D-Bus:"
 
448
                     "\n%s", e)
385
449
        sys.exit(1)
386
450
 
387
451
    # Compile dict of (clients: properties) to process
398
462
                    clients[client_objc] = client
399
463
                    break
400
464
            else:
401
 
                print("Client not found on server: {!r}"
402
 
                      .format(name), file=sys.stderr)
 
465
                log.critical("Client not found on server: %r", name)
403
466
                sys.exit(1)
404
467
 
405
468
    if not has_actions(options) and clients:
493
556
                client.Approve(dbus.Boolean(False),
494
557
                               dbus_interface=client_interface)
495
558
 
 
559
 
 
560
class Test_milliseconds_to_string(unittest.TestCase):
 
561
    def test_all(self):
 
562
        self.assertEqual(milliseconds_to_string(93785000),
 
563
                         "1T02:03:05")
 
564
    def test_no_days(self):
 
565
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
 
566
    def test_all_zero(self):
 
567
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
 
568
    def test_no_fractional_seconds(self):
 
569
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
 
570
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
 
571
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
 
572
 
 
573
class Test_string_to_delta(unittest.TestCase):
 
574
    def test_handles_basic_rfc3339(self):
 
575
        self.assertEqual(string_to_delta("PT2H"),
 
576
                         datetime.timedelta(0, 7200))
 
577
    def test_falls_back_to_pre_1_6_1_with_warning(self):
 
578
        # assertLogs only exists in Python 3.4
 
579
        if hasattr(self, "assertLogs"):
 
580
            with self.assertLogs(log, logging.WARNING):
 
581
                value = string_to_delta("2h")
 
582
        else:
 
583
            value = string_to_delta("2h")
 
584
        self.assertEqual(value, datetime.timedelta(0, 7200))
 
585
 
 
586
class Test_TableOfClients(unittest.TestCase):
 
587
    def setUp(self):
 
588
        self.tablewords = {
 
589
            "Attr1": "X",
 
590
            "AttrTwo": "Yy",
 
591
            "AttrThree": "Zzz",
 
592
            "Bool": "A D-BUS Boolean",
 
593
            "NonDbusBoolean": "A Non-D-BUS Boolean",
 
594
            "Integer": "An Integer",
 
595
            "Timeout": "Timedelta 1",
 
596
            "Interval": "Timedelta 2",
 
597
            "ApprovalDelay": "Timedelta 3",
 
598
            "ApprovalDuration": "Timedelta 4",
 
599
            "ExtendedTimeout": "Timedelta 5",
 
600
            "String": "A String",
 
601
        }
 
602
        self.keywords = ["Attr1", "AttrTwo"]
 
603
        self.clients = [
 
604
            {
 
605
                "Attr1": "x1",
 
606
                "AttrTwo": "y1",
 
607
                "AttrThree": "z1",
 
608
                "Bool": dbus.Boolean(False),
 
609
                "NonDbusBoolean": False,
 
610
                "Integer": 0,
 
611
                "Timeout": 0,
 
612
                "Interval": 1000,
 
613
                "ApprovalDelay": 2000,
 
614
                "ApprovalDuration": 3000,
 
615
                "ExtendedTimeout": 4000,
 
616
                "String": "",
 
617
            },
 
618
            {
 
619
                "Attr1": "x2",
 
620
                "AttrTwo": "y2",
 
621
                "AttrThree": "z2",
 
622
                "Bool": dbus.Boolean(True),
 
623
                "NonDbusBoolean": True,
 
624
                "Integer": 1,
 
625
                "Timeout": 93785000,
 
626
                "Interval": 93786000,
 
627
                "ApprovalDelay": 93787000,
 
628
                "ApprovalDuration": 93788000,
 
629
                "ExtendedTimeout": 93789000,
 
630
                "String": "A huge string which will not fit," * 10,
 
631
            },
 
632
        ]
 
633
    def test_short_header(self):
 
634
        rows = TableOfClients(self.clients, self.keywords,
 
635
                              self.tablewords).rows()
 
636
        expected_rows = [
 
637
            "X  Yy",
 
638
            "x1 y1",
 
639
            "x2 y2"]
 
640
        self.assertEqual(rows, expected_rows)
 
641
    def test_booleans(self):
 
642
        keywords = ["Bool", "NonDbusBoolean"]
 
643
        rows = TableOfClients(self.clients, keywords,
 
644
                              self.tablewords).rows()
 
645
        expected_rows = [
 
646
            "A D-BUS Boolean A Non-D-BUS Boolean",
 
647
            "No              False              ",
 
648
            "Yes             True               ",
 
649
        ]
 
650
        self.assertEqual(rows, expected_rows)
 
651
    def test_milliseconds_detection(self):
 
652
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
 
653
                    "ApprovalDuration", "ExtendedTimeout"]
 
654
        rows = TableOfClients(self.clients, keywords,
 
655
                              self.tablewords).rows()
 
656
        expected_rows = ("""
 
657
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
 
658
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
 
659
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
 
660
"""
 
661
        ).splitlines()[1:]
 
662
        self.assertEqual(rows, expected_rows)
 
663
    def test_empty_and_long_string_values(self):
 
664
        keywords = ["String"]
 
665
        rows = TableOfClients(self.clients, keywords,
 
666
                              self.tablewords).rows()
 
667
        expected_rows = ("""
 
668
A String                                                                                                                                                                                                                                                                                                                                  
 
669
                                                                                                                                                                                                                                                                                                                                          
 
670
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,
 
671
"""
 
672
        ).splitlines()[1:]
 
673
        self.assertEqual(rows, expected_rows)
 
674
 
 
675
 
 
676
 
 
677
def should_only_run_tests():
 
678
    parser = argparse.ArgumentParser(add_help=False)
 
679
    parser.add_argument("--check", action='store_true')
 
680
    args, unknown_args = parser.parse_known_args()
 
681
    run_tests = args.check
 
682
    if run_tests:
 
683
        # Remove --check argument from sys.argv
 
684
        sys.argv[1:] = unknown_args
 
685
    return run_tests
 
686
 
 
687
# Add all tests from doctest strings
 
688
def load_tests(loader, tests, none):
 
689
    import doctest
 
690
    tests.addTests(doctest.DocTestSuite())
 
691
    return tests
496
692
 
497
693
if __name__ == "__main__":
498
 
    main()
 
694
    if should_only_run_tests():
 
695
        # Call using ./tdd-python-script --check [--verbose]
 
696
        unittest.main()
 
697
    else:
 
698
        main()