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