/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: 2016-10-09 22:35:41 UTC
  • Revision ID: teddy@recompile.se-20161009223541-2g2xrvfii5m5ibjw
Stop the GnuPG agent after Debian package installation

* debian/mandos-client.postinst (create_key): Stop GPG agent after
                                              running mandos-keygen.

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
8
 
#
9
 
# This file is part of Mandos.
10
 
#
11
 
# Mandos is free software: you can redistribute it and/or modify it
12
 
# under the terms of the GNU General Public License as published by
 
6
# Copyright © 2008-2016 Teddy Hogeborn
 
7
# Copyright © 2008-2016 Björn Påhlsson
 
8
#
 
9
# This program is free software: you can redistribute it and/or modify
 
10
# it under the terms of the GNU General Public License as published by
13
11
# the Free Software Foundation, either version 3 of the License, or
14
12
# (at your option) any later version.
15
13
#
16
 
#     Mandos is distributed in the hope that it will be useful, but
17
 
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
18
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
17
#     GNU General Public License for more details.
20
18
#
21
19
# You should have received a copy of the GNU General Public License
22
 
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
23
22
#
24
23
# Contact the authors at <mandos@recompile.se>.
25
24
#
39
38
import re
40
39
import os
41
40
import collections
 
41
import doctest
42
42
import json
43
 
import unittest
44
43
 
45
44
import dbus
46
45
 
59
58
    "Interval": "Interval",
60
59
    "Host": "Host",
61
60
    "Fingerprint": "Fingerprint",
62
 
    "KeyID": "Key ID",
63
61
    "CheckerRunning": "Check Is Running",
64
62
    "LastEnabled": "Last Enabled",
65
63
    "ApprovalPending": "Approval Is Pending",
77
75
server_path = "/"
78
76
server_interface = domain + ".Mandos"
79
77
client_interface = domain + ".Mandos.Client"
80
 
version = "1.8.3"
 
78
version = "1.7.13"
81
79
 
82
80
 
83
81
try:
346
344
    if options.all and not has_actions(options):
347
345
        parser.error("--all requires an action.")
348
346
 
 
347
    if options.check:
 
348
        fail_count, test_count = doctest.testmod()
 
349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
350
 
349
351
    try:
350
352
        bus = dbus.SystemBus()
351
353
        mandos_dbus_objc = bus.get_object(busname, server_path)
401
403
    if not has_actions(options) and clients:
402
404
        if options.verbose or options.dump_json:
403
405
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
404
 
                        "Created", "Interval", "Host", "KeyID",
405
 
                        "Fingerprint", "CheckerRunning",
406
 
                        "LastEnabled", "ApprovalPending",
407
 
                        "ApprovedByDefault", "LastApprovalRequest",
408
 
                        "ApprovalDelay", "ApprovalDuration",
409
 
                        "Checker", "ExtendedTimeout", "Expires",
 
406
                        "Created", "Interval", "Host", "Fingerprint",
 
407
                        "CheckerRunning", "LastEnabled",
 
408
                        "ApprovalPending", "ApprovedByDefault",
 
409
                        "LastApprovalRequest", "ApprovalDelay",
 
410
                        "ApprovalDuration", "Checker",
 
411
                        "ExtendedTimeout", "Expires",
410
412
                        "LastCheckerStatus")
411
413
        else:
412
414
            keywords = defaultkeywords
489
491
                client.Approve(dbus.Boolean(False),
490
492
                               dbus_interface=client_interface)
491
493
 
492
 
 
493
 
class Test_milliseconds_to_string(unittest.TestCase):
494
 
    def test_all(self):
495
 
        self.assertEqual(milliseconds_to_string(93785000),
496
 
                         "1T02:03:05")
497
 
    def test_no_days(self):
498
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
499
 
    def test_all_zero(self):
500
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
501
 
    def test_no_fractional_seconds(self):
502
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
503
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
504
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
505
 
 
506
 
 
507
 
def should_only_run_tests():
508
 
    parser = argparse.ArgumentParser(add_help=False)
509
 
    parser.add_argument("--check", action='store_true')
510
 
    args, unknown_args = parser.parse_known_args()
511
 
    run_tests = args.check
512
 
    if run_tests:
513
 
        # Remove --check argument from sys.argv
514
 
        sys.argv[1:] = unknown_args
515
 
    return run_tests
516
 
 
517
 
# Add all tests from doctest strings
518
 
def load_tests(loader, tests, none):
519
 
    import doctest
520
 
    tests.addTests(doctest.DocTestSuite())
521
 
    return tests
522
494
 
523
495
if __name__ == "__main__":
524
 
    if should_only_run_tests():
525
 
        # Call using ./tdd-python-script --check [--verbose]
526
 
        unittest.main()
527
 
    else:
528
 
        main()
 
496
    main()