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