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-monitor
- browse files at revision 599
- compare with another revision
- download diff
- download tarball
- view history from revision 599
- Committer: Teddy Hogeborn
- Date: 2012-06-15 17:18:34 UTC
- Revision ID: teddy@recompile.se-20120615171834-gzzgknth003j903u
* plugins.d/mandos-client.c (main): Bug fix: Set DEVICE environment
variable correctly for network
hooks. Also, don't call
run_network_hooks() with NULL
value.
variable correctly for network
hooks. Also, don't call
run_network_hooks() with NULL
value.
- files added:
- debian/mandos-client.examples
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-monitor
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2009,2010 Teddy Hogeborn
7
# Copyright © 2009,2010 Björn Påhlsson
6
# Copyright © 2009-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 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 <http://www.gnu.org/licenses/>.
21
#
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
#
24
25
from __future__ import division, absolute_import, with_statement
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
22
#
23
# Contact the authors at <mandos@recompile.se>.
24
#
25
26
from __future__ import (division, absolute_import, print_function,
27
unicode_literals)
28
29
from future_builtins import *
26
30
27
31
import sys
28
32
import os
42
46
43
47
import locale
44
48
45
locale.setlocale(locale.LC_ALL, u'')
49
locale.setlocale(locale.LC_ALL, '')
46
50
47
51
import logging
48
52
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
53
50
54
# Some useful constants
51
domain = 'se.bsnet.fukt'
55
domain = 'se.recompile'
52
56
server_interface = domain + '.Mandos'
53
57
client_interface = domain + '.Mandos.Client'
54
version = "1.0.15"
58
version = "1.5.5"
55
59
56
60
# Always run in monochrome mode
57
61
urwid.curses_display.curses.has_colors = lambda : False
65
69
"Parse an ISO 8601 date string to a datetime.datetime()"
66
70
if not iso:
67
71
return None
68
d, t = iso.split(u"T", 1)
69
year, month, day = d.split(u"-", 2)
70
hour, minute, second = t.split(u":", 2)
72
d, t = iso.split("T", 1)
73
year, month, day = d.split("-", 2)
74
hour, minute, second = t.split(":", 2)
71
75
second, fraction = divmod(float(second), 1)
72
76
return datetime.datetime(int(year),
73
77
int(month),
82
86
properties and calls a hook function when any of them are
83
87
changed.
84
88
"""
85
def __init__(self, proxy_object=None, *args, **kwargs):
89
def __init__(self, proxy_object=None, properties=None, **kwargs):
86
90
self.proxy = proxy_object # Mandos Client proxy object
87
88
self.properties = dict()
89
self.proxy.connect_to_signal(u"PropertyChanged",
90
self.property_changed,
91
client_interface,
92
byte_arrays=True)
93
94
self.properties.update(
95
self.proxy.GetAll(client_interface,
96
dbus_interface = dbus.PROPERTIES_IFACE))
97
98
#XXX This break good super behaviour!
99
# super(MandosClientPropertyCache, self).__init__(
100
# *args, **kwargs)
91
self.properties = dict() if properties is None else properties
92
self.property_changed_match = (
93
self.proxy.connect_to_signal("PropertyChanged",
94
self._property_changed,
95
client_interface,
96
byte_arrays=True))
97
98
if properties is None:
99
self.properties.update(
100
self.proxy.GetAll(client_interface,
101
dbus_interface
102
= dbus.PROPERTIES_IFACE))
103
104
super(MandosClientPropertyCache, self).__init__(**kwargs)
105
106
def _property_changed(self, property, value):
107
"""Helper which takes positional arguments"""
108
return self.property_changed(property=property, value=value)
101
109
102
110
def property_changed(self, property=None, value=None):
103
111
"""This is called whenever we get a PropertyChanged signal
105
113
"""
106
114
# Update properties dict with new value
107
115
self.properties[property] = value
116
117
def delete(self):
118
self.property_changed_match.remove()
108
119
109
120
110
121
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
112
123
"""
113
124
114
125
def __init__(self, server_proxy_object=None, update_hook=None,
115
delete_hook=None, logger=None, *args, **kwargs):
126
delete_hook=None, logger=None, **kwargs):
116
127
# Called on update
117
128
self.update_hook = update_hook
118
129
# Called on delete
123
134
self.logger = logger
124
135
125
136
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
128
137
129
138
# The widget shown normally
130
self._text_widget = urwid.Text(u"")
139
self._text_widget = urwid.Text("")
131
140
# The widget shown when we have focus
132
self._focus_text_widget = urwid.Text(u"")
133
super(MandosClientWidget, self).__init__(
134
update_hook=update_hook, delete_hook=delete_hook,
135
*args, **kwargs)
141
self._focus_text_widget = urwid.Text("")
142
super(MandosClientWidget, self).__init__(**kwargs)
136
143
self.update()
137
144
self.opened = False
138
145
139
last_checked_ok = isoformat_to_datetime(self.properties
140
[u"LastCheckedOK"])
141
if last_checked_ok is None:
142
self.last_checker_failed = True
143
else:
144
self.last_checker_failed = ((datetime.datetime.utcnow()
145
- last_checked_ok)
146
> datetime.timedelta
147
(milliseconds=
148
self.properties
149
[u"Interval"]))
150
151
if self.last_checker_failed:
152
self.using_timer(True)
153
154
if self.need_approval:
155
self.using_timer(True)
156
157
self.proxy.connect_to_signal(u"CheckerCompleted",
158
self.checker_completed,
159
client_interface,
160
byte_arrays=True)
161
self.proxy.connect_to_signal(u"CheckerStarted",
162
self.checker_started,
163
client_interface,
164
byte_arrays=True)
165
self.proxy.connect_to_signal(u"GotSecret",
166
self.got_secret,
167
client_interface,
168
byte_arrays=True)
169
self.proxy.connect_to_signal(u"NeedApproval",
170
self.need_approval,
171
client_interface,
172
byte_arrays=True)
173
self.proxy.connect_to_signal(u"Rejected",
174
self.rejected,
175
client_interface,
176
byte_arrays=True)
146
self.match_objects = (
147
self.proxy.connect_to_signal("CheckerCompleted",
148
self.checker_completed,
149
client_interface,
150
byte_arrays=True),
151
self.proxy.connect_to_signal("CheckerStarted",
152
self.checker_started,
153
client_interface,
154
byte_arrays=True),
155
self.proxy.connect_to_signal("GotSecret",
156
self.got_secret,
157
client_interface,
158
byte_arrays=True),
159
self.proxy.connect_to_signal("NeedApproval",
160
self.need_approval,
161
client_interface,
162
byte_arrays=True),
163
self.proxy.connect_to_signal("Rejected",
164
self.rejected,
165
client_interface,
166
byte_arrays=True))
167
#self.logger('Created client {0}'
168
# .format(self.properties["Name"]))
177
169
178
def property_changed(self, property=None, value=None):
179
super(self, MandosClientWidget).property_changed(property,
180
value)
181
if property == u"ApprovalPending":
182
using_timer(bool(value))
183
184
170
def using_timer(self, flag):
185
171
"""Call this method with True or False when timer should be
186
172
activated or deactivated.
187
173
"""
188
old = self._update_timer_callback_lock
189
if flag:
190
self._update_timer_callback_lock += 1
191
else:
192
self._update_timer_callback_lock -= 1
193
if old == 0 and self._update_timer_callback_lock:
174
if flag and self._update_timer_callback_tag is None:
175
# Will update the shown timer value every second
194
176
self._update_timer_callback_tag = (gobject.timeout_add
195
177
(1000,
196
178
self.update_timer))
197
elif old and self._update_timer_callback_lock == 0:
179
elif not (flag or self._update_timer_callback_tag is None):
198
180
gobject.source_remove(self._update_timer_callback_tag)
199
181
self._update_timer_callback_tag = None
200
182
201
183
def checker_completed(self, exitstatus, condition, command):
202
184
if exitstatus == 0:
203
if self.last_checker_failed:
204
self.last_checker_failed = False
205
self.using_timer(False)
206
#self.logger(u'Checker for client %s (command "%s")'
207
# u' was successful'
208
# % (self.properties[u"Name"], command))
209
185
self.update()
210
186
return
211
187
# Checker failed
212
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
215
188
if os.WIFEXITED(condition):
216
self.logger(u'Checker for client %s (command "%s")'
217
u' failed with exit code %s'
218
% (self.properties[u"Name"], command,
219
os.WEXITSTATUS(condition)))
189
self.logger('Checker for client {0} (command "{1}")'
190
' failed with exit code {2}'
191
.format(self.properties["Name"], command,
192
os.WEXITSTATUS(condition)))
220
193
elif os.WIFSIGNALED(condition):
221
self.logger(u'Checker for client %s (command "%s")'
222
u' was killed by signal %s'
223
% (self.properties[u"Name"], command,
224
os.WTERMSIG(condition)))
194
self.logger('Checker for client {0} (command "{1}") was'
195
' killed by signal {2}'
196
.format(self.properties["Name"], command,
197
os.WTERMSIG(condition)))
225
198
elif os.WCOREDUMP(condition):
226
self.logger(u'Checker for client %s (command "%s")'
227
u' dumped core'
228
% (self.properties[u"Name"], command))
199
self.logger('Checker for client {0} (command "{1}")'
200
' dumped core'
201
.format(self.properties["Name"], command))
229
202
else:
230
self.logger(u'Checker for client %s completed'
231
u' mysteriously')
203
self.logger('Checker for client {0} completed'
204
' mysteriously'
205
.format(self.properties["Name"]))
232
206
self.update()
233
207
234
208
def checker_started(self, command):
235
#self.logger(u'Client %s started checker "%s"'
236
# % (self.properties[u"Name"], unicode(command)))
209
"""Server signals that a checker started. This could be useful
210
to log in the future. """
211
#self.logger('Client {0} started checker "{1}"'
212
# .format(self.properties["Name"],
213
# unicode(command)))
237
214
pass
238
215
239
216
def got_secret(self):
240
self.last_checker_failed = False
241
self.logger(u'Client %s received its secret'
242
% self.properties[u"Name"])
217
self.logger('Client {0} received its secret'
218
.format(self.properties["Name"]))
243
219
244
220
def need_approval(self, timeout, default):
245
221
if not default:
246
message = u'Client %s needs approval within %s seconds'
222
message = 'Client {0} needs approval within {1} seconds'
247
223
else:
248
message = u'Client %s will get its secret in %s seconds'
249
self.logger(message
250
% (self.properties[u"Name"], timeout/1000))
251
self.using_timer(True)
224
message = 'Client {0} will get its secret in {1} seconds'
225
self.logger(message.format(self.properties["Name"],
226
timeout/1000))
252
227
253
228
def rejected(self, reason):
254
self.logger(u'Client %s was rejected; reason: %s'
255
% (self.properties[u"Name"], reason))
229
self.logger('Client {0} was rejected; reason: {1}'
230
.format(self.properties["Name"], reason))
256
231
257
232
def selectable(self):
258
233
"""Make this a "selectable" widget.
259
234
This overrides the method from urwid.FlowWidget."""
260
235
return True
261
236
262
def rows(self, (maxcol,), focus=False):
237
def rows(self, maxcolrow, focus=False):
263
238
"""How many rows this widget will occupy might depend on
264
239
whether we have focus or not.
265
240
This overrides the method from urwid.FlowWidget"""
266
return self.current_widget(focus).rows((maxcol,), focus=focus)
241
return self.current_widget(focus).rows(maxcolrow, focus=focus)
267
242
268
243
def current_widget(self, focus=False):
269
244
if focus or self.opened:
273
248
def update(self):
274
249
"Called when what is visible on the screen should be updated."
275
250
# How to add standout mode to a style
276
with_standout = { u"normal": u"standout",
277
u"bold": u"bold-standout",
278
u"underline-blink":
279
u"underline-blink-standout",
280
u"bold-underline-blink":
281
u"bold-underline-blink-standout",
251
with_standout = { "normal": "standout",
252
"bold": "bold-standout",
253
"underline-blink":
254
"underline-blink-standout",
255
"bold-underline-blink":
256
"bold-underline-blink-standout",
282
257
}
283
258
284
259
# Rebuild focus and non-focus widgets using current properties
285
260
286
261
# Base part of a client. Name!
287
base = (u'%(name)s: '
288
% {u"name": self.properties[u"Name"]})
289
if not self.properties[u"Enabled"]:
290
message = u"DISABLED"
291
elif self.properties[u"ApprovalPending"]:
262
base = '{name}: '.format(name=self.properties["Name"])
263
if not self.properties["Enabled"]:
264
message = "DISABLED"
265
self.using_timer(False)
266
elif self.properties["ApprovalPending"]:
292
267
timeout = datetime.timedelta(milliseconds
293
268
= self.properties
294
[u"ApprovalDelay"])
269
["ApprovalDelay"])
295
270
last_approval_request = isoformat_to_datetime(
296
self.properties[u"LastApprovalRequest"])
271
self.properties["LastApprovalRequest"])
297
272
if last_approval_request is not None:
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
273
timer = max(timeout - (datetime.datetime.utcnow()
274
- last_approval_request),
275
datetime.timedelta())
300
276
else:
301
277
timer = datetime.timedelta()
302
if self.properties[u"ApprovedByDefault"]:
303
message = u"Approval in %s. (d)eny?"
304
else:
305
message = u"Denial in %s. (a)pprove?"
306
message = message % unicode(timer).rsplit(".", 1)[0]
307
elif self.last_checker_failed:
308
timeout = datetime.timedelta(milliseconds
309
= self.properties
310
[u"Timeout"])
311
last_ok = isoformat_to_datetime(
312
max((self.properties[u"LastCheckedOK"]
313
or self.properties[u"Created"]),
314
self.properties[u"LastEnabled"]))
315
timer = timeout - (datetime.datetime.utcnow() - last_ok)
316
message = (u'A checker has failed! Time until client'
317
u' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
278
if self.properties["ApprovedByDefault"]:
279
message = "Approval in {0}. (d)eny?"
280
else:
281
message = "Denial in {0}. (a)pprove?"
282
message = message.format(unicode(timer).rsplit(".", 1)[0])
283
self.using_timer(True)
284
elif self.properties["LastCheckerStatus"] != 0:
285
# When checker has failed, show timer until client expires
286
expires = self.properties["Expires"]
287
if expires == "":
288
timer = datetime.timedelta(0)
289
else:
290
expires = (datetime.datetime.strptime
291
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
292
timer = max(expires - datetime.datetime.utcnow(),
293
datetime.timedelta())
294
message = ('A checker has failed! Time until client'
295
' gets disabled: {0}'
296
.format(unicode(timer).rsplit(".", 1)[0]))
297
self.using_timer(True)
319
298
else:
320
message = u"enabled"
321
self._text = "%s%s" % (base, message)
322
299
message = "enabled"
300
self.using_timer(False)
301
self._text = "{0}{1}".format(base, message)
302
323
303
if not urwid.supports_unicode():
324
304
self._text = self._text.encode("ascii", "replace")
325
textlist = [(u"normal", self._text)]
305
textlist = [("normal", self._text)]
326
306
self._text_widget.set_text(textlist)
327
307
self._focus_text_widget.set_text([(with_standout[text[0]],
328
308
text[1])
337
317
self.update_hook()
338
318
339
319
def update_timer(self):
340
"called by gobject"
320
"""called by gobject. Will indefinitely loop until
321
gobject.source_remove() on tag is called"""
341
322
self.update()
342
323
return True # Keep calling this
343
324
344
def delete(self):
325
def delete(self, **kwargs):
345
326
if self._update_timer_callback_tag is not None:
346
327
gobject.source_remove(self._update_timer_callback_tag)
347
328
self._update_timer_callback_tag = None
329
for match in self.match_objects:
330
match.remove()
331
self.match_objects = ()
348
332
if self.delete_hook is not None:
349
333
self.delete_hook(self)
334
return super(MandosClientWidget, self).delete(**kwargs)
350
335
351
def render(self, (maxcol,), focus=False):
336
def render(self, maxcolrow, focus=False):
352
337
"""Render differently if we have focus.
353
338
This overrides the method from urwid.FlowWidget"""
354
return self.current_widget(focus).render((maxcol,),
339
return self.current_widget(focus).render(maxcolrow,
355
340
focus=focus)
356
341
357
def keypress(self, (maxcol,), key):
342
def keypress(self, maxcolrow, key):
358
343
"""Handle keys.
359
344
This overrides the method from urwid.FlowWidget"""
360
if key == u"+":
361
self.proxy.Enable(dbus_interface = client_interface)
362
elif key == u"-":
363
self.proxy.Disable(dbus_interface = client_interface)
364
elif key == u"a":
345
if key == "+":
346
self.proxy.Enable(dbus_interface = client_interface,
347
ignore_reply=True)
348
elif key == "-":
349
self.proxy.Disable(dbus_interface = client_interface,
350
ignore_reply=True)
351
elif key == "a":
365
352
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
dbus_interface = client_interface)
367
elif key == u"d":
353
dbus_interface = client_interface,
354
ignore_reply=True)
355
elif key == "d":
368
356
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
dbus_interface = client_interface)
370
elif key == u"R" or key == u"_" or key == u"ctrl k":
357
dbus_interface = client_interface,
358
ignore_reply=True)
359
elif key == "R" or key == "_" or key == "ctrl k":
371
360
self.server_proxy_object.RemoveClient(self.proxy
372
.object_path)
373
elif key == u"s":
374
self.proxy.StartChecker(dbus_interface = client_interface)
375
elif key == u"S":
376
self.proxy.StopChecker(dbus_interface = client_interface)
377
elif key == u"C":
378
self.proxy.CheckedOK(dbus_interface = client_interface)
361
.object_path,
362
ignore_reply=True)
363
elif key == "s":
364
self.proxy.StartChecker(dbus_interface = client_interface,
365
ignore_reply=True)
366
elif key == "S":
367
self.proxy.StopChecker(dbus_interface = client_interface,
368
ignore_reply=True)
369
elif key == "C":
370
self.proxy.CheckedOK(dbus_interface = client_interface,
371
ignore_reply=True)
379
372
# xxx
380
# elif key == u"p" or key == "=":
373
# elif key == "p" or key == "=":
381
374
# self.proxy.pause()
382
# elif key == u"u" or key == ":":
375
# elif key == "u" or key == ":":
383
376
# self.proxy.unpause()
384
# elif key == u"RET":
377
# elif key == "RET":
385
378
# self.open()
386
379
else:
387
380
return key
388
381
389
def property_changed(self, property=None, value=None,
390
*args, **kwargs):
382
def property_changed(self, property=None, **kwargs):
391
383
"""Call self.update() if old value is not new value.
392
384
This overrides the method from MandosClientPropertyCache"""
393
385
property_name = unicode(property)
394
386
old_value = self.properties.get(property_name)
395
387
super(MandosClientWidget, self).property_changed(
396
property=property, value=value, *args, **kwargs)
388
property=property, **kwargs)
397
389
if self.properties.get(property_name) != old_value:
398
390
self.update()
399
391
403
395
"down" key presses, thus not allowing any containing widgets to
404
396
use them as an excuse to shift focus away from this widget.
405
397
"""
406
def keypress(self, (maxcol, maxrow), key):
407
ret = super(ConstrainedListBox, self).keypress((maxcol,
408
maxrow), key)
409
if ret in (u"up", u"down"):
398
def keypress(self, *args, **kwargs):
399
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
400
if ret in ("up", "down"):
410
401
return
411
402
return ret
412
403
421
412
self.screen = urwid.curses_display.Screen()
422
413
423
414
self.screen.register_palette((
424
(u"normal",
425
u"default", u"default", None),
426
(u"bold",
427
u"default", u"default", u"bold"),
428
(u"underline-blink",
429
u"default", u"default", u"underline"),
430
(u"standout",
431
u"default", u"default", u"standout"),
432
(u"bold-underline-blink",
433
u"default", u"default", (u"bold", u"underline")),
434
(u"bold-standout",
435
u"default", u"default", (u"bold", u"standout")),
436
(u"underline-blink-standout",
437
u"default", u"default", (u"underline", u"standout")),
438
(u"bold-underline-blink-standout",
439
u"default", u"default", (u"bold", u"underline",
440
u"standout")),
415
("normal",
416
"default", "default", None),
417
("bold",
418
"default", "default", "bold"),
419
("underline-blink",
420
"default", "default", "underline"),
421
("standout",
422
"default", "default", "standout"),
423
("bold-underline-blink",
424
"default", "default", ("bold", "underline")),
425
("bold-standout",
426
"default", "default", ("bold", "standout")),
427
("underline-blink-standout",
428
"default", "default", ("underline", "standout")),
429
("bold-underline-blink-standout",
430
"default", "default", ("bold", "underline",
431
"standout")),
441
432
))
442
433
443
434
if urwid.supports_unicode():
444
self.divider = u"─" # \u2500
445
#self.divider = u"━" # \u2501
435
self.divider = "─" # \u2500
436
#self.divider = "━" # \u2501
446
437
else:
447
#self.divider = u"-" # \u002d
448
self.divider = u"_" # \u005f
438
#self.divider = "-" # \u002d
439
self.divider = "_" # \u005f
449
440
450
441
self.screen.start()
451
442
465
456
# This keeps track of whether self.uilist currently has
466
457
# self.logbox in it or not
467
458
self.log_visible = True
468
self.log_wrap = u"any"
459
self.log_wrap = "any"
469
460
470
461
self.rebuild()
471
self.log_message_raw((u"bold",
472
u"Mandos Monitor version " + version))
473
self.log_message_raw((u"bold",
474
u"q: Quit ?: Help"))
462
self.log_message_raw(("bold",
463
"Mandos Monitor version " + version))
464
self.log_message_raw(("bold",
465
"q: Quit ?: Help"))
475
466
476
467
self.busname = domain + '.Mandos'
477
468
self.main_loop = gobject.MainLoop()
478
self.bus = dbus.SystemBus()
479
mandos_dbus_objc = self.bus.get_object(
480
self.busname, u"/", follow_name_owner_changes=True)
481
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
482
dbus_interface
483
= server_interface)
484
try:
485
mandos_clients = (self.mandos_serv
486
.GetAllClientsWithProperties())
487
except dbus.exceptions.DBusException:
488
mandos_clients = dbus.Dictionary()
489
490
(self.mandos_serv
491
.connect_to_signal(u"ClientRemoved",
492
self.find_and_remove_client,
493
dbus_interface=server_interface,
494
byte_arrays=True))
495
(self.mandos_serv
496
.connect_to_signal(u"ClientAdded",
497
self.add_new_client,
498
dbus_interface=server_interface,
499
byte_arrays=True))
500
(self.mandos_serv
501
.connect_to_signal(u"ClientNotFound",
502
self.client_not_found,
503
dbus_interface=server_interface,
504
byte_arrays=True))
505
for path, client in mandos_clients.iteritems():
506
client_proxy_object = self.bus.get_object(self.busname,
507
path)
508
self.add_client(MandosClientWidget(server_proxy_object
509
=self.mandos_serv,
510
proxy_object
511
=client_proxy_object,
512
properties=client,
513
update_hook
514
=self.refresh,
515
delete_hook
516
=self.remove_client,
517
logger
518
=self.log_message),
519
path=path)
520
469
521
470
def client_not_found(self, fingerprint, address):
522
self.log_message((u"Client with address %s and fingerprint %s"
523
u" could not be found" % (address,
524
fingerprint)))
471
self.log_message("Client with address {0} and fingerprint"
472
" {1} could not be found"
473
.format(address, fingerprint))
525
474
526
475
def rebuild(self):
527
476
"""This rebuilds the User Interface.
537
486
self.divider)))
538
487
if self.log_visible:
539
488
self.uilist.append(self.logbox)
540
pass
541
489
self.topwidget = urwid.Pile(self.uilist)
542
490
543
491
def log_message(self, message):
544
492
timestamp = datetime.datetime.now().isoformat()
545
self.log_message_raw(timestamp + u": " + message)
493
self.log_message_raw(timestamp + ": " + message)
546
494
547
495
def log_message_raw(self, markup):
548
496
"""Add a log message to the log buffer."""
551
499
and len(self.log) > self.max_log_length):
552
500
del self.log[0:len(self.log)-self.max_log_length-1]
553
501
self.logbox.set_focus(len(self.logbox.body.contents),
554
coming_from=u"above")
502
coming_from="above")
555
503
self.refresh()
556
504
557
505
def toggle_log_display(self):
558
506
"""Toggle visibility of the log buffer."""
559
507
self.log_visible = not self.log_visible
560
508
self.rebuild()
561
#self.log_message(u"Log visibility changed to: "
509
#self.log_message("Log visibility changed to: "
562
510
# + unicode(self.log_visible))
563
511
564
512
def change_log_display(self):
565
513
"""Change type of log display.
566
514
Currently, this toggles wrapping of text lines."""
567
if self.log_wrap == u"clip":
568
self.log_wrap = u"any"
515
if self.log_wrap == "clip":
516
self.log_wrap = "any"
569
517
else:
570
self.log_wrap = u"clip"
518
self.log_wrap = "clip"
571
519
for textwidget in self.log:
572
520
textwidget.set_wrap_mode(self.log_wrap)
573
#self.log_message(u"Wrap mode: " + self.log_wrap)
521
#self.log_message("Wrap mode: " + self.log_wrap)
574
522
575
523
def find_and_remove_client(self, path, name):
576
"""Find an client from its object path and remove it.
524
"""Find a client by its object path and remove it.
577
525
578
526
This is connected to the ClientRemoved signal from the
579
527
Mandos server object."""
581
529
client = self.clients_dict[path]
582
530
except KeyError:
583
531
# not found?
532
self.log_message("Unknown client {0!r} ({1!r}) removed"
533
.format(name, path))
584
534
return
585
self.remove_client(client, path)
535
client.delete()
586
536
587
537
def add_new_client(self, path):
588
538
client_proxy_object = self.bus.get_object(self.busname, path)
603
553
if path is None:
604
554
path = client.proxy.object_path
605
555
self.clients_dict[path] = client
606
self.clients.sort(None, lambda c: c.properties[u"Name"])
556
self.clients.sort(None, lambda c: c.properties["Name"])
607
557
self.refresh()
608
558
609
559
def remove_client(self, client, path=None):
625
575
626
576
def run(self):
627
577
"""Start the main loop and exit when it's done."""
578
self.bus = dbus.SystemBus()
579
mandos_dbus_objc = self.bus.get_object(
580
self.busname, "/", follow_name_owner_changes=True)
581
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
582
dbus_interface
583
= server_interface)
584
try:
585
mandos_clients = (self.mandos_serv
586
.GetAllClientsWithProperties())
587
except dbus.exceptions.DBusException:
588
mandos_clients = dbus.Dictionary()
589
590
(self.mandos_serv
591
.connect_to_signal("ClientRemoved",
592
self.find_and_remove_client,
593
dbus_interface=server_interface,
594
byte_arrays=True))
595
(self.mandos_serv
596
.connect_to_signal("ClientAdded",
597
self.add_new_client,
598
dbus_interface=server_interface,
599
byte_arrays=True))
600
(self.mandos_serv
601
.connect_to_signal("ClientNotFound",
602
self.client_not_found,
603
dbus_interface=server_interface,
604
byte_arrays=True))
605
for path, client in mandos_clients.iteritems():
606
client_proxy_object = self.bus.get_object(self.busname,
607
path)
608
self.add_client(MandosClientWidget(server_proxy_object
609
=self.mandos_serv,
610
proxy_object
611
=client_proxy_object,
612
properties=client,
613
update_hook
614
=self.refresh,
615
delete_hook
616
=self.remove_client,
617
logger
618
=self.log_message),
619
path=path)
620
628
621
self.refresh()
629
622
self._input_callback_tag = (gobject.io_add_watch
630
623
(sys.stdin.fileno(),
640
633
641
634
def process_input(self, source, condition):
642
635
keys = self.screen.get_input()
643
translations = { u"ctrl n": u"down", # Emacs
644
u"ctrl p": u"up", # Emacs
645
u"ctrl v": u"page down", # Emacs
646
u"meta v": u"page up", # Emacs
647
u" ": u"page down", # less
648
u"f": u"page down", # less
649
u"b": u"page up", # less
650
u"j": u"down", # vi
651
u"k": u"up", # vi
636
translations = { "ctrl n": "down", # Emacs
637
"ctrl p": "up", # Emacs
638
"ctrl v": "page down", # Emacs
639
"meta v": "page up", # Emacs
640
" ": "page down", # less
641
"f": "page down", # less
642
"b": "page up", # less
643
"j": "down", # vi
644
"k": "up", # vi
652
645
}
653
646
for key in keys:
654
647
try:
656
649
except KeyError: # :-)
657
650
pass
658
651
659
if key == u"q" or key == u"Q":
652
if key == "q" or key == "Q":
660
653
self.stop()
661
654
break
662
elif key == u"window resize":
655
elif key == "window resize":
663
656
self.size = self.screen.get_cols_rows()
664
657
self.refresh()
665
elif key == u"\f": # Ctrl-L
658
elif key == "\f": # Ctrl-L
666
659
self.refresh()
667
elif key == u"l" or key == u"D":
660
elif key == "l" or key == "D":
668
661
self.toggle_log_display()
669
662
self.refresh()
670
elif key == u"w" or key == u"i":
663
elif key == "w" or key == "i":
671
664
self.change_log_display()
672
665
self.refresh()
673
elif key == u"?" or key == u"f1" or key == u"esc":
666
elif key == "?" or key == "f1" or key == "esc":
674
667
if not self.log_visible:
675
668
self.log_visible = True
676
669
self.rebuild()
677
self.log_message_raw((u"bold",
678
u" ".
679
join((u"q: Quit",
680
u"?: Help",
681
u"l: Log window toggle",
682
u"TAB: Switch window",
683
u"w: Wrap (log)"))))
684
self.log_message_raw((u"bold",
685
u" "
686
.join((u"Clients:",
687
u"+: Enable",
688
u"-: Disable",
689
u"R: Remove",
690
u"s: Start new checker",
691
u"S: Stop checker",
692
u"C: Checker OK",
693
u"a: Approve",
694
u"d: Deny"))))
670
self.log_message_raw(("bold",
671
" ".
672
join(("q: Quit",
673
"?: Help",
674
"l: Log window toggle",
675
"TAB: Switch window",
676
"w: Wrap (log)"))))
677
self.log_message_raw(("bold",
678
" "
679
.join(("Clients:",
680
"+: Enable",
681
"-: Disable",
682
"R: Remove",
683
"s: Start new checker",
684
"S: Stop checker",
685
"C: Checker OK",
686
"a: Approve",
687
"d: Deny"))))
695
688
self.refresh()
696
elif key == u"tab":
689
elif key == "tab":
697
690
if self.topwidget.get_focus() is self.logbox:
698
691
self.topwidget.set_focus(0)
699
692
else:
700
693
self.topwidget.set_focus(self.logbox)
701
694
self.refresh()
702
#elif (key == u"end" or key == u"meta >" or key == u"G"
703
# or key == u">"):
695
#elif (key == "end" or key == "meta >" or key == "G"
696
# or key == ">"):
704
697
# pass # xxx end-of-buffer
705
#elif (key == u"home" or key == u"meta <" or key == u"g"
706
# or key == u"<"):
698
#elif (key == "home" or key == "meta <" or key == "g"
699
# or key == "<"):
707
700
# pass # xxx beginning-of-buffer
708
#elif key == u"ctrl e" or key == u"$":
701
#elif key == "ctrl e" or key == "$":
709
702
# pass # xxx move-end-of-line
710
#elif key == u"ctrl a" or key == u"^":
703
#elif key == "ctrl a" or key == "^":
711
704
# pass # xxx move-beginning-of-line
712
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
705
#elif key == "ctrl b" or key == "meta (" or key == "h":
713
706
# pass # xxx left
714
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
707
#elif key == "ctrl f" or key == "meta )" or key == "l":
715
708
# pass # xxx right
716
#elif key == u"a":
709
#elif key == "a":
717
710
# pass # scroll up log
718
#elif key == u"z":
711
#elif key == "z":
719
712
# pass # scroll down log
720
713
elif self.topwidget.selectable():
721
714
self.topwidget.keypress(self.size, key)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0