/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: 2018-08-19 01:35:11 UTC
  • Revision ID: teddy@recompile.se-20180819013511-cku25q9yeub3dnr0
Adapt to changes in cryptsetup; use "cryptroot-unlock" program

* Makefile (install-client-nokey): Also install new script files
  "mandos-to-cryptroot-unlock" and "initramfs-tools-script-stop".
* debian/mandos-client.dirs: Add
  "usr/share/initramfs-tools/scripts/local-premount".
* initramfs-tools-hook: Also copy "mandos-to-cryptroot-unlock".
* initramfs-tools-script: Only modify keyscript setting in cryptroot
  file if the file exists, otherwise start
  "mandos-to-cryptroot-unlock" in background.
* initramfs-tools-script-stop: New script to make sure plugin-runner
  has stopped before continuing.
* mandos-to-cryptroot-unlock: New script to run plugin-runner and feed
  any password it gets into the "cryptroot-unlock" program.

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; 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*")))); -*-
 
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
 
# Copyright © 2008-2019 Teddy Hogeborn
7
 
# Copyright © 2008-2019 Björn Påhlsson
 
6
# Copyright © 2008-2018 Teddy Hogeborn
 
7
# Copyright © 2008-2018 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
45
43
 
46
44
import dbus
47
45
 
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
 
 
59
46
if sys.version_info.major == 2:
60
47
    str = unicode
61
48
 
62
49
locale.setlocale(locale.LC_ALL, "")
63
50
 
 
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
    "CheckerRunning": "Check Is Running",
 
62
    "LastEnabled": "Last Enabled",
 
63
    "ApprovalPending": "Approval Is Pending",
 
64
    "ApprovedByDefault": "Approved By Default",
 
65
    "ApprovalDelay": "Approval Delay",
 
66
    "ApprovalDuration": "Approval Duration",
 
67
    "Checker": "Checker",
 
68
    "ExtendedTimeout": "Extended Timeout",
 
69
    "Expires": "Expires",
 
70
    "LastCheckerStatus": "Last Checker Status",
 
71
}
64
72
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
65
73
domain = "se.recompile"
66
74
busname = domain + ".Mandos"
67
75
server_path = "/"
68
76
server_interface = domain + ".Mandos"
69
77
client_interface = domain + ".Mandos.Client"
70
 
version = "1.8.3"
 
78
version = "1.7.19"
71
79
 
72
80
 
73
81
try:
94
102
    datetime.timedelta(0, 60)
95
103
    >>> rfc3339_duration_to_delta("PT60M")
96
104
    datetime.timedelta(0, 3600)
97
 
    >>> rfc3339_duration_to_delta("P60M")
98
 
    datetime.timedelta(1680)
99
105
    >>> rfc3339_duration_to_delta("PT24H")
100
106
    datetime.timedelta(1)
101
107
    >>> rfc3339_duration_to_delta("P1W")
104
110
    datetime.timedelta(0, 330)
105
111
    >>> rfc3339_duration_to_delta("P1DT3M20S")
106
112
    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'
136
113
    """
137
114
 
138
115
    # Parsing an RFC 3339 duration with regular expressions is not
217
194
 
218
195
def string_to_delta(interval):
219
196
    """Parse a string and return a datetime.timedelta
 
197
 
 
198
    >>> string_to_delta('7d')
 
199
    datetime.timedelta(7)
 
200
    >>> string_to_delta('60s')
 
201
    datetime.timedelta(0, 60)
 
202
    >>> string_to_delta('60m')
 
203
    datetime.timedelta(0, 3600)
 
204
    >>> string_to_delta('24h')
 
205
    datetime.timedelta(1)
 
206
    >>> string_to_delta('1w')
 
207
    datetime.timedelta(7)
 
208
    >>> string_to_delta('5m 30s')
 
209
    datetime.timedelta(0, 330)
220
210
    """
221
211
 
222
212
    try:
223
213
        return rfc3339_duration_to_delta(interval)
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
 
    """
 
214
    except ValueError:
 
215
        pass
252
216
 
253
217
    value = datetime.timedelta(0)
254
218
    regexp = re.compile(r"(\d+)([dsmhw]?)")
270
234
 
271
235
 
272
236
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
 
    def rows(self):
306
 
        format_string = self.row_formatting_string()
307
 
        rows = [self.header_line(format_string)]
308
 
        rows.extend(self.client_line(client, format_string)
309
 
                    for client in self.clients)
310
 
        return rows
311
 
 
312
 
    def row_formatting_string(self):
313
 
        "Format string used to format table rows"
314
 
        return " ".join("{{{key}:{width}}}".format(
315
 
            width=max(len(self.tablewords[key]),
316
 
                      max(len(self.string_from_client(client, key))
317
 
                          for client in self.clients)),
318
 
            key=key)
319
 
                                 for key in self.keywords)
320
 
 
321
 
    def string_from_client(self, client, key):
322
 
        return self.valuetostring(client[key], key)
323
 
 
324
 
    @staticmethod
325
237
    def valuetostring(value, keyword):
326
 
        if isinstance(value, dbus.Boolean):
 
238
        if type(value) is dbus.Boolean:
327
239
            return "Yes" if value else "No"
328
240
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
329
241
                       "ApprovalDuration", "ExtendedTimeout"):
330
242
            return milliseconds_to_string(value)
331
243
        return str(value)
332
244
 
333
 
    def header_line(self, format_string):
334
 
        return format_string.format(**self.tablewords)
335
 
 
336
 
    def client_line(self, client, format_string):
337
 
        return format_string.format(
338
 
            **{key: self.string_from_client(client, key)
339
 
               for key in self.keywords})
 
245
    # Create format string to print table rows
 
246
    format_string = " ".join("{{{key}:{width}}}".format(
 
247
        width=max(len(tablewords[key]),
 
248
                  max(len(valuetostring(client[key], key))
 
249
                      for client in clients)),
 
250
        key=key)
 
251
                             for key in keywords)
 
252
    # Print header line
 
253
    print(format_string.format(**tablewords))
 
254
    for client in clients:
 
255
        print(format_string
 
256
              .format(**{key: valuetostring(client[key], key)
 
257
                         for key in keywords}))
340
258
 
341
259
 
342
260
def has_actions(options):
426
344
    if options.all and not has_actions(options):
427
345
        parser.error("--all requires an action.")
428
346
 
 
347
    if options.check:
 
348
        import doctest
 
349
        fail_count, test_count = doctest.testmod()
 
350
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
351
 
429
352
    try:
430
353
        bus = dbus.SystemBus()
431
354
        mandos_dbus_objc = bus.get_object(busname, server_path)
432
355
    except dbus.exceptions.DBusException:
433
 
        log.critical("Could not connect to Mandos server")
 
356
        print("Could not connect to Mandos server", file=sys.stderr)
434
357
        sys.exit(1)
435
358
 
436
359
    mandos_serv = dbus.Interface(mandos_dbus_objc,
455
378
            os.dup2(stderrcopy, sys.stderr.fileno())
456
379
            os.close(stderrcopy)
457
380
    except dbus.exceptions.DBusException as e:
458
 
        log.critical("Failed to access Mandos server through D-Bus:"
459
 
                     "\n%s", e)
 
381
        print("Access denied: "
 
382
              "Accessing mandos server through D-Bus: {}".format(e),
 
383
              file=sys.stderr)
460
384
        sys.exit(1)
461
385
 
462
386
    # Compile dict of (clients: properties) to process
473
397
                    clients[client_objc] = client
474
398
                    break
475
399
            else:
476
 
                log.critical("Client not found on server: %r", name)
 
400
                print("Client not found on server: {!r}"
 
401
                      .format(name), file=sys.stderr)
477
402
                sys.exit(1)
478
403
 
479
404
    if not has_actions(options) and clients:
480
405
        if options.verbose or options.dump_json:
481
406
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
482
 
                        "Created", "Interval", "Host", "KeyID",
483
 
                        "Fingerprint", "CheckerRunning",
484
 
                        "LastEnabled", "ApprovalPending",
485
 
                        "ApprovedByDefault", "LastApprovalRequest",
486
 
                        "ApprovalDelay", "ApprovalDuration",
487
 
                        "Checker", "ExtendedTimeout", "Expires",
 
407
                        "Created", "Interval", "Host", "Fingerprint",
 
408
                        "CheckerRunning", "LastEnabled",
 
409
                        "ApprovalPending", "ApprovedByDefault",
 
410
                        "LastApprovalRequest", "ApprovalDelay",
 
411
                        "ApprovalDuration", "Checker",
 
412
                        "ExtendedTimeout", "Expires",
488
413
                        "LastCheckerStatus")
489
414
        else:
490
415
            keywords = defaultkeywords
567
492
                client.Approve(dbus.Boolean(False),
568
493
                               dbus_interface=client_interface)
569
494
 
570
 
 
571
 
class Test_milliseconds_to_string(unittest.TestCase):
572
 
    def test_all(self):
573
 
        self.assertEqual(milliseconds_to_string(93785000),
574
 
                         "1T02:03:05")
575
 
    def test_no_days(self):
576
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
577
 
    def test_all_zero(self):
578
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
579
 
    def test_no_fractional_seconds(self):
580
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
581
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
582
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
583
 
 
584
 
class Test_string_to_delta(unittest.TestCase):
585
 
    def test_handles_basic_rfc3339(self):
586
 
        self.assertEqual(string_to_delta("PT2H"),
587
 
                         datetime.timedelta(0, 7200))
588
 
    def test_falls_back_to_pre_1_6_1_with_warning(self):
589
 
        # assertLogs only exists in Python 3.4
590
 
        if hasattr(self, "assertLogs"):
591
 
            with self.assertLogs(log, logging.WARNING):
592
 
                value = string_to_delta("2h")
593
 
        else:
594
 
            value = string_to_delta("2h")
595
 
        self.assertEqual(value, datetime.timedelta(0, 7200))
596
 
 
597
 
class Test_TableOfClients(unittest.TestCase):
598
 
    def setUp(self):
599
 
        self.tablewords = {
600
 
            "Attr1": "X",
601
 
            "AttrTwo": "Yy",
602
 
            "AttrThree": "Zzz",
603
 
            "Bool": "A D-BUS Boolean",
604
 
            "NonDbusBoolean": "A Non-D-BUS Boolean",
605
 
            "Integer": "An Integer",
606
 
            "Timeout": "Timedelta 1",
607
 
            "Interval": "Timedelta 2",
608
 
            "ApprovalDelay": "Timedelta 3",
609
 
            "ApprovalDuration": "Timedelta 4",
610
 
            "ExtendedTimeout": "Timedelta 5",
611
 
            "String": "A String",
612
 
        }
613
 
        self.keywords = ["Attr1", "AttrTwo"]
614
 
        self.clients = [
615
 
            {
616
 
                "Attr1": "x1",
617
 
                "AttrTwo": "y1",
618
 
                "AttrThree": "z1",
619
 
                "Bool": dbus.Boolean(False),
620
 
                "NonDbusBoolean": False,
621
 
                "Integer": 0,
622
 
                "Timeout": 0,
623
 
                "Interval": 1000,
624
 
                "ApprovalDelay": 2000,
625
 
                "ApprovalDuration": 3000,
626
 
                "ExtendedTimeout": 4000,
627
 
                "String": "",
628
 
            },
629
 
            {
630
 
                "Attr1": "x2",
631
 
                "AttrTwo": "y2",
632
 
                "AttrThree": "z2",
633
 
                "Bool": dbus.Boolean(True),
634
 
                "NonDbusBoolean": True,
635
 
                "Integer": 1,
636
 
                "Timeout": 93785000,
637
 
                "Interval": 93786000,
638
 
                "ApprovalDelay": 93787000,
639
 
                "ApprovalDuration": 93788000,
640
 
                "ExtendedTimeout": 93789000,
641
 
                "String": "A huge string which will not fit," * 10,
642
 
            },
643
 
        ]
644
 
    def test_short_header(self):
645
 
        rows = TableOfClients(self.clients, self.keywords,
646
 
                              self.tablewords).rows()
647
 
        expected_rows = [
648
 
            "X  Yy",
649
 
            "x1 y1",
650
 
            "x2 y2"]
651
 
        self.assertEqual(rows, expected_rows)
652
 
    def test_booleans(self):
653
 
        keywords = ["Bool", "NonDbusBoolean"]
654
 
        rows = TableOfClients(self.clients, keywords,
655
 
                              self.tablewords).rows()
656
 
        expected_rows = [
657
 
            "A D-BUS Boolean A Non-D-BUS Boolean",
658
 
            "No              False              ",
659
 
            "Yes             True               ",
660
 
        ]
661
 
        self.assertEqual(rows, expected_rows)
662
 
    def test_milliseconds_detection(self):
663
 
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
664
 
                    "ApprovalDuration", "ExtendedTimeout"]
665
 
        rows = TableOfClients(self.clients, keywords,
666
 
                              self.tablewords).rows()
667
 
        expected_rows = ("""
668
 
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
669
 
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
670
 
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
671
 
"""
672
 
        ).splitlines()[1:]
673
 
        self.assertEqual(rows, expected_rows)
674
 
    def test_empty_and_long_string_values(self):
675
 
        keywords = ["String"]
676
 
        rows = TableOfClients(self.clients, keywords,
677
 
                              self.tablewords).rows()
678
 
        expected_rows = ("""
679
 
A String                                                                                                                                                                                                                                                                                                                                  
680
 
                                                                                                                                                                                                                                                                                                                                          
681
 
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,
682
 
"""
683
 
        ).splitlines()[1:]
684
 
        self.assertEqual(rows, expected_rows)
685
 
 
686
 
 
687
 
 
688
 
def should_only_run_tests():
689
 
    parser = argparse.ArgumentParser(add_help=False)
690
 
    parser.add_argument("--check", action='store_true')
691
 
    args, unknown_args = parser.parse_known_args()
692
 
    run_tests = args.check
693
 
    if run_tests:
694
 
        # Remove --check argument from sys.argv
695
 
        sys.argv[1:] = unknown_args
696
 
    return run_tests
697
 
 
698
 
# Add all tests from doctest strings
699
 
def load_tests(loader, tests, none):
700
 
    import doctest
701
 
    tests.addTests(doctest.DocTestSuite())
702
 
    return tests
703
495
 
704
496
if __name__ == "__main__":
705
 
    if should_only_run_tests():
706
 
        # Call using ./tdd-python-script --check [--verbose]
707
 
        unittest.main()
708
 
    else:
709
 
        main()
 
497
    main()