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 237.2.173
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.173
- Committer: Teddy Hogeborn
- Date: 2009-11-19 18:31:28 UTC
- mto: (24.1.146 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.
- 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@recompile.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
41
19
42
20
import UserList
43
21
44
import locale
45
46
locale.setlocale(locale.LC_ALL, '')
47
48
import logging
49
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
51
22
# Some useful constants
52
domain = 'se.recompile'
23
domain = 'se.bsnet.fukt'
53
24
server_interface = domain + '.Mandos'
54
25
client_interface = domain + '.Mandos.Client'
55
version = "1.4.1"
26
version = "1.0.14"
56
27
57
28
# Always run in monochrome mode
58
29
urwid.curses_display.curses.has_colors = lambda : False
62
33
urwid.curses_display.curses.A_UNDERLINE |= (
63
34
urwid.curses_display.curses.A_BLINK)
64
35
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
36
class MandosClientPropertyCache(object):
82
37
"""This wraps a Mandos Client D-Bus proxy object, caches the
83
38
properties and calls a hook function when any of them are
84
39
changed.
85
40
"""
86
def __init__(self, proxy_object=None, *args, **kwargs):
41
def __init__(self, proxy_object=None, properties=None, *args,
42
**kwargs):
87
43
self.proxy = proxy_object # Mandos Client proxy object
88
44
89
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))
45
if properties is None:
46
self.properties = dict()
47
else:
48
self.properties = properties
49
self.proxy.connect_to_signal(u"PropertyChanged",
50
self.property_changed,
51
client_interface,
52
byte_arrays=True)
95
53
96
self.properties.update(
97
self.proxy.GetAll(client_interface,
98
dbus_interface = dbus.PROPERTIES_IFACE))
99
100
#XXX This breaks good super behaviour
101
# super(MandosClientPropertyCache, self).__init__(
102
# *args, **kwargs)
54
if properties is None:
55
self.properties.update(self.proxy.GetAll(client_interface,
56
dbus_interface =
57
dbus.PROPERTIES_IFACE))
58
super(MandosClientPropertyCache, self).__init__(
59
proxy_object=proxy_object,
60
properties=properties, *args, **kwargs)
103
61
104
62
def property_changed(self, property=None, value=None):
105
63
"""This is called whenever we get a PropertyChanged signal
107
65
"""
108
66
# Update properties dict with new value
109
67
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
68
116
69
117
70
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
129
82
# Logger
130
83
self.logger = logger
131
84
132
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
self.last_checker_failed = False
135
136
85
# The widget shown normally
137
self._text_widget = urwid.Text("")
86
self._text_widget = urwid.Text(u"")
138
87
# The widget shown when we have focus
139
self._focus_text_widget = urwid.Text("")
88
self._focus_text_widget = urwid.Text(u"")
140
89
super(MandosClientWidget, self).__init__(
141
90
update_hook=update_hook, delete_hook=delete_hook,
142
91
*args, **kwargs)
143
92
self.update()
144
93
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
# 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
94
self.proxy.connect_to_signal(u"CheckerCompleted",
95
self.checker_completed,
96
client_interface,
97
byte_arrays=True)
98
self.proxy.connect_to_signal(u"CheckerStarted",
99
self.checker_started,
100
client_interface,
101
byte_arrays=True)
102
self.proxy.connect_to_signal(u"GotSecret",
103
self.got_secret,
104
client_interface,
105
byte_arrays=True)
106
self.proxy.connect_to_signal(u"Rejected",
107
self.rejected,
108
client_interface,
109
byte_arrays=True)
210
110
211
111
def checker_completed(self, exitstatus, condition, command):
212
112
if exitstatus == 0:
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()
113
self.logger(u'Checker for client %s (command "%s")'
114
u' was successful'
115
% (self.properties[u"name"], command))
220
116
return
221
# Checker failed
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
225
117
if os.WIFEXITED(condition):
226
self.logger('Checker for client %s (command "%s")'
227
' failed with exit code %s'
228
% (self.properties["Name"], command,
118
self.logger(u'Checker for client %s (command "%s")'
119
u' failed with exit code %s'
120
% (self.properties[u"name"], command,
229
121
os.WEXITSTATUS(condition)))
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,
122
return
123
if os.WIFSIGNALED(condition):
124
self.logger(u'Checker for client %s (command "%s")'
125
u' was killed by signal %s'
126
% (self.properties[u"name"], command,
234
127
os.WTERMSIG(condition)))
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()
128
return
129
if os.WCOREDUMP(condition):
130
self.logger(u'Checker for client %s (command "%s")'
131
u' dumped core'
132
% (self.properties[u"name"], command))
133
self.logger(u'Checker for client %s completed mysteriously')
243
134
244
135
def checker_started(self, command):
245
#self.logger('Client %s started checker "%s"'
246
# % (self.properties["Name"], unicode(command)))
247
pass
136
self.logger(u'Client %s started checker "%s"'
137
% (self.properties[u"name"], unicode(command)))
248
138
249
139
def got_secret(self):
250
self.last_checker_failed = False
251
self.logger('Client %s received its secret'
252
% self.properties["Name"])
253
254
def need_approval(self, timeout, default):
255
if not default:
256
message = 'Client %s needs approval within %s seconds'
257
else:
258
message = 'Client %s will get its secret in %s seconds'
259
self.logger(message
260
% (self.properties["Name"], timeout/1000))
261
self.using_timer(True)
262
263
def rejected(self, reason):
264
self.logger('Client %s was rejected; reason: %s'
265
% (self.properties["Name"], reason))
140
self.logger(u'Client %s received its secret'
141
% self.properties[u"name"])
142
143
def rejected(self):
144
self.logger(u'Client %s was rejected'
145
% self.properties[u"name"])
266
146
267
147
def selectable(self):
268
148
"""Make this a "selectable" widget.
269
149
This overrides the method from urwid.FlowWidget."""
270
150
return True
271
151
272
def rows(self, maxcolrow, focus=False):
152
def rows(self, (maxcol,), focus=False):
273
153
"""How many rows this widget will occupy might depend on
274
154
whether we have focus or not.
275
155
This overrides the method from urwid.FlowWidget"""
276
return self.current_widget(focus).rows(maxcolrow, focus=focus)
156
return self.current_widget(focus).rows((maxcol,), focus=focus)
277
157
278
158
def current_widget(self, focus=False):
279
159
if focus or self.opened:
283
163
def update(self):
284
164
"Called when what is visible on the screen should be updated."
285
165
# How to add standout mode to a style
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",
166
with_standout = { u"normal": u"standout",
167
u"bold": u"bold-standout",
168
u"underline-blink":
169
u"underline-blink-standout",
170
u"bold-underline-blink":
171
u"bold-underline-blink-standout",
292
172
}
293
173
294
174
# Rebuild focus and non-focus widgets using current properties
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
175
self._text = (u'%(name)s: %(enabled)s'
176
% { u"name": self.properties[u"name"],
177
u"enabled":
178
(u"enabled"
179
if self.properties[u"enabled"]
180
else u"DISABLED")})
333
181
if not urwid.supports_unicode():
334
182
self._text = self._text.encode("ascii", "replace")
335
textlist = [("normal", self._text)]
183
textlist = [(u"normal", self._text)]
336
184
self._text_widget.set_text(textlist)
337
185
self._focus_text_widget.set_text([(with_standout[text[0]],
338
186
text[1])
346
194
if self.update_hook is not None:
347
195
self.update_hook()
348
196
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 = ()
197
def delete(self):
362
198
if self.delete_hook is not None:
363
199
self.delete_hook(self)
364
return super(MandosClientWidget, self).delete(*args, **kwargs)
365
200
366
def render(self, maxcolrow, focus=False):
201
def render(self, (maxcol,), focus=False):
367
202
"""Render differently if we have focus.
368
203
This overrides the method from urwid.FlowWidget"""
369
return self.current_widget(focus).render(maxcolrow,
204
return self.current_widget(focus).render((maxcol,),
370
205
focus=focus)
371
206
372
def keypress(self, maxcolrow, key):
207
def keypress(self, (maxcol,), key):
373
208
"""Handle keys.
374
209
This overrides the method from urwid.FlowWidget"""
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":
210
if key == u"e" or key == u"+":
211
self.proxy.Enable()
212
elif key == u"d" or key == u"-":
213
self.proxy.Disable()
214
elif key == u"r" or key == u"_" or key == u"ctrl k":
390
215
self.server_proxy_object.RemoveClient(self.proxy
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)
216
.object_path)
217
elif key == u"s":
218
self.proxy.StartChecker()
219
elif key == u"S":
220
self.proxy.StopChecker()
221
elif key == u"C":
222
self.proxy.CheckedOK()
402
223
# xxx
403
# elif key == "p" or key == "=":
224
# elif key == u"p" or key == "=":
404
225
# self.proxy.pause()
405
# elif key == "u" or key == ":":
226
# elif key == u"u" or key == ":":
406
227
# self.proxy.unpause()
407
# elif key == "RET":
228
# elif key == u"RET":
408
229
# self.open()
409
230
else:
410
231
return key
426
247
"down" key presses, thus not allowing any containing widgets to
427
248
use them as an excuse to shift focus away from this widget.
428
249
"""
429
def keypress(self, maxcolrow, key):
430
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
431
if ret in ("up", "down"):
250
def keypress(self, (maxcol, maxrow), key):
251
ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
252
if ret in (u"up", u"down"):
432
253
return
433
254
return ret
434
255
443
264
self.screen = urwid.curses_display.Screen()
444
265
445
266
self.screen.register_palette((
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")),
267
(u"normal",
268
u"default", u"default", None),
269
(u"bold",
270
u"default", u"default", u"bold"),
271
(u"underline-blink",
272
u"default", u"default", u"underline"),
273
(u"standout",
274
u"default", u"default", u"standout"),
275
(u"bold-underline-blink",
276
u"default", u"default", (u"bold", u"underline")),
277
(u"bold-standout",
278
u"default", u"default", (u"bold", u"standout")),
279
(u"underline-blink-standout",
280
u"default", u"default", (u"underline", u"standout")),
281
(u"bold-underline-blink-standout",
282
u"default", u"default", (u"bold", u"underline",
283
u"standout")),
463
284
))
464
285
465
286
if urwid.supports_unicode():
466
self.divider = "─" # \u2500
467
#self.divider = "━" # \u2501
287
self.divider = u"─" # \u2500
288
#self.divider = u"━" # \u2501
468
289
else:
469
#self.divider = "-" # \u002d
470
self.divider = "_" # \u005f
290
#self.divider = u"-" # \u002d
291
self.divider = u"_" # \u005f
471
292
472
293
self.screen.start()
473
294
487
308
# This keeps track of whether self.uilist currently has
488
309
# self.logbox in it or not
489
310
self.log_visible = True
490
self.log_wrap = "any"
311
self.log_wrap = u"any"
491
312
492
313
self.rebuild()
493
self.log_message_raw(("bold",
494
"Mandos Monitor version " + version))
495
self.log_message_raw(("bold",
496
"q: Quit ?: Help"))
314
self.log_message_raw((u"bold",
315
u"Mandos Monitor version " + version))
316
self.log_message_raw((u"bold",
317
u"q: Quit ?: Help"))
497
318
498
319
self.busname = domain + '.Mandos'
499
320
self.main_loop = gobject.MainLoop()
500
321
self.bus = dbus.SystemBus()
501
322
mandos_dbus_objc = self.bus.get_object(
502
self.busname, "/", follow_name_owner_changes=True)
323
self.busname, u"/", follow_name_owner_changes=True)
503
324
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
504
325
dbus_interface
505
326
= server_interface)
510
331
mandos_clients = dbus.Dictionary()
511
332
512
333
(self.mandos_serv
513
.connect_to_signal("ClientRemoved",
334
.connect_to_signal(u"ClientRemoved",
514
335
self.find_and_remove_client,
515
336
dbus_interface=server_interface,
516
337
byte_arrays=True))
517
338
(self.mandos_serv
518
.connect_to_signal("ClientAdded",
339
.connect_to_signal(u"ClientAdded",
519
340
self.add_new_client,
520
341
dbus_interface=server_interface,
521
342
byte_arrays=True))
522
343
(self.mandos_serv
523
.connect_to_signal("ClientNotFound",
344
.connect_to_signal(u"ClientNotFound",
524
345
self.client_not_found,
525
346
dbus_interface=server_interface,
526
347
byte_arrays=True))
541
362
path=path)
542
363
543
364
def client_not_found(self, fingerprint, address):
544
self.log_message(("Client with address %s and fingerprint %s"
545
" could not be found" % (address,
365
self.log_message((u"Client with address %s and fingerprint %s"
366
u" could not be found" % (address,
546
367
fingerprint)))
547
368
548
369
def rebuild(self):
550
371
Call this when the widget layout needs to change"""
551
372
self.uilist = []
552
373
#self.uilist.append(urwid.ListBox(self.clients))
553
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
554
clients),
374
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
555
375
#header=urwid.Divider(),
556
376
header=None,
557
footer=
558
urwid.Divider(div_char=
559
self.divider)))
377
footer=urwid.Divider(div_char=self.divider)))
560
378
if self.log_visible:
561
379
self.uilist.append(self.logbox)
562
380
pass
564
382
565
383
def log_message(self, message):
566
384
timestamp = datetime.datetime.now().isoformat()
567
self.log_message_raw(timestamp + ": " + message)
385
self.log_message_raw(timestamp + u": " + message)
568
386
569
387
def log_message_raw(self, markup):
570
388
"""Add a log message to the log buffer."""
573
391
and len(self.log) > self.max_log_length):
574
392
del self.log[0:len(self.log)-self.max_log_length-1]
575
393
self.logbox.set_focus(len(self.logbox.body.contents),
576
coming_from="above")
394
coming_from=u"above")
577
395
self.refresh()
578
396
579
397
def toggle_log_display(self):
580
398
"""Toggle visibility of the log buffer."""
581
399
self.log_visible = not self.log_visible
582
400
self.rebuild()
583
#self.log_message("Log visibility changed to: "
584
# + unicode(self.log_visible))
401
self.log_message(u"Log visibility changed to: "
402
+ unicode(self.log_visible))
585
403
586
404
def change_log_display(self):
587
405
"""Change type of log display.
588
406
Currently, this toggles wrapping of text lines."""
589
if self.log_wrap == "clip":
590
self.log_wrap = "any"
407
if self.log_wrap == u"clip":
408
self.log_wrap = u"any"
591
409
else:
592
self.log_wrap = "clip"
410
self.log_wrap = u"clip"
593
411
for textwidget in self.log:
594
412
textwidget.set_wrap_mode(self.log_wrap)
595
#self.log_message("Wrap mode: " + self.log_wrap)
413
self.log_message(u"Wrap mode: " + self.log_wrap)
596
414
597
415
def find_and_remove_client(self, path, name):
598
"""Find a client by its object path and remove it.
416
"""Find an client from its object path and remove it.
599
417
600
418
This is connected to the ClientRemoved signal from the
601
419
Mandos server object."""
603
421
client = self.clients_dict[path]
604
422
except KeyError:
605
423
# not found?
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
608
424
return
609
client.delete()
425
self.remove_client(client, path)
610
426
611
def add_new_client(self, path):
427
def add_new_client(self, path, properties):
612
428
client_proxy_object = self.bus.get_object(self.busname, path)
613
429
self.add_client(MandosClientWidget(server_proxy_object
614
430
=self.mandos_serv,
615
431
proxy_object
616
432
=client_proxy_object,
433
properties=properties,
617
434
update_hook
618
435
=self.refresh,
619
436
delete_hook
620
=self.remove_client,
621
logger
622
=self.log_message),
437
=self.remove_client),
623
438
path=path)
624
439
625
440
def add_client(self, client, path=None):
627
442
if path is None:
628
443
path = client.proxy.object_path
629
444
self.clients_dict[path] = client
630
self.clients.sort(None, lambda c: c.properties["Name"])
445
self.clients.sort(None, lambda c: c.properties[u"name"])
631
446
self.refresh()
632
447
633
448
def remove_client(self, client, path=None):
664
479
665
480
def process_input(self, source, condition):
666
481
keys = self.screen.get_input()
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
482
translations = { u"ctrl n": u"down", # Emacs
483
u"ctrl p": u"up", # Emacs
484
u"ctrl v": u"page down", # Emacs
485
u"meta v": u"page up", # Emacs
486
u" ": u"page down", # less
487
u"f": u"page down", # less
488
u"b": u"page up", # less
489
u"j": u"down", # vi
490
u"k": u"up", # vi
676
491
}
677
492
for key in keys:
678
493
try:
680
495
except KeyError: # :-)
681
496
pass
682
497
683
if key == "q" or key == "Q":
498
if key == u"q" or key == u"Q":
684
499
self.stop()
685
500
break
686
elif key == "window resize":
501
elif key == u"window resize":
687
502
self.size = self.screen.get_cols_rows()
688
503
self.refresh()
689
elif key == "\f": # Ctrl-L
504
elif key == u"\f": # Ctrl-L
690
505
self.refresh()
691
elif key == "l" or key == "D":
506
elif key == u"l" or key == u"D":
692
507
self.toggle_log_display()
693
508
self.refresh()
694
elif key == "w" or key == "i":
509
elif key == u"w" or key == u"i":
695
510
self.change_log_display()
696
511
self.refresh()
697
elif key == "?" or key == "f1" or key == "esc":
512
elif key == u"?" or key == u"f1" or key == u"esc":
698
513
if not self.log_visible:
699
514
self.log_visible = True
700
515
self.rebuild()
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"))))
516
self.log_message_raw((u"bold",
517
u" ".
518
join((u"q: Quit",
519
u"?: Help",
520
u"l: Log window toggle",
521
u"TAB: Switch window",
522
u"w: Wrap (log)"))))
523
self.log_message_raw((u"bold",
524
u" "
525
.join((u"Clients:",
526
u"e: Enable",
527
u"d: Disable",
528
u"r: Remove",
529
u"s: Start new checker",
530
u"S: Stop checker",
531
u"C: Checker OK"))))
719
532
self.refresh()
720
elif key == "tab":
533
elif key == u"tab":
721
534
if self.topwidget.get_focus() is self.logbox:
722
535
self.topwidget.set_focus(0)
723
536
else:
724
537
self.topwidget.set_focus(self.logbox)
725
538
self.refresh()
726
#elif (key == "end" or key == "meta >" or key == "G"
727
# or key == ">"):
539
#elif (key == u"end" or key == u"meta >" or key == u"G"
540
# or key == u">"):
728
541
# pass # xxx end-of-buffer
729
#elif (key == "home" or key == "meta <" or key == "g"
730
# or key == "<"):
542
#elif (key == u"home" or key == u"meta <" or key == u"g"
543
# or key == u"<"):
731
544
# pass # xxx beginning-of-buffer
732
#elif key == "ctrl e" or key == "$":
545
#elif key == u"ctrl e" or key == u"$":
733
546
# pass # xxx move-end-of-line
734
#elif key == "ctrl a" or key == "^":
547
#elif key == u"ctrl a" or key == u"^":
735
548
# pass # xxx move-beginning-of-line
736
#elif key == "ctrl b" or key == "meta (" or key == "h":
549
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
737
550
# pass # xxx left
738
#elif key == "ctrl f" or key == "meta )" or key == "l":
551
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
739
552
# pass # xxx right
740
#elif key == "a":
553
#elif key == u"a":
741
554
# pass # scroll up log
742
#elif key == "z":
555
#elif key == u"z":
743
556
# pass # scroll down log
744
557
elif self.topwidget.selectable():
745
558
self.topwidget.keypress(self.size, key)
749
562
ui = UserInterface()
750
563
try:
751
564
ui.run()
752
except KeyboardInterrupt:
753
ui.screen.stop()
754
except Exception, e:
755
ui.log_message(unicode(e))
565
except:
756
566
ui.screen.stop()
757
567
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0