/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: 2017-09-03 09:06:09 UTC
  • Revision ID: teddy@recompile.se-20170903090609-y6vqe6bpaedeeyvu
Plymouth plugin: Try the newest PID file location

* plugins.d/plymouth.c (plymouth_old_pid): Rename to
  "plymouth_old_old_pid".
  (plymouth_pid): Rename to "plymouth_old_pid".
  (plymouth_pid): New.
  (get_pid): Also check plymouth_old_old_pid.

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-2017 Teddy Hogeborn
 
7
# Copyright © 2008-2017 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
 
log = logging.getLogger(sys.argv[0])
49
 
logging.basicConfig(level="INFO", # Show info level messages
50
 
                    format="%(message)s") # Show basic log messages
51
 
 
52
46
if sys.version_info.major == 2:
53
47
    str = unicode
54
48
 
64
58
    "Interval": "Interval",
65
59
    "Host": "Host",
66
60
    "Fingerprint": "Fingerprint",
67
 
    "KeyID": "Key ID",
68
61
    "CheckerRunning": "Check Is Running",
69
62
    "LastEnabled": "Last Enabled",
70
63
    "ApprovalPending": "Approval Is Pending",
82
75
server_path = "/"
83
76
server_interface = domain + ".Mandos"
84
77
client_interface = domain + ".Mandos.Client"
85
 
version = "1.8.3"
 
78
version = "1.7.16"
86
79
 
87
80
 
88
81
try:
351
344
    if options.all and not has_actions(options):
352
345
        parser.error("--all requires an action.")
353
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
 
354
352
    try:
355
353
        bus = dbus.SystemBus()
356
354
        mandos_dbus_objc = bus.get_object(busname, server_path)
357
355
    except dbus.exceptions.DBusException:
358
 
        log.critical("Could not connect to Mandos server")
 
356
        print("Could not connect to Mandos server", file=sys.stderr)
359
357
        sys.exit(1)
360
358
 
361
359
    mandos_serv = dbus.Interface(mandos_dbus_objc,
380
378
            os.dup2(stderrcopy, sys.stderr.fileno())
381
379
            os.close(stderrcopy)
382
380
    except dbus.exceptions.DBusException as e:
383
 
        log.critical("Failed to access Mandos server through D-Bus:"
384
 
                     "\n%s", e)
 
381
        print("Access denied: "
 
382
              "Accessing mandos server through D-Bus: {}".format(e),
 
383
              file=sys.stderr)
385
384
        sys.exit(1)
386
385
 
387
386
    # Compile dict of (clients: properties) to process
398
397
                    clients[client_objc] = client
399
398
                    break
400
399
            else:
401
 
                log.critical("Client not found on server: %r", name)
 
400
                print("Client not found on server: {!r}"
 
401
                      .format(name), file=sys.stderr)
402
402
                sys.exit(1)
403
403
 
404
404
    if not has_actions(options) and clients:
405
405
        if options.verbose or options.dump_json:
406
406
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
407
 
                        "Created", "Interval", "Host", "KeyID",
408
 
                        "Fingerprint", "CheckerRunning",
409
 
                        "LastEnabled", "ApprovalPending",
410
 
                        "ApprovedByDefault", "LastApprovalRequest",
411
 
                        "ApprovalDelay", "ApprovalDuration",
412
 
                        "Checker", "ExtendedTimeout", "Expires",
 
407
                        "Created", "Interval", "Host", "Fingerprint",
 
408
                        "CheckerRunning", "LastEnabled",
 
409
                        "ApprovalPending", "ApprovedByDefault",
 
410
                        "LastApprovalRequest", "ApprovalDelay",
 
411
                        "ApprovalDuration", "Checker",
 
412
                        "ExtendedTimeout", "Expires",
413
413
                        "LastCheckerStatus")
414
414
        else:
415
415
            keywords = defaultkeywords
492
492
                client.Approve(dbus.Boolean(False),
493
493
                               dbus_interface=client_interface)
494
494
 
495
 
 
496
 
class Test_milliseconds_to_string(unittest.TestCase):
497
 
    def test_all(self):
498
 
        self.assertEqual(milliseconds_to_string(93785000),
499
 
                         "1T02:03:05")
500
 
    def test_no_days(self):
501
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
502
 
    def test_all_zero(self):
503
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
504
 
    def test_no_fractional_seconds(self):
505
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
506
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
507
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
508
 
 
509
 
 
510
 
def should_only_run_tests():
511
 
    parser = argparse.ArgumentParser(add_help=False)
512
 
    parser.add_argument("--check", action='store_true')
513
 
    args, unknown_args = parser.parse_known_args()
514
 
    run_tests = args.check
515
 
    if run_tests:
516
 
        # Remove --check argument from sys.argv
517
 
        sys.argv[1:] = unknown_args
518
 
    return run_tests
519
 
 
520
 
# Add all tests from doctest strings
521
 
def load_tests(loader, tests, none):
522
 
    import doctest
523
 
    tests.addTests(doctest.DocTestSuite())
524
 
    return tests
525
495
 
526
496
if __name__ == "__main__":
527
 
    if should_only_run_tests():
528
 
        # Call using ./tdd-python-script --check [--verbose]
529
 
        unittest.main()
530
 
    else:
531
 
        main()
 
497
    main()