/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: 2011-09-26 19:36:18 UTC
  • mfrom: (24.1.184 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110926193618-vtj5c9hena1maixx
Merge from Björn

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-2010 Teddy Hogeborn
 
7
# Copyright © 2008-2010 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@recompile.se>.
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
23
# 
24
24
 
25
25
from __future__ import (division, absolute_import, print_function,
55
55
    "ExtendedTimeout" : "Extended Timeout"
56
56
    }
57
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
58
 
domain = "se.recompile"
 
58
domain = "se.bsnet.fukt"
59
59
busname = domain + ".Mandos"
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.3.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
93
93
    >>> string_to_delta("5m 30s")
94
94
    datetime.timedelta(0, 330)
95
95
    """
96
 
    value = datetime.timedelta(0)
97
 
    regexp = re.compile("(\d+)([dsmhw]?)")
 
96
    timevalue = datetime.timedelta(0)
 
97
    regexp = re.compile("\d+[dsmhw]")
98
98
    
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
 
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
113
119
 
114
120
def print_clients(clients, keywords):
115
121
    def valuetostring(value, keyword):
121
127
        return unicode(value)
122
128
    
123
129
    # 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)
 
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)
131
137
    # Print header line
132
 
    print(format_string.format(**tablewords))
 
138
    print(format_string % tuple(tablewords[key] for key in keywords))
133
139
    for client in clients:
134
 
        print(format_string.format(**dict((key,
135
 
                                           valuetostring(client[key],
136
 
                                                         key))
137
 
                                          for key in keywords)))
 
140
        print(format_string % tuple(valuetostring(client[key], key)
 
141
                                    for key in keywords))
138
142
 
139
143
def has_actions(options):
140
144
    return any((options.enable,
159
163
def main():
160
164
    parser = argparse.ArgumentParser()
161
165
    parser.add_argument("--version", action="version",
162
 
                        version = "%(prog)s {0}".format(version),
 
166
                        version = "%%prog %s" % version,
163
167
                        help="show version number and exit")
164
168
    parser.add_argument("-a", "--all", action="store_true",
165
169
                        help="Select all clients")
238
242
            #restore stderr
239
243
            os.dup2(stderrcopy, sys.stderr.fileno())
240
244
            os.close(stderrcopy)
241
 
    except dbus.exceptions.DBusException:
 
245
    except dbus.exceptions.DBusException, e:
242
246
        print("Access denied: Accessing mandos server through dbus.",
243
247
              file=sys.stderr)
244
248
        sys.exit(1)
258
262
                    clients[client_objc] = client
259
263
                    break
260
264
            else:
261
 
                print("Client not found on server: {0!r}"
262
 
                      .format(name), file=sys.stderr)
 
265
                print("Client not found on server: %r" % name,
 
266
                      file=sys.stderr)
263
267
                sys.exit(1)
264
268
    
265
269
    if not has_actions(options) and clients:
282
286
            if options.remove:
283
287
                mandos_serv.RemoveClient(client.__dbus_object_path__)
284
288
            if options.enable:
285
 
                client.Set(client_interface, "Enabled",
286
 
                           dbus.Boolean(True),
287
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
289
                client.Enable(dbus_interface=client_interface)
288
290
            if options.disable:
289
 
                client.Set(client_interface, "Enabled",
290
 
                           dbus.Boolean(False),
291
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
291
                client.Disable(dbus_interface=client_interface)
292
292
            if options.bump_timeout:
293
 
                client.Set(client_interface, "LastCheckedOK", "",
294
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
293
                client.CheckedOK(dbus_interface=client_interface)
295
294
            if options.start_checker:
296
 
                client.Set(client_interface, "CheckerRunning",
297
 
                           dbus.Boolean(True),
298
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
295
                client.StartChecker(dbus_interface=client_interface)
299
296
            if options.stop_checker:
300
 
                client.Set(client_interface, "CheckerRunning",
301
 
                           dbus.Boolean(False),
302
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
297
                client.StopChecker(dbus_interface=client_interface)
303
298
            if options.is_enabled:
304
299
                sys.exit(0 if client.Get(client_interface,
305
300
                                         "Enabled",
306
301
                                         dbus_interface=
307
302
                                         dbus.PROPERTIES_IFACE)
308
303
                         else 1)
309
 
            if options.checker is not None:
 
304
            if options.checker:
310
305
                client.Set(client_interface, "Checker",
311
306
                           options.checker,
312
307
                           dbus_interface=dbus.PROPERTIES_IFACE)
313
 
            if options.host is not None:
 
308
            if options.host:
314
309
                client.Set(client_interface, "Host", options.host,
315
310
                           dbus_interface=dbus.PROPERTIES_IFACE)
316
 
            if options.interval is not None:
 
311
            if options.interval:
317
312
                client.Set(client_interface, "Interval",
318
313
                           timedelta_to_milliseconds
319
314
                           (string_to_delta(options.interval)),
320
315
                           dbus_interface=dbus.PROPERTIES_IFACE)
321
 
            if options.approval_delay is not None:
 
316
            if options.approval_delay:
322
317
                client.Set(client_interface, "ApprovalDelay",
323
318
                           timedelta_to_milliseconds
324
319
                           (string_to_delta(options.
325
320
                                            approval_delay)),
326
321
                           dbus_interface=dbus.PROPERTIES_IFACE)
327
 
            if options.approval_duration is not None:
 
322
            if options.approval_duration:
328
323
                client.Set(client_interface, "ApprovalDuration",
329
324
                           timedelta_to_milliseconds
330
325
                           (string_to_delta(options.
331
326
                                            approval_duration)),
332
327
                           dbus_interface=dbus.PROPERTIES_IFACE)
333
 
            if options.timeout is not None:
 
328
            if options.timeout:
334
329
                client.Set(client_interface, "Timeout",
335
330
                           timedelta_to_milliseconds
336
331
                           (string_to_delta(options.timeout)),
337
332
                           dbus_interface=dbus.PROPERTIES_IFACE)
338
 
            if options.extended_timeout is not None:
 
333
            if options.extended_timeout:
339
334
                client.Set(client_interface, "ExtendedTimeout",
340
335
                           timedelta_to_milliseconds
341
336
                           (string_to_delta(options.extended_timeout)),
342
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
343
 
            if options.secret is not None:
 
338
            if options.secret:
344
339
                client.Set(client_interface, "Secret",
345
 
                           dbus.ByteArray(options.secret.read()),
 
340
                           dbus.ByteArray(open(options.secret,
 
341
                                               "rb").read()),
346
342
                           dbus_interface=dbus.PROPERTIES_IFACE)
347
343
            if options.approved_by_default is not None:
348
344
                client.Set(client_interface, "ApprovedByDefault",