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 443
- compare with another revision
- download diff
- download tarball
- view history from revision 443
- Committer: Teddy Hogeborn
- Date: 2010-09-26 17:44:43 UTC
- Revision ID: teddy@fukt.bsnet.se-20100926174443-452k363uuvczuuzg
* mandos-ctl: Also show "LastApprovalRequest" property.
added
removed
mandos-ctl
8
8
import locale
9
9
import datetime
10
10
import re
11
import os
11
12
12
13
locale.setlocale(locale.LC_ALL, u'')
13
14
14
15
tablewords = {
15
'name': u'Name',
16
'enabled': u'Enabled',
17
'timeout': u'Timeout',
18
'last_checked_ok': u'Last Successful Check',
19
'created': u'Created',
20
'interval': u'Interval',
21
'host': u'Host',
22
'fingerprint': u'Fingerprint',
23
'checker_running': u'Check Is Running',
24
'last_enabled': u'Last Enabled',
25
'checker': u'Checker',
16
'Name': u'Name',
17
'Enabled': u'Enabled',
18
'Timeout': u'Timeout',
19
'LastCheckedOK': u'Last Successful Check',
20
'LastApprovalRequest': u'Last Approval Request',
21
'Created': u'Created',
22
'Interval': u'Interval',
23
'Host': u'Host',
24
'Fingerprint': u'Fingerprint',
25
'CheckerRunning': u'Check Is Running',
26
'LastEnabled': u'Last Enabled',
27
'ApprovalPending': u'Approval Is Pending',
28
'ApprovedByDefault': u'Approved By Default',
29
'ApprovalDelay': u"Approval Delay",
30
'ApprovalDuration': u"Approval Duration",
31
'Checker': u'Checker',
26
32
}
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
'checker')
29
busname = 'org.mandos-system.Mandos'
30
server_path = '/Mandos'
31
server_interface = 'org.mandos_system.Mandos'
32
client_interface = 'org.mandos_system.Mandos.Client'
33
version = "1.0.5"
34
35
bus = dbus.SystemBus()
36
mandos_dbus_objc = bus.get_object(busname, server_path)
37
mandos_serv = dbus.Interface(mandos_dbus_objc,
38
dbus_interface = server_interface)
39
mandos_clients = mandos_serv.GetAllClientsWithProperties()
40
41
def datetime_to_milliseconds(dt):
42
"Return the 'timeout' attribute in milliseconds"
43
return ((dt.days * 24 * 60 * 60 * 1000)
44
+ (dt.seconds * 1000)
45
+ (dt.microseconds // 1000))
33
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
34
domain = 'se.bsnet.fukt'
35
busname = domain + '.Mandos'
36
server_path = '/'
37
server_interface = domain + '.Mandos'
38
client_interface = domain + '.Mandos.Client'
39
version = "1.0.14"
40
41
def timedelta_to_milliseconds(td):
42
"Convert a datetime.timedelta object to milliseconds"
43
return ((td.days * 24 * 60 * 60 * 1000)
44
+ (td.seconds * 1000)
45
+ (td.microseconds // 1000))
46
46
47
47
def milliseconds_to_string(ms):
48
48
td = datetime.timedelta(0, 0, 0, ms)
49
return "%s%02d:%02d:%02d" % (("%dT" % td.days) if td.days else "", # days
50
td.seconds // 3600, # hours
51
(td.seconds % 3600) // 60, # minutes
52
(td.seconds % 60)) # seconds
49
return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
50
% { "days": "%dT" % td.days if td.days else "",
51
"hours": td.seconds // 3600,
52
"minutes": (td.seconds % 3600) // 60,
53
"seconds": td.seconds % 60,
54
})
53
55
54
56
55
57
def string_to_delta(interval):
92
94
timevalue += delta
93
95
return timevalue
94
96
95
def print_clients(clients):
97
def print_clients(clients, keywords):
96
98
def valuetostring(value, keyword):
97
99
if type(value) is dbus.Boolean:
98
100
return u"Yes" if value else u"No"
99
if keyword in ("timeout", "interval"):
101
if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
102
u"ApprovalDuration"):
100
103
return milliseconds_to_string(value)
101
104
return unicode(value)
102
105
106
# Create format string to print table rows
103
107
format_string = u' '.join(u'%%-%ds' %
104
108
max(len(tablewords[key]),
105
max(len(valuetostring(client[key], key))
109
max(len(valuetostring(client[key],
110
key))
106
111
for client in
107
112
clients))
108
113
for key in keywords)
109
print format_string % tuple(tablewords[key] for key in keywords)
114
# Print header line
115
print format_string % tuple(tablewords[key] for key in keywords)
110
116
for client in clients:
111
117
print format_string % tuple(valuetostring(client[key], key)
112
118
for key in keywords)
113
119
114
parser = OptionParser(version = "%%prog %s" % version)
115
parser.add_option("-a", "--all", action="store_true",
116
help="Print all fields")
117
parser.add_option("-e", "--enable", action="store_true",
118
help="Enable specified client")
119
parser.add_option("-d", "--disable", action="store_true",
120
help="disable specified client")
121
parser.add_option("-b", "--bump-timeout", action="store_true",
122
help="Bump timeout of specified client")
123
parser.add_option("--start-checker", action="store_true",
124
help="Start checker for specified client")
125
parser.add_option("--stop-checker", action="store_true",
126
help="Stop checker for specified client")
127
parser.add_option("-v", "--is-valid", action="store_true",
128
help="Stop checker for specified client")
129
parser.add_option("-c", "--checker", type="string",
130
help="Set checker command for specified client")
131
parser.add_option("-t", "--timeout", type="string",
132
help="Set timeout for specified client")
133
parser.add_option("-i", "--interval", type="string",
134
help="Set checker interval for specified client")
135
parser.add_option("-H", "--host", type="string",
136
help="Set host for specified client")
137
parser.add_option("-s", "--secret", type="string",
138
help="Set password blob (file) for specified client")
139
options, client_names = parser.parse_args()
140
141
clients=[]
142
for name in client_names:
143
for path, client in mandos_clients.iteritems():
144
if client['name'] == name:
145
client_objc = bus.get_object(busname, path)
146
clients.append(dbus.Interface(client_objc,
147
dbus_interface
148
= client_interface))
149
break
150
else:
151
print >> sys.stderr, "Client not found on server: %r" % name
152
sys.exit(1)
153
154
if not clients:
155
keywords = defaultkeywords
156
if options.all:
157
keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
158
'created', 'interval', 'host', 'fingerprint',
159
'checker_running', 'last_enabled', 'checker')
160
print_clients(mandos_clients.values())
161
162
for client in clients:
163
if options.enable:
164
client.Enable()
165
if options.disable:
166
client.Disable()
167
if options.bump_timeout:
168
client.BumpTimeout()
169
if options.start_checker:
170
client.StartChecker()
171
if options.stop_checker:
172
client.StopChecker()
173
if options.is_valid:
174
sys.exit(0 if client.IsStillValid() else 1)
175
if options.checker:
176
client.SetChecker(options.checker)
177
if options.host:
178
client.SetHost(options.host)
179
if options.interval:
180
client.SetInterval(datetime_to_milliseconds
181
(string_to_delta(options.interval)))
182
if options.timeout:
183
client.SetTimeout(datetime_to_milliseconds
184
(string_to_delta(options.timeout)))
185
if options.secret:
186
client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
187
120
def has_actions(options):
121
return any((options.enable,
122
options.disable,
123
options.bump_timeout,
124
options.start_checker,
125
options.stop_checker,
126
options.is_enabled,
127
options.remove,
128
options.checker is not None,
129
options.timeout is not None,
130
options.interval is not None,
131
options.approved_by_default is not None,
132
options.approval_delay is not None,
133
options.approval_duration is not None,
134
options.host is not None,
135
options.secret is not None,
136
options.approve,
137
options.deny))
138
139
def main():
140
parser = OptionParser(version = "%%prog %s" % version)
141
parser.add_option("-a", "--all", action="store_true",
142
help="Select all clients")
143
parser.add_option("-v", "--verbose", action="store_true",
144
help="Print all fields")
145
parser.add_option("-e", "--enable", action="store_true",
146
help="Enable client")
147
parser.add_option("-d", "--disable", action="store_true",
148
help="disable client")
149
parser.add_option("-b", "--bump-timeout", action="store_true",
150
help="Bump timeout for client")
151
parser.add_option("--start-checker", action="store_true",
152
help="Start checker for client")
153
parser.add_option("--stop-checker", action="store_true",
154
help="Stop checker for client")
155
parser.add_option("-V", "--is-enabled", action="store_true",
156
help="Check if client is enabled")
157
parser.add_option("-r", "--remove", action="store_true",
158
help="Remove client")
159
parser.add_option("-c", "--checker", type="string",
160
help="Set checker command for client")
161
parser.add_option("-t", "--timeout", type="string",
162
help="Set timeout for client")
163
parser.add_option("-i", "--interval", type="string",
164
help="Set checker interval for client")
165
parser.add_option("--approve-by-default", action="store_true",
166
dest=u"approved_by_default",
167
help="Set client to be approved by default")
168
parser.add_option("--deny-by-default", action="store_false",
169
dest=u"approved_by_default",
170
help="Set client to be denied by default")
171
parser.add_option("--approval-delay", type="string",
172
help="Set delay before client approve/deny")
173
parser.add_option("--approval-duration", type="string",
174
help="Set duration of one client approval")
175
parser.add_option("-H", "--host", type="string",
176
help="Set host for client")
177
parser.add_option("-s", "--secret", type="string",
178
help="Set password blob (file) for client")
179
parser.add_option("-A", "--approve", action="store_true",
180
help="Approve any current client request")
181
parser.add_option("-D", "--deny", action="store_true",
182
help="Deny any current client request")
183
options, client_names = parser.parse_args()
184
185
if has_actions(options) and not client_names and not options.all:
186
parser.error('Options require clients names or --all.')
187
if options.verbose and has_actions(options):
188
parser.error('--verbose can only be used alone or with'
189
' --all.')
190
if options.all and not has_actions(options):
191
parser.error('--all requires an action.')
192
193
try:
194
bus = dbus.SystemBus()
195
mandos_dbus_objc = bus.get_object(busname, server_path)
196
except dbus.exceptions.DBusException:
197
print >> sys.stderr, "Could not connect to Mandos server"
198
sys.exit(1)
199
200
mandos_serv = dbus.Interface(mandos_dbus_objc,
201
dbus_interface = server_interface)
202
203
#block stderr since dbus library prints to stderr
204
null = os.open(os.path.devnull, os.O_RDWR)
205
stderrcopy = os.dup(sys.stderr.fileno())
206
os.dup2(null, sys.stderr.fileno())
207
os.close(null)
208
try:
209
try:
210
mandos_clients = mandos_serv.GetAllClientsWithProperties()
211
finally:
212
#restore stderr
213
os.dup2(stderrcopy, sys.stderr.fileno())
214
os.close(stderrcopy)
215
except dbus.exceptions.DBusException, e:
216
print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
217
sys.exit(1)
218
219
# Compile dict of (clients: properties) to process
220
clients={}
221
222
if options.all or not client_names:
223
clients = dict((bus.get_object(busname, path), properties)
224
for path, properties in
225
mandos_clients.iteritems())
226
else:
227
for name in client_names:
228
for path, client in mandos_clients.iteritems():
229
if client['Name'] == name:
230
client_objc = bus.get_object(busname, path)
231
clients[client_objc] = client
232
break
233
else:
234
print >> sys.stderr, "Client not found on server: %r" % name
235
sys.exit(1)
236
237
if not has_actions(options) and clients:
238
if options.verbose:
239
keywords = ('Name', 'Enabled', 'Timeout',
240
'LastCheckedOK', 'Created', 'Interval',
241
'Host', 'Fingerprint', 'CheckerRunning',
242
'LastEnabled', 'ApprovalPending',
243
'ApprovedByDefault',
244
'LastApprovalRequest', 'ApprovalDelay',
245
'ApprovalDuration', 'Checker')
246
else:
247
keywords = defaultkeywords
248
249
print_clients(clients.values(), keywords)
250
else:
251
# Process each client in the list by all selected options
252
for client in clients:
253
if options.remove:
254
mandos_serv.RemoveClient(client.__dbus_object_path__)
255
if options.enable:
256
client.Enable(dbus_interface=client_interface)
257
if options.disable:
258
client.Disable(dbus_interface=client_interface)
259
if options.bump_timeout:
260
client.CheckedOK(dbus_interface=client_interface)
261
if options.start_checker:
262
client.StartChecker(dbus_interface=client_interface)
263
if options.stop_checker:
264
client.StopChecker(dbus_interface=client_interface)
265
if options.is_enabled:
266
sys.exit(0 if client.Get(client_interface,
267
u"Enabled",
268
dbus_interface=dbus.PROPERTIES_IFACE)
269
else 1)
270
if options.checker:
271
client.Set(client_interface, u"Checker", options.checker,
272
dbus_interface=dbus.PROPERTIES_IFACE)
273
if options.host:
274
client.Set(client_interface, u"Host", options.host,
275
dbus_interface=dbus.PROPERTIES_IFACE)
276
if options.interval:
277
client.Set(client_interface, u"Interval",
278
timedelta_to_milliseconds
279
(string_to_delta(options.interval)),
280
dbus_interface=dbus.PROPERTIES_IFACE)
281
if options.approval_delay:
282
client.Set(client_interface, u"ApprovalDelay",
283
timedelta_to_milliseconds
284
(string_to_delta(options.
285
approval_delay)),
286
dbus_interface=dbus.PROPERTIES_IFACE)
287
if options.approval_duration:
288
client.Set(client_interface, u"ApprovalDuration",
289
timedelta_to_milliseconds
290
(string_to_delta(options.
291
approval_duration)),
292
dbus_interface=dbus.PROPERTIES_IFACE)
293
if options.timeout:
294
client.Set(client_interface, u"Timeout",
295
timedelta_to_milliseconds
296
(string_to_delta(options.timeout)),
297
dbus_interface=dbus.PROPERTIES_IFACE)
298
if options.secret:
299
client.Set(client_interface, u"Secret",
300
dbus.ByteArray(open(options.secret,
301
u'rb').read()),
302
dbus_interface=dbus.PROPERTIES_IFACE)
303
if options.approved_by_default is not None:
304
client.Set(client_interface, u"ApprovedByDefault",
305
dbus.Boolean(options
306
.approved_by_default),
307
dbus_interface=dbus.PROPERTIES_IFACE)
308
if options.approve:
309
client.Approve(dbus.Boolean(True),
310
dbus_interface=client_interface)
311
elif options.deny:
312
client.Approve(dbus.Boolean(False),
313
dbus_interface=client_interface)
314
315
if __name__ == '__main__':
316
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0