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