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.154
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.154
- Committer: Björn Påhlsson
- Date: 2010-09-04 13:31:36 UTC
- mfrom: (24.2.5 mandos-multiprocessing)
- mto: (237.4.3 mandos-release)
- mto: This revision was merged to the branch mainline in revision 421.
- Revision ID: belorn@fukt.bsnet.se-20100904133136-vhn6gxmunefopx3c
merge
new approve/deny functionallity in mandos-monitor
new approve/deny functionallity in mandos-monitor
- files added:
- plugins.d/plymouth
- 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
62
40
urwid.curses_display.curses.A_UNDERLINE |= (
63
41
urwid.curses_display.curses.A_BLINK)
64
42
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
81
43
class MandosClientPropertyCache(object):
82
44
"""This wraps a Mandos Client D-Bus proxy object, caches the
83
45
properties and calls a hook function when any of them are
87
49
self.proxy = proxy_object # Mandos Client proxy object
88
50
89
51
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))
52
self.proxy.connect_to_signal(u"PropertyChanged",
53
self.property_changed,
54
client_interface,
55
byte_arrays=True)
95
56
96
57
self.properties.update(
97
58
self.proxy.GetAll(client_interface,
98
59
dbus_interface = dbus.PROPERTIES_IFACE))
99
60
100
#XXX This breaks good super behaviour
61
#XXX This break good super behaviour!
101
62
# super(MandosClientPropertyCache, self).__init__(
102
63
# *args, **kwargs)
103
64
107
68
"""
108
69
# Update properties dict with new value
109
70
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
71
116
72
117
73
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
129
85
# Logger
130
86
self.logger = logger
131
87
132
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
self.last_checker_failed = False
135
136
88
# The widget shown normally
137
self._text_widget = urwid.Text("")
89
self._text_widget = urwid.Text(u"")
138
90
# The widget shown when we have focus
139
self._focus_text_widget = urwid.Text("")
91
self._focus_text_widget = urwid.Text(u"")
140
92
super(MandosClientWidget, self).__init__(
141
93
update_hook=update_hook, delete_hook=delete_hook,
142
94
*args, **kwargs)
143
95
self.update()
144
96
self.opened = False
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
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)
209
117
210
118
def checker_completed(self, exitstatus, condition, command):
211
119
if exitstatus == 0:
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()
120
#self.logger(u'Checker for client %s (command "%s")'
121
# u' was successful'
122
# % (self.properties[u"name"], command))
219
123
return
220
# Checker failed
221
if not self.last_checker_failed:
222
self.last_checker_failed = True
223
self.using_timer(True)
224
124
if os.WIFEXITED(condition):
225
self.logger('Checker for client %s (command "%s")'
226
' failed with exit code %s'
227
% (self.properties["Name"], command,
125
self.logger(u'Checker for client %s (command "%s")'
126
u' failed with exit code %s'
127
% (self.properties[u"name"], command,
228
128
os.WEXITSTATUS(condition)))
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,
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,
233
134
os.WTERMSIG(condition)))
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()
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')
242
141
243
142
def checker_started(self, command):
244
#self.logger('Client %s started checker "%s"'
245
# % (self.properties["Name"], unicode(command)))
143
#self.logger(u'Client %s started checker "%s"'
144
# % (self.properties[u"name"], unicode(command)))
246
145
pass
247
146
248
147
def got_secret(self):
249
self.last_checker_failed = False
250
self.logger('Client %s received its secret'
251
% self.properties["Name"])
148
self.logger(u'Client %s received its secret'
149
% self.properties[u"name"])
252
150
253
151
def need_approval(self, timeout, default):
254
152
if not default:
255
message = 'Client %s needs approval within %s seconds'
153
message = u'Client %s needs approval within %s seconds'
256
154
else:
257
message = 'Client %s will get its secret in %s seconds'
155
message = u'Client %s will get its secret in %s seconds'
258
156
self.logger(message
259
% (self.properties["Name"], timeout/1000))
260
self.using_timer(True)
157
% (self.properties[u"name"], timeout/1000))
261
158
262
159
def rejected(self, reason):
263
self.logger('Client %s was rejected; reason: %s'
264
% (self.properties["Name"], reason))
160
self.logger(u'Client %s was rejected; reason: %s'
161
% (self.properties[u"name"], reason))
265
162
266
163
def selectable(self):
267
164
"""Make this a "selectable" widget.
268
165
This overrides the method from urwid.FlowWidget."""
269
166
return True
270
167
271
def rows(self, maxcolrow, focus=False):
168
def rows(self, (maxcol,), focus=False):
272
169
"""How many rows this widget will occupy might depend on
273
170
whether we have focus or not.
274
171
This overrides the method from urwid.FlowWidget"""
275
return self.current_widget(focus).rows(maxcolrow, focus=focus)
172
return self.current_widget(focus).rows((maxcol,), focus=focus)
276
173
277
174
def current_widget(self, focus=False):
278
175
if focus or self.opened:
282
179
def update(self):
283
180
"Called when what is visible on the screen should be updated."
284
181
# 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",
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",
291
188
}
292
189
293
190
# Rebuild focus and non-focus widgets using current properties
294
191
295
192
# 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]
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])
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?"
328
201
else:
329
message = "enabled"
330
self._text = "%s%s" % (base, message)
331
202
self._text += (u'%(enabled)s'
203
% {u"enabled":
204
(u"enabled"
205
if self.properties[u"enabled"]
206
else u"DISABLED")})
332
207
if not urwid.supports_unicode():
333
208
self._text = self._text.encode("ascii", "replace")
334
textlist = [("normal", self._text)]
209
textlist = [(u"normal", self._text)]
335
210
self._text_widget.set_text(textlist)
336
211
self._focus_text_widget.set_text([(with_standout[text[0]],
337
212
text[1])
345
220
if self.update_hook is not None:
346
221
self.update_hook()
347
222
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 = ()
223
def delete(self):
360
224
if self.delete_hook is not None:
361
225
self.delete_hook(self)
362
return super(MandosClientWidget, self).delete(*args, **kwargs)
363
226
364
def render(self, maxcolrow, focus=False):
227
def render(self, (maxcol,), focus=False):
365
228
"""Render differently if we have focus.
366
229
This overrides the method from urwid.FlowWidget"""
367
return self.current_widget(focus).render(maxcolrow,
230
return self.current_widget(focus).render((maxcol,),
368
231
focus=focus)
369
232
370
def keypress(self, maxcolrow, key):
233
def keypress(self, (maxcol,), key):
371
234
"""Handle keys.
372
235
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":
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":
380
241
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
381
dbus_interface = client_interface,
382
ignore_reply=True)
383
elif key == "d":
242
dbus_interface = client_interface)
243
elif key == u"d":
384
244
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":
245
dbus_interface = client_interface)
246
elif key == u"r" or key == u"_" or key == u"ctrl k":
388
247
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)
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)
400
255
# xxx
401
# elif key == "p" or key == "=":
256
# elif key == u"p" or key == "=":
402
257
# self.proxy.pause()
403
# elif key == "u" or key == ":":
258
# elif key == u"u" or key == ":":
404
259
# self.proxy.unpause()
405
# elif key == "RET":
260
# elif key == u"RET":
406
261
# self.open()
262
# elif key == u"+":
263
# self.proxy.Approve(True)
264
# elif key == u"-":
265
# self.proxy.Approve(False)
407
266
else:
408
267
return key
409
268
424
283
"down" key presses, thus not allowing any containing widgets to
425
284
use them as an excuse to shift focus away from this widget.
426
285
"""
427
def keypress(self, maxcolrow, key):
428
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
429
if ret in ("up", "down"):
286
def keypress(self, (maxcol, maxrow), key):
287
ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
288
if ret in (u"up", u"down"):
430
289
return
431
290
return ret
432
291
441
300
self.screen = urwid.curses_display.Screen()
442
301
443
302
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")),
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")),
461
320
))
462
321
463
322
if urwid.supports_unicode():
464
self.divider = "─" # \u2500
465
#self.divider = "━" # \u2501
323
self.divider = u"─" # \u2500
324
#self.divider = u"━" # \u2501
466
325
else:
467
#self.divider = "-" # \u002d
468
self.divider = "_" # \u005f
326
#self.divider = u"-" # \u002d
327
self.divider = u"_" # \u005f
469
328
470
329
self.screen.start()
471
330
485
344
# This keeps track of whether self.uilist currently has
486
345
# self.logbox in it or not
487
346
self.log_visible = True
488
self.log_wrap = "any"
347
self.log_wrap = u"any"
489
348
490
349
self.rebuild()
491
self.log_message_raw(("bold",
492
"Mandos Monitor version " + version))
493
self.log_message_raw(("bold",
494
"q: Quit ?: Help"))
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"))
495
354
496
355
self.busname = domain + '.Mandos'
497
356
self.main_loop = gobject.MainLoop()
498
357
self.bus = dbus.SystemBus()
499
358
mandos_dbus_objc = self.bus.get_object(
500
self.busname, "/", follow_name_owner_changes=True)
359
self.busname, u"/", follow_name_owner_changes=True)
501
360
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
502
361
dbus_interface
503
362
= server_interface)
508
367
mandos_clients = dbus.Dictionary()
509
368
510
369
(self.mandos_serv
511
.connect_to_signal("ClientRemoved",
370
.connect_to_signal(u"ClientRemoved",
512
371
self.find_and_remove_client,
513
372
dbus_interface=server_interface,
514
373
byte_arrays=True))
515
374
(self.mandos_serv
516
.connect_to_signal("ClientAdded",
375
.connect_to_signal(u"ClientAdded",
517
376
self.add_new_client,
518
377
dbus_interface=server_interface,
519
378
byte_arrays=True))
520
379
(self.mandos_serv
521
.connect_to_signal("ClientNotFound",
380
.connect_to_signal(u"ClientNotFound",
522
381
self.client_not_found,
523
382
dbus_interface=server_interface,
524
383
byte_arrays=True))
539
398
path=path)
540
399
541
400
def client_not_found(self, fingerprint, address):
542
self.log_message(("Client with address %s and fingerprint %s"
543
" could not be found" % (address,
401
self.log_message((u"Client with address %s and fingerprint %s"
402
u" could not be found" % (address,
544
403
fingerprint)))
545
404
546
405
def rebuild(self):
548
407
Call this when the widget layout needs to change"""
549
408
self.uilist = []
550
409
#self.uilist.append(urwid.ListBox(self.clients))
551
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
552
clients),
410
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
553
411
#header=urwid.Divider(),
554
412
header=None,
555
footer=
556
urwid.Divider(div_char=
557
self.divider)))
413
footer=urwid.Divider(div_char=self.divider)))
558
414
if self.log_visible:
559
415
self.uilist.append(self.logbox)
560
416
pass
562
418
563
419
def log_message(self, message):
564
420
timestamp = datetime.datetime.now().isoformat()
565
self.log_message_raw(timestamp + ": " + message)
421
self.log_message_raw(timestamp + u": " + message)
566
422
567
423
def log_message_raw(self, markup):
568
424
"""Add a log message to the log buffer."""
571
427
and len(self.log) > self.max_log_length):
572
428
del self.log[0:len(self.log)-self.max_log_length-1]
573
429
self.logbox.set_focus(len(self.logbox.body.contents),
574
coming_from="above")
430
coming_from=u"above")
575
431
self.refresh()
576
432
577
433
def toggle_log_display(self):
578
434
"""Toggle visibility of the log buffer."""
579
435
self.log_visible = not self.log_visible
580
436
self.rebuild()
581
#self.log_message("Log visibility changed to: "
582
# + unicode(self.log_visible))
437
self.log_message(u"Log visibility changed to: "
438
+ unicode(self.log_visible))
583
439
584
440
def change_log_display(self):
585
441
"""Change type of log display.
586
442
Currently, this toggles wrapping of text lines."""
587
if self.log_wrap == "clip":
588
self.log_wrap = "any"
443
if self.log_wrap == u"clip":
444
self.log_wrap = u"any"
589
445
else:
590
self.log_wrap = "clip"
446
self.log_wrap = u"clip"
591
447
for textwidget in self.log:
592
448
textwidget.set_wrap_mode(self.log_wrap)
593
#self.log_message("Wrap mode: " + self.log_wrap)
449
self.log_message(u"Wrap mode: " + self.log_wrap)
594
450
595
451
def find_and_remove_client(self, path, name):
596
"""Find a client by its object path and remove it.
452
"""Find an client from its object path and remove it.
597
453
598
454
This is connected to the ClientRemoved signal from the
599
455
Mandos server object."""
601
457
client = self.clients_dict[path]
602
458
except KeyError:
603
459
# not found?
604
self.log_message("Unknown client %r (%r) removed", name,
605
path)
606
460
return
607
client.delete()
461
self.remove_client(client, path)
608
462
609
463
def add_new_client(self, path):
610
464
client_proxy_object = self.bus.get_object(self.busname, path)
625
479
if path is None:
626
480
path = client.proxy.object_path
627
481
self.clients_dict[path] = client
628
self.clients.sort(None, lambda c: c.properties["Name"])
482
self.clients.sort(None, lambda c: c.properties[u"name"])
629
483
self.refresh()
630
484
631
485
def remove_client(self, client, path=None):
662
516
663
517
def process_input(self, source, condition):
664
518
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
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
674
528
}
675
529
for key in keys:
676
530
try:
678
532
except KeyError: # :-)
679
533
pass
680
534
681
if key == "q" or key == "Q":
535
if key == u"q" or key == u"Q":
682
536
self.stop()
683
537
break
684
elif key == "window resize":
538
elif key == u"window resize":
685
539
self.size = self.screen.get_cols_rows()
686
540
self.refresh()
687
elif key == "\f": # Ctrl-L
541
elif key == u"\f": # Ctrl-L
688
542
self.refresh()
689
elif key == "l" or key == "D":
543
elif key == u"l" or key == u"D":
690
544
self.toggle_log_display()
691
545
self.refresh()
692
elif key == "w" or key == "i":
546
elif key == u"w" or key == u"i":
693
547
self.change_log_display()
694
548
self.refresh()
695
elif key == "?" or key == "f1" or key == "esc":
549
elif key == u"?" or key == u"f1" or key == u"esc":
696
550
if not self.log_visible:
697
551
self.log_visible = True
698
552
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"))))
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"))))
717
571
self.refresh()
718
elif key == "tab":
572
elif key == u"tab":
719
573
if self.topwidget.get_focus() is self.logbox:
720
574
self.topwidget.set_focus(0)
721
575
else:
722
576
self.topwidget.set_focus(self.logbox)
723
577
self.refresh()
724
#elif (key == "end" or key == "meta >" or key == "G"
725
# or key == ">"):
578
#elif (key == u"end" or key == u"meta >" or key == u"G"
579
# or key == u">"):
726
580
# pass # xxx end-of-buffer
727
#elif (key == "home" or key == "meta <" or key == "g"
728
# or key == "<"):
581
#elif (key == u"home" or key == u"meta <" or key == u"g"
582
# or key == u"<"):
729
583
# pass # xxx beginning-of-buffer
730
#elif key == "ctrl e" or key == "$":
584
#elif key == u"ctrl e" or key == u"$":
731
585
# pass # xxx move-end-of-line
732
#elif key == "ctrl a" or key == "^":
586
#elif key == u"ctrl a" or key == u"^":
733
587
# pass # xxx move-beginning-of-line
734
#elif key == "ctrl b" or key == "meta (" or key == "h":
588
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
735
589
# pass # xxx left
736
#elif key == "ctrl f" or key == "meta )" or key == "l":
590
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
737
591
# pass # xxx right
738
#elif key == "a":
592
#elif key == u"a":
739
593
# pass # scroll up log
740
#elif key == "z":
594
#elif key == u"z":
741
595
# pass # scroll down log
742
596
elif self.topwidget.selectable():
743
597
self.topwidget.keypress(self.size, key)
747
601
ui = UserInterface()
748
602
try:
749
603
ui.run()
750
except KeyboardInterrupt:
751
ui.screen.stop()
752
604
except Exception, e:
753
605
ui.log_message(unicode(e))
754
606
ui.screen.stop()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0