/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-ctl

Add TODO entries about new D-Bus features we should use.

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-2012 Teddy Hogeborn
7
 
# Copyright © 2008-2012 Björn Påhlsson
 
6
# Copyright © 2008-2011 Teddy Hogeborn
 
7
# Copyright © 2008-2011 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.5.3"
 
63
version = "1.4.1"
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}{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
 
                    ))
 
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
                })
79
79
 
80
80
def string_to_delta(interval):
81
81
    """Parse a string and return a datetime.timedelta
121
121
        return unicode(value)
122
122
    
123
123
    # Create format string to print table rows
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)
 
124
    format_string = " ".join("%%-%ds" %
 
125
                             max(len(tablewords[key]),
 
126
                                 max(len(valuetostring(client[key],
 
127
                                                       key))
 
128
                                     for client in
 
129
                                     clients))
 
130
                             for key in keywords)
131
131
    # Print header line
132
 
    print(format_string.format(**tablewords))
 
132
    print(format_string % tuple(tablewords[key] for key in keywords))
133
133
    for client in clients:
134
 
        print(format_string.format(**dict((key,
135
 
                                           valuetostring(client[key],
136
 
                                                         key))
137
 
                                          for key in keywords)))
 
134
        print(format_string % tuple(valuetostring(client[key], key)
 
135
                                    for key in keywords))
138
136
 
139
137
def has_actions(options):
140
138
    return any((options.enable,
159
157
def main():
160
158
    parser = argparse.ArgumentParser()
161
159
    parser.add_argument("--version", action="version",
162
 
                        version = "%(prog)s {0}".format(version),
 
160
                        version = "%%prog %s" % version,
163
161
                        help="show version number and exit")
164
162
    parser.add_argument("-a", "--all", action="store_true",
165
163
                        help="Select all clients")
258
256
                    clients[client_objc] = client
259
257
                    break
260
258
            else:
261
 
                print("Client not found on server: {0!r}"
262
 
                      .format(name), file=sys.stderr)
 
259
                print("Client not found on server: %r" % name,
 
260
                      file=sys.stderr)
263
261
                sys.exit(1)
264
262
    
265
263
    if not has_actions(options) and clients:
333
331
                           dbus_interface=dbus.PROPERTIES_IFACE)
334
332
            if options.secret is not None:
335
333
                client.Set(client_interface, "Secret",
336
 
                           dbus.ByteArray(options.secret.read()),
 
334
                           dbus.ByteArray(open(options.secret,
 
335
                                               "rb").read()),
337
336
                           dbus_interface=dbus.PROPERTIES_IFACE)
338
337
            if options.approved_by_default is not None:
339
338
                client.Set(client_interface, "ApprovedByDefault",