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 451
- compare with another revision
- download diff
- download tarball
- view history from revision 451
- Committer: Teddy Hogeborn
- Date: 2010-09-30 06:24:20 UTC
- Revision ID: teddy@fukt.bsnet.se-20100930062420-nm7nlb160myyzj82
* mandos-monitor.xml (KEYS): Bug fix: Changed "r" to "R".
* .bzrignore: Updated.
(debian/po/messages.mo, debian/po/templates.pot): Removed.
(plugins.d/plymouth): Added.
* .bzrignore: Updated.
(debian/po/messages.mo, debian/po/templates.pot): Removed.
(plugins.d/plymouth): Added.
- files removed:
- debian/source
- network-hooks.d
- files modified:
- DBUS-API
added
removed
mandos-monitor
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2009-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 Björn Påhlsson
6
# Copyright © 2009,2010 Teddy Hogeborn
7
# Copyright © 2009,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/>.
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 *
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
30
26
31
27
import sys
32
28
import os
46
42
47
43
import locale
48
44
49
locale.setlocale(locale.LC_ALL, '')
45
locale.setlocale(locale.LC_ALL, u'')
50
46
51
47
import logging
52
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
53
49
54
50
# Some useful constants
55
domain = 'se.recompile'
51
domain = 'se.bsnet.fukt'
56
52
server_interface = domain + '.Mandos'
57
53
client_interface = domain + '.Mandos.Client'
58
version = "1.5.3"
54
version = "1.2"
59
55
60
56
# Always run in monochrome mode
61
57
urwid.curses_display.curses.has_colors = lambda : False
69
65
"Parse an ISO 8601 date string to a datetime.datetime()"
70
66
if not iso:
71
67
return None
72
d, t = iso.split("T", 1)
73
year, month, day = d.split("-", 2)
74
hour, minute, second = t.split(":", 2)
68
d, t = iso.split(u"T", 1)
69
year, month, day = d.split(u"-", 2)
70
hour, minute, second = t.split(u":", 2)
75
71
second, fraction = divmod(float(second), 1)
76
72
return datetime.datetime(int(year),
77
73
int(month),
86
82
properties and calls a hook function when any of them are
87
83
changed.
88
84
"""
89
def __init__(self, proxy_object=None, properties=None, **kwargs):
85
def __init__(self, proxy_object=None, *args, **kwargs):
90
86
self.proxy = proxy_object # Mandos Client proxy object
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)
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)
109
101
110
102
def property_changed(self, property=None, value=None):
111
103
"""This is called whenever we get a PropertyChanged signal
113
105
"""
114
106
# Update properties dict with new value
115
107
self.properties[property] = value
116
117
def delete(self):
118
self.property_changed_match.remove()
119
108
120
109
121
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
123
112
"""
124
113
125
114
def __init__(self, server_proxy_object=None, update_hook=None,
126
delete_hook=None, logger=None, **kwargs):
115
delete_hook=None, logger=None, *args, **kwargs):
127
116
# Called on update
128
117
self.update_hook = update_hook
129
118
# Called on delete
134
123
self.logger = logger
135
124
136
125
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
137
128
138
129
# The widget shown normally
139
self._text_widget = urwid.Text("")
130
self._text_widget = urwid.Text(u"")
140
131
# The widget shown when we have focus
141
self._focus_text_widget = urwid.Text("")
142
super(MandosClientWidget, self).__init__(**kwargs)
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)
143
136
self.update()
144
137
self.opened = False
145
138
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"]))
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)
169
177
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
170
184
def using_timer(self, flag):
171
185
"""Call this method with True or False when timer should be
172
186
activated or deactivated.
173
187
"""
174
if flag and self._update_timer_callback_tag is None:
175
# Will update the shown timer value every second
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:
176
194
self._update_timer_callback_tag = (gobject.timeout_add
177
195
(1000,
178
196
self.update_timer))
179
elif not (flag or self._update_timer_callback_tag is None):
197
elif old and self._update_timer_callback_lock == 0:
180
198
gobject.source_remove(self._update_timer_callback_tag)
181
199
self._update_timer_callback_tag = None
182
200
183
201
def checker_completed(self, exitstatus, condition, command):
184
202
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))
185
209
self.update()
186
210
return
187
211
# Checker failed
212
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
188
215
if os.WIFEXITED(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)))
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)))
193
220
elif os.WIFSIGNALED(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)))
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)))
198
225
elif os.WCOREDUMP(condition):
199
self.logger('Checker for client {0} (command "{1}")'
200
' dumped core'
201
.format(self.properties["Name"], command))
226
self.logger(u'Checker for client %s (command "%s")'
227
u' dumped core'
228
% (self.properties[u"Name"], command))
202
229
else:
203
self.logger('Checker for client {0} completed'
204
' mysteriously'
205
.format(self.properties["Name"]))
230
self.logger(u'Checker for client %s completed'
231
u' mysteriously')
206
232
self.update()
207
233
208
234
def checker_started(self, 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)))
235
#self.logger(u'Client %s started checker "%s"'
236
# % (self.properties[u"Name"], unicode(command)))
214
237
pass
215
238
216
239
def got_secret(self):
217
self.logger('Client {0} received its secret'
218
.format(self.properties["Name"]))
240
self.last_checker_failed = False
241
self.logger(u'Client %s received its secret'
242
% self.properties[u"Name"])
219
243
220
244
def need_approval(self, timeout, default):
221
245
if not default:
222
message = 'Client {0} needs approval within {1} seconds'
246
message = u'Client %s needs approval within %s seconds'
223
247
else:
224
message = 'Client {0} will get its secret in {1} seconds'
225
self.logger(message.format(self.properties["Name"],
226
timeout/1000))
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)
227
252
228
253
def rejected(self, reason):
229
self.logger('Client {0} was rejected; reason: {1}'
230
.format(self.properties["Name"], reason))
254
self.logger(u'Client %s was rejected; reason: %s'
255
% (self.properties[u"Name"], reason))
231
256
232
257
def selectable(self):
233
258
"""Make this a "selectable" widget.
234
259
This overrides the method from urwid.FlowWidget."""
235
260
return True
236
261
237
def rows(self, maxcolrow, focus=False):
262
def rows(self, (maxcol,), focus=False):
238
263
"""How many rows this widget will occupy might depend on
239
264
whether we have focus or not.
240
265
This overrides the method from urwid.FlowWidget"""
241
return self.current_widget(focus).rows(maxcolrow, focus=focus)
266
return self.current_widget(focus).rows((maxcol,), focus=focus)
242
267
243
268
def current_widget(self, focus=False):
244
269
if focus or self.opened:
248
273
def update(self):
249
274
"Called when what is visible on the screen should be updated."
250
275
# How to add standout mode to a style
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",
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",
257
282
}
258
283
259
284
# Rebuild focus and non-focus widgets using current properties
260
285
261
286
# Base part of a client. Name!
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"]:
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"]:
267
292
timeout = datetime.timedelta(milliseconds
268
293
= self.properties
269
["ApprovalDelay"])
294
[u"ApprovalDelay"])
270
295
last_approval_request = isoformat_to_datetime(
271
self.properties["LastApprovalRequest"])
296
self.properties[u"LastApprovalRequest"])
272
297
if last_approval_request is not None:
273
timer = max(timeout - (datetime.datetime.utcnow()
274
- last_approval_request),
275
datetime.timedelta())
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
276
300
else:
277
301
timer = datetime.timedelta()
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)
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])
298
319
else:
299
message = "enabled"
300
self.using_timer(False)
301
self._text = "{0}{1}".format(base, message)
302
320
message = u"enabled"
321
self._text = "%s%s" % (base, message)
322
303
323
if not urwid.supports_unicode():
304
324
self._text = self._text.encode("ascii", "replace")
305
textlist = [("normal", self._text)]
325
textlist = [(u"normal", self._text)]
306
326
self._text_widget.set_text(textlist)
307
327
self._focus_text_widget.set_text([(with_standout[text[0]],
308
328
text[1])
317
337
self.update_hook()
318
338
319
339
def update_timer(self):
320
"""called by gobject. Will indefinitely loop until
321
gobject.source_remove() on tag is called"""
340
"called by gobject"
322
341
self.update()
323
342
return True # Keep calling this
324
343
325
def delete(self, **kwargs):
344
def delete(self):
326
345
if self._update_timer_callback_tag is not None:
327
346
gobject.source_remove(self._update_timer_callback_tag)
328
347
self._update_timer_callback_tag = None
329
for match in self.match_objects:
330
match.remove()
331
self.match_objects = ()
332
348
if self.delete_hook is not None:
333
349
self.delete_hook(self)
334
return super(MandosClientWidget, self).delete(**kwargs)
335
350
336
def render(self, maxcolrow, focus=False):
351
def render(self, (maxcol,), focus=False):
337
352
"""Render differently if we have focus.
338
353
This overrides the method from urwid.FlowWidget"""
339
return self.current_widget(focus).render(maxcolrow,
354
return self.current_widget(focus).render((maxcol,),
340
355
focus=focus)
341
356
342
def keypress(self, maxcolrow, key):
357
def keypress(self, (maxcol,), key):
343
358
"""Handle keys.
344
359
This overrides the method from urwid.FlowWidget"""
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":
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":
352
365
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
353
dbus_interface = client_interface,
354
ignore_reply=True)
355
elif key == "d":
366
dbus_interface = client_interface)
367
elif key == u"d":
356
368
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
357
dbus_interface = client_interface,
358
ignore_reply=True)
359
elif key == "R" or key == "_" or key == "ctrl k":
369
dbus_interface = client_interface)
370
elif key == u"R" or key == u"_" or key == u"ctrl k":
360
371
self.server_proxy_object.RemoveClient(self.proxy
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)
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)
372
379
# xxx
373
# elif key == "p" or key == "=":
380
# elif key == u"p" or key == "=":
374
381
# self.proxy.pause()
375
# elif key == "u" or key == ":":
382
# elif key == u"u" or key == ":":
376
383
# self.proxy.unpause()
377
# elif key == "RET":
384
# elif key == u"RET":
378
385
# self.open()
379
386
else:
380
387
return key
381
388
382
def property_changed(self, property=None, **kwargs):
389
def property_changed(self, property=None, value=None,
390
*args, **kwargs):
383
391
"""Call self.update() if old value is not new value.
384
392
This overrides the method from MandosClientPropertyCache"""
385
393
property_name = unicode(property)
386
394
old_value = self.properties.get(property_name)
387
395
super(MandosClientWidget, self).property_changed(
388
property=property, **kwargs)
396
property=property, value=value, *args, **kwargs)
389
397
if self.properties.get(property_name) != old_value:
390
398
self.update()
391
399
395
403
"down" key presses, thus not allowing any containing widgets to
396
404
use them as an excuse to shift focus away from this widget.
397
405
"""
398
def keypress(self, *args, **kwargs):
399
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
400
if ret in ("up", "down"):
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"):
401
410
return
402
411
return ret
403
412
412
421
self.screen = urwid.curses_display.Screen()
413
422
414
423
self.screen.register_palette((
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")),
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")),
432
441
))
433
442
434
443
if urwid.supports_unicode():
435
self.divider = "─" # \u2500
436
#self.divider = "━" # \u2501
444
self.divider = u"─" # \u2500
445
#self.divider = u"━" # \u2501
437
446
else:
438
#self.divider = "-" # \u002d
439
self.divider = "_" # \u005f
447
#self.divider = u"-" # \u002d
448
self.divider = u"_" # \u005f
440
449
441
450
self.screen.start()
442
451
456
465
# This keeps track of whether self.uilist currently has
457
466
# self.logbox in it or not
458
467
self.log_visible = True
459
self.log_wrap = "any"
468
self.log_wrap = u"any"
460
469
461
470
self.rebuild()
462
self.log_message_raw(("bold",
463
"Mandos Monitor version " + version))
464
self.log_message_raw(("bold",
465
"q: Quit ?: Help"))
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"))
466
475
467
476
self.busname = domain + '.Mandos'
468
477
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)
469
520
470
521
def client_not_found(self, fingerprint, address):
471
self.log_message("Client with address {0} and fingerprint"
472
" {1} could not be found"
473
.format(address, fingerprint))
522
self.log_message((u"Client with address %s and fingerprint %s"
523
u" could not be found" % (address,
524
fingerprint)))
474
525
475
526
def rebuild(self):
476
527
"""This rebuilds the User Interface.
486
537
self.divider)))
487
538
if self.log_visible:
488
539
self.uilist.append(self.logbox)
540
pass
489
541
self.topwidget = urwid.Pile(self.uilist)
490
542
491
543
def log_message(self, message):
492
544
timestamp = datetime.datetime.now().isoformat()
493
self.log_message_raw(timestamp + ": " + message)
545
self.log_message_raw(timestamp + u": " + message)
494
546
495
547
def log_message_raw(self, markup):
496
548
"""Add a log message to the log buffer."""
499
551
and len(self.log) > self.max_log_length):
500
552
del self.log[0:len(self.log)-self.max_log_length-1]
501
553
self.logbox.set_focus(len(self.logbox.body.contents),
502
coming_from="above")
554
coming_from=u"above")
503
555
self.refresh()
504
556
505
557
def toggle_log_display(self):
506
558
"""Toggle visibility of the log buffer."""
507
559
self.log_visible = not self.log_visible
508
560
self.rebuild()
509
#self.log_message("Log visibility changed to: "
561
#self.log_message(u"Log visibility changed to: "
510
562
# + unicode(self.log_visible))
511
563
512
564
def change_log_display(self):
513
565
"""Change type of log display.
514
566
Currently, this toggles wrapping of text lines."""
515
if self.log_wrap == "clip":
516
self.log_wrap = "any"
567
if self.log_wrap == u"clip":
568
self.log_wrap = u"any"
517
569
else:
518
self.log_wrap = "clip"
570
self.log_wrap = u"clip"
519
571
for textwidget in self.log:
520
572
textwidget.set_wrap_mode(self.log_wrap)
521
#self.log_message("Wrap mode: " + self.log_wrap)
573
#self.log_message(u"Wrap mode: " + self.log_wrap)
522
574
523
575
def find_and_remove_client(self, path, name):
524
"""Find a client by its object path and remove it.
576
"""Find an client from its object path and remove it.
525
577
526
578
This is connected to the ClientRemoved signal from the
527
579
Mandos server object."""
529
581
client = self.clients_dict[path]
530
582
except KeyError:
531
583
# not found?
532
self.log_message("Unknown client {0!r} ({1!r}) removed"
533
.format(name, path))
534
584
return
535
client.delete()
585
self.remove_client(client, path)
536
586
537
587
def add_new_client(self, path):
538
588
client_proxy_object = self.bus.get_object(self.busname, path)
553
603
if path is None:
554
604
path = client.proxy.object_path
555
605
self.clients_dict[path] = client
556
self.clients.sort(None, lambda c: c.properties["Name"])
606
self.clients.sort(None, lambda c: c.properties[u"Name"])
557
607
self.refresh()
558
608
559
609
def remove_client(self, client, path=None):
575
625
576
626
def run(self):
577
627
"""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
621
628
self.refresh()
622
629
self._input_callback_tag = (gobject.io_add_watch
623
630
(sys.stdin.fileno(),
633
640
634
641
def process_input(self, source, condition):
635
642
keys = self.screen.get_input()
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
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
645
652
}
646
653
for key in keys:
647
654
try:
649
656
except KeyError: # :-)
650
657
pass
651
658
652
if key == "q" or key == "Q":
659
if key == u"q" or key == u"Q":
653
660
self.stop()
654
661
break
655
elif key == "window resize":
662
elif key == u"window resize":
656
663
self.size = self.screen.get_cols_rows()
657
664
self.refresh()
658
elif key == "\f": # Ctrl-L
665
elif key == u"\f": # Ctrl-L
659
666
self.refresh()
660
elif key == "l" or key == "D":
667
elif key == u"l" or key == u"D":
661
668
self.toggle_log_display()
662
669
self.refresh()
663
elif key == "w" or key == "i":
670
elif key == u"w" or key == u"i":
664
671
self.change_log_display()
665
672
self.refresh()
666
elif key == "?" or key == "f1" or key == "esc":
673
elif key == u"?" or key == u"f1" or key == u"esc":
667
674
if not self.log_visible:
668
675
self.log_visible = True
669
676
self.rebuild()
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"))))
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"))))
688
695
self.refresh()
689
elif key == "tab":
696
elif key == u"tab":
690
697
if self.topwidget.get_focus() is self.logbox:
691
698
self.topwidget.set_focus(0)
692
699
else:
693
700
self.topwidget.set_focus(self.logbox)
694
701
self.refresh()
695
#elif (key == "end" or key == "meta >" or key == "G"
696
# or key == ">"):
702
#elif (key == u"end" or key == u"meta >" or key == u"G"
703
# or key == u">"):
697
704
# pass # xxx end-of-buffer
698
#elif (key == "home" or key == "meta <" or key == "g"
699
# or key == "<"):
705
#elif (key == u"home" or key == u"meta <" or key == u"g"
706
# or key == u"<"):
700
707
# pass # xxx beginning-of-buffer
701
#elif key == "ctrl e" or key == "$":
708
#elif key == u"ctrl e" or key == u"$":
702
709
# pass # xxx move-end-of-line
703
#elif key == "ctrl a" or key == "^":
710
#elif key == u"ctrl a" or key == u"^":
704
711
# pass # xxx move-beginning-of-line
705
#elif key == "ctrl b" or key == "meta (" or key == "h":
712
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
706
713
# pass # xxx left
707
#elif key == "ctrl f" or key == "meta )" or key == "l":
714
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
708
715
# pass # xxx right
709
#elif key == "a":
716
#elif key == u"a":
710
717
# pass # scroll up log
711
#elif key == "z":
718
#elif key == u"z":
712
719
# pass # scroll down log
713
720
elif self.topwidget.selectable():
714
721
self.topwidget.keypress(self.size, key)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0