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
- browse files at revision 574
- compare with another revision
- download diff
- download tarball
- view history from revision 574
- Committer: Teddy Hogeborn
- Date: 2012-05-05 10:52:11 UTC
- Revision ID: teddy@recompile.se-20120505105211-58z3hyjfzep3z2q9
* mandos: White space and other misc. format fixes only.
added
removed
mandos-ctl
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.5.2"
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
116
117
if type(value) is dbus.Boolean:
117
118
return "Yes" if value else "No"
118
119
if keyword in ("Timeout", "Interval", "ApprovalDelay",
119
"ApprovalDuration"):
120
"ApprovalDuration", "ExtendedTimeout"):
120
121
return milliseconds_to_string(value)
121
122
return unicode(value)
122
123
123
124
# 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)
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)
131
132
# Print header line
132
print(format_string % tuple(tablewords[key] for key in keywords))
133
print(format_string.format(**tablewords))
133
134
for client in clients:
134
print(format_string % tuple(valuetostring(client[key], key)
135
for key in keywords))
135
print(format_string.format(**dict((key,
136
valuetostring(client[key],
137
key))
138
for key in keywords)))
136
139
137
140
def has_actions(options):
138
141
return any((options.enable,
157
160
def main():
158
161
parser = argparse.ArgumentParser()
159
162
parser.add_argument("--version", action="version",
160
version = "%%prog %s" % version,
163
version = "%(prog)s {0}".format(version),
161
164
help="show version number and exit")
162
165
parser.add_argument("-a", "--all", action="store_true",
163
166
help="Select all clients")
205
208
parser.add_argument("client", nargs="*", help="Client name")
206
209
options = parser.parse_args()
207
210
208
if has_actions(options) and not options.client and not options.all:
211
if has_actions(options) and not (options.client or options.all):
209
212
parser.error("Options require clients names or --all.")
210
213
if options.verbose and has_actions(options):
211
214
parser.error("--verbose can only be used alone or with"
256
259
clients[client_objc] = client
257
260
break
258
261
else:
259
print("Client not found on server: %r" % name,
260
file=sys.stderr)
262
print("Client not found on server: {0!r}"
263
.format(name), file=sys.stderr)
261
264
sys.exit(1)
262
265
263
266
if not has_actions(options) and clients:
277
280
else:
278
281
# Process each client in the list by all selected options
279
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)))
280
293
if options.remove:
281
294
mandos_serv.RemoveClient(client.__dbus_object_path__)
282
295
if options.enable:
283
client.Enable(dbus_interface=client_interface)
296
set_client_prop("Enabled", dbus.Boolean(True))
284
297
if options.disable:
285
client.Disable(dbus_interface=client_interface)
298
set_client_prop("Enabled", dbus.Boolean(False))
286
299
if options.bump_timeout:
287
client.CheckedOK(dbus_interface=client_interface)
300
set_client_prop("LastCheckedOK", "")
288
301
if options.start_checker:
289
client.StartChecker(dbus_interface=client_interface)
302
set_client_prop("CheckerRunning", dbus.Boolean(True))
290
303
if options.stop_checker:
291
client.StopChecker(dbus_interface=client_interface)
304
set_client_prop("CheckerRunning", dbus.Boolean(False))
292
305
if options.is_enabled:
293
306
sys.exit(0 if client.Get(client_interface,
294
307
"Enabled",
296
309
dbus.PROPERTIES_IFACE)
297
310
else 1)
298
311
if options.checker is not None:
299
client.Set(client_interface, "Checker",
300
options.checker,
301
dbus_interface=dbus.PROPERTIES_IFACE)
312
set_client_prop("Checker", options.checker)
302
313
if options.host is not None:
303
client.Set(client_interface, "Host", options.host,
304
dbus_interface=dbus.PROPERTIES_IFACE)
314
set_client_prop("Host", options.host)
305
315
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)
316
set_client_prop_ms("Interval", options.interval)
310
317
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)
318
set_client_prop_ms("ApprovalDelay",
319
options.approval_delay)
316
320
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)
321
set_client_prop_ms("ApprovalDuration",
322
options.approval_duration)
322
323
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)
324
set_client_prop_ms("Timeout", options.timeout)
327
325
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)
326
set_client_prop_ms("ExtendedTimeout",
327
options.extended_timeout)
332
328
if options.secret is not None:
333
client.Set(client_interface, "Secret",
334
dbus.ByteArray(options.secret.read()),
335
dbus_interface=dbus.PROPERTIES_IFACE)
329
set_client_prop("Secret",
330
dbus.ByteArray(options.secret.read()))
336
331
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)
332
set_client_prop("ApprovedByDefault",
333
dbus.Boolean(options
334
.approved_by_default))
341
335
if options.approve:
342
336
client.Approve(dbus.Boolean(True),
343
337
dbus_interface=client_interface)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0