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