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