/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 (main): Use D-Bus properties instead of methods.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
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
121
121
        return unicode(value)
122
122
    
123
123
    # Create format string to print table rows
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)
 
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)
131
131
    # Print header line
132
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
132
    print(format_string.format(**tablewords))
133
133
    for client in clients:
134
 
        print(format_string % tuple(valuetostring(client[key], key)
135
 
                                    for key in keywords))
 
134
        print(format_string.format(**dict((key,
 
135
                                           valuetostring(client[key],
 
136
                                                         key))
 
137
                                          for key in keywords)))
136
138
 
137
139
def has_actions(options):
138
140
    return any((options.enable,
157
159
def main():
158
160
    parser = argparse.ArgumentParser()
159
161
    parser.add_argument("--version", action="version",
160
 
                        version = "%%prog %s" % version,
 
162
                        version = "%(prog)s {0}".format(version),
161
163
                        help="show version number and exit")
162
164
    parser.add_argument("-a", "--all", action="store_true",
163
165
                        help="Select all clients")
256
258
                    clients[client_objc] = client
257
259
                    break
258
260
            else:
259
 
                print("Client not found on server: %r" % name,
260
 
                      file=sys.stderr)
 
261
                print("Client not found on server: {0!r}"
 
262
                      .format(name), file=sys.stderr)
261
263
                sys.exit(1)
262
264
    
263
265
    if not has_actions(options) and clients:
277
279
    else:
278
280
        # Process each client in the list by all selected options
279
281
        for client in clients:
 
282
            def set_client_prop(prop, value):
 
283
                """Set a Client D-Bus property"""
 
284
                client.Set(client_interface, prop, value,
 
285
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
286
            def set_client_prop_ms(prop, value):
 
287
                """Set a Client D-Bus property, converted
 
288
                from a string to milliseconds."""
 
289
                set_client_prop(prop,
 
290
                                timedelta_to_milliseconds
 
291
                                (string_to_delta(value)))
280
292
            if options.remove:
281
293
                mandos_serv.RemoveClient(client.__dbus_object_path__)
282
294
            if options.enable:
283
 
                client.Enable(dbus_interface=client_interface)
 
295
                set_client_prop("Enabled", dbus.Boolean(True))
284
296
            if options.disable:
285
 
                client.Disable(dbus_interface=client_interface)
 
297
                set_client_prop("Enabled", dbus.Boolean(False))
286
298
            if options.bump_timeout:
287
 
                client.CheckedOK(dbus_interface=client_interface)
 
299
                set_client_prop("LastCheckedOK", "")
288
300
            if options.start_checker:
289
 
                client.StartChecker(dbus_interface=client_interface)
 
301
                set_client_prop("CheckerRunning", dbus.Boolean(True))
290
302
            if options.stop_checker:
291
 
                client.StopChecker(dbus_interface=client_interface)
 
303
                set_client_prop("CheckerRunning", dbus.Boolean(False))
292
304
            if options.is_enabled:
293
305
                sys.exit(0 if client.Get(client_interface,
294
306
                                         "Enabled",
296
308
                                         dbus.PROPERTIES_IFACE)
297
309
                         else 1)
298
310
            if options.checker is not None:
299
 
                client.Set(client_interface, "Checker",
300
 
                           options.checker,
301
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
311
                set_client_prop("Checker", options.checker)
302
312
            if options.host is not None:
303
 
                client.Set(client_interface, "Host", options.host,
304
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
313
                set_client_prop("Host", options.host)
305
314
            if options.interval is not None:
306
 
                client.Set(client_interface, "Interval",
307
 
                           timedelta_to_milliseconds
308
 
                           (string_to_delta(options.interval)),
309
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
315
                set_client_prop_ms("Interval", options.interval)
310
316
            if options.approval_delay is not None:
311
 
                client.Set(client_interface, "ApprovalDelay",
312
 
                           timedelta_to_milliseconds
313
 
                           (string_to_delta(options.
314
 
                                            approval_delay)),
315
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
317
                set_client_prop_ms("ApprovalDelay",
 
318
                                   options.approval_delay)
316
319
            if options.approval_duration is not None:
317
 
                client.Set(client_interface, "ApprovalDuration",
318
 
                           timedelta_to_milliseconds
319
 
                           (string_to_delta(options.
320
 
                                            approval_duration)),
321
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
320
                set_client_prop_ms("ApprovalDuration",
 
321
                                   options.approval_duration)
322
322
            if options.timeout is not None:
323
 
                client.Set(client_interface, "Timeout",
324
 
                           timedelta_to_milliseconds
325
 
                           (string_to_delta(options.timeout)),
326
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
323
                set_client_prop_ms("Timeout", options.timeout)
327
324
            if options.extended_timeout is not None:
328
 
                client.Set(client_interface, "ExtendedTimeout",
329
 
                           timedelta_to_milliseconds
330
 
                           (string_to_delta(options.extended_timeout)),
331
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
325
                set_client_prop_ms("ExtendedTimeout",
 
326
                                   options.extended_timeout)
332
327
            if options.secret is not None:
333
 
                client.Set(client_interface, "Secret",
334
 
                           dbus.ByteArray(options.secret.read()),
335
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
328
                set_client_prop("Secret",
 
329
                                dbus.ByteArray(options.secret.read()))
336
330
            if options.approved_by_default is not None:
337
 
                client.Set(client_interface, "ApprovedByDefault",
338
 
                           dbus.Boolean(options
339
 
                                        .approved_by_default),
340
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
331
                set_client_prop("ApprovedByDefault",
 
332
                                dbus.Boolean(options
 
333
                                             .approved_by_default))
341
334
            if options.approve:
342
335
                client.Approve(dbus.Boolean(True),
343
336
                               dbus_interface=client_interface)