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 494
- compare with another revision
- download diff
- download tarball
- view history from revision 494
- Committer: Teddy Hogeborn
- Date: 2011-08-17 22:27:13 UTC
- Revision ID: teddy@fukt.bsnet.se-20110817222713-xemqfzafjciuaqkz
* mandos-keygen: Loop until passwords match when run interactively.
- files removed:
- debian/mandos-client.examples
- 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-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
25
from __future__ import (division, absolute_import, print_function,
27
26
unicode_literals)
28
27
29
from future_builtins import *
30
31
28
import sys
32
29
import dbus
33
30
import argparse
55
52
"ApprovalDelay": "Approval Delay",
56
53
"ApprovalDuration": "Approval Duration",
57
54
"Checker": "Checker",
58
"ExtendedTimeout" : "Extended Timeout"
59
55
}
60
56
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
61
domain = "se.recompile"
57
domain = "se.bsnet.fukt"
62
58
busname = domain + ".Mandos"
63
59
server_path = "/"
64
60
server_interface = domain + ".Mandos"
65
61
client_interface = domain + ".Mandos.Client"
66
version = "1.5.5"
62
version = "1.3.1"
67
63
68
64
def timedelta_to_milliseconds(td):
69
65
"""Convert a datetime.timedelta object to milliseconds"""
73
69
74
70
def milliseconds_to_string(ms):
75
71
td = datetime.timedelta(0, 0, 0, ms)
76
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
77
.format(days = "{0}T".format(td.days) if td.days else "",
78
hours = td.seconds // 3600,
79
minutes = (td.seconds % 3600) // 60,
80
seconds = td.seconds % 60,
81
))
72
return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
73
% { "days": "%dT" % td.days if td.days else "",
74
"hours": td.seconds // 3600,
75
"minutes": (td.seconds % 3600) // 60,
76
"seconds": td.seconds % 60,
77
})
82
78
83
79
def string_to_delta(interval):
84
80
"""Parse a string and return a datetime.timedelta
96
92
>>> string_to_delta("5m 30s")
97
93
datetime.timedelta(0, 330)
98
94
"""
99
value = datetime.timedelta(0)
100
regexp = re.compile("(\d+)([dsmhw]?)")
95
timevalue = datetime.timedelta(0)
96
regexp = re.compile("\d+[dsmhw]")
101
97
102
for num, suffix in regexp.findall(interval):
103
if suffix == "d":
104
value += datetime.timedelta(int(num))
105
elif suffix == "s":
106
value += datetime.timedelta(0, int(num))
107
elif suffix == "m":
108
value += datetime.timedelta(0, 0, 0, 0, int(num))
109
elif suffix == "h":
110
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
111
elif suffix == "w":
112
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
113
elif suffix == "":
114
value += datetime.timedelta(0, 0, 0, int(num))
115
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
116
118
117
119
def print_clients(clients, keywords):
118
120
def valuetostring(value, keyword):
119
121
if type(value) is dbus.Boolean:
120
122
return "Yes" if value else "No"
121
123
if keyword in ("Timeout", "Interval", "ApprovalDelay",
122
"ApprovalDuration", "ExtendedTimeout"):
124
"ApprovalDuration"):
123
125
return milliseconds_to_string(value)
124
126
return unicode(value)
125
127
126
128
# Create format string to print table rows
127
format_string = " ".join("{{{key}:{width}}}".format(
128
width = max(len(tablewords[key]),
129
max(len(valuetostring(client[key],
130
key))
131
for client in
132
clients)),
133
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)
134
136
# Print header line
135
print(format_string.format(**tablewords))
137
print(format_string % tuple(tablewords[key] for key in keywords))
136
138
for client in clients:
137
print(format_string.format(**dict((key,
138
valuetostring(client[key],
139
key))
140
for key in keywords)))
139
print(format_string % tuple(valuetostring(client[key], key)
140
for key in keywords))
141
141
142
142
def has_actions(options):
143
143
return any((options.enable,
149
149
options.remove,
150
150
options.checker is not None,
151
151
options.timeout is not None,
152
options.extended_timeout is not None,
153
152
options.interval is not None,
154
153
options.approved_by_default is not None,
155
154
options.approval_delay is not None,
162
161
def main():
163
162
parser = argparse.ArgumentParser()
164
163
parser.add_argument("--version", action="version",
165
version = "%(prog)s {0}".format(version),
164
version = "%%prog %s" % version,
166
165
help="show version number and exit")
167
166
parser.add_argument("-a", "--all", action="store_true",
168
167
help="Select all clients")
186
185
help="Set checker command for client")
187
186
parser.add_argument("-t", "--timeout",
188
187
help="Set timeout for client")
189
parser.add_argument("--extended-timeout",
190
help="Set extended timeout for client")
191
188
parser.add_argument("-i", "--interval",
192
189
help="Set checker interval for client")
193
190
parser.add_argument("--approve-by-default", action="store_true",
210
207
parser.add_argument("client", nargs="*", help="Client name")
211
208
options = parser.parse_args()
212
209
213
if has_actions(options) and not (options.client or options.all):
210
if has_actions(options) and not options.client and not options.all:
214
211
parser.error("Options require clients names or --all.")
215
212
if options.verbose and has_actions(options):
216
213
parser.error("--verbose can only be used alone or with"
241
238
#restore stderr
242
239
os.dup2(stderrcopy, sys.stderr.fileno())
243
240
os.close(stderrcopy)
244
except dbus.exceptions.DBusException:
241
except dbus.exceptions.DBusException, e:
245
242
print("Access denied: Accessing mandos server through dbus.",
246
243
file=sys.stderr)
247
244
sys.exit(1)
261
258
clients[client_objc] = client
262
259
break
263
260
else:
264
print("Client not found on server: {0!r}"
265
.format(name), file=sys.stderr)
261
print("Client not found on server: %r" % name,
262
file=sys.stderr)
266
263
sys.exit(1)
267
264
268
265
if not has_actions(options) and clients:
273
270
"LastEnabled", "ApprovalPending",
274
271
"ApprovedByDefault",
275
272
"LastApprovalRequest", "ApprovalDelay",
276
"ApprovalDuration", "Checker",
277
"ExtendedTimeout")
273
"ApprovalDuration", "Checker")
278
274
else:
279
275
keywords = defaultkeywords
280
276
282
278
else:
283
279
# Process each client in the list by all selected options
284
280
for client in clients:
285
def set_client_prop(prop, value):
286
"""Set a Client D-Bus property"""
287
client.Set(client_interface, prop, value,
288
dbus_interface=dbus.PROPERTIES_IFACE)
289
def set_client_prop_ms(prop, value):
290
"""Set a Client D-Bus property, converted
291
from a string to milliseconds."""
292
set_client_prop(prop,
293
timedelta_to_milliseconds
294
(string_to_delta(value)))
295
281
if options.remove:
296
282
mandos_serv.RemoveClient(client.__dbus_object_path__)
297
283
if options.enable:
298
set_client_prop("Enabled", dbus.Boolean(True))
284
client.Enable(dbus_interface=client_interface)
299
285
if options.disable:
300
set_client_prop("Enabled", dbus.Boolean(False))
286
client.Disable(dbus_interface=client_interface)
301
287
if options.bump_timeout:
302
set_client_prop("LastCheckedOK", "")
288
client.CheckedOK(dbus_interface=client_interface)
303
289
if options.start_checker:
304
set_client_prop("CheckerRunning", dbus.Boolean(True))
290
client.StartChecker(dbus_interface=client_interface)
305
291
if options.stop_checker:
306
set_client_prop("CheckerRunning", dbus.Boolean(False))
292
client.StopChecker(dbus_interface=client_interface)
307
293
if options.is_enabled:
308
294
sys.exit(0 if client.Get(client_interface,
309
295
"Enabled",
310
296
dbus_interface=
311
297
dbus.PROPERTIES_IFACE)
312
298
else 1)
313
if options.checker is not None:
314
set_client_prop("Checker", options.checker)
315
if options.host is not None:
316
set_client_prop("Host", options.host)
317
if options.interval is not None:
318
set_client_prop_ms("Interval", options.interval)
319
if options.approval_delay is not None:
320
set_client_prop_ms("ApprovalDelay",
321
options.approval_delay)
322
if options.approval_duration is not None:
323
set_client_prop_ms("ApprovalDuration",
324
options.approval_duration)
325
if options.timeout is not None:
326
set_client_prop_ms("Timeout", options.timeout)
327
if options.extended_timeout is not None:
328
set_client_prop_ms("ExtendedTimeout",
329
options.extended_timeout)
330
if options.secret is not None:
331
set_client_prop("Secret",
332
dbus.ByteArray(options.secret.read()))
299
if options.checker:
300
client.Set(client_interface, "Checker",
301
options.checker,
302
dbus_interface=dbus.PROPERTIES_IFACE)
303
if options.host:
304
client.Set(client_interface, "Host", options.host,
305
dbus_interface=dbus.PROPERTIES_IFACE)
306
if options.interval:
307
client.Set(client_interface, "Interval",
308
timedelta_to_milliseconds
309
(string_to_delta(options.interval)),
310
dbus_interface=dbus.PROPERTIES_IFACE)
311
if options.approval_delay:
312
client.Set(client_interface, "ApprovalDelay",
313
timedelta_to_milliseconds
314
(string_to_delta(options.
315
approval_delay)),
316
dbus_interface=dbus.PROPERTIES_IFACE)
317
if options.approval_duration:
318
client.Set(client_interface, "ApprovalDuration",
319
timedelta_to_milliseconds
320
(string_to_delta(options.
321
approval_duration)),
322
dbus_interface=dbus.PROPERTIES_IFACE)
323
if options.timeout:
324
client.Set(client_interface, "Timeout",
325
timedelta_to_milliseconds
326
(string_to_delta(options.timeout)),
327
dbus_interface=dbus.PROPERTIES_IFACE)
328
if options.secret:
329
client.Set(client_interface, "Secret",
330
dbus.ByteArray(open(options.secret,
331
"rb").read()),
332
dbus_interface=dbus.PROPERTIES_IFACE)
333
333
if options.approved_by_default is not None:
334
set_client_prop("ApprovedByDefault",
335
dbus.Boolean(options
336
.approved_by_default))
334
client.Set(client_interface, "ApprovedByDefault",
335
dbus.Boolean(options
336
.approved_by_default),
337
dbus_interface=dbus.PROPERTIES_IFACE)
337
338
if options.approve:
338
339
client.Approve(dbus.Boolean(True),
339
340
dbus_interface=client_interface)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0