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 573
- compare with another revision
- download diff
- download tarball
- view history from revision 573
- Committer: Teddy Hogeborn
- Date: 2012-05-05 10:15:01 UTC
- Revision ID: teddy@recompile.se-20120505101501-czfhh1p0tm3tbvkh
* mandos: White space and other misc. format fixes only.
- files removed:
- debian/mandos-client.examples
- debian/upstream
- files modified:
- .bzrignore
added
removed
mandos-ctl
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2008-2015 Teddy Hogeborn
7
# Copyright © 2008-2015 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
26
26
from __future__ import (division, absolute_import, print_function,
27
27
unicode_literals)
28
28
29
try:
30
from future_builtins import *
31
except ImportError:
32
pass
33
34
29
import sys
30
import dbus
35
31
import argparse
36
32
import locale
37
33
import datetime
38
34
import re
39
35
import os
40
import collections
41
import doctest
42
43
import dbus
44
45
if sys.version_info.major == 2:
46
str = unicode
47
36
48
37
locale.setlocale(locale.LC_ALL, "")
49
38
64
53
"ApprovalDelay": "Approval Delay",
65
54
"ApprovalDuration": "Approval Duration",
66
55
"Checker": "Checker",
67
"ExtendedTimeout": "Extended Timeout"
68
}
56
"ExtendedTimeout" : "Extended Timeout"
57
}
69
58
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
59
domain = "se.recompile"
71
60
busname = domain + ".Mandos"
72
61
server_path = "/"
73
62
server_interface = domain + ".Mandos"
74
63
client_interface = domain + ".Mandos.Client"
75
version = "1.6.9"
64
version = "1.5.3"
76
65
66
def timedelta_to_milliseconds(td):
67
"""Convert a datetime.timedelta object to milliseconds"""
68
return ((td.days * 24 * 60 * 60 * 1000)
69
+ (td.seconds * 1000)
70
+ (td.microseconds // 1000))
77
71
78
72
def milliseconds_to_string(ms):
79
73
td = datetime.timedelta(0, 0, 0, ms)
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
86
87
def rfc3339_duration_to_delta(duration):
88
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
89
90
>>> rfc3339_duration_to_delta("P7D")
91
datetime.timedelta(7)
92
>>> rfc3339_duration_to_delta("PT60S")
93
datetime.timedelta(0, 60)
94
>>> rfc3339_duration_to_delta("PT60M")
95
datetime.timedelta(0, 3600)
96
>>> rfc3339_duration_to_delta("PT24H")
97
datetime.timedelta(1)
98
>>> rfc3339_duration_to_delta("P1W")
99
datetime.timedelta(7)
100
>>> rfc3339_duration_to_delta("PT5M30S")
101
datetime.timedelta(0, 330)
102
>>> rfc3339_duration_to_delta("P1DT3M20S")
103
datetime.timedelta(1, 200)
104
"""
105
106
# Parsing an RFC 3339 duration with regular expressions is not
107
# possible - there would have to be multiple places for the same
108
# values, like seconds. The current code, while more esoteric, is
109
# cleaner without depending on a parsing library. If Python had a
110
# built-in library for parsing we would use it, but we'd like to
111
# avoid excessive use of external libraries.
112
113
# New type for defining tokens, syntax, and semantics all-in-one
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
123
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
124
# the "duration" ABNF definition in RFC 3339, Appendix A.
125
token_end = Token(re.compile(r"$"), None, frozenset())
126
token_second = Token(re.compile(r"(\d+)S"),
127
datetime.timedelta(seconds=1),
128
frozenset((token_end, )))
129
token_minute = Token(re.compile(r"(\d+)M"),
130
datetime.timedelta(minutes=1),
131
frozenset((token_second, token_end)))
132
token_hour = Token(re.compile(r"(\d+)H"),
133
datetime.timedelta(hours=1),
134
frozenset((token_minute, token_end)))
135
token_time = Token(re.compile(r"T"),
136
None,
137
frozenset((token_hour, token_minute,
138
token_second)))
139
token_day = Token(re.compile(r"(\d+)D"),
140
datetime.timedelta(days=1),
141
frozenset((token_time, token_end)))
142
token_month = Token(re.compile(r"(\d+)M"),
143
datetime.timedelta(weeks=4),
144
frozenset((token_day, token_end)))
145
token_year = Token(re.compile(r"(\d+)Y"),
146
datetime.timedelta(weeks=52),
147
frozenset((token_month, token_end)))
148
token_week = Token(re.compile(r"(\d+)W"),
149
datetime.timedelta(weeks=1),
150
frozenset((token_end, )))
151
token_duration = Token(re.compile(r"P"), None,
152
frozenset((token_year, token_month,
153
token_day, token_time,
154
token_week)))
155
# Define starting values
156
value = datetime.timedelta() # Value so far
157
found_token = None
158
followers = frozenset((token_duration, )) # Following valid tokens
159
s = duration # String left to parse
160
# Loop until end token is found
161
while found_token is not token_end:
162
# Search for any currently valid tokens
163
for token in followers:
164
match = token.regexp.match(s)
165
if match is not None:
166
# Token found
167
if token.value is not None:
168
# Value found, parse digits
169
factor = int(match.group(1), 10)
170
# Add to value so far
171
value += factor * token.value
172
# Strip token from string
173
s = token.regexp.sub("", s, 1)
174
# Go to found token
175
found_token = token
176
# Set valid next tokens
177
followers = found_token.followers
178
break
179
else:
180
# No currently valid tokens were found
181
raise ValueError("Invalid RFC 3339 duration")
182
# End token found
183
return value
184
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
))
185
80
186
81
def string_to_delta(interval):
187
82
"""Parse a string and return a datetime.timedelta
199
94
>>> string_to_delta("5m 30s")
200
95
datetime.timedelta(0, 330)
201
96
"""
202
203
try:
204
return rfc3339_duration_to_delta(interval)
205
except ValueError:
206
pass
207
208
97
value = datetime.timedelta(0)
209
regexp = re.compile(r"(\d+)([dsmhw]?)")
98
regexp = re.compile("(\d+)([dsmhw]?)")
210
99
211
100
for num, suffix in regexp.findall(interval):
212
101
if suffix == "d":
223
112
value += datetime.timedelta(0, 0, 0, int(num))
224
113
return value
225
114
226
227
115
def print_clients(clients, keywords):
228
116
def valuetostring(value, keyword):
229
117
if type(value) is dbus.Boolean:
231
119
if keyword in ("Timeout", "Interval", "ApprovalDelay",
232
120
"ApprovalDuration", "ExtendedTimeout"):
233
121
return milliseconds_to_string(value)
234
return str(value)
122
return unicode(value)
235
123
236
124
# Create format string to print table rows
237
125
format_string = " ".join("{{{key}:{width}}}".format(
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)
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)
243
132
# Print header line
244
133
print(format_string.format(**tablewords))
245
134
for client in clients:
246
print(format_string.format(**{
247
key: valuetostring(client[key], key)
248
for key in keywords }))
249
135
print(format_string.format(**dict((key,
136
valuetostring(client[key],
137
key))
138
for key in keywords)))
250
139
251
140
def has_actions(options):
252
141
return any((options.enable,
268
157
options.approve,
269
158
options.deny))
270
159
271
272
160
def main():
273
161
parser = argparse.ArgumentParser()
274
162
parser.add_argument("--version", action="version",
275
version = "%(prog)s {}".format(version),
163
version = "%(prog)s {0}".format(version),
276
164
help="show version number and exit")
277
165
parser.add_argument("-a", "--all", action="store_true",
278
166
help="Select all clients")
311
199
parser.add_argument("--approval-duration",
312
200
help="Set duration of one client approval")
313
201
parser.add_argument("-H", "--host", help="Set host for client")
314
parser.add_argument("-s", "--secret",
315
type=argparse.FileType(mode="rb"),
202
parser.add_argument("-s", "--secret", type=file,
316
203
help="Set password blob (file) for client")
317
204
parser.add_argument("-A", "--approve", action="store_true",
318
205
help="Approve any current client request")
319
206
parser.add_argument("-D", "--deny", action="store_true",
320
207
help="Deny any current client request")
321
parser.add_argument("--check", action="store_true",
322
help="Run self-test")
323
208
parser.add_argument("client", nargs="*", help="Client name")
324
209
options = parser.parse_args()
325
210
330
215
" --all.")
331
216
if options.all and not has_actions(options):
332
217
parser.error("--all requires an action.")
333
334
if options.check:
335
fail_count, test_count = doctest.testmod()
336
sys.exit(os.EX_OK if fail_count == 0 else 1)
337
218
338
219
try:
339
220
bus = dbus.SystemBus()
340
221
mandos_dbus_objc = bus.get_object(busname, server_path)
341
222
except dbus.exceptions.DBusException:
342
print("Could not connect to Mandos server", file=sys.stderr)
223
print("Could not connect to Mandos server",
224
file=sys.stderr)
343
225
sys.exit(1)
344
226
345
227
mandos_serv = dbus.Interface(mandos_dbus_objc,
366
248
clients={}
367
249
368
250
if options.all or not options.client:
369
clients = { bus.get_object(busname, path): properties
370
for path, properties in mandos_clients.items() }
251
clients = dict((bus.get_object(busname, path), properties)
252
for path, properties in
253
mandos_clients.iteritems())
371
254
else:
372
255
for name in options.client:
373
for path, client in mandos_clients.items():
256
for path, client in mandos_clients.iteritems():
374
257
if client["Name"] == name:
375
258
client_objc = bus.get_object(busname, path)
376
259
clients[client_objc] = client
377
260
break
378
261
else:
379
print("Client not found on server: {!r}"
262
print("Client not found on server: {0!r}"
380
263
.format(name), file=sys.stderr)
381
264
sys.exit(1)
382
265
383
266
if not has_actions(options) and clients:
384
267
if options.verbose:
385
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
386
"Created", "Interval", "Host", "Fingerprint",
387
"CheckerRunning", "LastEnabled",
388
"ApprovalPending", "ApprovedByDefault",
268
keywords = ("Name", "Enabled", "Timeout",
269
"LastCheckedOK", "Created", "Interval",
270
"Host", "Fingerprint", "CheckerRunning",
271
"LastEnabled", "ApprovalPending",
272
"ApprovedByDefault",
389
273
"LastApprovalRequest", "ApprovalDelay",
390
274
"ApprovalDuration", "Checker",
391
275
"ExtendedTimeout")
396
280
else:
397
281
# Process each client in the list by all selected options
398
282
for client in clients:
399
400
283
def set_client_prop(prop, value):
401
284
"""Set a Client D-Bus property"""
402
285
client.Set(client_interface, prop, value,
403
286
dbus_interface=dbus.PROPERTIES_IFACE)
404
405
287
def set_client_prop_ms(prop, value):
406
288
"""Set a Client D-Bus property, converted
407
289
from a string to milliseconds."""
408
290
set_client_prop(prop,
409
string_to_delta(value).total_seconds()
410
* 1000)
411
291
timedelta_to_milliseconds
292
(string_to_delta(value)))
412
293
if options.remove:
413
294
mandos_serv.RemoveClient(client.__dbus_object_path__)
414
295
if options.enable:
458
339
client.Approve(dbus.Boolean(False),
459
340
dbus_interface=client_interface)
460
341
461
462
342
if __name__ == "__main__":
463
343
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0