/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-05-03 20:16:22 UTC
  • Revision ID: teddy@recompile.se-20120503201622-d9yezi9t17i00lio
* mandos-ctl: Use new string format method.  Bug fix: --version now
              shows the program name.

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-2010 Teddy Hogeborn
7
 
# Copyright © 2008-2010 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
60
60
server_path = "/"
61
61
server_interface = domain + ".Mandos"
62
62
client_interface = domain + ".Mandos.Client"
63
 
version = "1.3.1"
 
63
version = "1.5.3"
64
64
 
65
65
def timedelta_to_milliseconds(td):
66
66
    """Convert a datetime.timedelta object to milliseconds"""
70
70
 
71
71
def milliseconds_to_string(ms):
72
72
    td = datetime.timedelta(0, 0, 0, ms)
73
 
    return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
74
 
            % { "days": "%dT" % td.days if td.days else "",
75
 
                "hours": td.seconds // 3600,
76
 
                "minutes": (td.seconds % 3600) // 60,
77
 
                "seconds": td.seconds % 60,
78
 
                })
 
73
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
74
            .format(days = "{0}T".format(td.days) if td.days else "",
 
75
                    hours = td.seconds // 3600,
 
76
                    minutes = (td.seconds % 3600) // 60,
 
77
                    seconds = td.seconds % 60,
 
78
                    ))
79
79
 
80
80
def string_to_delta(interval):
81
81
    """Parse a string and return a datetime.timedelta
93
93
    >>> string_to_delta("5m 30s")
94
94
    datetime.timedelta(0, 330)
95
95
    """
96
 
    timevalue = datetime.timedelta(0)
97
 
    regexp = re.compile("\d+[dsmhw]")
 
96
    value = datetime.timedelta(0)
 
97
    regexp = re.compile("(\d+)([dsmhw]?)")
98
98
    
99
 
    for s in regexp.findall(interval):
100
 
        try:
101
 
            suffix = unicode(s[-1])
102
 
            value = int(s[:-1])
103
 
            if suffix == "d":
104
 
                delta = datetime.timedelta(value)
105
 
            elif suffix == "s":
106
 
                delta = datetime.timedelta(0, value)
107
 
            elif suffix == "m":
108
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
109
 
            elif suffix == "h":
110
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
111
 
            elif suffix == "w":
112
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
113
 
            else:
114
 
                raise ValueError
115
 
        except (ValueError, IndexError):
116
 
            raise ValueError
117
 
        timevalue += delta
118
 
    return timevalue
 
99
    for num, suffix in regexp.findall(interval):
 
100
        if suffix == "d":
 
101
            value += datetime.timedelta(int(num))
 
102
        elif suffix == "s":
 
103
            value += datetime.timedelta(0, int(num))
 
104
        elif suffix == "m":
 
105
            value += datetime.timedelta(0, 0, 0, 0, int(num))
 
106
        elif suffix == "h":
 
107
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
 
108
        elif suffix == "w":
 
109
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
 
110
        elif suffix == "":
 
111
            value += datetime.timedelta(0, 0, 0, int(num))
 
112
    return value
119
113
 
120
114
def print_clients(clients, keywords):
121
115
    def valuetostring(value, keyword):
127
121
        return unicode(value)
128
122
    
129
123
    # Create format string to print table rows
130
 
    format_string = " ".join("%%-%ds" %
131
 
                             max(len(tablewords[key]),
132
 
                                 max(len(valuetostring(client[key],
133
 
                                                       key))
134
 
                                     for client in
135
 
                                     clients))
136
 
                             for key in keywords)
 
124
    format_string = " ".join("{{{key}:{width}}}".format(
 
125
            width = max(len(tablewords[key]),
 
126
                        max(len(valuetostring(client[key],
 
127
                                              key))
 
128
                            for client in
 
129
                            clients)),
 
130
            key = key) for key in keywords)
137
131
    # Print header line
138
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
132
    print(format_string.format(**tablewords))
139
133
    for client in clients:
140
 
        print(format_string % tuple(valuetostring(client[key], key)
141
 
                                    for key in keywords))
 
134
        print(format_string.format(**dict((key,
 
135
                                           valuetostring(client[key],
 
136
                                                         key))
 
137
                                          for key in keywords)))
142
138
 
143
139
def has_actions(options):
144
140
    return any((options.enable,
163
159
def main():
164
160
    parser = argparse.ArgumentParser()
165
161
    parser.add_argument("--version", action="version",
166
 
                        version = "%%prog %s" % version,
 
162
                        version = "%(prog)s {0}".format(version),
167
163
                        help="show version number and exit")
168
164
    parser.add_argument("-a", "--all", action="store_true",
169
165
                        help="Select all clients")
242
238
            #restore stderr
243
239
            os.dup2(stderrcopy, sys.stderr.fileno())
244
240
            os.close(stderrcopy)
245
 
    except dbus.exceptions.DBusException, e:
 
241
    except dbus.exceptions.DBusException:
246
242
        print("Access denied: Accessing mandos server through dbus.",
247
243
              file=sys.stderr)
248
244
        sys.exit(1)
262
258
                    clients[client_objc] = client
263
259
                    break
264
260
            else:
265
 
                print("Client not found on server: %r" % name,
266
 
                      file=sys.stderr)
 
261
                print("Client not found on server: {0!r}"
 
262
                      .format(name), file=sys.stderr)
267
263
                sys.exit(1)
268
264
    
269
265
    if not has_actions(options) and clients:
301
297
                                         dbus_interface=
302
298
                                         dbus.PROPERTIES_IFACE)
303
299
                         else 1)
304
 
            if options.checker:
 
300
            if options.checker is not None:
305
301
                client.Set(client_interface, "Checker",
306
302
                           options.checker,
307
303
                           dbus_interface=dbus.PROPERTIES_IFACE)
308
 
            if options.host:
 
304
            if options.host is not None:
309
305
                client.Set(client_interface, "Host", options.host,
310
306
                           dbus_interface=dbus.PROPERTIES_IFACE)
311
 
            if options.interval:
 
307
            if options.interval is not None:
312
308
                client.Set(client_interface, "Interval",
313
309
                           timedelta_to_milliseconds
314
310
                           (string_to_delta(options.interval)),
315
311
                           dbus_interface=dbus.PROPERTIES_IFACE)
316
 
            if options.approval_delay:
 
312
            if options.approval_delay is not None:
317
313
                client.Set(client_interface, "ApprovalDelay",
318
314
                           timedelta_to_milliseconds
319
315
                           (string_to_delta(options.
320
316
                                            approval_delay)),
321
317
                           dbus_interface=dbus.PROPERTIES_IFACE)
322
 
            if options.approval_duration:
 
318
            if options.approval_duration is not None:
323
319
                client.Set(client_interface, "ApprovalDuration",
324
320
                           timedelta_to_milliseconds
325
321
                           (string_to_delta(options.
326
322
                                            approval_duration)),
327
323
                           dbus_interface=dbus.PROPERTIES_IFACE)
328
 
            if options.timeout:
 
324
            if options.timeout is not None:
329
325
                client.Set(client_interface, "Timeout",
330
326
                           timedelta_to_milliseconds
331
327
                           (string_to_delta(options.timeout)),
332
328
                           dbus_interface=dbus.PROPERTIES_IFACE)
333
 
            if options.extended_timeout:
 
329
            if options.extended_timeout is not None:
334
330
                client.Set(client_interface, "ExtendedTimeout",
335
331
                           timedelta_to_milliseconds
336
332
                           (string_to_delta(options.extended_timeout)),
337
333
                           dbus_interface=dbus.PROPERTIES_IFACE)
338
 
            if options.secret:
 
334
            if options.secret is not None:
339
335
                client.Set(client_interface, "Secret",
340
 
                           dbus.ByteArray(open(options.secret,
341
 
                                               "rb").read()),
 
336
                           dbus.ByteArray(options.secret.read()),
342
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
343
338
            if options.approved_by_default is not None:
344
339
                client.Set(client_interface, "ApprovedByDefault",