/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-06 17:23:08 UTC
  • Revision ID: teddy@recompile.se-20120506172308-xw7368koksmjmnv3
* mandos (Client.start_checker): Reworded comment.
 (MandosServer.handle_ipc): Removed dead code.

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-2011 Teddy Hogeborn
7
 
# Copyright © 2008-2011 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
17
17
#     GNU General Public License for more details.
18
18
# 
19
19
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
21
22
# 
22
23
# Contact the authors at <mandos@recompile.se>.
23
24
# 
60
61
server_path = "/"
61
62
server_interface = domain + ".Mandos"
62
63
client_interface = domain + ".Mandos.Client"
63
 
version = "1.4.1"
 
64
version = "1.5.3"
64
65
 
65
66
def timedelta_to_milliseconds(td):
66
67
    """Convert a datetime.timedelta object to milliseconds"""
70
71
 
71
72
def milliseconds_to_string(ms):
72
73
    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
 
                })
 
74
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
75
            .format(days = "{0}T".format(td.days) if td.days else "",
 
76
                    hours = td.seconds // 3600,
 
77
                    minutes = (td.seconds % 3600) // 60,
 
78
                    seconds = td.seconds % 60,
 
79
                    ))
79
80
 
80
81
def string_to_delta(interval):
81
82
    """Parse a string and return a datetime.timedelta
93
94
    >>> string_to_delta("5m 30s")
94
95
    datetime.timedelta(0, 330)
95
96
    """
96
 
    timevalue = datetime.timedelta(0)
97
 
    regexp = re.compile("\d+[dsmhw]")
 
97
    value = datetime.timedelta(0)
 
98
    regexp = re.compile("(\d+)([dsmhw]?)")
98
99
    
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
 
100
    for num, suffix in regexp.findall(interval):
 
101
        if suffix == "d":
 
102
            value += datetime.timedelta(int(num))
 
103
        elif suffix == "s":
 
104
            value += datetime.timedelta(0, int(num))
 
105
        elif suffix == "m":
 
106
            value += datetime.timedelta(0, 0, 0, 0, int(num))
 
107
        elif suffix == "h":
 
108
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
 
109
        elif suffix == "w":
 
110
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
 
111
        elif suffix == "":
 
112
            value += datetime.timedelta(0, 0, 0, int(num))
 
113
    return value
119
114
 
120
115
def print_clients(clients, keywords):
121
116
    def valuetostring(value, keyword):
122
117
        if type(value) is dbus.Boolean:
123
118
            return "Yes" if value else "No"
124
119
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
125
 
                       "ApprovalDuration"):
 
120
                       "ApprovalDuration", "ExtendedTimeout"):
126
121
            return milliseconds_to_string(value)
127
122
        return unicode(value)
128
123
    
129
124
    # 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)
 
125
    format_string = " ".join("{{{key}:{width}}}".format(
 
126
            width = max(len(tablewords[key]),
 
127
                        max(len(valuetostring(client[key],
 
128
                                              key))
 
129
                            for client in
 
130
                            clients)),
 
131
            key = key) for key in keywords)
137
132
    # Print header line
138
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
133
    print(format_string.format(**tablewords))
139
134
    for client in clients:
140
 
        print(format_string % tuple(valuetostring(client[key], key)
141
 
                                    for key in keywords))
 
135
        print(format_string.format(**dict((key,
 
136
                                           valuetostring(client[key],
 
137
                                                         key))
 
138
                                          for key in keywords)))
142
139
 
143
140
def has_actions(options):
144
141
    return any((options.enable,
163
160
def main():
164
161
    parser = argparse.ArgumentParser()
165
162
    parser.add_argument("--version", action="version",
166
 
                        version = "%%prog %s" % version,
 
163
                        version = "%(prog)s {0}".format(version),
167
164
                        help="show version number and exit")
168
165
    parser.add_argument("-a", "--all", action="store_true",
169
166
                        help="Select all clients")
211
208
    parser.add_argument("client", nargs="*", help="Client name")
212
209
    options = parser.parse_args()
213
210
    
214
 
    if has_actions(options) and not options.client and not options.all:
 
211
    if has_actions(options) and not (options.client or options.all):
215
212
        parser.error("Options require clients names or --all.")
216
213
    if options.verbose and has_actions(options):
217
214
        parser.error("--verbose can only be used alone or with"
242
239
            #restore stderr
243
240
            os.dup2(stderrcopy, sys.stderr.fileno())
244
241
            os.close(stderrcopy)
245
 
    except dbus.exceptions.DBusException, e:
 
242
    except dbus.exceptions.DBusException:
246
243
        print("Access denied: Accessing mandos server through dbus.",
247
244
              file=sys.stderr)
248
245
        sys.exit(1)
262
259
                    clients[client_objc] = client
263
260
                    break
264
261
            else:
265
 
                print("Client not found on server: %r" % name,
266
 
                      file=sys.stderr)
 
262
                print("Client not found on server: {0!r}"
 
263
                      .format(name), file=sys.stderr)
267
264
                sys.exit(1)
268
265
    
269
266
    if not has_actions(options) and clients:
283
280
    else:
284
281
        # Process each client in the list by all selected options
285
282
        for client in clients:
 
283
            def set_client_prop(prop, value):
 
284
                """Set a Client D-Bus property"""
 
285
                client.Set(client_interface, prop, value,
 
286
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
287
            def set_client_prop_ms(prop, value):
 
288
                """Set a Client D-Bus property, converted
 
289
                from a string to milliseconds."""
 
290
                set_client_prop(prop,
 
291
                                timedelta_to_milliseconds
 
292
                                (string_to_delta(value)))
286
293
            if options.remove:
287
294
                mandos_serv.RemoveClient(client.__dbus_object_path__)
288
295
            if options.enable:
289
 
                client.Enable(dbus_interface=client_interface)
 
296
                set_client_prop("Enabled", dbus.Boolean(True))
290
297
            if options.disable:
291
 
                client.Disable(dbus_interface=client_interface)
 
298
                set_client_prop("Enabled", dbus.Boolean(False))
292
299
            if options.bump_timeout:
293
 
                client.CheckedOK(dbus_interface=client_interface)
 
300
                set_client_prop("LastCheckedOK", "")
294
301
            if options.start_checker:
295
 
                client.StartChecker(dbus_interface=client_interface)
 
302
                set_client_prop("CheckerRunning", dbus.Boolean(True))
296
303
            if options.stop_checker:
297
 
                client.StopChecker(dbus_interface=client_interface)
 
304
                set_client_prop("CheckerRunning", dbus.Boolean(False))
298
305
            if options.is_enabled:
299
306
                sys.exit(0 if client.Get(client_interface,
300
307
                                         "Enabled",
302
309
                                         dbus.PROPERTIES_IFACE)
303
310
                         else 1)
304
311
            if options.checker is not None:
305
 
                client.Set(client_interface, "Checker",
306
 
                           options.checker,
307
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
312
                set_client_prop("Checker", options.checker)
308
313
            if options.host is not None:
309
 
                client.Set(client_interface, "Host", options.host,
310
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
314
                set_client_prop("Host", options.host)
311
315
            if options.interval is not None:
312
 
                client.Set(client_interface, "Interval",
313
 
                           timedelta_to_milliseconds
314
 
                           (string_to_delta(options.interval)),
315
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
316
                set_client_prop_ms("Interval", options.interval)
316
317
            if options.approval_delay is not None:
317
 
                client.Set(client_interface, "ApprovalDelay",
318
 
                           timedelta_to_milliseconds
319
 
                           (string_to_delta(options.
320
 
                                            approval_delay)),
321
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
318
                set_client_prop_ms("ApprovalDelay",
 
319
                                   options.approval_delay)
322
320
            if options.approval_duration is not None:
323
 
                client.Set(client_interface, "ApprovalDuration",
324
 
                           timedelta_to_milliseconds
325
 
                           (string_to_delta(options.
326
 
                                            approval_duration)),
327
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
321
                set_client_prop_ms("ApprovalDuration",
 
322
                                   options.approval_duration)
328
323
            if options.timeout is not None:
329
 
                client.Set(client_interface, "Timeout",
330
 
                           timedelta_to_milliseconds
331
 
                           (string_to_delta(options.timeout)),
332
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
324
                set_client_prop_ms("Timeout", options.timeout)
333
325
            if options.extended_timeout is not None:
334
 
                client.Set(client_interface, "ExtendedTimeout",
335
 
                           timedelta_to_milliseconds
336
 
                           (string_to_delta(options.extended_timeout)),
337
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
326
                set_client_prop_ms("ExtendedTimeout",
 
327
                                   options.extended_timeout)
338
328
            if options.secret is not None:
339
 
                client.Set(client_interface, "Secret",
340
 
                           dbus.ByteArray(open(options.secret,
341
 
                                               "rb").read()),
342
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
329
                set_client_prop("Secret",
 
330
                                dbus.ByteArray(options.secret.read()))
343
331
            if options.approved_by_default is not None:
344
 
                client.Set(client_interface, "ApprovedByDefault",
345
 
                           dbus.Boolean(options
346
 
                                        .approved_by_default),
347
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
332
                set_client_prop("ApprovedByDefault",
 
333
                                dbus.Boolean(options
 
334
                                             .approved_by_default))
348
335
            if options.approve:
349
336
                client.Approve(dbus.Boolean(True),
350
337
                               dbus_interface=client_interface)