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 24.1.185
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.185
- Committer: Björn Påhlsson
- Date: 2011-10-02 13:45:45 UTC
- mto: This revision was merged to the branch mainline in revision 505.
- Revision ID: belorn@fukt.bsnet.se-20111002134545-oytmfbl15r8lsm6p
working transition code for going between se.bsnet.fukt to se.recompile
- 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
super(MandosClientPropertyCache, self).__init__(
61
*args, **kwargs)
99
100
#XXX This breaks good super behaviour
101
# super(MandosClientPropertyCache, self).__init__(
102
# *args, **kwargs)
62
103
63
104
def property_changed(self, property=None, value=None):
64
105
"""This is called whenever we get a PropertyChanged signal
66
107
"""
67
108
# Update properties dict with new value
68
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)
69
115
70
116
71
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
83
129
# Logger
84
130
self.logger = logger
85
131
132
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
self.last_checker_failed = False
135
86
136
# The widget shown normally
87
self._text_widget = urwid.Text(u"")
137
self._text_widget = urwid.Text("")
88
138
# The widget shown when we have focus
89
self._focus_text_widget = urwid.Text(u"")
139
self._focus_text_widget = urwid.Text("")
90
140
super(MandosClientWidget, self).__init__(
91
141
update_hook=update_hook, delete_hook=delete_hook,
92
142
*args, **kwargs)
93
143
self.update()
94
144
self.opened = False
95
self.proxy.connect_to_signal(u"CheckerCompleted",
96
self.checker_completed,
97
client_interface,
98
byte_arrays=True)
99
self.proxy.connect_to_signal(u"CheckerStarted",
100
self.checker_started,
101
client_interface,
102
byte_arrays=True)
103
self.proxy.connect_to_signal(u"GotSecret",
104
self.got_secret,
105
client_interface,
106
byte_arrays=True)
107
self.proxy.connect_to_signal(u"NeedApproval",
108
self.need_approval,
109
client_interface,
110
byte_arrays=True)
111
self.proxy.connect_to_signal(u"Rejected",
112
self.rejected,
113
client_interface,
114
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
115
210
116
211
def checker_completed(self, exitstatus, condition, command):
117
212
if exitstatus == 0:
118
#self.logger(u'Checker for client %s (command "%s")'
119
# u' was successful'
120
# % (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()
121
220
return
221
# Checker failed
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
122
225
if os.WIFEXITED(condition):
123
self.logger(u'Checker for client %s (command "%s")'
124
u' failed with exit code %s'
125
% (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,
126
229
os.WEXITSTATUS(condition)))
127
return
128
if os.WIFSIGNALED(condition):
129
self.logger(u'Checker for client %s (command "%s")'
130
u' was killed by signal %s'
131
% (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,
132
234
os.WTERMSIG(condition)))
133
return
134
if os.WCOREDUMP(condition):
135
self.logger(u'Checker for client %s (command "%s")'
136
u' dumped core'
137
% (self.properties[u"name"], command))
138
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()
139
243
140
244
def checker_started(self, command):
141
#self.logger(u'Client %s started checker "%s"'
142
# % (self.properties[u"name"], unicode(command)))
245
#self.logger('Client %s started checker "%s"'
246
# % (self.properties["Name"], unicode(command)))
143
247
pass
144
248
145
249
def got_secret(self):
146
self.logger(u'Client %s received its secret'
147
% self.properties[u"name"])
250
self.last_checker_failed = False
251
self.logger('Client %s received its secret'
252
% self.properties["Name"])
148
253
149
254
def need_approval(self, timeout, default):
150
255
if not default:
151
message = u'Client %s needs approval within %s seconds'
256
message = 'Client %s needs approval within %s seconds'
152
257
else:
153
message = u'Client %s will get its secret in %s seconds'
258
message = 'Client %s will get its secret in %s seconds'
154
259
self.logger(message
155
% (self.properties[u"name"], timeout/1000))
260
% (self.properties["Name"], timeout/1000))
261
self.using_timer(True)
156
262
157
263
def rejected(self, reason):
158
self.logger(u'Client %s was rejected; reason: %s'
159
% (self.properties[u"name"], reason))
264
self.logger('Client %s was rejected; reason: %s'
265
% (self.properties["Name"], reason))
160
266
161
267
def selectable(self):
162
268
"""Make this a "selectable" widget.
163
269
This overrides the method from urwid.FlowWidget."""
164
270
return True
165
271
166
def rows(self, (maxcol,), focus=False):
272
def rows(self, maxcolrow, focus=False):
167
273
"""How many rows this widget will occupy might depend on
168
274
whether we have focus or not.
169
275
This overrides the method from urwid.FlowWidget"""
170
return self.current_widget(focus).rows((maxcol,), focus=focus)
276
return self.current_widget(focus).rows(maxcolrow, focus=focus)
171
277
172
278
def current_widget(self, focus=False):
173
279
if focus or self.opened:
177
283
def update(self):
178
284
"Called when what is visible on the screen should be updated."
179
285
# How to add standout mode to a style
180
with_standout = { u"normal": u"standout",
181
u"bold": u"bold-standout",
182
u"underline-blink":
183
u"underline-blink-standout",
184
u"bold-underline-blink":
185
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",
186
292
}
187
293
188
294
# Rebuild focus and non-focus widgets using current properties
189
self._text = (u'%(name)s: %(enabled)s'
190
% { u"name": self.properties[u"name"],
191
u"enabled":
192
(u"enabled"
193
if self.properties[u"enabled"]
194
else u"DISABLED")})
295
296
# Base part of a client. Name!
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])
329
else:
330
message = "enabled"
331
self._text = "%s%s" % (base, message)
332
195
333
if not urwid.supports_unicode():
196
334
self._text = self._text.encode("ascii", "replace")
197
textlist = [(u"normal", self._text)]
335
textlist = [("normal", self._text)]
198
336
self._text_widget.set_text(textlist)
199
337
self._focus_text_widget.set_text([(with_standout[text[0]],
200
338
text[1])
208
346
if self.update_hook is not None:
209
347
self.update_hook()
210
348
211
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 = ()
212
362
if self.delete_hook is not None:
213
363
self.delete_hook(self)
364
return super(MandosClientWidget, self).delete(*args, **kwargs)
214
365
215
def render(self, (maxcol,), focus=False):
366
def render(self, maxcolrow, focus=False):
216
367
"""Render differently if we have focus.
217
368
This overrides the method from urwid.FlowWidget"""
218
return self.current_widget(focus).render((maxcol,),
369
return self.current_widget(focus).render(maxcolrow,
219
370
focus=focus)
220
371
221
def keypress(self, (maxcol,), key):
372
def keypress(self, maxcolrow, key):
222
373
"""Handle keys.
223
374
This overrides the method from urwid.FlowWidget"""
224
if key == u"e" or key == u"+":
225
self.proxy.Enable()
226
elif key == u"d" or key == u"-":
227
self.proxy.Disable()
228
elif key == u"r" or key == u"_" or key == u"ctrl k":
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":
382
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
383
dbus_interface = client_interface,
384
ignore_reply=True)
385
elif key == "d":
386
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
387
dbus_interface = client_interface,
388
ignore_reply=True)
389
elif key == "R" or key == "_" or key == "ctrl k":
229
390
self.server_proxy_object.RemoveClient(self.proxy
230
.object_path)
231
elif key == u"s":
232
self.proxy.StartChecker()
233
elif key == u"S":
234
self.proxy.StopChecker()
235
elif key == u"C":
236
self.proxy.CheckedOK()
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)
237
402
# xxx
238
# elif key == u"p" or key == "=":
403
# elif key == "p" or key == "=":
239
404
# self.proxy.pause()
240
# elif key == u"u" or key == ":":
405
# elif key == "u" or key == ":":
241
406
# self.proxy.unpause()
242
# elif key == u"RET":
407
# elif key == "RET":
243
408
# self.open()
244
elif key == u"+":
245
self.proxy.Approve(True)
246
elif key == u"-":
247
self.proxy.Approve(False)
248
409
else:
249
410
return key
250
411
265
426
"down" key presses, thus not allowing any containing widgets to
266
427
use them as an excuse to shift focus away from this widget.
267
428
"""
268
def keypress(self, (maxcol, maxrow), key):
269
ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
270
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"):
271
432
return
272
433
return ret
273
434
282
443
self.screen = urwid.curses_display.Screen()
283
444
284
445
self.screen.register_palette((
285
(u"normal",
286
u"default", u"default", None),
287
(u"bold",
288
u"default", u"default", u"bold"),
289
(u"underline-blink",
290
u"default", u"default", u"underline"),
291
(u"standout",
292
u"default", u"default", u"standout"),
293
(u"bold-underline-blink",
294
u"default", u"default", (u"bold", u"underline")),
295
(u"bold-standout",
296
u"default", u"default", (u"bold", u"standout")),
297
(u"underline-blink-standout",
298
u"default", u"default", (u"underline", u"standout")),
299
(u"bold-underline-blink-standout",
300
u"default", u"default", (u"bold", u"underline",
301
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")),
302
463
))
303
464
304
465
if urwid.supports_unicode():
305
self.divider = u"─" # \u2500
306
#self.divider = u"━" # \u2501
466
self.divider = "─" # \u2500
467
#self.divider = "━" # \u2501
307
468
else:
308
#self.divider = u"-" # \u002d
309
self.divider = u"_" # \u005f
469
#self.divider = "-" # \u002d
470
self.divider = "_" # \u005f
310
471
311
472
self.screen.start()
312
473
326
487
# This keeps track of whether self.uilist currently has
327
488
# self.logbox in it or not
328
489
self.log_visible = True
329
self.log_wrap = u"any"
490
self.log_wrap = "any"
330
491
331
492
self.rebuild()
332
self.log_message_raw((u"bold",
333
u"Mandos Monitor version " + version))
334
self.log_message_raw((u"bold",
335
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"))
336
497
337
498
self.busname = domain + '.Mandos'
338
499
self.main_loop = gobject.MainLoop()
339
500
self.bus = dbus.SystemBus()
340
501
mandos_dbus_objc = self.bus.get_object(
341
self.busname, u"/", follow_name_owner_changes=True)
502
self.busname, "/", follow_name_owner_changes=True)
342
503
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
343
504
dbus_interface
344
505
= server_interface)
349
510
mandos_clients = dbus.Dictionary()
350
511
351
512
(self.mandos_serv
352
.connect_to_signal(u"ClientRemoved",
513
.connect_to_signal("ClientRemoved",
353
514
self.find_and_remove_client,
354
515
dbus_interface=server_interface,
355
516
byte_arrays=True))
356
517
(self.mandos_serv
357
.connect_to_signal(u"ClientAdded",
518
.connect_to_signal("ClientAdded",
358
519
self.add_new_client,
359
520
dbus_interface=server_interface,
360
521
byte_arrays=True))
361
522
(self.mandos_serv
362
.connect_to_signal(u"ClientNotFound",
523
.connect_to_signal("ClientNotFound",
363
524
self.client_not_found,
364
525
dbus_interface=server_interface,
365
526
byte_arrays=True))
380
541
path=path)
381
542
382
543
def client_not_found(self, fingerprint, address):
383
self.log_message((u"Client with address %s and fingerprint %s"
384
u" could not be found" % (address,
544
self.log_message(("Client with address %s and fingerprint %s"
545
" could not be found" % (address,
385
546
fingerprint)))
386
547
387
548
def rebuild(self):
389
550
Call this when the widget layout needs to change"""
390
551
self.uilist = []
391
552
#self.uilist.append(urwid.ListBox(self.clients))
392
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
553
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
554
clients),
393
555
#header=urwid.Divider(),
394
556
header=None,
395
footer=urwid.Divider(div_char=self.divider)))
557
footer=
558
urwid.Divider(div_char=
559
self.divider)))
396
560
if self.log_visible:
397
561
self.uilist.append(self.logbox)
398
562
pass
400
564
401
565
def log_message(self, message):
402
566
timestamp = datetime.datetime.now().isoformat()
403
self.log_message_raw(timestamp + u": " + message)
567
self.log_message_raw(timestamp + ": " + message)
404
568
405
569
def log_message_raw(self, markup):
406
570
"""Add a log message to the log buffer."""
409
573
and len(self.log) > self.max_log_length):
410
574
del self.log[0:len(self.log)-self.max_log_length-1]
411
575
self.logbox.set_focus(len(self.logbox.body.contents),
412
coming_from=u"above")
576
coming_from="above")
413
577
self.refresh()
414
578
415
579
def toggle_log_display(self):
416
580
"""Toggle visibility of the log buffer."""
417
581
self.log_visible = not self.log_visible
418
582
self.rebuild()
419
self.log_message(u"Log visibility changed to: "
420
+ unicode(self.log_visible))
583
#self.log_message("Log visibility changed to: "
584
# + unicode(self.log_visible))
421
585
422
586
def change_log_display(self):
423
587
"""Change type of log display.
424
588
Currently, this toggles wrapping of text lines."""
425
if self.log_wrap == u"clip":
426
self.log_wrap = u"any"
589
if self.log_wrap == "clip":
590
self.log_wrap = "any"
427
591
else:
428
self.log_wrap = u"clip"
592
self.log_wrap = "clip"
429
593
for textwidget in self.log:
430
594
textwidget.set_wrap_mode(self.log_wrap)
431
self.log_message(u"Wrap mode: " + self.log_wrap)
595
#self.log_message("Wrap mode: " + self.log_wrap)
432
596
433
597
def find_and_remove_client(self, path, name):
434
"""Find an client from its object path and remove it.
598
"""Find a client by its object path and remove it.
435
599
436
600
This is connected to the ClientRemoved signal from the
437
601
Mandos server object."""
439
603
client = self.clients_dict[path]
440
604
except KeyError:
441
605
# not found?
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
442
608
return
443
self.remove_client(client, path)
609
client.delete()
444
610
445
611
def add_new_client(self, path):
446
612
client_proxy_object = self.bus.get_object(self.busname, path)
461
627
if path is None:
462
628
path = client.proxy.object_path
463
629
self.clients_dict[path] = client
464
self.clients.sort(None, lambda c: c.properties[u"name"])
630
self.clients.sort(None, lambda c: c.properties["Name"])
465
631
self.refresh()
466
632
467
633
def remove_client(self, client, path=None):
498
664
499
665
def process_input(self, source, condition):
500
666
keys = self.screen.get_input()
501
translations = { u"ctrl n": u"down", # Emacs
502
u"ctrl p": u"up", # Emacs
503
u"ctrl v": u"page down", # Emacs
504
u"meta v": u"page up", # Emacs
505
u" ": u"page down", # less
506
u"f": u"page down", # less
507
u"b": u"page up", # less
508
u"j": u"down", # vi
509
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
510
676
}
511
677
for key in keys:
512
678
try:
514
680
except KeyError: # :-)
515
681
pass
516
682
517
if key == u"q" or key == u"Q":
683
if key == "q" or key == "Q":
518
684
self.stop()
519
685
break
520
elif key == u"window resize":
686
elif key == "window resize":
521
687
self.size = self.screen.get_cols_rows()
522
688
self.refresh()
523
elif key == u"\f": # Ctrl-L
689
elif key == "\f": # Ctrl-L
524
690
self.refresh()
525
elif key == u"l" or key == u"D":
691
elif key == "l" or key == "D":
526
692
self.toggle_log_display()
527
693
self.refresh()
528
elif key == u"w" or key == u"i":
694
elif key == "w" or key == "i":
529
695
self.change_log_display()
530
696
self.refresh()
531
elif key == u"?" or key == u"f1" or key == u"esc":
697
elif key == "?" or key == "f1" or key == "esc":
532
698
if not self.log_visible:
533
699
self.log_visible = True
534
700
self.rebuild()
535
self.log_message_raw((u"bold",
536
u" ".
537
join((u"q: Quit",
538
u"?: Help",
539
u"l: Log window toggle",
540
u"TAB: Switch window",
541
u"w: Wrap (log)"))))
542
self.log_message_raw((u"bold",
543
u" "
544
.join((u"Clients:",
545
u"e: Enable",
546
u"d: Disable",
547
u"r: Remove",
548
u"s: Start new checker",
549
u"S: Stop checker",
550
u"C: Checker OK"))))
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"))))
551
719
self.refresh()
552
elif key == u"tab":
720
elif key == "tab":
553
721
if self.topwidget.get_focus() is self.logbox:
554
722
self.topwidget.set_focus(0)
555
723
else:
556
724
self.topwidget.set_focus(self.logbox)
557
725
self.refresh()
558
#elif (key == u"end" or key == u"meta >" or key == u"G"
559
# or key == u">"):
726
#elif (key == "end" or key == "meta >" or key == "G"
727
# or key == ">"):
560
728
# pass # xxx end-of-buffer
561
#elif (key == u"home" or key == u"meta <" or key == u"g"
562
# or key == u"<"):
729
#elif (key == "home" or key == "meta <" or key == "g"
730
# or key == "<"):
563
731
# pass # xxx beginning-of-buffer
564
#elif key == u"ctrl e" or key == u"$":
732
#elif key == "ctrl e" or key == "$":
565
733
# pass # xxx move-end-of-line
566
#elif key == u"ctrl a" or key == u"^":
734
#elif key == "ctrl a" or key == "^":
567
735
# pass # xxx move-beginning-of-line
568
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
736
#elif key == "ctrl b" or key == "meta (" or key == "h":
569
737
# pass # xxx left
570
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
738
#elif key == "ctrl f" or key == "meta )" or key == "l":
571
739
# pass # xxx right
572
#elif key == u"a":
740
#elif key == "a":
573
741
# pass # scroll up log
574
#elif key == u"z":
742
#elif key == "z":
575
743
# pass # scroll down log
576
744
elif self.topwidget.selectable():
577
745
self.topwidget.keypress(self.size, key)
581
749
ui = UserInterface()
582
750
try:
583
751
ui.run()
752
except KeyboardInterrupt:
753
ui.screen.stop()
584
754
except Exception, e:
585
755
ui.log_message(unicode(e))
586
756
ui.screen.stop()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0