/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

* 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
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
21
# 
22
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
22
# Contact the authors at <mandos@recompile.se>.
23
23
# 
24
24
 
25
25
from __future__ import (division, absolute_import, print_function,
52
52
    "ApprovalDelay": "Approval Delay",
53
53
    "ApprovalDuration": "Approval Duration",
54
54
    "Checker": "Checker",
 
55
    "ExtendedTimeout" : "Extended Timeout"
55
56
    }
56
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
57
 
domain = "se.bsnet.fukt"
 
58
domain = "se.recompile"
58
59
busname = domain + ".Mandos"
59
60
server_path = "/"
60
61
server_interface = domain + ".Mandos"
61
62
client_interface = domain + ".Mandos.Client"
62
 
version = "1.3.0"
 
63
version = "1.5.3"
63
64
 
64
65
def timedelta_to_milliseconds(td):
65
66
    """Convert a datetime.timedelta object to milliseconds"""
69
70
 
70
71
def milliseconds_to_string(ms):
71
72
    td = datetime.timedelta(0, 0, 0, ms)
72
 
    return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
73
 
            % { "days": "%dT" % td.days if td.days else "",
74
 
                "hours": td.seconds // 3600,
75
 
                "minutes": (td.seconds % 3600) // 60,
76
 
                "seconds": td.seconds % 60,
77
 
                })
 
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
                    ))
78
79
 
79
80
def string_to_delta(interval):
80
81
    """Parse a string and return a datetime.timedelta
92
93
    >>> string_to_delta("5m 30s")
93
94
    datetime.timedelta(0, 330)
94
95
    """
95
 
    timevalue = datetime.timedelta(0)
96
 
    regexp = re.compile("\d+[dsmhw]")
 
96
    value = datetime.timedelta(0)
 
97
    regexp = re.compile("(\d+)([dsmhw]?)")
97
98
    
98
 
    for s in regexp.findall(interval):
99
 
        try:
100
 
            suffix = unicode(s[-1])
101
 
            value = int(s[:-1])
102
 
            if suffix == "d":
103
 
                delta = datetime.timedelta(value)
104
 
            elif suffix == "s":
105
 
                delta = datetime.timedelta(0, value)
106
 
            elif suffix == "m":
107
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
108
 
            elif suffix == "h":
109
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
110
 
            elif suffix == "w":
111
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
112
 
            else:
113
 
                raise ValueError
114
 
        except (ValueError, IndexError):
115
 
            raise ValueError
116
 
        timevalue += delta
117
 
    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
118
113
 
119
114
def print_clients(clients, keywords):
120
115
    def valuetostring(value, keyword):
126
121
        return unicode(value)
127
122
    
128
123
    # Create format string to print table rows
129
 
    format_string = " ".join("%%-%ds" %
130
 
                             max(len(tablewords[key]),
131
 
                                 max(len(valuetostring(client[key],
132
 
                                                       key))
133
 
                                     for client in
134
 
                                     clients))
135
 
                             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)
136
131
    # Print header line
137
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
132
    print(format_string.format(**tablewords))
138
133
    for client in clients:
139
 
        print(format_string % tuple(valuetostring(client[key], key)
140
 
                                    for key in keywords))
 
134
        print(format_string.format(**dict((key,
 
135
                                           valuetostring(client[key],
 
136
                                                         key))
 
137
                                          for key in keywords)))
141
138
 
142
139
def has_actions(options):
143
140
    return any((options.enable,
149
146
                options.remove,
150
147
                options.checker is not None,
151
148
                options.timeout is not None,
 
149
                options.extended_timeout is not None,
152
150
                options.interval is not None,
153
151
                options.approved_by_default is not None,
154
152
                options.approval_delay is not None,
161
159
def main():
162
160
    parser = argparse.ArgumentParser()
163
161
    parser.add_argument("--version", action="version",
164
 
                        version = "%%prog %s" % version,
 
162
                        version = "%(prog)s {0}".format(version),
165
163
                        help="show version number and exit")
166
164
    parser.add_argument("-a", "--all", action="store_true",
167
165
                        help="Select all clients")
185
183
                        help="Set checker command for client")
186
184
    parser.add_argument("-t", "--timeout",
187
185
                        help="Set timeout for client")
 
186
    parser.add_argument("--extended-timeout",
 
187
                        help="Set extended timeout for client")
188
188
    parser.add_argument("-i", "--interval",
189
189
                        help="Set checker interval for client")
190
190
    parser.add_argument("--approve-by-default", action="store_true",
238
238
            #restore stderr
239
239
            os.dup2(stderrcopy, sys.stderr.fileno())
240
240
            os.close(stderrcopy)
241
 
    except dbus.exceptions.DBusException, e:
 
241
    except dbus.exceptions.DBusException:
242
242
        print("Access denied: Accessing mandos server through dbus.",
243
243
              file=sys.stderr)
244
244
        sys.exit(1)
258
258
                    clients[client_objc] = client
259
259
                    break
260
260
            else:
261
 
                print("Client not found on server: %r" % name,
262
 
                      file=sys.stderr)
 
261
                print("Client not found on server: {0!r}"
 
262
                      .format(name), file=sys.stderr)
263
263
                sys.exit(1)
264
264
    
265
265
    if not has_actions(options) and clients:
270
270
                        "LastEnabled", "ApprovalPending",
271
271
                        "ApprovedByDefault",
272
272
                        "LastApprovalRequest", "ApprovalDelay",
273
 
                        "ApprovalDuration", "Checker")
 
273
                        "ApprovalDuration", "Checker",
 
274
                        "ExtendedTimeout")
274
275
        else:
275
276
            keywords = defaultkeywords
276
277
        
296
297
                                         dbus_interface=
297
298
                                         dbus.PROPERTIES_IFACE)
298
299
                         else 1)
299
 
            if options.checker:
 
300
            if options.checker is not None:
300
301
                client.Set(client_interface, "Checker",
301
302
                           options.checker,
302
303
                           dbus_interface=dbus.PROPERTIES_IFACE)
303
 
            if options.host:
 
304
            if options.host is not None:
304
305
                client.Set(client_interface, "Host", options.host,
305
306
                           dbus_interface=dbus.PROPERTIES_IFACE)
306
 
            if options.interval:
 
307
            if options.interval is not None:
307
308
                client.Set(client_interface, "Interval",
308
309
                           timedelta_to_milliseconds
309
310
                           (string_to_delta(options.interval)),
310
311
                           dbus_interface=dbus.PROPERTIES_IFACE)
311
 
            if options.approval_delay:
 
312
            if options.approval_delay is not None:
312
313
                client.Set(client_interface, "ApprovalDelay",
313
314
                           timedelta_to_milliseconds
314
315
                           (string_to_delta(options.
315
316
                                            approval_delay)),
316
317
                           dbus_interface=dbus.PROPERTIES_IFACE)
317
 
            if options.approval_duration:
 
318
            if options.approval_duration is not None:
318
319
                client.Set(client_interface, "ApprovalDuration",
319
320
                           timedelta_to_milliseconds
320
321
                           (string_to_delta(options.
321
322
                                            approval_duration)),
322
323
                           dbus_interface=dbus.PROPERTIES_IFACE)
323
 
            if options.timeout:
 
324
            if options.timeout is not None:
324
325
                client.Set(client_interface, "Timeout",
325
326
                           timedelta_to_milliseconds
326
327
                           (string_to_delta(options.timeout)),
327
328
                           dbus_interface=dbus.PROPERTIES_IFACE)
328
 
            if options.secret:
 
329
            if options.extended_timeout is not None:
 
330
                client.Set(client_interface, "ExtendedTimeout",
 
331
                           timedelta_to_milliseconds
 
332
                           (string_to_delta(options.extended_timeout)),
 
333
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
334
            if options.secret is not None:
329
335
                client.Set(client_interface, "Secret",
330
 
                           dbus.ByteArray(open(options.secret,
331
 
                                               "rb").read()),
 
336
                           dbus.ByteArray(options.secret.read()),
332
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
333
338
            if options.approved_by_default is not None:
334
339
                client.Set(client_interface, "ApprovedByDefault",