To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos-ctl
- browse files at revision 24.1.163
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.163
- Committer: Björn Påhlsson
- Date: 2010-09-12 18:12:11 UTC
- mto: (237.7.1 mandos)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.
mandos-ctl: Better option parsing.
- files removed:
- DBUS-API
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-ctl
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
#
4
# Mandos Monitor - Control and monitor the Mandos server
5
#
6
# Copyright © 2008-2012 Teddy Hogeborn
7
# Copyright © 2008-2012 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 <http://www.gnu.org/licenses/>.
21
#
22
# Contact the authors at <mandos@recompile.se>.
23
#
24
25
from __future__ import (division, absolute_import, print_function,
26
unicode_literals)
27
3
4
from __future__ import division
28
5
import sys
29
6
import dbus
30
import argparse
7
from optparse import OptionParser
31
8
import locale
32
9
import datetime
33
10
import re
34
11
import os
35
12
36
locale.setlocale(locale.LC_ALL, "")
13
locale.setlocale(locale.LC_ALL, u'')
37
14
38
15
tablewords = {
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"
16
'name': u'Name',
17
'enabled': u'Enabled',
18
'timeout': u'Timeout',
19
'last_checked_ok': u'Last Successful Check',
20
'created': u'Created',
21
'interval': u'Interval',
22
'host': u'Host',
23
'fingerprint': u'Fingerprint',
24
'checker_running': u'Check Is Running',
25
'last_enabled': u'Last Enabled',
26
'checker': u'Checker',
56
27
}
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"
28
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
29
domain = 'se.bsnet.fukt'
30
busname = domain + '.Mandos'
31
server_path = '/'
32
server_interface = domain + '.Mandos'
33
client_interface = domain + '.Mandos.Client'
34
version = "1.0.14"
64
35
65
36
def timedelta_to_milliseconds(td):
66
"""Convert a datetime.timedelta object to milliseconds"""
37
"Convert a datetime.timedelta object to milliseconds"
67
38
return ((td.days * 24 * 60 * 60 * 1000)
68
39
+ (td.seconds * 1000)
69
40
+ (td.microseconds // 1000))
70
41
71
42
def milliseconds_to_string(ms):
72
43
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
))
44
return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
45
% { "days": "%dT" % td.days if td.days else "",
46
"hours": td.seconds // 3600,
47
"minutes": (td.seconds % 3600) // 60,
48
"seconds": td.seconds % 60,
49
})
50
79
51
80
52
def string_to_delta(interval):
81
53
"""Parse a string and return a datetime.timedelta
82
83
>>> string_to_delta("7d")
54
55
>>> string_to_delta('7d')
84
56
datetime.timedelta(7)
85
>>> string_to_delta("60s")
57
>>> string_to_delta('60s')
86
58
datetime.timedelta(0, 60)
87
>>> string_to_delta("60m")
59
>>> string_to_delta('60m')
88
60
datetime.timedelta(0, 3600)
89
>>> string_to_delta("24h")
61
>>> string_to_delta('24h')
90
62
datetime.timedelta(1)
91
>>> string_to_delta("1w")
63
>>> string_to_delta(u'1w')
92
64
datetime.timedelta(7)
93
>>> string_to_delta("5m 30s")
65
>>> string_to_delta('5m 30s')
94
66
datetime.timedelta(0, 330)
95
67
"""
96
value = datetime.timedelta(0)
97
regexp = re.compile("(\d+)([dsmhw]?)")
68
timevalue = datetime.timedelta(0)
69
regexp = re.compile("\d+[dsmhw]")
98
70
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
71
for s in regexp.findall(interval):
72
try:
73
suffix = unicode(s[-1])
74
value = int(s[:-1])
75
if suffix == u"d":
76
delta = datetime.timedelta(value)
77
elif suffix == u"s":
78
delta = datetime.timedelta(0, value)
79
elif suffix == u"m":
80
delta = datetime.timedelta(0, 0, 0, 0, value)
81
elif suffix == u"h":
82
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
83
elif suffix == u"w":
84
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
85
else:
86
raise ValueError
87
except (ValueError, IndexError):
88
raise ValueError
89
timevalue += delta
90
return timevalue
113
91
114
92
def print_clients(clients, keywords):
115
93
def valuetostring(value, keyword):
116
94
if type(value) is dbus.Boolean:
117
return "Yes" if value else "No"
118
if keyword in ("Timeout", "Interval", "ApprovalDelay",
119
"ApprovalDuration"):
95
return u"Yes" if value else u"No"
96
if keyword in (u"timeout", u"interval"):
120
97
return milliseconds_to_string(value)
121
98
return unicode(value)
122
99
123
100
# Create format string to print table rows
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)
101
format_string = u' '.join(u'%%-%ds' %
102
max(len(tablewords[key]),
103
max(len(valuetostring(client[key], key))
104
for client in
105
clients))
106
for key in keywords)
131
107
# Print header line
132
print(format_string.format(**tablewords))
108
print format_string % tuple(tablewords[key] for key in keywords)
133
109
for client in clients:
134
print(format_string.format(**dict((key,
135
valuetostring(client[key],
136
key))
137
for key in keywords)))
138
110
print format_string % tuple(valuetostring(client[key], key)
111
for key in keywords)
139
112
def has_actions(options):
140
113
return any((options.enable,
141
114
options.disable,
146
119
options.remove,
147
120
options.checker is not None,
148
121
options.timeout is not None,
149
options.extended_timeout is not None,
150
122
options.interval is not None,
151
options.approved_by_default is not None,
152
options.approval_delay is not None,
153
options.approval_duration is not None,
154
123
options.host is not None,
155
124
options.secret is not None,
156
125
options.approve,
157
126
options.deny))
158
127
159
128
def main():
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
129
parser = OptionParser(version = "%%prog %s" % version)
130
parser.add_option("-a", "--all", action="store_true",
131
help="Select all clients")
132
parser.add_option("-v", "--verbose", action="store_true",
133
help="Print all fields")
134
parser.add_option("-e", "--enable", action="store_true",
135
help="Enable client")
136
parser.add_option("-d", "--disable", action="store_true",
137
help="disable client")
138
parser.add_option("-b", "--bump-timeout", action="store_true",
139
help="Bump timeout for client")
140
parser.add_option("--start-checker", action="store_true",
141
help="Start checker for client")
142
parser.add_option("--stop-checker", action="store_true",
143
help="Stop checker for client")
144
parser.add_option("-V", "--is-enabled", action="store_true",
145
help="Check if client is enabled")
146
parser.add_option("-r", "--remove", action="store_true",
147
help="Remove client")
148
parser.add_option("-c", "--checker", type="string",
149
help="Set checker command for client")
150
parser.add_option("-t", "--timeout", type="string",
151
help="Set timeout for client")
152
parser.add_option("-i", "--interval", type="string",
153
help="Set checker interval for client")
154
parser.add_option("-H", "--host", type="string",
155
help="Set host for client")
156
parser.add_option("-s", "--secret", type="string",
157
help="Set password blob (file) for client")
158
parser.add_option("-A", "--approve", action="store_true",
159
help="Approve any current client request")
160
parser.add_option("-D", "--deny", action="store_true",
161
help="Deny any current client request")
162
options, client_names = parser.parse_args()
163
164
if has_actions(options) and not client_names and not options.all:
165
parser.error('Options requires clients names or --all.')
166
if options.verbose and has_actions(options):
167
parser.error('Verbose option can only be used alone or with --all.')
168
if options.all and not has_actions(options):
169
parser.error('--all requires an action')
170
171
try:
172
bus = dbus.SystemBus()
173
mandos_dbus_objc = bus.get_object(busname, server_path)
174
except dbus.exceptions.DBusException:
175
print >> sys.stderr, "Could not connect to Mandos server"
176
sys.exit(1)
177
178
mandos_serv = dbus.Interface(mandos_dbus_objc,
179
dbus_interface = server_interface)
180
181
#block stderr since dbus library prints to stderr
182
null = os.open(os.path.devnull, os.O_RDWR)
183
stderrcopy = os.dup(sys.stderr.fileno())
184
os.dup2(null, sys.stderr.fileno())
185
os.close(null)
186
try:
187
try:
188
mandos_clients = mandos_serv.GetAllClientsWithProperties()
189
finally:
190
#restore stderr
191
os.dup2(stderrcopy, sys.stderr.fileno())
192
os.close(stderrcopy)
193
except dbus.exceptions.DBusException, e:
194
print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
195
sys.exit(1)
196
197
# Compile list of clients to process
198
clients=[]
199
200
if options.all or not client_names:
201
clients = (bus.get_object(busname, path) for path in mandos_clients.iterkeys())
202
else:
203
for name in client_names:
204
for path, client in mandos_clients.iteritems():
205
if client['name'] == name:
206
client_objc = bus.get_object(busname, path)
207
clients.append(client_objc)
208
break
209
else:
210
print >> sys.stderr, "Client not found on server: %r" % name
211
sys.exit(1)
212
213
if not has_actions(options) and clients:
214
if options.verbose:
215
keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
216
'created', 'interval', 'host', 'fingerprint',
217
'checker_running', 'last_enabled', 'checker')
260
218
else:
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")
219
keywords = defaultkeywords
220
221
print_clients(mandos_clients.values(), keywords)
275
222
else:
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)
223
# Process each client in the list by all selected options
224
for client in clients:
225
if options.remove:
226
mandos_serv.RemoveClient(client.__dbus_object_path__)
227
if options.enable:
228
client.Enable(dbus_interface=client_interface)
229
if options.disable:
230
client.Disable(dbus_interface=client_interface)
231
if options.bump_timeout:
232
client.CheckedOK(dbus_interface=client_interface)
233
if options.start_checker:
234
client.StartChecker(dbus_interface=client_interface)
235
if options.stop_checker:
236
client.StopChecker(dbus_interface=client_interface)
237
if options.is_enabled:
238
sys.exit(0 if client.Get(client_interface,
239
u"enabled",
240
dbus_interface=dbus.PROPERTIES_IFACE)
241
else 1)
242
if options.checker:
243
client.Set(client_interface, u"checker", options.checker,
244
dbus_interface=dbus.PROPERTIES_IFACE)
245
if options.host:
246
client.Set(client_interface, u"host", options.host,
247
dbus_interface=dbus.PROPERTIES_IFACE)
248
if options.interval:
249
client.Set(client_interface, u"interval",
250
timedelta_to_milliseconds
251
(string_to_delta(options.interval)),
252
dbus_interface=dbus.PROPERTIES_IFACE)
253
if options.timeout:
254
client.Set(client_interface, u"timeout",
255
timedelta_to_milliseconds(string_to_delta
256
(options.timeout)),
257
dbus_interface=dbus.PROPERTIES_IFACE)
258
if options.secret:
259
client.Set(client_interface, u"secret",
260
dbus.ByteArray(open(options.secret, u'rb').read()),
261
dbus_interface=dbus.PROPERTIES_IFACE)
262
if options.approve:
263
client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
264
if options.deny:
265
client.Approve(dbus.Boolean(False), dbus_interface=client_interface)
340
266
341
if __name__ == "__main__":
267
if __name__ == '__main__':
342
268
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0