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 723.1.3
- compare with another revision
- download diff
- download tarball
- view history from revision 723.1.3
- Committer: Teddy Hogeborn
- Date: 2014-07-25 23:00:45 UTC
- mto: This revision was merged to the branch mainline in revision 724.
- Revision ID: teddy@recompile.se-20140725230045-94y6ghmwqkb00ffw
Use dictionary comprehensions.
* mandos (Client.start_checker): Use a dictionary comprehension when
creating the "escaped_attrs" mapping.
* mandos-ctl (print_clients): Use a dictionary comprehension when
creating keyword arguments to the
.format string method.
(main): Use a dictionary comprehension when creating the "clients"
mapping.
* mandos (Client.start_checker): Use a dictionary comprehension when
creating the "escaped_attrs" mapping.
* mandos-ctl (print_clients): Use a dictionary comprehension when
creating keyword arguments to the
.format string method.
(main): Use a dictionary comprehension when creating the "clients"
mapping.
- files added:
- DBUS-API
- debian/source
- debian/upstream
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-ctl
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
4
from __future__ import division
3
#
4
# Mandos Monitor - Control and monitor the Mandos server
5
#
6
# Copyright © 2008-2014 Teddy Hogeborn
7
# Copyright © 2008-2014 Björn Påhlsson
8
#
9
# This program is free software: you can redistribute it and/or modify
10
# it under the terms of the GNU General Public License as published by
11
# the Free Software Foundation, either version 3 of the License, or
12
# (at your option) any later version.
13
#
14
# This program is distributed in the hope that it will be useful,
15
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17
# GNU General Public License for more details.
18
#
19
# You should have received a copy of the GNU General Public License
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
22
#
23
# Contact the authors at <mandos@recompile.se>.
24
#
25
26
from __future__ import (division, absolute_import, print_function,
27
unicode_literals)
28
29
try:
30
from future_builtins import *
31
except ImportError:
32
pass
33
5
34
import sys
6
import dbus
7
from optparse import OptionParser
35
import argparse
8
36
import locale
9
37
import datetime
10
38
import re
11
12
locale.setlocale(locale.LC_ALL, u'')
39
import os
40
import collections
41
import doctest
42
43
import dbus
44
45
if sys.version_info[0] == 2:
46
str = unicode
47
48
locale.setlocale(locale.LC_ALL, "")
13
49
14
50
tablewords = {
15
'name': u'Name',
16
'enabled': u'Enabled',
17
'timeout': u'Timeout',
18
'last_checked_ok': u'Last Successful Check',
19
'created': u'Created',
20
'interval': u'Interval',
21
'host': u'Host',
22
'fingerprint': u'Fingerprint',
23
'checker_running': u'Check Is Running',
24
'last_enabled': u'Last Enabled',
25
'checker': u'Checker',
51
"Name": "Name",
52
"Enabled": "Enabled",
53
"Timeout": "Timeout",
54
"LastCheckedOK": "Last Successful Check",
55
"LastApprovalRequest": "Last Approval Request",
56
"Created": "Created",
57
"Interval": "Interval",
58
"Host": "Host",
59
"Fingerprint": "Fingerprint",
60
"CheckerRunning": "Check Is Running",
61
"LastEnabled": "Last Enabled",
62
"ApprovalPending": "Approval Is Pending",
63
"ApprovedByDefault": "Approved By Default",
64
"ApprovalDelay": "Approval Delay",
65
"ApprovalDuration": "Approval Duration",
66
"Checker": "Checker",
67
"ExtendedTimeout" : "Extended Timeout"
26
68
}
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
'checker')
29
busname = 'org.mandos-system.Mandos'
30
server_path = '/Mandos'
31
server_interface = 'org.mandos_system.Mandos'
32
client_interface = 'org.mandos_system.Mandos.Client'
33
version = "1.0.4"
34
35
bus = dbus.SystemBus()
36
mandos_dbus_objc = bus.get_object(busname, server_path)
37
mandos_serv = dbus.Interface(mandos_dbus_objc,
38
dbus_interface = server_interface)
39
mandos_clients = mandos_serv.GetAllClientsWithProperties()
40
41
def datetime_to_milliseconds(dt):
42
"Return the 'timeout' attribute in milliseconds"
43
return ((dt.days * 24 * 60 * 60 * 1000)
44
+ (dt.seconds * 1000)
45
+ (dt.microseconds // 1000))
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
domain = "se.recompile"
71
busname = domain + ".Mandos"
72
server_path = "/"
73
server_interface = domain + ".Mandos"
74
client_interface = domain + ".Mandos.Client"
75
version = "1.6.7"
76
77
def timedelta_to_milliseconds(td):
78
"""Convert a datetime.timedelta object to milliseconds"""
79
return ((td.days * 24 * 60 * 60 * 1000)
80
+ (td.seconds * 1000)
81
+ (td.microseconds // 1000))
46
82
47
83
def milliseconds_to_string(ms):
48
84
td = datetime.timedelta(0, 0, 0, ms)
49
return "%s%02d:%02d:%02d" % (("%dT" % td.days) if td.days else "", # days
50
td.seconds // 3600, # hours
51
(td.seconds % 3600) // 60, # minutes
52
(td.seconds % 60)) # seconds
85
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
86
.format(days = "{0}T".format(td.days) if td.days else "",
87
hours = td.seconds // 3600,
88
minutes = (td.seconds % 3600) // 60,
89
seconds = td.seconds % 60,
90
))
91
92
93
def rfc3339_duration_to_delta(duration):
94
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
95
96
>>> rfc3339_duration_to_delta("P7D")
97
datetime.timedelta(7)
98
>>> rfc3339_duration_to_delta("PT60S")
99
datetime.timedelta(0, 60)
100
>>> rfc3339_duration_to_delta("PT60M")
101
datetime.timedelta(0, 3600)
102
>>> rfc3339_duration_to_delta("PT24H")
103
datetime.timedelta(1)
104
>>> rfc3339_duration_to_delta("P1W")
105
datetime.timedelta(7)
106
>>> rfc3339_duration_to_delta("PT5M30S")
107
datetime.timedelta(0, 330)
108
>>> rfc3339_duration_to_delta("P1DT3M20S")
109
datetime.timedelta(1, 200)
110
"""
111
112
# Parsing an RFC 3339 duration with regular expressions is not
113
# possible - there would have to be multiple places for the same
114
# values, like seconds. The current code, while more esoteric, is
115
# cleaner without depending on a parsing library. If Python had a
116
# built-in library for parsing we would use it, but we'd like to
117
# avoid excessive use of external libraries.
118
119
# New type for defining tokens, syntax, and semantics all-in-one
120
Token = collections.namedtuple("Token",
121
("regexp", # To match token; if
122
# "value" is not None,
123
# must have a "group"
124
# containing digits
125
"value", # datetime.timedelta or
126
# None
127
"followers")) # Tokens valid after
128
# this token
129
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
130
# the "duration" ABNF definition in RFC 3339, Appendix A.
131
token_end = Token(re.compile(r"$"), None, frozenset())
132
token_second = Token(re.compile(r"(\d+)S"),
133
datetime.timedelta(seconds=1),
134
frozenset((token_end,)))
135
token_minute = Token(re.compile(r"(\d+)M"),
136
datetime.timedelta(minutes=1),
137
frozenset((token_second, token_end)))
138
token_hour = Token(re.compile(r"(\d+)H"),
139
datetime.timedelta(hours=1),
140
frozenset((token_minute, token_end)))
141
token_time = Token(re.compile(r"T"),
142
None,
143
frozenset((token_hour, token_minute,
144
token_second)))
145
token_day = Token(re.compile(r"(\d+)D"),
146
datetime.timedelta(days=1),
147
frozenset((token_time, token_end)))
148
token_month = Token(re.compile(r"(\d+)M"),
149
datetime.timedelta(weeks=4),
150
frozenset((token_day, token_end)))
151
token_year = Token(re.compile(r"(\d+)Y"),
152
datetime.timedelta(weeks=52),
153
frozenset((token_month, token_end)))
154
token_week = Token(re.compile(r"(\d+)W"),
155
datetime.timedelta(weeks=1),
156
frozenset((token_end,)))
157
token_duration = Token(re.compile(r"P"), None,
158
frozenset((token_year, token_month,
159
token_day, token_time,
160
token_week)))
161
# Define starting values
162
value = datetime.timedelta() # Value so far
163
found_token = None
164
followers = frozenset((token_duration,)) # Following valid tokens
165
s = duration # String left to parse
166
# Loop until end token is found
167
while found_token is not token_end:
168
# Search for any currently valid tokens
169
for token in followers:
170
match = token.regexp.match(s)
171
if match is not None:
172
# Token found
173
if token.value is not None:
174
# Value found, parse digits
175
factor = int(match.group(1), 10)
176
# Add to value so far
177
value += factor * token.value
178
# Strip token from string
179
s = token.regexp.sub("", s, 1)
180
# Go to found token
181
found_token = token
182
# Set valid next tokens
183
followers = found_token.followers
184
break
185
else:
186
# No currently valid tokens were found
187
raise ValueError("Invalid RFC 3339 duration")
188
# End token found
189
return value
53
190
54
191
55
192
def string_to_delta(interval):
56
193
"""Parse a string and return a datetime.timedelta
57
58
>>> string_to_delta('7d')
194
195
>>> string_to_delta("7d")
59
196
datetime.timedelta(7)
60
>>> string_to_delta('60s')
197
>>> string_to_delta("60s")
61
198
datetime.timedelta(0, 60)
62
>>> string_to_delta('60m')
199
>>> string_to_delta("60m")
63
200
datetime.timedelta(0, 3600)
64
>>> string_to_delta('24h')
201
>>> string_to_delta("24h")
65
202
datetime.timedelta(1)
66
>>> string_to_delta(u'1w')
203
>>> string_to_delta("1w")
67
204
datetime.timedelta(7)
68
>>> string_to_delta('5m 30s')
205
>>> string_to_delta("5m 30s")
69
206
datetime.timedelta(0, 330)
70
207
"""
71
timevalue = datetime.timedelta(0)
72
regexp = re.compile("\d+[dsmhw]")
73
74
for s in regexp.findall(interval):
75
try:
76
suffix = unicode(s[-1])
77
value = int(s[:-1])
78
if suffix == u"d":
79
delta = datetime.timedelta(value)
80
elif suffix == u"s":
81
delta = datetime.timedelta(0, value)
82
elif suffix == u"m":
83
delta = datetime.timedelta(0, 0, 0, 0, value)
84
elif suffix == u"h":
85
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
86
elif suffix == u"w":
87
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
88
else:
89
raise ValueError
90
except (ValueError, IndexError):
91
raise ValueError
92
timevalue += delta
93
return timevalue
208
209
try:
210
return rfc3339_duration_to_delta(interval)
211
except ValueError:
212
pass
213
214
value = datetime.timedelta(0)
215
regexp = re.compile(r"(\d+)([dsmhw]?)")
216
217
for num, suffix in regexp.findall(interval):
218
if suffix == "d":
219
value += datetime.timedelta(int(num))
220
elif suffix == "s":
221
value += datetime.timedelta(0, int(num))
222
elif suffix == "m":
223
value += datetime.timedelta(0, 0, 0, 0, int(num))
224
elif suffix == "h":
225
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
226
elif suffix == "w":
227
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
228
elif suffix == "":
229
value += datetime.timedelta(0, 0, 0, int(num))
230
return value
94
231
95
def print_clients(clients):
232
def print_clients(clients, keywords):
96
233
def valuetostring(value, keyword):
97
234
if type(value) is dbus.Boolean:
98
return u"Yes" if value else u"No"
99
if keyword in ("timeout", "interval"):
235
return "Yes" if value else "No"
236
if keyword in ("Timeout", "Interval", "ApprovalDelay",
237
"ApprovalDuration", "ExtendedTimeout"):
100
238
return milliseconds_to_string(value)
101
return unicode(value)
239
return str(value)
102
240
103
format_string = u' '.join(u'%%-%ds' %
104
max(len(tablewords[key]),
105
max(len(valuetostring(client[key], key))
106
for client in
107
clients))
108
for key in keywords)
109
print format_string % tuple(tablewords[key] for key in keywords)
241
# Create format string to print table rows
242
format_string = " ".join("{{{key}:{width}}}".format(
243
width = max(len(tablewords[key]),
244
max(len(valuetostring(client[key],
245
key))
246
for client in
247
clients)),
248
key = key) for key in keywords)
249
# Print header line
250
print(format_string.format(**tablewords))
110
251
for client in clients:
111
print format_string % tuple(valuetostring(client[key], key)
112
for key in keywords)
113
114
parser = OptionParser(version = "%%prog %s" % version)
115
parser.add_option("-a", "--all", action="store_true",
116
help="Print all fields")
117
parser.add_option("-e", "--enable", action="store_true",
118
help="Enable specified client")
119
parser.add_option("-d", "--disable", action="store_true",
120
help="disable specified client")
121
parser.add_option("-b", "--bump-timeout", action="store_true",
122
help="Bump timeout of specified client")
123
parser.add_option("--start-checker", action="store_true",
124
help="Start checker for specified client")
125
parser.add_option("--stop-checker", action="store_true",
126
help="Stop checker for specified client")
127
parser.add_option("-v", "--is-valid", action="store_true",
128
help="Stop checker for specified client")
129
parser.add_option("-c", "--checker", type="string",
130
help="Set checker command for specified client")
131
parser.add_option("-t", "--timeout", type="string",
132
help="Set timeout for specified client")
133
parser.add_option("-i", "--interval", type="string",
134
help="Set checker interval for specified client")
135
parser.add_option("-H", "--host", type="string",
136
help="Set host for specified client")
137
parser.add_option("-s", "--secret", type="string",
138
help="Set password blob (file) for specified client")
139
options, client_names = parser.parse_args()
140
141
clients=[]
142
for name in client_names:
143
for path, client in mandos_clients.iteritems():
144
if client['name'] == name:
145
client_objc = bus.get_object(busname, path)
146
clients.append(dbus.Interface(client_objc,
147
dbus_interface
148
= client_interface))
149
break
150
else:
151
print >> sys.stderr, "Client not found on server: %r" % name
152
sys.exit(1)
153
154
if not clients:
155
keywords = defaultkeywords
156
if options.all:
157
keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
158
'created', 'interval', 'host', 'fingerprint',
159
'checker_running', 'last_enabled', 'checker')
160
print_clients(mandos_clients.values())
161
162
for client in clients:
163
if options.enable:
164
client.Enable()
165
if options.disable:
166
client.Disable()
167
if options.bump_timeout:
168
client.BumpTimeout()
169
if options.start_checker:
170
client.StartChecker()
171
if options.stop_checker:
172
client.StopChecker()
173
if options.is_valid:
174
sys.exit(0 if client.IsStillValid() else 1)
175
if options.checker:
176
client.SetChecker(options.checker)
177
if options.host:
178
client.SetHost(options.host)
179
if options.interval:
180
client.SetInterval(datetime_to_milliseconds
181
(string_to_delta(options.interval)))
182
if options.timeout:
183
client.SetTimeout(datetime_to_milliseconds
184
(string_to_delta(options.timeout)))
185
if options.secret:
186
client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
187
252
print(format_string.format(**{ key:
253
valuetostring(client[key],
254
key)
255
for key in keywords }))
256
257
def has_actions(options):
258
return any((options.enable,
259
options.disable,
260
options.bump_timeout,
261
options.start_checker,
262
options.stop_checker,
263
options.is_enabled,
264
options.remove,
265
options.checker is not None,
266
options.timeout is not None,
267
options.extended_timeout is not None,
268
options.interval is not None,
269
options.approved_by_default is not None,
270
options.approval_delay is not None,
271
options.approval_duration is not None,
272
options.host is not None,
273
options.secret is not None,
274
options.approve,
275
options.deny))
276
277
def main():
278
parser = argparse.ArgumentParser()
279
parser.add_argument("--version", action="version",
280
version = "%(prog)s {0}".format(version),
281
help="show version number and exit")
282
parser.add_argument("-a", "--all", action="store_true",
283
help="Select all clients")
284
parser.add_argument("-v", "--verbose", action="store_true",
285
help="Print all fields")
286
parser.add_argument("-e", "--enable", action="store_true",
287
help="Enable client")
288
parser.add_argument("-d", "--disable", action="store_true",
289
help="disable client")
290
parser.add_argument("-b", "--bump-timeout", action="store_true",
291
help="Bump timeout for client")
292
parser.add_argument("--start-checker", action="store_true",
293
help="Start checker for client")
294
parser.add_argument("--stop-checker", action="store_true",
295
help="Stop checker for client")
296
parser.add_argument("-V", "--is-enabled", action="store_true",
297
help="Check if client is enabled")
298
parser.add_argument("-r", "--remove", action="store_true",
299
help="Remove client")
300
parser.add_argument("-c", "--checker",
301
help="Set checker command for client")
302
parser.add_argument("-t", "--timeout",
303
help="Set timeout for client")
304
parser.add_argument("--extended-timeout",
305
help="Set extended timeout for client")
306
parser.add_argument("-i", "--interval",
307
help="Set checker interval for client")
308
parser.add_argument("--approve-by-default", action="store_true",
309
default=None, dest="approved_by_default",
310
help="Set client to be approved by default")
311
parser.add_argument("--deny-by-default", action="store_false",
312
dest="approved_by_default",
313
help="Set client to be denied by default")
314
parser.add_argument("--approval-delay",
315
help="Set delay before client approve/deny")
316
parser.add_argument("--approval-duration",
317
help="Set duration of one client approval")
318
parser.add_argument("-H", "--host", help="Set host for client")
319
parser.add_argument("-s", "--secret",
320
type=argparse.FileType(mode="rb"),
321
help="Set password blob (file) for client")
322
parser.add_argument("-A", "--approve", action="store_true",
323
help="Approve any current client request")
324
parser.add_argument("-D", "--deny", action="store_true",
325
help="Deny any current client request")
326
parser.add_argument("--check", action="store_true",
327
help="Run self-test")
328
parser.add_argument("client", nargs="*", help="Client name")
329
options = parser.parse_args()
330
331
if has_actions(options) and not (options.client or options.all):
332
parser.error("Options require clients names or --all.")
333
if options.verbose and has_actions(options):
334
parser.error("--verbose can only be used alone or with"
335
" --all.")
336
if options.all and not has_actions(options):
337
parser.error("--all requires an action.")
338
339
if options.check:
340
fail_count, test_count = doctest.testmod()
341
sys.exit(os.EX_OK if fail_count == 0 else 1)
342
343
try:
344
bus = dbus.SystemBus()
345
mandos_dbus_objc = bus.get_object(busname, server_path)
346
except dbus.exceptions.DBusException:
347
print("Could not connect to Mandos server",
348
file=sys.stderr)
349
sys.exit(1)
350
351
mandos_serv = dbus.Interface(mandos_dbus_objc,
352
dbus_interface = server_interface)
353
354
#block stderr since dbus library prints to stderr
355
null = os.open(os.path.devnull, os.O_RDWR)
356
stderrcopy = os.dup(sys.stderr.fileno())
357
os.dup2(null, sys.stderr.fileno())
358
os.close(null)
359
try:
360
try:
361
mandos_clients = mandos_serv.GetAllClientsWithProperties()
362
finally:
363
#restore stderr
364
os.dup2(stderrcopy, sys.stderr.fileno())
365
os.close(stderrcopy)
366
except dbus.exceptions.DBusException:
367
print("Access denied: Accessing mandos server through dbus.",
368
file=sys.stderr)
369
sys.exit(1)
370
371
# Compile dict of (clients: properties) to process
372
clients={}
373
374
if options.all or not options.client:
375
clients = { bus.get_object(busname, path): properties
376
for path, properties in mandos_clients.items() }
377
else:
378
for name in options.client:
379
for path, client in mandos_clients.iteritems():
380
if client["Name"] == name:
381
client_objc = bus.get_object(busname, path)
382
clients[client_objc] = client
383
break
384
else:
385
print("Client not found on server: {0!r}"
386
.format(name), file=sys.stderr)
387
sys.exit(1)
388
389
if not has_actions(options) and clients:
390
if options.verbose:
391
keywords = ("Name", "Enabled", "Timeout",
392
"LastCheckedOK", "Created", "Interval",
393
"Host", "Fingerprint", "CheckerRunning",
394
"LastEnabled", "ApprovalPending",
395
"ApprovedByDefault",
396
"LastApprovalRequest", "ApprovalDelay",
397
"ApprovalDuration", "Checker",
398
"ExtendedTimeout")
399
else:
400
keywords = defaultkeywords
401
402
print_clients(clients.values(), keywords)
403
else:
404
# Process each client in the list by all selected options
405
for client in clients:
406
def set_client_prop(prop, value):
407
"""Set a Client D-Bus property"""
408
client.Set(client_interface, prop, value,
409
dbus_interface=dbus.PROPERTIES_IFACE)
410
def set_client_prop_ms(prop, value):
411
"""Set a Client D-Bus property, converted
412
from a string to milliseconds."""
413
set_client_prop(prop,
414
timedelta_to_milliseconds
415
(string_to_delta(value)))
416
if options.remove:
417
mandos_serv.RemoveClient(client.__dbus_object_path__)
418
if options.enable:
419
set_client_prop("Enabled", dbus.Boolean(True))
420
if options.disable:
421
set_client_prop("Enabled", dbus.Boolean(False))
422
if options.bump_timeout:
423
set_client_prop("LastCheckedOK", "")
424
if options.start_checker:
425
set_client_prop("CheckerRunning", dbus.Boolean(True))
426
if options.stop_checker:
427
set_client_prop("CheckerRunning", dbus.Boolean(False))
428
if options.is_enabled:
429
sys.exit(0 if client.Get(client_interface,
430
"Enabled",
431
dbus_interface=
432
dbus.PROPERTIES_IFACE)
433
else 1)
434
if options.checker is not None:
435
set_client_prop("Checker", options.checker)
436
if options.host is not None:
437
set_client_prop("Host", options.host)
438
if options.interval is not None:
439
set_client_prop_ms("Interval", options.interval)
440
if options.approval_delay is not None:
441
set_client_prop_ms("ApprovalDelay",
442
options.approval_delay)
443
if options.approval_duration is not None:
444
set_client_prop_ms("ApprovalDuration",
445
options.approval_duration)
446
if options.timeout is not None:
447
set_client_prop_ms("Timeout", options.timeout)
448
if options.extended_timeout is not None:
449
set_client_prop_ms("ExtendedTimeout",
450
options.extended_timeout)
451
if options.secret is not None:
452
set_client_prop("Secret",
453
dbus.ByteArray(options.secret.read()))
454
if options.approved_by_default is not None:
455
set_client_prop("ApprovedByDefault",
456
dbus.Boolean(options
457
.approved_by_default))
458
if options.approve:
459
client.Approve(dbus.Boolean(True),
460
dbus_interface=client_interface)
461
elif options.deny:
462
client.Approve(dbus.Boolean(False),
463
dbus_interface=client_interface)
464
465
if __name__ == "__main__":
466
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0