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 437
- compare with another revision
- download diff
- download tarball
- view history from revision 437
- Committer: Teddy Hogeborn
- Date: 2010-09-25 16:53:58 UTC
- Revision ID: teddy@fukt.bsnet.se-20100925165358-6fvrfd4ws9am7dgf
* mandos-ctl: Bug fix: only show properties of specifies clients.
- files modified:
- DBUS-API
added
removed
mandos-ctl
17
17
'Enabled': u'Enabled',
18
18
'Timeout': u'Timeout',
19
19
'LastCheckedOK': u'Last Successful Check',
20
'LastApprovalRequest': u'Last Approval Request',
21
20
'Created': u'Created',
22
21
'Interval': u'Interval',
23
22
'Host': u'Host',
24
23
'Fingerprint': u'Fingerprint',
25
24
'CheckerRunning': u'Check Is Running',
26
25
'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
26
'Checker': u'Checker',
32
27
}
33
28
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
98
93
def valuetostring(value, keyword):
99
94
if type(value) is dbus.Boolean:
100
95
return u"Yes" if value else u"No"
101
if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
102
u"ApprovalDuration"):
96
if keyword in (u"timeout", u"interval"):
103
97
return milliseconds_to_string(value)
104
98
return unicode(value)
105
99
116
110
for client in clients:
117
111
print format_string % tuple(valuetostring(client[key], key)
118
112
for key in keywords)
119
120
113
def has_actions(options):
121
114
return any((options.enable,
122
115
options.disable,
128
121
options.checker is not None,
129
122
options.timeout is not None,
130
123
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
124
options.host is not None,
135
125
options.secret is not None,
136
126
options.approve,
162
152
help="Set timeout for client")
163
153
parser.add_option("-i", "--interval", type="string",
164
154
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
155
parser.add_option("-H", "--host", type="string",
176
156
help="Set host for client")
177
157
parser.add_option("-s", "--secret", type="string",
183
163
options, client_names = parser.parse_args()
184
164
185
165
if has_actions(options) and not client_names and not options.all:
186
parser.error('Options require clients names or --all.')
166
parser.error('Options requires clients names or --all.')
187
167
if options.verbose and has_actions(options):
188
parser.error('--verbose can only be used alone or with'
189
' --all.')
168
parser.error('Verbose option can only be used alone or with --all.')
190
169
if options.all and not has_actions(options):
191
parser.error('--all requires an action.')
192
170
parser.error('--all requires an action')
171
193
172
try:
194
173
bus = dbus.SystemBus()
195
174
mandos_dbus_objc = bus.get_object(busname, server_path)
236
215
237
216
if not has_actions(options) and clients:
238
217
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')
218
keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',
219
'Created', 'Interval', 'Host', 'Fingerprint',
220
'CheckerRunning', 'LastEnabled', 'Checker')
246
221
else:
247
222
keywords = defaultkeywords
248
223
249
224
print_clients(clients.values(), keywords)
250
225
else:
251
226
# Process each client in the list by all selected options
278
253
timedelta_to_milliseconds
279
254
(string_to_delta(options.interval)),
280
255
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
256
if options.timeout:
294
257
client.Set(client_interface, u"Timeout",
295
timedelta_to_milliseconds
296
(string_to_delta(options.timeout)),
258
timedelta_to_milliseconds(string_to_delta
259
(options.timeout)),
297
260
dbus_interface=dbus.PROPERTIES_IFACE)
298
261
if options.secret:
299
262
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),
263
dbus.ByteArray(open(options.secret, u'rb').read()),
307
264
dbus_interface=dbus.PROPERTIES_IFACE)
308
265
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)
266
client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
267
if options.deny:
268
client.Approve(dbus.Boolean(False), dbus_interface=client_interface)
314
269
315
270
if __name__ == '__main__':
316
271
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0