/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: 2015-04-02 21:56:15 UTC
  • Revision ID: teddy@recompile.se-20150402215615-v2ll1pgbae2dqdfx
mandos-ctl: Do minor formatting and whitespace adjustments.

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-2014 Teddy Hogeborn
7
 
# Copyright © 2008-2014 Björn Påhlsson
 
6
# Copyright © 2008-2015 Teddy Hogeborn
 
7
# Copyright © 2008-2015 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
42
42
 
43
43
import dbus
44
44
 
45
 
if sys.version_info[0] == 2:
 
45
if sys.version_info.major == 2:
46
46
    str = unicode
47
47
 
48
48
locale.setlocale(locale.LC_ALL, "")
64
64
    "ApprovalDelay": "Approval Delay",
65
65
    "ApprovalDuration": "Approval Duration",
66
66
    "Checker": "Checker",
67
 
    "ExtendedTimeout" : "Extended Timeout"
68
 
    }
 
67
    "ExtendedTimeout": "Extended Timeout"
 
68
}
69
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
70
domain = "se.recompile"
71
71
busname = domain + ".Mandos"
72
72
server_path = "/"
73
73
server_interface = domain + ".Mandos"
74
74
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.7"
 
75
version = "1.6.9"
76
76
 
77
 
def timedelta_to_milliseconds(td):
78
 
    """Convert a datetime.timedelta object to milliseconds"""
79
 
    return ((td.days * 24 * 60 * 60 * 1000)
80
 
            + (td.seconds * 1000)
81
 
            + (td.microseconds // 1000))
82
77
 
83
78
def milliseconds_to_string(ms):
84
79
    td = datetime.timedelta(0, 0, 0, ms)
85
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
86
 
            .format(days = "{0}T".format(td.days) if td.days else "",
87
 
                    hours = td.seconds // 3600,
88
 
                    minutes = (td.seconds % 3600) // 60,
89
 
                    seconds = td.seconds % 60,
90
 
                    ))
 
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))
91
85
 
92
86
 
93
87
def rfc3339_duration_to_delta(duration):
131
125
    token_end = Token(re.compile(r"$"), None, frozenset())
132
126
    token_second = Token(re.compile(r"(\d+)S"),
133
127
                         datetime.timedelta(seconds=1),
134
 
                         frozenset((token_end,)))
 
128
                         frozenset((token_end, )))
135
129
    token_minute = Token(re.compile(r"(\d+)M"),
136
130
                         datetime.timedelta(minutes=1),
137
131
                         frozenset((token_second, token_end)))
153
147
                       frozenset((token_month, token_end)))
154
148
    token_week = Token(re.compile(r"(\d+)W"),
155
149
                       datetime.timedelta(weeks=1),
156
 
                       frozenset((token_end,)))
 
150
                       frozenset((token_end, )))
157
151
    token_duration = Token(re.compile(r"P"), None,
158
152
                           frozenset((token_year, token_month,
159
153
                                      token_day, token_time,
160
 
                                      token_week))),
 
154
                                      token_week)))
161
155
    # Define starting values
162
156
    value = datetime.timedelta() # Value so far
163
157
    found_token = None
164
 
    followers = frozenset(token_duration,) # Following valid tokens
 
158
    followers = frozenset((token_duration, )) # Following valid tokens
165
159
    s = duration                # String left to parse
166
160
    # Loop until end token is found
167
161
    while found_token is not token_end:
229
223
            value += datetime.timedelta(0, 0, 0, int(num))
230
224
    return value
231
225
 
 
226
 
232
227
def print_clients(clients, keywords):
233
228
    def valuetostring(value, keyword):
234
229
        if type(value) is dbus.Boolean:
240
235
    
241
236
    # Create format string to print table rows
242
237
    format_string = " ".join("{{{key}:{width}}}".format(
243
 
            width = max(len(tablewords[key]),
244
 
                        max(len(valuetostring(client[key],
245
 
                                              key))
246
 
                            for client in
247
 
                            clients)),
248
 
            key = key) for key in keywords)
 
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)
249
243
    # Print header line
250
244
    print(format_string.format(**tablewords))
251
245
    for client in clients:
252
 
        print(format_string.format(**dict((key,
253
 
                                           valuetostring(client[key],
254
 
                                                         key))
255
 
                                          for key in keywords)))
 
246
        print(format_string.format(**{
 
247
            key: valuetostring(client[key], key)
 
248
            for key in keywords }))
 
249
 
256
250
 
257
251
def has_actions(options):
258
252
    return any((options.enable,
274
268
                options.approve,
275
269
                options.deny))
276
270
 
 
271
 
277
272
def main():
278
273
    parser = argparse.ArgumentParser()
279
274
    parser.add_argument("--version", action="version",
280
 
                        version = "%(prog)s {0}".format(version),
 
275
                        version = "%(prog)s {}".format(version),
281
276
                        help="show version number and exit")
282
277
    parser.add_argument("-a", "--all", action="store_true",
283
278
                        help="Select all clients")
344
339
        bus = dbus.SystemBus()
345
340
        mandos_dbus_objc = bus.get_object(busname, server_path)
346
341
    except dbus.exceptions.DBusException:
347
 
        print("Could not connect to Mandos server",
348
 
              file=sys.stderr)
 
342
        print("Could not connect to Mandos server", file=sys.stderr)
349
343
        sys.exit(1)
350
344
    
351
345
    mandos_serv = dbus.Interface(mandos_dbus_objc,
372
366
    clients={}
373
367
    
374
368
    if options.all or not options.client:
375
 
        clients = dict((bus.get_object(busname, path), properties)
376
 
                       for path, properties in
377
 
                       mandos_clients.items())
 
369
        clients = { bus.get_object(busname, path): properties
 
370
                    for path, properties in mandos_clients.items() }
378
371
    else:
379
372
        for name in options.client:
380
 
            for path, client in mandos_clients.iteritems():
 
373
            for path, client in mandos_clients.items():
381
374
                if client["Name"] == name:
382
375
                    client_objc = bus.get_object(busname, path)
383
376
                    clients[client_objc] = client
384
377
                    break
385
378
            else:
386
 
                print("Client not found on server: {0!r}"
 
379
                print("Client not found on server: {!r}"
387
380
                      .format(name), file=sys.stderr)
388
381
                sys.exit(1)
389
382
    
390
383
    if not has_actions(options) and clients:
391
384
        if options.verbose:
392
 
            keywords = ("Name", "Enabled", "Timeout",
393
 
                        "LastCheckedOK", "Created", "Interval",
394
 
                        "Host", "Fingerprint", "CheckerRunning",
395
 
                        "LastEnabled", "ApprovalPending",
396
 
                        "ApprovedByDefault",
 
385
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
386
                        "Created", "Interval", "Host", "Fingerprint",
 
387
                        "CheckerRunning", "LastEnabled",
 
388
                        "ApprovalPending", "ApprovedByDefault",
397
389
                        "LastApprovalRequest", "ApprovalDelay",
398
390
                        "ApprovalDuration", "Checker",
399
391
                        "ExtendedTimeout")
404
396
    else:
405
397
        # Process each client in the list by all selected options
406
398
        for client in clients:
 
399
            
407
400
            def set_client_prop(prop, value):
408
401
                """Set a Client D-Bus property"""
409
402
                client.Set(client_interface, prop, value,
410
403
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
404
            
411
405
            def set_client_prop_ms(prop, value):
412
406
                """Set a Client D-Bus property, converted
413
407
                from a string to milliseconds."""
414
408
                set_client_prop(prop,
415
 
                                timedelta_to_milliseconds
416
 
                                (string_to_delta(value)))
 
409
                                string_to_delta(value).total_seconds()
 
410
                                * 1000)
 
411
            
417
412
            if options.remove:
418
413
                mandos_serv.RemoveClient(client.__dbus_object_path__)
419
414
            if options.enable:
463
458
                client.Approve(dbus.Boolean(False),
464
459
                               dbus_interface=client_interface)
465
460
 
 
461
 
466
462
if __name__ == "__main__":
467
463
    main()