/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-10-24 19:34:13 UTC
  • Revision ID: teddy@recompile.se-20121024193413-yiorm0x5lj48fu7i
http://bugs.debian.org/690639
* mandos: Comment changes.
* mandos-keygen (--password): Fix bashism.  Thanks to Raphael Geissert
                              <atomo64@gmail.com> for the bug report.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2008-2015 Teddy Hogeborn
7
 
# Copyright © 2008-2015 Björn Påhlsson
 
6
# Copyright © 2008-2012 Teddy Hogeborn
 
7
# Copyright © 2008-2012 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
28
 
29
 
try:
30
 
    from future_builtins import *
31
 
except ImportError:
32
 
    pass
 
29
from future_builtins import *
33
30
 
34
31
import sys
35
32
import argparse
42
39
 
43
40
import dbus
44
41
 
45
 
if sys.version_info.major == 2:
46
 
    str = unicode
47
 
 
48
42
locale.setlocale(locale.LC_ALL, "")
49
43
 
50
44
tablewords = {
64
58
    "ApprovalDelay": "Approval Delay",
65
59
    "ApprovalDuration": "Approval Duration",
66
60
    "Checker": "Checker",
67
 
    "ExtendedTimeout": "Extended Timeout"
68
 
}
 
61
    "ExtendedTimeout" : "Extended Timeout"
 
62
    }
69
63
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
64
domain = "se.recompile"
71
65
busname = domain + ".Mandos"
72
66
server_path = "/"
73
67
server_interface = domain + ".Mandos"
74
68
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.9"
 
69
version = "1.6.0"
76
70
 
 
71
def timedelta_to_milliseconds(td):
 
72
    """Convert a datetime.timedelta object to milliseconds"""
 
73
    return ((td.days * 24 * 60 * 60 * 1000)
 
74
            + (td.seconds * 1000)
 
75
            + (td.microseconds // 1000))
77
76
 
78
77
def milliseconds_to_string(ms):
79
78
    td = datetime.timedelta(0, 0, 0, ms)
80
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}".format(
81
 
        days = "{}T".format(td.days) if td.days else "",
82
 
        hours = td.seconds // 3600,
83
 
        minutes = (td.seconds % 3600) // 60,
84
 
        seconds = td.seconds % 60))
 
79
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
80
            .format(days = "{0}T".format(td.days) if td.days else "",
 
81
                    hours = td.seconds // 3600,
 
82
                    minutes = (td.seconds % 3600) // 60,
 
83
                    seconds = td.seconds % 60,
 
84
                    ))
85
85
 
86
86
 
87
87
def rfc3339_duration_to_delta(duration):
125
125
    token_end = Token(re.compile(r"$"), None, frozenset())
126
126
    token_second = Token(re.compile(r"(\d+)S"),
127
127
                         datetime.timedelta(seconds=1),
128
 
                         frozenset((token_end, )))
 
128
                         frozenset((token_end,)))
129
129
    token_minute = Token(re.compile(r"(\d+)M"),
130
130
                         datetime.timedelta(minutes=1),
131
131
                         frozenset((token_second, token_end)))
147
147
                       frozenset((token_month, token_end)))
148
148
    token_week = Token(re.compile(r"(\d+)W"),
149
149
                       datetime.timedelta(weeks=1),
150
 
                       frozenset((token_end, )))
 
150
                       frozenset((token_end,)))
151
151
    token_duration = Token(re.compile(r"P"), None,
152
152
                           frozenset((token_year, token_month,
153
153
                                      token_day, token_time,
154
 
                                      token_week)))
 
154
                                      token_week))),
155
155
    # Define starting values
156
156
    value = datetime.timedelta() # Value so far
157
157
    found_token = None
158
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
158
    followers = frozenset(token_duration,) # Following valid tokens
159
159
    s = duration                # String left to parse
160
160
    # Loop until end token is found
161
161
    while found_token is not token_end:
199
199
    >>> string_to_delta("5m 30s")
200
200
    datetime.timedelta(0, 330)
201
201
    """
 
202
    value = datetime.timedelta(0)
 
203
    regexp = re.compile(r"(\d+)([dsmhw]?)")
202
204
    
203
205
    try:
204
206
        return rfc3339_duration_to_delta(interval)
205
207
    except ValueError:
206
208
        pass
207
209
    
208
 
    value = datetime.timedelta(0)
209
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
210
 
    
211
210
    for num, suffix in regexp.findall(interval):
212
211
        if suffix == "d":
213
212
            value += datetime.timedelta(int(num))
223
222
            value += datetime.timedelta(0, 0, 0, int(num))
224
223
    return value
225
224
 
226
 
 
227
225
def print_clients(clients, keywords):
228
226
    def valuetostring(value, keyword):
229
227
        if type(value) is dbus.Boolean:
231
229
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
232
230
                       "ApprovalDuration", "ExtendedTimeout"):
233
231
            return milliseconds_to_string(value)
234
 
        return str(value)
 
232
        return unicode(value)
235
233
    
236
234
    # Create format string to print table rows
237
235
    format_string = " ".join("{{{key}:{width}}}".format(
238
 
        width = max(len(tablewords[key]),
239
 
                    max(len(valuetostring(client[key], key))
240
 
                        for client in clients)),
241
 
        key = key)
242
 
                             for key in keywords)
 
236
            width = max(len(tablewords[key]),
 
237
                        max(len(valuetostring(client[key],
 
238
                                              key))
 
239
                            for client in
 
240
                            clients)),
 
241
            key = key) for key in keywords)
243
242
    # Print header line
244
243
    print(format_string.format(**tablewords))
245
244
    for client in clients:
246
 
        print(format_string.format(**{
247
 
            key: valuetostring(client[key], key)
248
 
            for key in keywords }))
249
 
 
 
245
        print(format_string.format(**dict((key,
 
246
                                           valuetostring(client[key],
 
247
                                                         key))
 
248
                                          for key in keywords)))
250
249
 
251
250
def has_actions(options):
252
251
    return any((options.enable,
268
267
                options.approve,
269
268
                options.deny))
270
269
 
271
 
 
272
270
def main():
273
271
    parser = argparse.ArgumentParser()
274
272
    parser.add_argument("--version", action="version",
275
 
                        version = "%(prog)s {}".format(version),
 
273
                        version = "%(prog)s {0}".format(version),
276
274
                        help="show version number and exit")
277
275
    parser.add_argument("-a", "--all", action="store_true",
278
276
                        help="Select all clients")
311
309
    parser.add_argument("--approval-duration",
312
310
                        help="Set duration of one client approval")
313
311
    parser.add_argument("-H", "--host", help="Set host for client")
314
 
    parser.add_argument("-s", "--secret",
315
 
                        type=argparse.FileType(mode="rb"),
 
312
    parser.add_argument("-s", "--secret", type=file,
316
313
                        help="Set password blob (file) for client")
317
314
    parser.add_argument("-A", "--approve", action="store_true",
318
315
                        help="Approve any current client request")
333
330
 
334
331
    if options.check:
335
332
        fail_count, test_count = doctest.testmod()
336
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
333
        sys.exit(0 if fail_count == 0 else 1)
337
334
    
338
335
    try:
339
336
        bus = dbus.SystemBus()
340
337
        mandos_dbus_objc = bus.get_object(busname, server_path)
341
338
    except dbus.exceptions.DBusException:
342
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
339
        print("Could not connect to Mandos server",
 
340
              file=sys.stderr)
343
341
        sys.exit(1)
344
342
    
345
343
    mandos_serv = dbus.Interface(mandos_dbus_objc,
366
364
    clients={}
367
365
    
368
366
    if options.all or not options.client:
369
 
        clients = { bus.get_object(busname, path): properties
370
 
                    for path, properties in mandos_clients.items() }
 
367
        clients = dict((bus.get_object(busname, path), properties)
 
368
                       for path, properties in
 
369
                       mandos_clients.iteritems())
371
370
    else:
372
371
        for name in options.client:
373
 
            for path, client in mandos_clients.items():
 
372
            for path, client in mandos_clients.iteritems():
374
373
                if client["Name"] == name:
375
374
                    client_objc = bus.get_object(busname, path)
376
375
                    clients[client_objc] = client
377
376
                    break
378
377
            else:
379
 
                print("Client not found on server: {!r}"
 
378
                print("Client not found on server: {0!r}"
380
379
                      .format(name), file=sys.stderr)
381
380
                sys.exit(1)
382
381
    
383
382
    if not has_actions(options) and clients:
384
383
        if options.verbose:
385
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
386
 
                        "Created", "Interval", "Host", "Fingerprint",
387
 
                        "CheckerRunning", "LastEnabled",
388
 
                        "ApprovalPending", "ApprovedByDefault",
 
384
            keywords = ("Name", "Enabled", "Timeout",
 
385
                        "LastCheckedOK", "Created", "Interval",
 
386
                        "Host", "Fingerprint", "CheckerRunning",
 
387
                        "LastEnabled", "ApprovalPending",
 
388
                        "ApprovedByDefault",
389
389
                        "LastApprovalRequest", "ApprovalDelay",
390
390
                        "ApprovalDuration", "Checker",
391
391
                        "ExtendedTimeout")
396
396
    else:
397
397
        # Process each client in the list by all selected options
398
398
        for client in clients:
399
 
            
400
399
            def set_client_prop(prop, value):
401
400
                """Set a Client D-Bus property"""
402
401
                client.Set(client_interface, prop, value,
403
402
                           dbus_interface=dbus.PROPERTIES_IFACE)
404
 
            
405
403
            def set_client_prop_ms(prop, value):
406
404
                """Set a Client D-Bus property, converted
407
405
                from a string to milliseconds."""
408
406
                set_client_prop(prop,
409
 
                                string_to_delta(value).total_seconds()
410
 
                                * 1000)
411
 
            
 
407
                                timedelta_to_milliseconds
 
408
                                (string_to_delta(value)))
412
409
            if options.remove:
413
410
                mandos_serv.RemoveClient(client.__dbus_object_path__)
414
411
            if options.enable:
458
455
                client.Approve(dbus.Boolean(False),
459
456
                               dbus_interface=client_interface)
460
457
 
461
 
 
462
458
if __name__ == "__main__":
463
459
    main()