/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: 2014-07-25 23:16:04 UTC
  • mto: This revision was merged to the branch mainline in revision 724.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

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