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 745
- compare with another revision
- download diff
- download tarball
- view history from revision 745
- Committer: Teddy Hogeborn
- Date: 2015-04-02 21:56:15 UTC
- Revision ID: teddy@recompile.se-20150402215615-v2ll1pgbae2dqdfx
mandos-ctl: Do minor formatting and whitespace adjustments.
- files modified:
- DBUS-API
added
removed
mandos-ctl
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2008-2014 Teddy Hogeborn
7
# Copyright © 2008-2014 Björn Påhlsson
6
# Copyright © 2008-2015 Teddy Hogeborn
7
# Copyright © 2008-2015 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
64
64
"ApprovalDelay": "Approval Delay",
65
65
"ApprovalDuration": "Approval Duration",
66
66
"Checker": "Checker",
67
"ExtendedTimeout" : "Extended Timeout"
68
}
67
"ExtendedTimeout": "Extended Timeout"
68
}
69
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
70
domain = "se.recompile"
71
71
busname = domain + ".Mandos"
72
72
server_path = "/"
73
73
server_interface = domain + ".Mandos"
74
74
client_interface = domain + ".Mandos.Client"
75
version = "1.6.7"
75
version = "1.6.9"
76
76
77
77
78
def milliseconds_to_string(ms):
78
79
td = datetime.timedelta(0, 0, 0, ms)
79
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
80
.format(days = "{}T".format(td.days) if td.days else "",
81
hours = td.seconds // 3600,
82
minutes = (td.seconds % 3600) // 60,
83
seconds = td.seconds % 60,
84
))
80
return ("{days}{hours:02}:{minutes:02}:{seconds:02}".format(
81
days = "{}T".format(td.days) if td.days else "",
82
hours = td.seconds // 3600,
83
minutes = (td.seconds % 3600) // 60,
84
seconds = td.seconds % 60))
85
85
86
86
87
87
def rfc3339_duration_to_delta(duration):
125
125
token_end = Token(re.compile(r"$"), None, frozenset())
126
126
token_second = Token(re.compile(r"(\d+)S"),
127
127
datetime.timedelta(seconds=1),
128
frozenset((token_end,)))
128
frozenset((token_end, )))
129
129
token_minute = Token(re.compile(r"(\d+)M"),
130
130
datetime.timedelta(minutes=1),
131
131
frozenset((token_second, token_end)))
147
147
frozenset((token_month, token_end)))
148
148
token_week = Token(re.compile(r"(\d+)W"),
149
149
datetime.timedelta(weeks=1),
150
frozenset((token_end,)))
150
frozenset((token_end, )))
151
151
token_duration = Token(re.compile(r"P"), None,
152
152
frozenset((token_year, token_month,
153
153
token_day, token_time,
155
155
# Define starting values
156
156
value = datetime.timedelta() # Value so far
157
157
found_token = None
158
followers = frozenset((token_duration,)) # Following valid tokens
158
followers = frozenset((token_duration, )) # Following valid tokens
159
159
s = duration # String left to parse
160
160
# Loop until end token is found
161
161
while found_token is not token_end:
223
223
value += datetime.timedelta(0, 0, 0, int(num))
224
224
return value
225
225
226
226
227
def print_clients(clients, keywords):
227
228
def valuetostring(value, keyword):
228
229
if type(value) is dbus.Boolean:
234
235
235
236
# Create format string to print table rows
236
237
format_string = " ".join("{{{key}:{width}}}".format(
237
width = max(len(tablewords[key]),
238
max(len(valuetostring(client[key],
239
key))
240
for client in
241
clients)),
242
key = key) for key in keywords)
238
width = max(len(tablewords[key]),
239
max(len(valuetostring(client[key], key))
240
for client in clients)),
241
key = key)
242
for key in keywords)
243
243
# Print header line
244
244
print(format_string.format(**tablewords))
245
245
for client in clients:
246
print(format_string.format(**{ key:
247
valuetostring(client[key],
248
key)
249
for key in keywords }))
246
print(format_string.format(**{
247
key: valuetostring(client[key], key)
248
for key in keywords }))
249
250
250
251
251
def has_actions(options):
252
252
return any((options.enable,
268
268
options.approve,
269
269
options.deny))
270
270
271
271
272
def main():
272
273
parser = argparse.ArgumentParser()
273
274
parser.add_argument("--version", action="version",
338
339
bus = dbus.SystemBus()
339
340
mandos_dbus_objc = bus.get_object(busname, server_path)
340
341
except dbus.exceptions.DBusException:
341
print("Could not connect to Mandos server",
342
file=sys.stderr)
342
print("Could not connect to Mandos server", file=sys.stderr)
343
343
sys.exit(1)
344
344
345
345
mandos_serv = dbus.Interface(mandos_dbus_objc,
382
382
383
383
if not has_actions(options) and clients:
384
384
if options.verbose:
385
keywords = ("Name", "Enabled", "Timeout",
386
"LastCheckedOK", "Created", "Interval",
387
"Host", "Fingerprint", "CheckerRunning",
388
"LastEnabled", "ApprovalPending",
389
"ApprovedByDefault",
385
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
386
"Created", "Interval", "Host", "Fingerprint",
387
"CheckerRunning", "LastEnabled",
388
"ApprovalPending", "ApprovedByDefault",
390
389
"LastApprovalRequest", "ApprovalDelay",
391
390
"ApprovalDuration", "Checker",
392
391
"ExtendedTimeout")
397
396
else:
398
397
# Process each client in the list by all selected options
399
398
for client in clients:
399
400
400
def set_client_prop(prop, value):
401
401
"""Set a Client D-Bus property"""
402
402
client.Set(client_interface, prop, value,
403
403
dbus_interface=dbus.PROPERTIES_IFACE)
404
404
405
def set_client_prop_ms(prop, value):
405
406
"""Set a Client D-Bus property, converted
406
407
from a string to milliseconds."""
407
408
set_client_prop(prop,
408
409
string_to_delta(value).total_seconds()
409
410
* 1000)
411
410
412
if options.remove:
411
413
mandos_serv.RemoveClient(client.__dbus_object_path__)
412
414
if options.enable:
456
458
client.Approve(dbus.Boolean(False),
457
459
dbus_interface=client_interface)
458
460
461
459
462
if __name__ == "__main__":
460
463
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0