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 571
- compare with another revision
- download diff
- download tarball
- view history from revision 571
- Committer: Teddy Hogeborn
- Date: 2012-05-05 09:27:47 UTC
- Revision ID: teddy@recompile.se-20120505092747-d8s061chuhlt961h
* mandos-ctl (print_clients): Bug fix: Don't show "Extended Timeout"
as milliseconds.
as milliseconds.
- files added:
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-ctl
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2008-2010 Teddy Hogeborn
7
# Copyright © 2008-2010 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
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program. If not, see <http://www.gnu.org/licenses/>.
21
21
#
22
# Contact the authors at <mandos@fukt.bsnet.se>.
22
# Contact the authors at <mandos@recompile.se>.
23
23
#
24
24
25
from __future__ import division
25
from __future__ import (division, absolute_import, print_function,
26
unicode_literals)
27
26
28
import sys
27
29
import dbus
28
from optparse import OptionParser
30
import argparse
29
31
import locale
30
32
import datetime
31
33
import re
32
34
import os
33
35
34
locale.setlocale(locale.LC_ALL, u'')
36
locale.setlocale(locale.LC_ALL, "")
35
37
36
38
tablewords = {
37
'Name': u'Name',
38
'Enabled': u'Enabled',
39
'Timeout': u'Timeout',
40
'LastCheckedOK': u'Last Successful Check',
41
'LastApprovalRequest': u'Last Approval Request',
42
'Created': u'Created',
43
'Interval': u'Interval',
44
'Host': u'Host',
45
'Fingerprint': u'Fingerprint',
46
'CheckerRunning': u'Check Is Running',
47
'LastEnabled': u'Last Enabled',
48
'ApprovalPending': u'Approval Is Pending',
49
'ApprovedByDefault': u'Approved By Default',
50
'ApprovalDelay': u"Approval Delay",
51
'ApprovalDuration': u"Approval Duration",
52
'Checker': u'Checker',
39
"Name": "Name",
40
"Enabled": "Enabled",
41
"Timeout": "Timeout",
42
"LastCheckedOK": "Last Successful Check",
43
"LastApprovalRequest": "Last Approval Request",
44
"Created": "Created",
45
"Interval": "Interval",
46
"Host": "Host",
47
"Fingerprint": "Fingerprint",
48
"CheckerRunning": "Check Is Running",
49
"LastEnabled": "Last Enabled",
50
"ApprovalPending": "Approval Is Pending",
51
"ApprovedByDefault": "Approved By Default",
52
"ApprovalDelay": "Approval Delay",
53
"ApprovalDuration": "Approval Duration",
54
"Checker": "Checker",
55
"ExtendedTimeout" : "Extended Timeout"
53
56
}
54
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
55
domain = 'se.bsnet.fukt'
56
busname = domain + '.Mandos'
57
server_path = '/'
58
server_interface = domain + '.Mandos'
59
client_interface = domain + '.Mandos.Client'
60
version = "1.0.14"
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
58
domain = "se.recompile"
59
busname = domain + ".Mandos"
60
server_path = "/"
61
server_interface = domain + ".Mandos"
62
client_interface = domain + ".Mandos.Client"
63
version = "1.5.3"
61
64
62
65
def timedelta_to_milliseconds(td):
63
"Convert a datetime.timedelta object to milliseconds"
66
"""Convert a datetime.timedelta object to milliseconds"""
64
67
return ((td.days * 24 * 60 * 60 * 1000)
65
68
+ (td.seconds * 1000)
66
69
+ (td.microseconds // 1000))
67
70
68
71
def milliseconds_to_string(ms):
69
72
td = datetime.timedelta(0, 0, 0, ms)
70
return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
71
% { "days": "%dT" % td.days if td.days else "",
72
"hours": td.seconds // 3600,
73
"minutes": (td.seconds % 3600) // 60,
74
"seconds": td.seconds % 60,
75
})
76
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
))
77
79
78
80
def string_to_delta(interval):
79
81
"""Parse a string and return a datetime.timedelta
80
81
>>> string_to_delta('7d')
82
83
>>> string_to_delta("7d")
82
84
datetime.timedelta(7)
83
>>> string_to_delta('60s')
85
>>> string_to_delta("60s")
84
86
datetime.timedelta(0, 60)
85
>>> string_to_delta('60m')
87
>>> string_to_delta("60m")
86
88
datetime.timedelta(0, 3600)
87
>>> string_to_delta('24h')
89
>>> string_to_delta("24h")
88
90
datetime.timedelta(1)
89
>>> string_to_delta(u'1w')
91
>>> string_to_delta("1w")
90
92
datetime.timedelta(7)
91
>>> string_to_delta('5m 30s')
93
>>> string_to_delta("5m 30s")
92
94
datetime.timedelta(0, 330)
93
95
"""
94
timevalue = datetime.timedelta(0)
95
regexp = re.compile("\d+[dsmhw]")
96
value = datetime.timedelta(0)
97
regexp = re.compile("(\d+)([dsmhw]?)")
96
98
97
for s in regexp.findall(interval):
98
try:
99
suffix = unicode(s[-1])
100
value = int(s[:-1])
101
if suffix == u"d":
102
delta = datetime.timedelta(value)
103
elif suffix == u"s":
104
delta = datetime.timedelta(0, value)
105
elif suffix == u"m":
106
delta = datetime.timedelta(0, 0, 0, 0, value)
107
elif suffix == u"h":
108
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
109
elif suffix == u"w":
110
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
111
else:
112
raise ValueError
113
except (ValueError, IndexError):
114
raise ValueError
115
timevalue += delta
116
return timevalue
99
for num, suffix in regexp.findall(interval):
100
if suffix == "d":
101
value += datetime.timedelta(int(num))
102
elif suffix == "s":
103
value += datetime.timedelta(0, int(num))
104
elif suffix == "m":
105
value += datetime.timedelta(0, 0, 0, 0, int(num))
106
elif suffix == "h":
107
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
108
elif suffix == "w":
109
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
110
elif suffix == "":
111
value += datetime.timedelta(0, 0, 0, int(num))
112
return value
117
113
118
114
def print_clients(clients, keywords):
119
115
def valuetostring(value, keyword):
120
116
if type(value) is dbus.Boolean:
121
return u"Yes" if value else u"No"
122
if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
123
u"ApprovalDuration"):
117
return "Yes" if value else "No"
118
if keyword in ("Timeout", "Interval", "ApprovalDelay",
119
"ApprovalDuration", "ExtendedTimeout"):
124
120
return milliseconds_to_string(value)
125
121
return unicode(value)
126
122
127
123
# Create format string to print table rows
128
format_string = u' '.join(u'%%-%ds' %
129
max(len(tablewords[key]),
130
max(len(valuetostring(client[key],
131
key))
132
for client in
133
clients))
134
for key in keywords)
124
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)
135
131
# Print header line
136
print format_string % tuple(tablewords[key] for key in keywords)
132
print(format_string.format(**tablewords))
137
133
for client in clients:
138
print format_string % tuple(valuetostring(client[key], key)
139
for key in keywords)
134
print(format_string.format(**dict((key,
135
valuetostring(client[key],
136
key))
137
for key in keywords)))
140
138
141
139
def has_actions(options):
142
140
return any((options.enable,
148
146
options.remove,
149
147
options.checker is not None,
150
148
options.timeout is not None,
149
options.extended_timeout is not None,
151
150
options.interval is not None,
152
151
options.approved_by_default is not None,
153
152
options.approval_delay is not None,
156
155
options.secret is not None,
157
156
options.approve,
158
157
options.deny))
159
158
160
159
def main():
161
parser = OptionParser(version = "%%prog %s" % version)
162
parser.add_option("-a", "--all", action="store_true",
163
help="Select all clients")
164
parser.add_option("-v", "--verbose", action="store_true",
165
help="Print all fields")
166
parser.add_option("-e", "--enable", action="store_true",
167
help="Enable client")
168
parser.add_option("-d", "--disable", action="store_true",
169
help="disable client")
170
parser.add_option("-b", "--bump-timeout", action="store_true",
171
help="Bump timeout for client")
172
parser.add_option("--start-checker", action="store_true",
173
help="Start checker for client")
174
parser.add_option("--stop-checker", action="store_true",
175
help="Stop checker for client")
176
parser.add_option("-V", "--is-enabled", action="store_true",
177
help="Check if client is enabled")
178
parser.add_option("-r", "--remove", action="store_true",
179
help="Remove client")
180
parser.add_option("-c", "--checker", type="string",
181
help="Set checker command for client")
182
parser.add_option("-t", "--timeout", type="string",
183
help="Set timeout for client")
184
parser.add_option("-i", "--interval", type="string",
185
help="Set checker interval for client")
186
parser.add_option("--approve-by-default", action="store_true",
187
dest=u"approved_by_default",
188
help="Set client to be approved by default")
189
parser.add_option("--deny-by-default", action="store_false",
190
dest=u"approved_by_default",
191
help="Set client to be denied by default")
192
parser.add_option("--approval-delay", type="string",
193
help="Set delay before client approve/deny")
194
parser.add_option("--approval-duration", type="string",
195
help="Set duration of one client approval")
196
parser.add_option("-H", "--host", type="string",
197
help="Set host for client")
198
parser.add_option("-s", "--secret", type="string",
199
help="Set password blob (file) for client")
200
parser.add_option("-A", "--approve", action="store_true",
201
help="Approve any current client request")
202
parser.add_option("-D", "--deny", action="store_true",
203
help="Deny any current client request")
204
options, client_names = parser.parse_args()
205
206
if has_actions(options) and not client_names and not options.all:
207
parser.error('Options require clients names or --all.')
208
if options.verbose and has_actions(options):
209
parser.error('--verbose can only be used alone or with'
210
' --all.')
211
if options.all and not has_actions(options):
212
parser.error('--all requires an action.')
213
214
try:
215
bus = dbus.SystemBus()
216
mandos_dbus_objc = bus.get_object(busname, server_path)
217
except dbus.exceptions.DBusException:
218
print >> sys.stderr, "Could not connect to Mandos server"
219
sys.exit(1)
220
221
mandos_serv = dbus.Interface(mandos_dbus_objc,
222
dbus_interface = server_interface)
223
224
#block stderr since dbus library prints to stderr
225
null = os.open(os.path.devnull, os.O_RDWR)
226
stderrcopy = os.dup(sys.stderr.fileno())
227
os.dup2(null, sys.stderr.fileno())
228
os.close(null)
229
try:
230
try:
231
mandos_clients = mandos_serv.GetAllClientsWithProperties()
232
finally:
233
#restore stderr
234
os.dup2(stderrcopy, sys.stderr.fileno())
235
os.close(stderrcopy)
236
except dbus.exceptions.DBusException, e:
237
print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
238
sys.exit(1)
239
240
# Compile dict of (clients: properties) to process
241
clients={}
242
243
if options.all or not client_names:
244
clients = dict((bus.get_object(busname, path), properties)
245
for path, properties in
246
mandos_clients.iteritems())
247
else:
248
for name in client_names:
249
for path, client in mandos_clients.iteritems():
250
if client['Name'] == name:
251
client_objc = bus.get_object(busname, path)
252
clients[client_objc] = client
253
break
254
else:
255
print >> sys.stderr, "Client not found on server: %r" % name
256
sys.exit(1)
257
258
if not has_actions(options) and clients:
259
if options.verbose:
260
keywords = ('Name', 'Enabled', 'Timeout',
261
'LastCheckedOK', 'Created', 'Interval',
262
'Host', 'Fingerprint', 'CheckerRunning',
263
'LastEnabled', 'ApprovalPending',
264
'ApprovedByDefault',
265
'LastApprovalRequest', 'ApprovalDelay',
266
'ApprovalDuration', 'Checker')
160
parser = argparse.ArgumentParser()
161
parser.add_argument("--version", action="version",
162
version = "%(prog)s {0}".format(version),
163
help="show version number and exit")
164
parser.add_argument("-a", "--all", action="store_true",
165
help="Select all clients")
166
parser.add_argument("-v", "--verbose", action="store_true",
167
help="Print all fields")
168
parser.add_argument("-e", "--enable", action="store_true",
169
help="Enable client")
170
parser.add_argument("-d", "--disable", action="store_true",
171
help="disable client")
172
parser.add_argument("-b", "--bump-timeout", action="store_true",
173
help="Bump timeout for client")
174
parser.add_argument("--start-checker", action="store_true",
175
help="Start checker for client")
176
parser.add_argument("--stop-checker", action="store_true",
177
help="Stop checker for client")
178
parser.add_argument("-V", "--is-enabled", action="store_true",
179
help="Check if client is enabled")
180
parser.add_argument("-r", "--remove", action="store_true",
181
help="Remove client")
182
parser.add_argument("-c", "--checker",
183
help="Set checker command for client")
184
parser.add_argument("-t", "--timeout",
185
help="Set timeout for client")
186
parser.add_argument("--extended-timeout",
187
help="Set extended timeout for client")
188
parser.add_argument("-i", "--interval",
189
help="Set checker interval for client")
190
parser.add_argument("--approve-by-default", action="store_true",
191
default=None, dest="approved_by_default",
192
help="Set client to be approved by default")
193
parser.add_argument("--deny-by-default", action="store_false",
194
dest="approved_by_default",
195
help="Set client to be denied by default")
196
parser.add_argument("--approval-delay",
197
help="Set delay before client approve/deny")
198
parser.add_argument("--approval-duration",
199
help="Set duration of one client approval")
200
parser.add_argument("-H", "--host", help="Set host for client")
201
parser.add_argument("-s", "--secret", type=file,
202
help="Set password blob (file) for client")
203
parser.add_argument("-A", "--approve", action="store_true",
204
help="Approve any current client request")
205
parser.add_argument("-D", "--deny", action="store_true",
206
help="Deny any current client request")
207
parser.add_argument("client", nargs="*", help="Client name")
208
options = parser.parse_args()
209
210
if has_actions(options) and not options.client and not options.all:
211
parser.error("Options require clients names or --all.")
212
if options.verbose and has_actions(options):
213
parser.error("--verbose can only be used alone or with"
214
" --all.")
215
if options.all and not has_actions(options):
216
parser.error("--all requires an action.")
217
218
try:
219
bus = dbus.SystemBus()
220
mandos_dbus_objc = bus.get_object(busname, server_path)
221
except dbus.exceptions.DBusException:
222
print("Could not connect to Mandos server",
223
file=sys.stderr)
224
sys.exit(1)
225
226
mandos_serv = dbus.Interface(mandos_dbus_objc,
227
dbus_interface = server_interface)
228
229
#block stderr since dbus library prints to stderr
230
null = os.open(os.path.devnull, os.O_RDWR)
231
stderrcopy = os.dup(sys.stderr.fileno())
232
os.dup2(null, sys.stderr.fileno())
233
os.close(null)
234
try:
235
try:
236
mandos_clients = mandos_serv.GetAllClientsWithProperties()
237
finally:
238
#restore stderr
239
os.dup2(stderrcopy, sys.stderr.fileno())
240
os.close(stderrcopy)
241
except dbus.exceptions.DBusException:
242
print("Access denied: Accessing mandos server through dbus.",
243
file=sys.stderr)
244
sys.exit(1)
245
246
# Compile dict of (clients: properties) to process
247
clients={}
248
249
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())
253
else:
254
for name in options.client:
255
for path, client in mandos_clients.iteritems():
256
if client["Name"] == name:
257
client_objc = bus.get_object(busname, path)
258
clients[client_objc] = client
259
break
267
260
else:
268
keywords = defaultkeywords
269
270
print_clients(clients.values(), keywords)
261
print("Client not found on server: {0!r}"
262
.format(name), file=sys.stderr)
263
sys.exit(1)
264
265
if not has_actions(options) and clients:
266
if options.verbose:
267
keywords = ("Name", "Enabled", "Timeout",
268
"LastCheckedOK", "Created", "Interval",
269
"Host", "Fingerprint", "CheckerRunning",
270
"LastEnabled", "ApprovalPending",
271
"ApprovedByDefault",
272
"LastApprovalRequest", "ApprovalDelay",
273
"ApprovalDuration", "Checker",
274
"ExtendedTimeout")
271
275
else:
272
# Process each client in the list by all selected options
273
for client in clients:
274
if options.remove:
275
mandos_serv.RemoveClient(client.__dbus_object_path__)
276
if options.enable:
277
client.Enable(dbus_interface=client_interface)
278
if options.disable:
279
client.Disable(dbus_interface=client_interface)
280
if options.bump_timeout:
281
client.CheckedOK(dbus_interface=client_interface)
282
if options.start_checker:
283
client.StartChecker(dbus_interface=client_interface)
284
if options.stop_checker:
285
client.StopChecker(dbus_interface=client_interface)
286
if options.is_enabled:
287
sys.exit(0 if client.Get(client_interface,
288
u"Enabled",
289
dbus_interface=dbus.PROPERTIES_IFACE)
290
else 1)
291
if options.checker:
292
client.Set(client_interface, u"Checker", options.checker,
293
dbus_interface=dbus.PROPERTIES_IFACE)
294
if options.host:
295
client.Set(client_interface, u"Host", options.host,
296
dbus_interface=dbus.PROPERTIES_IFACE)
297
if options.interval:
298
client.Set(client_interface, u"Interval",
299
timedelta_to_milliseconds
300
(string_to_delta(options.interval)),
301
dbus_interface=dbus.PROPERTIES_IFACE)
302
if options.approval_delay:
303
client.Set(client_interface, u"ApprovalDelay",
304
timedelta_to_milliseconds
305
(string_to_delta(options.
306
approval_delay)),
307
dbus_interface=dbus.PROPERTIES_IFACE)
308
if options.approval_duration:
309
client.Set(client_interface, u"ApprovalDuration",
310
timedelta_to_milliseconds
311
(string_to_delta(options.
312
approval_duration)),
313
dbus_interface=dbus.PROPERTIES_IFACE)
314
if options.timeout:
315
client.Set(client_interface, u"Timeout",
316
timedelta_to_milliseconds
317
(string_to_delta(options.timeout)),
318
dbus_interface=dbus.PROPERTIES_IFACE)
319
if options.secret:
320
client.Set(client_interface, u"Secret",
321
dbus.ByteArray(open(options.secret,
322
u'rb').read()),
323
dbus_interface=dbus.PROPERTIES_IFACE)
324
if options.approved_by_default is not None:
325
client.Set(client_interface, u"ApprovedByDefault",
326
dbus.Boolean(options
327
.approved_by_default),
328
dbus_interface=dbus.PROPERTIES_IFACE)
329
if options.approve:
330
client.Approve(dbus.Boolean(True),
331
dbus_interface=client_interface)
332
elif options.deny:
333
client.Approve(dbus.Boolean(False),
334
dbus_interface=client_interface)
276
keywords = defaultkeywords
277
278
print_clients(clients.values(), keywords)
279
else:
280
# Process each client in the list by all selected options
281
for client in clients:
282
def set_client_prop(prop, value):
283
"""Set a Client D-Bus property"""
284
client.Set(client_interface, prop, value,
285
dbus_interface=dbus.PROPERTIES_IFACE)
286
def set_client_prop_ms(prop, value):
287
"""Set a Client D-Bus property, converted
288
from a string to milliseconds."""
289
set_client_prop(prop,
290
timedelta_to_milliseconds
291
(string_to_delta(value)))
292
if options.remove:
293
mandos_serv.RemoveClient(client.__dbus_object_path__)
294
if options.enable:
295
set_client_prop("Enabled", dbus.Boolean(True))
296
if options.disable:
297
set_client_prop("Enabled", dbus.Boolean(False))
298
if options.bump_timeout:
299
set_client_prop("LastCheckedOK", "")
300
if options.start_checker:
301
set_client_prop("CheckerRunning", dbus.Boolean(True))
302
if options.stop_checker:
303
set_client_prop("CheckerRunning", dbus.Boolean(False))
304
if options.is_enabled:
305
sys.exit(0 if client.Get(client_interface,
306
"Enabled",
307
dbus_interface=
308
dbus.PROPERTIES_IFACE)
309
else 1)
310
if options.checker is not None:
311
set_client_prop("Checker", options.checker)
312
if options.host is not None:
313
set_client_prop("Host", options.host)
314
if options.interval is not None:
315
set_client_prop_ms("Interval", options.interval)
316
if options.approval_delay is not None:
317
set_client_prop_ms("ApprovalDelay",
318
options.approval_delay)
319
if options.approval_duration is not None:
320
set_client_prop_ms("ApprovalDuration",
321
options.approval_duration)
322
if options.timeout is not None:
323
set_client_prop_ms("Timeout", options.timeout)
324
if options.extended_timeout is not None:
325
set_client_prop_ms("ExtendedTimeout",
326
options.extended_timeout)
327
if options.secret is not None:
328
set_client_prop("Secret",
329
dbus.ByteArray(options.secret.read()))
330
if options.approved_by_default is not None:
331
set_client_prop("ApprovedByDefault",
332
dbus.Boolean(options
333
.approved_by_default))
334
if options.approve:
335
client.Approve(dbus.Boolean(True),
336
dbus_interface=client_interface)
337
elif options.deny:
338
client.Approve(dbus.Boolean(False),
339
dbus_interface=client_interface)
335
340
336
if __name__ == '__main__':
341
if __name__ == "__main__":
337
342
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0