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
- browse files at revision 237.7.288
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.288
- Committer: Teddy Hogeborn
- Date: 2014-12-21 12:56:08 UTC
- mto: (237.7.304 trunk)
- mto: This revision was merged to the branch mainline in revision 325.
- Revision ID: teddy@recompile.se-20141221125608-bmkvujlj39srpwd3
mandos-keygen: Fix some stylistic quoting issues.
added
removed
mandos-ctl
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2008-2016 Teddy Hogeborn
7
# Copyright © 2008-2016 Björn Påhlsson
6
# Copyright © 2008-2014 Teddy Hogeborn
7
# Copyright © 2008-2014 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.7.5"
76
77
78
try:
79
dbus.OBJECT_MANAGER_IFACE
80
except AttributeError:
81
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
75
version = "1.6.9"
82
76
83
77
def milliseconds_to_string(ms):
84
78
td = datetime.timedelta(0, 0, 0, ms)
85
return ("{days}{hours:02}:{minutes:02}:{seconds:02}".format(
86
days = "{}T".format(td.days) if td.days else "",
87
hours = td.seconds // 3600,
88
minutes = (td.seconds % 3600) // 60,
89
seconds = td.seconds % 60))
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
))
90
85
91
86
92
87
def rfc3339_duration_to_delta(duration):
116
111
# avoid excessive use of external libraries.
117
112
118
113
# New type for defining tokens, syntax, and semantics all-in-one
119
Token = collections.namedtuple("Token", (
120
"regexp", # To match token; if "value" is not None, must have
121
# a "group" containing digits
122
"value", # datetime.timedelta or None
123
"followers")) # Tokens valid after this token
114
Token = collections.namedtuple("Token",
115
("regexp", # To match token; if
116
# "value" is not None,
117
# must have a "group"
118
# containing digits
119
"value", # datetime.timedelta or
120
# None
121
"followers")) # Tokens valid after
122
# this token
124
123
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
125
124
# the "duration" ABNF definition in RFC 3339, Appendix A.
126
125
token_end = Token(re.compile(r"$"), None, frozenset())
127
126
token_second = Token(re.compile(r"(\d+)S"),
128
127
datetime.timedelta(seconds=1),
129
frozenset((token_end, )))
128
frozenset((token_end,)))
130
129
token_minute = Token(re.compile(r"(\d+)M"),
131
130
datetime.timedelta(minutes=1),
132
131
frozenset((token_second, token_end)))
148
147
frozenset((token_month, token_end)))
149
148
token_week = Token(re.compile(r"(\d+)W"),
150
149
datetime.timedelta(weeks=1),
151
frozenset((token_end, )))
150
frozenset((token_end,)))
152
151
token_duration = Token(re.compile(r"P"), None,
153
152
frozenset((token_year, token_month,
154
153
token_day, token_time,
156
155
# Define starting values
157
156
value = datetime.timedelta() # Value so far
158
157
found_token = None
159
followers = frozenset((token_duration, )) # Following valid tokens
158
followers = frozenset((token_duration,)) # Following valid tokens
160
159
s = duration # String left to parse
161
160
# Loop until end token is found
162
161
while found_token is not token_end:
179
178
break
180
179
else:
181
180
# No currently valid tokens were found
182
raise ValueError("Invalid RFC 3339 duration: {!r}"
183
.format(duration))
181
raise ValueError("Invalid RFC 3339 duration")
184
182
# End token found
185
183
return value
186
184
188
186
def string_to_delta(interval):
189
187
"""Parse a string and return a datetime.timedelta
190
188
191
>>> string_to_delta('7d')
189
>>> string_to_delta("7d")
192
190
datetime.timedelta(7)
193
>>> string_to_delta('60s')
191
>>> string_to_delta("60s")
194
192
datetime.timedelta(0, 60)
195
>>> string_to_delta('60m')
193
>>> string_to_delta("60m")
196
194
datetime.timedelta(0, 3600)
197
>>> string_to_delta('24h')
195
>>> string_to_delta("24h")
198
196
datetime.timedelta(1)
199
>>> string_to_delta('1w')
197
>>> string_to_delta("1w")
200
198
datetime.timedelta(7)
201
>>> string_to_delta('5m 30s')
199
>>> string_to_delta("5m 30s")
202
200
datetime.timedelta(0, 330)
203
201
"""
204
202
225
223
value += datetime.timedelta(0, 0, 0, int(num))
226
224
return value
227
225
228
229
226
def print_clients(clients, keywords):
230
227
def valuetostring(value, keyword):
231
228
if type(value) is dbus.Boolean:
237
234
238
235
# Create format string to print table rows
239
236
format_string = " ".join("{{{key}:{width}}}".format(
240
width = max(len(tablewords[key]),
241
max(len(valuetostring(client[key], key))
242
for client in clients)),
243
key = key)
244
for key in keywords)
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)
245
243
# Print header line
246
244
print(format_string.format(**tablewords))
247
245
for client in clients:
248
print(format_string.format(**{
249
key: valuetostring(client[key], key)
250
for key in keywords }))
251
246
print(format_string.format(**{ key:
247
valuetostring(client[key],
248
key)
249
for key in keywords }))
252
250
253
251
def has_actions(options):
254
252
return any((options.enable,
270
268
options.approve,
271
269
options.deny))
272
270
273
274
271
def main():
275
272
parser = argparse.ArgumentParser()
276
273
parser.add_argument("--version", action="version",
341
338
bus = dbus.SystemBus()
342
339
mandos_dbus_objc = bus.get_object(busname, server_path)
343
340
except dbus.exceptions.DBusException:
344
print("Could not connect to Mandos server", file=sys.stderr)
341
print("Could not connect to Mandos server",
342
file=sys.stderr)
345
343
sys.exit(1)
346
344
347
345
mandos_serv = dbus.Interface(mandos_dbus_objc,
348
346
dbus_interface = server_interface)
349
mandos_serv_object_manager = dbus.Interface(
350
mandos_dbus_objc, dbus_interface = dbus.OBJECT_MANAGER_IFACE)
351
347
352
348
#block stderr since dbus library prints to stderr
353
349
null = os.open(os.path.devnull, os.O_RDWR)
356
352
os.close(null)
357
353
try:
358
354
try:
359
mandos_clients = { path: ifs_and_props[client_interface]
360
for path, ifs_and_props in
361
mandos_serv_object_manager
362
.GetManagedObjects().items()
363
if client_interface in ifs_and_props }
355
mandos_clients = mandos_serv.GetAllClientsWithProperties()
364
356
finally:
365
357
#restore stderr
366
358
os.dup2(stderrcopy, sys.stderr.fileno())
367
359
os.close(stderrcopy)
368
except dbus.exceptions.DBusException as e:
369
print("Access denied: Accessing mandos server through D-Bus: {}"
370
.format(e), file=sys.stderr)
360
except dbus.exceptions.DBusException:
361
print("Access denied: Accessing mandos server through dbus.",
362
file=sys.stderr)
371
363
sys.exit(1)
372
364
373
365
# Compile dict of (clients: properties) to process
390
382
391
383
if not has_actions(options) and clients:
392
384
if options.verbose:
393
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
394
"Created", "Interval", "Host", "Fingerprint",
395
"CheckerRunning", "LastEnabled",
396
"ApprovalPending", "ApprovedByDefault",
385
keywords = ("Name", "Enabled", "Timeout",
386
"LastCheckedOK", "Created", "Interval",
387
"Host", "Fingerprint", "CheckerRunning",
388
"LastEnabled", "ApprovalPending",
389
"ApprovedByDefault",
397
390
"LastApprovalRequest", "ApprovalDelay",
398
391
"ApprovalDuration", "Checker",
399
392
"ExtendedTimeout")
404
397
else:
405
398
# Process each client in the list by all selected options
406
399
for client in clients:
407
408
400
def set_client_prop(prop, value):
409
401
"""Set a Client D-Bus property"""
410
402
client.Set(client_interface, prop, value,
411
403
dbus_interface=dbus.PROPERTIES_IFACE)
412
413
404
def set_client_prop_ms(prop, value):
414
405
"""Set a Client D-Bus property, converted
415
406
from a string to milliseconds."""
416
407
set_client_prop(prop,
417
408
string_to_delta(value).total_seconds()
418
409
* 1000)
419
420
410
if options.remove:
421
411
mandos_serv.RemoveClient(client.__dbus_object_path__)
422
412
if options.enable:
466
456
client.Approve(dbus.Boolean(False),
467
457
dbus_interface=client_interface)
468
458
469
470
459
if __name__ == "__main__":
471
460
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0