To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos-monitor
- browse files at revision 284
- compare with another revision
- download diff
- download tarball
- view history from revision 284
- Committer: Teddy Hogeborn
- Date: 2011-07-25 18:52:11 UTC
- mfrom: (237.7.37 trunk)
- Revision ID: teddy@fukt.bsnet.se-20110725185211-wlitr9jvs70e1xh8
Merge from trunk.
- 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.0"
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
self._update_timer_callback_tag = (gobject.timeout_add
204
(1000,
205
self.update_timer))
206
elif old and self._update_timer_callback_lock == 0:
207
gobject.source_remove(self._update_timer_callback_tag)
208
self._update_timer_callback_tag = None
117
209
118
210
def checker_completed(self, exitstatus, condition, command):
119
211
if exitstatus == 0:
120
#self.logger(u'Checker for client %s (command "%s")'
121
# u' was successful'
122
# % (self.properties[u"name"], command))
212
if self.last_checker_failed:
213
self.last_checker_failed = False
214
self.using_timer(False)
215
#self.logger('Checker for client %s (command "%s")'
216
# ' was successful'
217
# % (self.properties["Name"], command))
218
self.update()
123
219
return
220
# Checker failed
221
if not self.last_checker_failed:
222
self.last_checker_failed = True
223
self.using_timer(True)
124
224
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,
225
self.logger('Checker for client %s (command "%s")'
226
' failed with exit code %s'
227
% (self.properties["Name"], command,
128
228
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,
229
elif os.WIFSIGNALED(condition):
230
self.logger('Checker for client %s (command "%s")'
231
' was killed by signal %s'
232
% (self.properties["Name"], command,
134
233
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')
234
elif os.WCOREDUMP(condition):
235
self.logger('Checker for client %s (command "%s")'
236
' dumped core'
237
% (self.properties["Name"], command))
238
else:
239
self.logger('Checker for client %s completed'
240
' mysteriously')
241
self.update()
141
242
142
243
def checker_started(self, command):
143
#self.logger(u'Client %s started checker "%s"'
144
# % (self.properties[u"name"], unicode(command)))
244
#self.logger('Client %s started checker "%s"'
245
# % (self.properties["Name"], unicode(command)))
145
246
pass
146
247
147
248
def got_secret(self):
148
self.logger(u'Client %s received its secret'
149
% self.properties[u"name"])
249
self.last_checker_failed = False
250
self.logger('Client %s received its secret'
251
% self.properties["Name"])
150
252
151
253
def need_approval(self, timeout, default):
152
254
if not default:
153
message = u'Client %s needs approval within %s seconds'
255
message = 'Client %s needs approval within %s seconds'
154
256
else:
155
message = u'Client %s will get its secret in %s seconds'
257
message = 'Client %s will get its secret in %s seconds'
156
258
self.logger(message
157
% (self.properties[u"name"], timeout/1000))
259
% (self.properties["Name"], timeout/1000))
260
self.using_timer(True)
158
261
159
262
def rejected(self, reason):
160
self.logger(u'Client %s was rejected; reason: %s'
161
% (self.properties[u"name"], reason))
263
self.logger('Client %s was rejected; reason: %s'
264
% (self.properties["Name"], reason))
162
265
163
266
def selectable(self):
164
267
"""Make this a "selectable" widget.
165
268
This overrides the method from urwid.FlowWidget."""
166
269
return True
167
270
168
def rows(self, (maxcol,), focus=False):
271
def rows(self, maxcolrow, focus=False):
169
272
"""How many rows this widget will occupy might depend on
170
273
whether we have focus or not.
171
274
This overrides the method from urwid.FlowWidget"""
172
return self.current_widget(focus).rows((maxcol,), focus=focus)
275
return self.current_widget(focus).rows(maxcolrow, focus=focus)
173
276
174
277
def current_widget(self, focus=False):
175
278
if focus or self.opened:
179
282
def update(self):
180
283
"Called when what is visible on the screen should be updated."
181
284
# 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",
285
with_standout = { "normal": "standout",
286
"bold": "bold-standout",
287
"underline-blink":
288
"underline-blink-standout",
289
"bold-underline-blink":
290
"bold-underline-blink-standout",
188
291
}
189
292
190
293
# Rebuild focus and non-focus widgets using current properties
191
294
192
295
# 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?"
296
base = ('%(name)s: '
297
% {"name": self.properties["Name"]})
298
if not self.properties["Enabled"]:
299
message = "DISABLED"
300
elif self.properties["ApprovalPending"]:
301
timeout = datetime.timedelta(milliseconds
302
= self.properties
303
["ApprovalDelay"])
304
last_approval_request = isoformat_to_datetime(
305
self.properties["LastApprovalRequest"])
306
if last_approval_request is not None:
307
timer = timeout - (datetime.datetime.utcnow()
308
- last_approval_request)
309
else:
310
timer = datetime.timedelta()
311
if self.properties["ApprovedByDefault"]:
312
message = "Approval in %s. (d)eny?"
313
else:
314
message = "Denial in %s. (a)pprove?"
315
message = message % unicode(timer).rsplit(".", 1)[0]
316
elif self.last_checker_failed:
317
timeout = datetime.timedelta(milliseconds
318
= self.properties
319
["Timeout"])
320
last_ok = isoformat_to_datetime(
321
max((self.properties["LastCheckedOK"]
322
or self.properties["Created"]),
323
self.properties["LastEnabled"]))
324
timer = timeout - (datetime.datetime.utcnow() - last_ok)
325
message = ('A checker has failed! Time until client'
326
' gets disabled: %s'
327
% unicode(timer).rsplit(".", 1)[0])
201
328
else:
202
self._text += (u'%(enabled)s'
203
% {u"enabled":
204
(u"enabled"
205
if self.properties[u"enabled"]
206
else u"DISABLED")})
329
message = "enabled"
330
self._text = "%s%s" % (base, message)
331
207
332
if not urwid.supports_unicode():
208
333
self._text = self._text.encode("ascii", "replace")
209
textlist = [(u"normal", self._text)]
334
textlist = [("normal", self._text)]
210
335
self._text_widget.set_text(textlist)
211
336
self._focus_text_widget.set_text([(with_standout[text[0]],
212
337
text[1])
220
345
if self.update_hook is not None:
221
346
self.update_hook()
222
347
223
def delete(self):
348
def update_timer(self):
349
"called by gobject"
350
self.update()
351
return True # Keep calling this
352
353
def delete(self, *args, **kwargs):
354
if self._update_timer_callback_tag is not None:
355
gobject.source_remove(self._update_timer_callback_tag)
356
self._update_timer_callback_tag = None
357
for match in self.match_objects:
358
match.remove()
359
self.match_objects = ()
224
360
if self.delete_hook is not None:
225
361
self.delete_hook(self)
362
return super(MandosClientWidget, self).delete(*args, **kwargs)
226
363
227
def render(self, (maxcol,), focus=False):
364
def render(self, maxcolrow, focus=False):
228
365
"""Render differently if we have focus.
229
366
This overrides the method from urwid.FlowWidget"""
230
return self.current_widget(focus).render((maxcol,),
367
return self.current_widget(focus).render(maxcolrow,
231
368
focus=focus)
232
369
233
def keypress(self, (maxcol,), key):
370
def keypress(self, maxcolrow, key):
234
371
"""Handle keys.
235
372
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":
373
if key == "+":
374
self.proxy.Enable(dbus_interface = client_interface,
375
ignore_reply=True)
376
elif key == "-":
377
self.proxy.Disable(dbus_interface = client_interface,
378
ignore_reply=True)
379
elif key == "a":
241
380
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
242
dbus_interface = client_interface)
243
elif key == u"d":
381
dbus_interface = client_interface,
382
ignore_reply=True)
383
elif key == "d":
244
384
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":
385
dbus_interface = client_interface,
386
ignore_reply=True)
387
elif key == "R" or key == "_" or key == "ctrl k":
247
388
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)
389
.object_path,
390
ignore_reply=True)
391
elif key == "s":
392
self.proxy.StartChecker(dbus_interface = client_interface,
393
ignore_reply=True)
394
elif key == "S":
395
self.proxy.StopChecker(dbus_interface = client_interface,
396
ignore_reply=True)
397
elif key == "C":
398
self.proxy.CheckedOK(dbus_interface = client_interface,
399
ignore_reply=True)
255
400
# xxx
256
# elif key == u"p" or key == "=":
401
# elif key == "p" or key == "=":
257
402
# self.proxy.pause()
258
# elif key == u"u" or key == ":":
403
# elif key == "u" or key == ":":
259
404
# self.proxy.unpause()
260
# elif key == u"RET":
405
# elif key == "RET":
261
406
# self.open()
262
# elif key == u"+":
263
# self.proxy.Approve(True)
264
# elif key == u"-":
265
# self.proxy.Approve(False)
266
407
else:
267
408
return key
268
409
283
424
"down" key presses, thus not allowing any containing widgets to
284
425
use them as an excuse to shift focus away from this widget.
285
426
"""
286
def keypress(self, (maxcol, maxrow), key):
287
ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
288
if ret in (u"up", u"down"):
427
def keypress(self, maxcolrow, key):
428
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
429
if ret in ("up", "down"):
289
430
return
290
431
return ret
291
432
300
441
self.screen = urwid.curses_display.Screen()
301
442
302
443
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")),
444
("normal",
445
"default", "default", None),
446
("bold",
447
"default", "default", "bold"),
448
("underline-blink",
449
"default", "default", "underline"),
450
("standout",
451
"default", "default", "standout"),
452
("bold-underline-blink",
453
"default", "default", ("bold", "underline")),
454
("bold-standout",
455
"default", "default", ("bold", "standout")),
456
("underline-blink-standout",
457
"default", "default", ("underline", "standout")),
458
("bold-underline-blink-standout",
459
"default", "default", ("bold", "underline",
460
"standout")),
320
461
))
321
462
322
463
if urwid.supports_unicode():
323
self.divider = u"─" # \u2500
324
#self.divider = u"━" # \u2501
464
self.divider = "─" # \u2500
465
#self.divider = "━" # \u2501
325
466
else:
326
#self.divider = u"-" # \u002d
327
self.divider = u"_" # \u005f
467
#self.divider = "-" # \u002d
468
self.divider = "_" # \u005f
328
469
329
470
self.screen.start()
330
471
344
485
# This keeps track of whether self.uilist currently has
345
486
# self.logbox in it or not
346
487
self.log_visible = True
347
self.log_wrap = u"any"
488
self.log_wrap = "any"
348
489
349
490
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"))
491
self.log_message_raw(("bold",
492
"Mandos Monitor version " + version))
493
self.log_message_raw(("bold",
494
"q: Quit ?: Help"))
354
495
355
496
self.busname = domain + '.Mandos'
356
497
self.main_loop = gobject.MainLoop()
357
498
self.bus = dbus.SystemBus()
358
499
mandos_dbus_objc = self.bus.get_object(
359
self.busname, u"/", follow_name_owner_changes=True)
500
self.busname, "/", follow_name_owner_changes=True)
360
501
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
361
502
dbus_interface
362
503
= server_interface)
367
508
mandos_clients = dbus.Dictionary()
368
509
369
510
(self.mandos_serv
370
.connect_to_signal(u"ClientRemoved",
511
.connect_to_signal("ClientRemoved",
371
512
self.find_and_remove_client,
372
513
dbus_interface=server_interface,
373
514
byte_arrays=True))
374
515
(self.mandos_serv
375
.connect_to_signal(u"ClientAdded",
516
.connect_to_signal("ClientAdded",
376
517
self.add_new_client,
377
518
dbus_interface=server_interface,
378
519
byte_arrays=True))
379
520
(self.mandos_serv
380
.connect_to_signal(u"ClientNotFound",
521
.connect_to_signal("ClientNotFound",
381
522
self.client_not_found,
382
523
dbus_interface=server_interface,
383
524
byte_arrays=True))
398
539
path=path)
399
540
400
541
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,
542
self.log_message(("Client with address %s and fingerprint %s"
543
" could not be found" % (address,
403
544
fingerprint)))
404
545
405
546
def rebuild(self):
407
548
Call this when the widget layout needs to change"""
408
549
self.uilist = []
409
550
#self.uilist.append(urwid.ListBox(self.clients))
410
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
551
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
552
clients),
411
553
#header=urwid.Divider(),
412
554
header=None,
413
footer=urwid.Divider(div_char=self.divider)))
555
footer=
556
urwid.Divider(div_char=
557
self.divider)))
414
558
if self.log_visible:
415
559
self.uilist.append(self.logbox)
416
560
pass
418
562
419
563
def log_message(self, message):
420
564
timestamp = datetime.datetime.now().isoformat()
421
self.log_message_raw(timestamp + u": " + message)
565
self.log_message_raw(timestamp + ": " + message)
422
566
423
567
def log_message_raw(self, markup):
424
568
"""Add a log message to the log buffer."""
427
571
and len(self.log) > self.max_log_length):
428
572
del self.log[0:len(self.log)-self.max_log_length-1]
429
573
self.logbox.set_focus(len(self.logbox.body.contents),
430
coming_from=u"above")
574
coming_from="above")
431
575
self.refresh()
432
576
433
577
def toggle_log_display(self):
434
578
"""Toggle visibility of the log buffer."""
435
579
self.log_visible = not self.log_visible
436
580
self.rebuild()
437
self.log_message(u"Log visibility changed to: "
438
+ unicode(self.log_visible))
581
#self.log_message("Log visibility changed to: "
582
# + unicode(self.log_visible))
439
583
440
584
def change_log_display(self):
441
585
"""Change type of log display.
442
586
Currently, this toggles wrapping of text lines."""
443
if self.log_wrap == u"clip":
444
self.log_wrap = u"any"
587
if self.log_wrap == "clip":
588
self.log_wrap = "any"
445
589
else:
446
self.log_wrap = u"clip"
590
self.log_wrap = "clip"
447
591
for textwidget in self.log:
448
592
textwidget.set_wrap_mode(self.log_wrap)
449
self.log_message(u"Wrap mode: " + self.log_wrap)
593
#self.log_message("Wrap mode: " + self.log_wrap)
450
594
451
595
def find_and_remove_client(self, path, name):
452
"""Find an client from its object path and remove it.
596
"""Find a client by its object path and remove it.
453
597
454
598
This is connected to the ClientRemoved signal from the
455
599
Mandos server object."""
457
601
client = self.clients_dict[path]
458
602
except KeyError:
459
603
# not found?
604
self.log_message("Unknown client %r (%r) removed", name,
605
path)
460
606
return
461
self.remove_client(client, path)
607
client.delete()
462
608
463
609
def add_new_client(self, path):
464
610
client_proxy_object = self.bus.get_object(self.busname, path)
479
625
if path is None:
480
626
path = client.proxy.object_path
481
627
self.clients_dict[path] = client
482
self.clients.sort(None, lambda c: c.properties[u"name"])
628
self.clients.sort(None, lambda c: c.properties["Name"])
483
629
self.refresh()
484
630
485
631
def remove_client(self, client, path=None):
516
662
517
663
def process_input(self, source, condition):
518
664
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
665
translations = { "ctrl n": "down", # Emacs
666
"ctrl p": "up", # Emacs
667
"ctrl v": "page down", # Emacs
668
"meta v": "page up", # Emacs
669
" ": "page down", # less
670
"f": "page down", # less
671
"b": "page up", # less
672
"j": "down", # vi
673
"k": "up", # vi
528
674
}
529
675
for key in keys:
530
676
try:
532
678
except KeyError: # :-)
533
679
pass
534
680
535
if key == u"q" or key == u"Q":
681
if key == "q" or key == "Q":
536
682
self.stop()
537
683
break
538
elif key == u"window resize":
684
elif key == "window resize":
539
685
self.size = self.screen.get_cols_rows()
540
686
self.refresh()
541
elif key == u"\f": # Ctrl-L
687
elif key == "\f": # Ctrl-L
542
688
self.refresh()
543
elif key == u"l" or key == u"D":
689
elif key == "l" or key == "D":
544
690
self.toggle_log_display()
545
691
self.refresh()
546
elif key == u"w" or key == u"i":
692
elif key == "w" or key == "i":
547
693
self.change_log_display()
548
694
self.refresh()
549
elif key == u"?" or key == u"f1" or key == u"esc":
695
elif key == "?" or key == "f1" or key == "esc":
550
696
if not self.log_visible:
551
697
self.log_visible = True
552
698
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"+: Enable",
564
u"-: 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"))))
699
self.log_message_raw(("bold",
700
" ".
701
join(("q: Quit",
702
"?: Help",
703
"l: Log window toggle",
704
"TAB: Switch window",
705
"w: Wrap (log)"))))
706
self.log_message_raw(("bold",
707
" "
708
.join(("Clients:",
709
"+: Enable",
710
"-: Disable",
711
"R: Remove",
712
"s: Start new checker",
713
"S: Stop checker",
714
"C: Checker OK",
715
"a: Approve",
716
"d: Deny"))))
571
717
self.refresh()
572
elif key == u"tab":
718
elif key == "tab":
573
719
if self.topwidget.get_focus() is self.logbox:
574
720
self.topwidget.set_focus(0)
575
721
else:
576
722
self.topwidget.set_focus(self.logbox)
577
723
self.refresh()
578
#elif (key == u"end" or key == u"meta >" or key == u"G"
579
# or key == u">"):
724
#elif (key == "end" or key == "meta >" or key == "G"
725
# or key == ">"):
580
726
# pass # xxx end-of-buffer
581
#elif (key == u"home" or key == u"meta <" or key == u"g"
582
# or key == u"<"):
727
#elif (key == "home" or key == "meta <" or key == "g"
728
# or key == "<"):
583
729
# pass # xxx beginning-of-buffer
584
#elif key == u"ctrl e" or key == u"$":
730
#elif key == "ctrl e" or key == "$":
585
731
# pass # xxx move-end-of-line
586
#elif key == u"ctrl a" or key == u"^":
732
#elif key == "ctrl a" or key == "^":
587
733
# pass # xxx move-beginning-of-line
588
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
734
#elif key == "ctrl b" or key == "meta (" or key == "h":
589
735
# pass # xxx left
590
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
736
#elif key == "ctrl f" or key == "meta )" or key == "l":
591
737
# pass # xxx right
592
#elif key == u"a":
738
#elif key == "a":
593
739
# pass # scroll up log
594
#elif key == u"z":
740
#elif key == "z":
595
741
# pass # scroll down log
596
742
elif self.topwidget.selectable():
597
743
self.topwidget.keypress(self.size, key)
601
747
ui = UserInterface()
602
748
try:
603
749
ui.run()
750
except KeyboardInterrupt:
751
ui.screen.stop()
604
752
except Exception, e:
605
753
ui.log_message(unicode(e))
606
754
ui.screen.stop()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0