/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: 2012-06-01 21:48:12 UTC
  • Revision ID: teddy@recompile.se-20120601214812-g7685v5oeiuhi2qw
* debian/copyright (Copyright): Join the two lines to one line.
* debian/mandos-client.README.Debian: Refer to new location of example
  network hooks.
* debian/mandos-client.docs (network-hooks.d): Removed.
* debian/mandos-client.examples: New; contains "network-hooks.d".
* debian/rules (binary-common): Added "dh_installexamples".
  (binary-common/dh_fixperms): Changed to exclude new location of
  "network-hooks.d".
* init.d-mandos (status): Support new "status" action.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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*")))); -*-
3
 
#
 
2
# -*- mode: python; coding: utf-8 -*-
 
3
4
4
# Mandos Monitor - Control and monitor the Mandos server
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
 
5
 
6
# Copyright © 2008-2012 Teddy Hogeborn
 
7
# Copyright © 2008-2012 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/>.
23
 
#
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
 
22
24
23
# Contact the authors at <mandos@recompile.se>.
25
 
#
 
24
26
25
 
27
26
from __future__ import (division, absolute_import, print_function,
28
27
                        unicode_literals)
29
28
 
30
 
try:
31
 
    from future_builtins import *
32
 
except ImportError:
33
 
    pass
 
29
from future_builtins import *
34
30
 
35
31
import sys
 
32
import dbus
36
33
import argparse
37
34
import locale
38
35
import datetime
39
36
import re
40
37
import os
41
 
import collections
42
 
import json
43
 
import unittest
44
 
 
45
 
import dbus
46
 
 
47
 
if sys.version_info.major == 2:
48
 
    str = unicode
49
38
 
50
39
locale.setlocale(locale.LC_ALL, "")
51
40
 
59
48
    "Interval": "Interval",
60
49
    "Host": "Host",
61
50
    "Fingerprint": "Fingerprint",
62
 
    "KeyID": "Key ID",
63
51
    "CheckerRunning": "Check Is Running",
64
52
    "LastEnabled": "Last Enabled",
65
53
    "ApprovalPending": "Approval Is Pending",
67
55
    "ApprovalDelay": "Approval Delay",
68
56
    "ApprovalDuration": "Approval Duration",
69
57
    "Checker": "Checker",
70
 
    "ExtendedTimeout": "Extended Timeout",
71
 
    "Expires": "Expires",
72
 
    "LastCheckerStatus": "Last Checker Status",
73
 
}
 
58
    "ExtendedTimeout" : "Extended Timeout"
 
59
    }
74
60
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
75
61
domain = "se.recompile"
76
62
busname = domain + ".Mandos"
77
63
server_path = "/"
78
64
server_interface = domain + ".Mandos"
79
65
client_interface = domain + ".Mandos.Client"
80
 
version = "1.8.3"
81
 
 
82
 
 
83
 
try:
84
 
    dbus.OBJECT_MANAGER_IFACE
85
 
except AttributeError:
86
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
87
 
 
 
66
version = "1.5.5"
 
67
 
 
68
def timedelta_to_milliseconds(td):
 
69
    """Convert a datetime.timedelta object to milliseconds"""
 
70
    return ((td.days * 24 * 60 * 60 * 1000)
 
71
            + (td.seconds * 1000)
 
72
            + (td.microseconds // 1000))
88
73
 
89
74
def milliseconds_to_string(ms):
90
75
    td = datetime.timedelta(0, 0, 0, ms)
91
76
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
92
 
            .format(days="{}T".format(td.days) if td.days else "",
93
 
                    hours=td.seconds // 3600,
94
 
                    minutes=(td.seconds % 3600) // 60,
95
 
                    seconds=td.seconds % 60))
96
 
 
97
 
 
98
 
def rfc3339_duration_to_delta(duration):
99
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
100
 
 
101
 
    >>> rfc3339_duration_to_delta("P7D")
102
 
    datetime.timedelta(7)
103
 
    >>> rfc3339_duration_to_delta("PT60S")
104
 
    datetime.timedelta(0, 60)
105
 
    >>> rfc3339_duration_to_delta("PT60M")
106
 
    datetime.timedelta(0, 3600)
107
 
    >>> rfc3339_duration_to_delta("PT24H")
108
 
    datetime.timedelta(1)
109
 
    >>> rfc3339_duration_to_delta("P1W")
110
 
    datetime.timedelta(7)
111
 
    >>> rfc3339_duration_to_delta("PT5M30S")
112
 
    datetime.timedelta(0, 330)
113
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
114
 
    datetime.timedelta(1, 200)
115
 
    """
116
 
 
117
 
    # Parsing an RFC 3339 duration with regular expressions is not
118
 
    # possible - there would have to be multiple places for the same
119
 
    # values, like seconds.  The current code, while more esoteric, is
120
 
    # cleaner without depending on a parsing library.  If Python had a
121
 
    # built-in library for parsing we would use it, but we'd like to
122
 
    # avoid excessive use of external libraries.
123
 
 
124
 
    # New type for defining tokens, syntax, and semantics all-in-one
125
 
    Token = collections.namedtuple("Token", (
126
 
        "regexp",  # To match token; if "value" is not None, must have
127
 
                   # a "group" containing digits
128
 
        "value",   # datetime.timedelta or None
129
 
        "followers"))           # Tokens valid after this token
130
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
131
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
132
 
    token_end = Token(re.compile(r"$"), None, frozenset())
133
 
    token_second = Token(re.compile(r"(\d+)S"),
134
 
                         datetime.timedelta(seconds=1),
135
 
                         frozenset((token_end, )))
136
 
    token_minute = Token(re.compile(r"(\d+)M"),
137
 
                         datetime.timedelta(minutes=1),
138
 
                         frozenset((token_second, token_end)))
139
 
    token_hour = Token(re.compile(r"(\d+)H"),
140
 
                       datetime.timedelta(hours=1),
141
 
                       frozenset((token_minute, token_end)))
142
 
    token_time = Token(re.compile(r"T"),
143
 
                       None,
144
 
                       frozenset((token_hour, token_minute,
145
 
                                  token_second)))
146
 
    token_day = Token(re.compile(r"(\d+)D"),
147
 
                      datetime.timedelta(days=1),
148
 
                      frozenset((token_time, token_end)))
149
 
    token_month = Token(re.compile(r"(\d+)M"),
150
 
                        datetime.timedelta(weeks=4),
151
 
                        frozenset((token_day, token_end)))
152
 
    token_year = Token(re.compile(r"(\d+)Y"),
153
 
                       datetime.timedelta(weeks=52),
154
 
                       frozenset((token_month, token_end)))
155
 
    token_week = Token(re.compile(r"(\d+)W"),
156
 
                       datetime.timedelta(weeks=1),
157
 
                       frozenset((token_end, )))
158
 
    token_duration = Token(re.compile(r"P"), None,
159
 
                           frozenset((token_year, token_month,
160
 
                                      token_day, token_time,
161
 
                                      token_week)))
162
 
    # Define starting values:
163
 
    # Value so far
164
 
    value = datetime.timedelta()
165
 
    found_token = None
166
 
    # Following valid tokens
167
 
    followers = frozenset((token_duration, ))
168
 
    # String left to parse
169
 
    s = duration
170
 
    # Loop until end token is found
171
 
    while found_token is not token_end:
172
 
        # Search for any currently valid tokens
173
 
        for token in followers:
174
 
            match = token.regexp.match(s)
175
 
            if match is not None:
176
 
                # Token found
177
 
                if token.value is not None:
178
 
                    # Value found, parse digits
179
 
                    factor = int(match.group(1), 10)
180
 
                    # Add to value so far
181
 
                    value += factor * token.value
182
 
                # Strip token from string
183
 
                s = token.regexp.sub("", s, 1)
184
 
                # Go to found token
185
 
                found_token = token
186
 
                # Set valid next tokens
187
 
                followers = found_token.followers
188
 
                break
189
 
        else:
190
 
            # No currently valid tokens were found
191
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
192
 
                             .format(duration))
193
 
    # End token found
194
 
    return value
195
 
 
 
77
            .format(days = "{0}T".format(td.days) if td.days else "",
 
78
                    hours = td.seconds // 3600,
 
79
                    minutes = (td.seconds % 3600) // 60,
 
80
                    seconds = td.seconds % 60,
 
81
                    ))
196
82
 
197
83
def string_to_delta(interval):
198
84
    """Parse a string and return a datetime.timedelta
199
 
 
200
 
    >>> string_to_delta('7d')
 
85
    
 
86
    >>> string_to_delta("7d")
201
87
    datetime.timedelta(7)
202
 
    >>> string_to_delta('60s')
 
88
    >>> string_to_delta("60s")
203
89
    datetime.timedelta(0, 60)
204
 
    >>> string_to_delta('60m')
 
90
    >>> string_to_delta("60m")
205
91
    datetime.timedelta(0, 3600)
206
 
    >>> string_to_delta('24h')
 
92
    >>> string_to_delta("24h")
207
93
    datetime.timedelta(1)
208
 
    >>> string_to_delta('1w')
 
94
    >>> string_to_delta("1w")
209
95
    datetime.timedelta(7)
210
 
    >>> string_to_delta('5m 30s')
 
96
    >>> string_to_delta("5m 30s")
211
97
    datetime.timedelta(0, 330)
212
98
    """
213
 
 
214
 
    try:
215
 
        return rfc3339_duration_to_delta(interval)
216
 
    except ValueError:
217
 
        pass
218
 
 
219
99
    value = datetime.timedelta(0)
220
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
221
 
 
 
100
    regexp = re.compile("(\d+)([dsmhw]?)")
 
101
    
222
102
    for num, suffix in regexp.findall(interval):
223
103
        if suffix == "d":
224
104
            value += datetime.timedelta(int(num))
234
114
            value += datetime.timedelta(0, 0, 0, int(num))
235
115
    return value
236
116
 
237
 
 
238
117
def print_clients(clients, keywords):
239
118
    def valuetostring(value, keyword):
240
119
        if type(value) is dbus.Boolean:
242
121
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
243
122
                       "ApprovalDuration", "ExtendedTimeout"):
244
123
            return milliseconds_to_string(value)
245
 
        return str(value)
246
 
 
 
124
        return unicode(value)
 
125
    
247
126
    # Create format string to print table rows
248
127
    format_string = " ".join("{{{key}:{width}}}".format(
249
 
        width=max(len(tablewords[key]),
250
 
                  max(len(valuetostring(client[key], key))
251
 
                      for client in clients)),
252
 
        key=key)
253
 
                             for key in keywords)
 
128
            width = max(len(tablewords[key]),
 
129
                        max(len(valuetostring(client[key],
 
130
                                              key))
 
131
                            for client in
 
132
                            clients)),
 
133
            key = key) for key in keywords)
254
134
    # Print header line
255
135
    print(format_string.format(**tablewords))
256
136
    for client in clients:
257
 
        print(format_string
258
 
              .format(**{key: valuetostring(client[key], key)
259
 
                         for key in keywords}))
260
 
 
 
137
        print(format_string.format(**dict((key,
 
138
                                           valuetostring(client[key],
 
139
                                                         key))
 
140
                                          for key in keywords)))
261
141
 
262
142
def has_actions(options):
263
143
    return any((options.enable,
279
159
                options.approve,
280
160
                options.deny))
281
161
 
282
 
 
283
162
def main():
284
163
    parser = argparse.ArgumentParser()
285
164
    parser.add_argument("--version", action="version",
286
 
                        version="%(prog)s {}".format(version),
 
165
                        version = "%(prog)s {0}".format(version),
287
166
                        help="show version number and exit")
288
167
    parser.add_argument("-a", "--all", action="store_true",
289
168
                        help="Select all clients")
290
169
    parser.add_argument("-v", "--verbose", action="store_true",
291
170
                        help="Print all fields")
292
 
    parser.add_argument("-j", "--dump-json", action="store_true",
293
 
                        help="Dump client data in JSON format")
294
171
    parser.add_argument("-e", "--enable", action="store_true",
295
172
                        help="Enable client")
296
173
    parser.add_argument("-d", "--disable", action="store_true",
324
201
    parser.add_argument("--approval-duration",
325
202
                        help="Set duration of one client approval")
326
203
    parser.add_argument("-H", "--host", help="Set host for client")
327
 
    parser.add_argument("-s", "--secret",
328
 
                        type=argparse.FileType(mode="rb"),
 
204
    parser.add_argument("-s", "--secret", type=file,
329
205
                        help="Set password blob (file) for client")
330
206
    parser.add_argument("-A", "--approve", action="store_true",
331
207
                        help="Approve any current client request")
332
208
    parser.add_argument("-D", "--deny", action="store_true",
333
209
                        help="Deny any current client request")
334
 
    parser.add_argument("--check", action="store_true",
335
 
                        help="Run self-test")
336
210
    parser.add_argument("client", nargs="*", help="Client name")
337
211
    options = parser.parse_args()
338
 
 
 
212
    
339
213
    if has_actions(options) and not (options.client or options.all):
340
214
        parser.error("Options require clients names or --all.")
341
215
    if options.verbose and has_actions(options):
342
 
        parser.error("--verbose can only be used alone.")
343
 
    if options.dump_json and (options.verbose
344
 
                              or has_actions(options)):
345
 
        parser.error("--dump-json can only be used alone.")
 
216
        parser.error("--verbose can only be used alone or with"
 
217
                     " --all.")
346
218
    if options.all and not has_actions(options):
347
219
        parser.error("--all requires an action.")
348
 
 
 
220
    
349
221
    try:
350
222
        bus = dbus.SystemBus()
351
223
        mandos_dbus_objc = bus.get_object(busname, server_path)
352
224
    except dbus.exceptions.DBusException:
353
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
225
        print("Could not connect to Mandos server",
 
226
              file=sys.stderr)
354
227
        sys.exit(1)
355
 
 
 
228
    
356
229
    mandos_serv = dbus.Interface(mandos_dbus_objc,
357
 
                                 dbus_interface=server_interface)
358
 
    mandos_serv_object_manager = dbus.Interface(
359
 
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
360
 
 
361
 
    # block stderr since dbus library prints to stderr
 
230
                                 dbus_interface = server_interface)
 
231
    
 
232
    #block stderr since dbus library prints to stderr
362
233
    null = os.open(os.path.devnull, os.O_RDWR)
363
234
    stderrcopy = os.dup(sys.stderr.fileno())
364
235
    os.dup2(null, sys.stderr.fileno())
365
236
    os.close(null)
366
237
    try:
367
238
        try:
368
 
            mandos_clients = {path: ifs_and_props[client_interface]
369
 
                              for path, ifs_and_props in
370
 
                              mandos_serv_object_manager
371
 
                              .GetManagedObjects().items()
372
 
                              if client_interface in ifs_and_props}
 
239
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
373
240
        finally:
374
 
            # restore stderr
 
241
            #restore stderr
375
242
            os.dup2(stderrcopy, sys.stderr.fileno())
376
243
            os.close(stderrcopy)
377
 
    except dbus.exceptions.DBusException as e:
378
 
        print("Access denied: "
379
 
              "Accessing mandos server through D-Bus: {}".format(e),
 
244
    except dbus.exceptions.DBusException:
 
245
        print("Access denied: Accessing mandos server through dbus.",
380
246
              file=sys.stderr)
381
247
        sys.exit(1)
382
 
 
 
248
    
383
249
    # Compile dict of (clients: properties) to process
384
 
    clients = {}
385
 
 
 
250
    clients={}
 
251
    
386
252
    if options.all or not options.client:
387
 
        clients = {bus.get_object(busname, path): properties
388
 
                   for path, properties in mandos_clients.items()}
 
253
        clients = dict((bus.get_object(busname, path), properties)
 
254
                       for path, properties in
 
255
                       mandos_clients.iteritems())
389
256
    else:
390
257
        for name in options.client:
391
 
            for path, client in mandos_clients.items():
 
258
            for path, client in mandos_clients.iteritems():
392
259
                if client["Name"] == name:
393
260
                    client_objc = bus.get_object(busname, path)
394
261
                    clients[client_objc] = client
395
262
                    break
396
263
            else:
397
 
                print("Client not found on server: {!r}"
 
264
                print("Client not found on server: {0!r}"
398
265
                      .format(name), file=sys.stderr)
399
266
                sys.exit(1)
400
 
 
 
267
    
401
268
    if not has_actions(options) and clients:
402
 
        if options.verbose or options.dump_json:
403
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
404
 
                        "Created", "Interval", "Host", "KeyID",
405
 
                        "Fingerprint", "CheckerRunning",
 
269
        if options.verbose:
 
270
            keywords = ("Name", "Enabled", "Timeout",
 
271
                        "LastCheckedOK", "Created", "Interval",
 
272
                        "Host", "Fingerprint", "CheckerRunning",
406
273
                        "LastEnabled", "ApprovalPending",
407
 
                        "ApprovedByDefault", "LastApprovalRequest",
408
 
                        "ApprovalDelay", "ApprovalDuration",
409
 
                        "Checker", "ExtendedTimeout", "Expires",
410
 
                        "LastCheckerStatus")
 
274
                        "ApprovedByDefault",
 
275
                        "LastApprovalRequest", "ApprovalDelay",
 
276
                        "ApprovalDuration", "Checker",
 
277
                        "ExtendedTimeout")
411
278
        else:
412
279
            keywords = defaultkeywords
413
 
 
414
 
        if options.dump_json:
415
 
            json.dump({client["Name"]: {key:
416
 
                                        bool(client[key])
417
 
                                        if isinstance(client[key],
418
 
                                                      dbus.Boolean)
419
 
                                        else client[key]
420
 
                                        for key in keywords}
421
 
                       for client in clients.values()},
422
 
                      fp=sys.stdout, indent=4,
423
 
                      separators=(',', ': '))
424
 
            print()
425
 
        else:
426
 
            print_clients(clients.values(), keywords)
 
280
        
 
281
        print_clients(clients.values(), keywords)
427
282
    else:
428
283
        # Process each client in the list by all selected options
429
284
        for client in clients:
430
 
 
431
285
            def set_client_prop(prop, value):
432
286
                """Set a Client D-Bus property"""
433
287
                client.Set(client_interface, prop, value,
434
288
                           dbus_interface=dbus.PROPERTIES_IFACE)
435
 
 
436
289
            def set_client_prop_ms(prop, value):
437
290
                """Set a Client D-Bus property, converted
438
291
                from a string to milliseconds."""
439
292
                set_client_prop(prop,
440
 
                                string_to_delta(value).total_seconds()
441
 
                                * 1000)
442
 
 
 
293
                                timedelta_to_milliseconds
 
294
                                (string_to_delta(value)))
443
295
            if options.remove:
444
296
                mandos_serv.RemoveClient(client.__dbus_object_path__)
445
297
            if options.enable:
453
305
            if options.stop_checker:
454
306
                set_client_prop("CheckerRunning", dbus.Boolean(False))
455
307
            if options.is_enabled:
456
 
                if client.Get(client_interface, "Enabled",
457
 
                              dbus_interface=dbus.PROPERTIES_IFACE):
458
 
                    sys.exit(0)
459
 
                else:
460
 
                    sys.exit(1)
 
308
                sys.exit(0 if client.Get(client_interface,
 
309
                                         "Enabled",
 
310
                                         dbus_interface=
 
311
                                         dbus.PROPERTIES_IFACE)
 
312
                         else 1)
461
313
            if options.checker is not None:
462
314
                set_client_prop("Checker", options.checker)
463
315
            if options.host is not None:
489
341
                client.Approve(dbus.Boolean(False),
490
342
                               dbus_interface=client_interface)
491
343
 
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
 
 
523
344
if __name__ == "__main__":
524
 
    if should_only_run_tests():
525
 
        # Call using ./tdd-python-script --check [--verbose]
526
 
        unittest.main()
527
 
    else:
528
 
        main()
 
345
    main()