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.7.290
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.290
- Committer: Teddy Hogeborn
- Date: 2015-03-10 18:03:38 UTC
- mto: (237.7.304 trunk)
- mto: This revision was merged to the branch mainline in revision 325.
- Revision ID: teddy@recompile.se-20150310180338-pcxw6r2qmw9k6br9
Add ":!RSA" to GnuTLS priority string, to disallow non-DHE kx.
If Mandos was somehow made to use a non-ephemeral Diffie-Hellman key
exchange algorithm in the TLS handshake, any saved network traffic
could then be decrypted later if the Mandos client key was obtained.
By default, Mandos uses ephemeral DH key exchanges which does not have
this problem, but a non-ephemeral key exchange algorithm was still
enabled by default. The simplest solution is to simply turn that off,
which ensures that Mandos will always use ephemeral DH key exchanges.
There is a "PFS" priority string specifier, but we can't use it because:
1. Security-wise, it is a mix between "NORMAL" and "SECURE128" - it
enables a lot more algorithms than "SECURE256".
2. It is only available since GnuTLS 3.2.4.
Thanks to Andreas Fischer <af@bantuX.org> for reporting this issue.
If Mandos was somehow made to use a non-ephemeral Diffie-Hellman key
exchange algorithm in the TLS handshake, any saved network traffic
could then be decrypted later if the Mandos client key was obtained.
By default, Mandos uses ephemeral DH key exchanges which does not have
this problem, but a non-ephemeral key exchange algorithm was still
enabled by default. The simplest solution is to simply turn that off,
which ensures that Mandos will always use ephemeral DH key exchanges.
There is a "PFS" priority string specifier, but we can't use it because:
1. Security-wise, it is a mix between "NORMAL" and "SECURE128" - it
enables a lot more algorithms than "SECURE256".
2. It is only available since GnuTLS 3.2.4.
Thanks to Andreas Fischer <af@bantuX.org> for reporting this issue.
- files added:
- debian/mandos-client.examples
- debian/upstream
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-monitor
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2009-2011 Teddy Hogeborn
7
# Copyright © 2009-2011 Björn Påhlsson
6
# Copyright © 2009-2014 Teddy Hogeborn
7
# Copyright © 2009-2014 Björn Påhlsson
8
8
#
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
17
17
# GNU General Public License for more details.
18
18
#
19
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/>.
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
21
22
#
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
# Contact the authors at <mandos@recompile.se>.
23
24
#
24
25
25
26
from __future__ import (division, absolute_import, print_function,
26
27
unicode_literals)
28
try:
29
from future_builtins import *
30
except ImportError:
31
pass
27
32
28
33
import sys
29
34
import os
30
import signal
31
35
32
36
import datetime
33
37
35
39
import urwid
36
40
37
41
from dbus.mainloop.glib import DBusGMainLoop
38
import gobject
42
try:
43
import gobject
44
except ImportError:
45
from gi.repository import GObject as gobject
39
46
40
47
import dbus
41
48
42
import UserList
43
44
49
import locale
45
50
51
if sys.version_info.major == 2:
52
str = unicode
53
46
54
locale.setlocale(locale.LC_ALL, '')
47
55
48
56
import logging
49
57
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
58
51
59
# Some useful constants
52
domain = 'se.bsnet.fukt'
60
domain = 'se.recompile'
53
61
server_interface = domain + '.Mandos'
54
62
client_interface = domain + '.Mandos.Client'
55
version = "1.3.1"
56
57
# Always run in monochrome mode
58
urwid.curses_display.curses.has_colors = lambda : False
59
60
# Urwid doesn't support blinking, but we want it. Since we have no
61
# use for underline on its own, we make underline also always blink.
62
urwid.curses_display.curses.A_UNDERLINE |= (
63
urwid.curses_display.curses.A_BLINK)
63
version = "1.6.9"
64
64
65
65
def isoformat_to_datetime(iso):
66
66
"Parse an ISO 8601 date string to a datetime.datetime()"
83
83
properties and calls a hook function when any of them are
84
84
changed.
85
85
"""
86
def __init__(self, proxy_object=None, *args, **kwargs):
86
def __init__(self, proxy_object=None, properties=None, **kwargs):
87
87
self.proxy = proxy_object # Mandos Client proxy object
88
89
self.properties = dict()
88
self.properties = dict() if properties is None else properties
90
89
self.property_changed_match = (
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
93
client_interface,
90
self.proxy.connect_to_signal("PropertiesChanged",
91
self.properties_changed,
92
dbus.PROPERTIES_IFACE,
94
93
byte_arrays=True))
95
94
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)
95
if properties is None:
96
self.properties.update(
97
self.proxy.GetAll(client_interface,
98
dbus_interface
99
= dbus.PROPERTIES_IFACE))
100
101
super(MandosClientPropertyCache, self).__init__(**kwargs)
103
102
104
def property_changed(self, property=None, value=None):
105
"""This is called whenever we get a PropertyChanged signal
106
It updates the changed property in the "properties" dict.
103
def properties_changed(self, interface, properties, invalidated):
104
"""This is called whenever we get a PropertiesChanged signal
105
It updates the changed properties in the "properties" dict.
107
106
"""
108
107
# Update properties dict with new value
109
self.properties[property] = value
108
self.properties.update(properties)
110
109
111
def delete(self, *args, **kwargs):
110
def delete(self):
112
111
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
114
*args, **kwargs)
115
112
116
113
117
114
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
116
"""
120
117
121
118
def __init__(self, server_proxy_object=None, update_hook=None,
122
delete_hook=None, logger=None, *args, **kwargs):
119
delete_hook=None, logger=None, **kwargs):
123
120
# Called on update
124
121
self.update_hook = update_hook
125
122
# Called on delete
130
127
self.logger = logger
131
128
132
129
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
self.last_checker_failed = False
135
130
136
131
# The widget shown normally
137
132
self._text_widget = urwid.Text("")
138
133
# The widget shown when we have focus
139
134
self._focus_text_widget = urwid.Text("")
140
super(MandosClientWidget, self).__init__(
141
update_hook=update_hook, delete_hook=delete_hook,
142
*args, **kwargs)
135
super(MandosClientWidget, self).__init__(**kwargs)
143
136
self.update()
144
137
self.opened = False
145
138
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
139
self.match_objects = (
165
140
self.proxy.connect_to_signal("CheckerCompleted",
166
141
self.checker_completed,
182
157
self.rejected,
183
158
client_interface,
184
159
byte_arrays=True))
185
#self.logger('Created client %s' % (self.properties["Name"]))
160
self.logger('Created client {}'
161
.format(self.properties["Name"]), level=0)
186
162
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
163
def using_timer(self, flag):
194
164
"""Call this method with True or False when timer should be
195
165
activated or deactivated.
196
166
"""
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:
167
if flag and self._update_timer_callback_tag is None:
168
# Will update the shown timer value every second
203
169
self._update_timer_callback_tag = (gobject.timeout_add
204
170
(1000,
205
171
self.update_timer))
206
elif old and self._update_timer_callback_lock == 0:
172
elif not (flag or self._update_timer_callback_tag is None):
207
173
gobject.source_remove(self._update_timer_callback_tag)
208
174
self._update_timer_callback_tag = None
209
175
210
176
def checker_completed(self, exitstatus, condition, command):
211
177
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))
178
self.logger('Checker for client {} (command "{}")'
179
' succeeded'.format(self.properties["Name"],
180
command), level=0)
218
181
self.update()
219
182
return
220
183
# Checker failed
221
if not self.last_checker_failed:
222
self.last_checker_failed = True
223
self.using_timer(True)
224
184
if os.WIFEXITED(condition):
225
self.logger('Checker for client %s (command "%s")'
226
' failed with exit code %s'
227
% (self.properties["Name"], command,
228
os.WEXITSTATUS(condition)))
185
self.logger('Checker for client {} (command "{}") failed'
186
' with exit code {}'
187
.format(self.properties["Name"], command,
188
os.WEXITSTATUS(condition)))
229
189
elif os.WIFSIGNALED(condition):
230
self.logger('Checker for client %s (command "%s")'
231
' was killed by signal %s'
232
% (self.properties["Name"], command,
233
os.WTERMSIG(condition)))
190
self.logger('Checker for client {} (command "{}") was'
191
' killed by signal {}'
192
.format(self.properties["Name"], command,
193
os.WTERMSIG(condition)))
234
194
elif os.WCOREDUMP(condition):
235
self.logger('Checker for client %s (command "%s")'
236
' dumped core'
237
% (self.properties["Name"], command))
195
self.logger('Checker for client {} (command "{}") dumped'
196
' core'.format(self.properties["Name"],
197
command))
238
198
else:
239
self.logger('Checker for client %s completed'
240
' mysteriously')
199
self.logger('Checker for client {} completed'
200
' mysteriously'
201
.format(self.properties["Name"]))
241
202
self.update()
242
203
243
204
def checker_started(self, command):
244
#self.logger('Client %s started checker "%s"'
245
# % (self.properties["Name"], unicode(command)))
246
pass
205
"""Server signals that a checker started."""
206
self.logger('Client {} started checker "{}"'
207
.format(self.properties["Name"],
208
command), level=0)
247
209
248
210
def got_secret(self):
249
self.last_checker_failed = False
250
self.logger('Client %s received its secret'
251
% self.properties["Name"])
211
self.logger('Client {} received its secret'
212
.format(self.properties["Name"]))
252
213
253
214
def need_approval(self, timeout, default):
254
215
if not default:
255
message = 'Client %s needs approval within %s seconds'
216
message = 'Client {} needs approval within {} seconds'
256
217
else:
257
message = 'Client %s will get its secret in %s seconds'
258
self.logger(message
259
% (self.properties["Name"], timeout/1000))
260
self.using_timer(True)
218
message = 'Client {} will get its secret in {} seconds'
219
self.logger(message.format(self.properties["Name"],
220
timeout/1000))
261
221
262
222
def rejected(self, reason):
263
self.logger('Client %s was rejected; reason: %s'
264
% (self.properties["Name"], reason))
223
self.logger('Client {} was rejected; reason: {}'
224
.format(self.properties["Name"], reason))
265
225
266
226
def selectable(self):
267
227
"""Make this a "selectable" widget.
289
249
"bold-underline-blink":
290
250
"bold-underline-blink-standout",
291
251
}
292
252
293
253
# Rebuild focus and non-focus widgets using current properties
294
254
295
255
# Base part of a client. Name!
296
base = ('%(name)s: '
297
% {"name": self.properties["Name"]})
256
base = '{name}: '.format(name=self.properties["Name"])
298
257
if not self.properties["Enabled"]:
299
258
message = "DISABLED"
259
self.using_timer(False)
300
260
elif self.properties["ApprovalPending"]:
301
261
timeout = datetime.timedelta(milliseconds
302
262
= self.properties
304
264
last_approval_request = isoformat_to_datetime(
305
265
self.properties["LastApprovalRequest"])
306
266
if last_approval_request is not None:
307
timer = timeout - (datetime.datetime.utcnow()
308
- last_approval_request)
267
timer = max(timeout - (datetime.datetime.utcnow()
268
- last_approval_request),
269
datetime.timedelta())
309
270
else:
310
271
timer = datetime.timedelta()
311
272
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)
273
message = "Approval in {}. (d)eny?"
274
else:
275
message = "Denial in {}. (a)pprove?"
276
message = message.format(str(timer).rsplit(".", 1)[0])
277
self.using_timer(True)
278
elif self.properties["LastCheckerStatus"] != 0:
279
# When checker has failed, show timer until client expires
280
expires = self.properties["Expires"]
281
if expires == "":
282
timer = datetime.timedelta(0)
283
else:
284
expires = (datetime.datetime.strptime
285
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
286
timer = max(expires - datetime.datetime.utcnow(),
287
datetime.timedelta())
325
288
message = ('A checker has failed! Time until client'
326
' gets disabled: %s'
327
% unicode(timer).rsplit(".", 1)[0])
289
' gets disabled: {}'
290
.format(str(timer).rsplit(".", 1)[0]))
291
self.using_timer(True)
328
292
else:
329
293
message = "enabled"
330
self._text = "%s%s" % (base, message)
331
294
self.using_timer(False)
295
self._text = "{}{}".format(base, message)
296
332
297
if not urwid.supports_unicode():
333
298
self._text = self._text.encode("ascii", "replace")
334
299
textlist = [("normal", self._text)]
346
311
self.update_hook()
347
312
348
313
def update_timer(self):
349
"called by gobject"
314
"""called by gobject. Will indefinitely loop until
315
gobject.source_remove() on tag is called"""
350
316
self.update()
351
317
return True # Keep calling this
352
318
353
def delete(self, *args, **kwargs):
319
def delete(self, **kwargs):
354
320
if self._update_timer_callback_tag is not None:
355
321
gobject.source_remove(self._update_timer_callback_tag)
356
322
self._update_timer_callback_tag = None
359
325
self.match_objects = ()
360
326
if self.delete_hook is not None:
361
327
self.delete_hook(self)
362
return super(MandosClientWidget, self).delete(*args, **kwargs)
328
return super(MandosClientWidget, self).delete(**kwargs)
363
329
364
330
def render(self, maxcolrow, focus=False):
365
331
"""Render differently if we have focus.
407
373
else:
408
374
return key
409
375
410
def property_changed(self, property=None, value=None,
411
*args, **kwargs):
412
"""Call self.update() if old value is not new value.
376
def properties_changed(self, interface, properties, invalidated):
377
"""Call self.update() if any properties changed.
413
378
This overrides the method from MandosClientPropertyCache"""
414
property_name = unicode(property)
415
old_value = self.properties.get(property_name)
416
super(MandosClientWidget, self).property_changed(
417
property=property, value=value, *args, **kwargs)
418
if self.properties.get(property_name) != old_value:
379
old_values = { key: self.properties.get(key)
380
for key in properties.keys() }
381
super(MandosClientWidget, self).properties_changed(
382
interface, properties, invalidated)
383
if any(old_values[key] != self.properties.get(key)
384
for key in old_values):
419
385
self.update()
420
386
421
387
424
390
"down" key presses, thus not allowing any containing widgets to
425
391
use them as an excuse to shift focus away from this widget.
426
392
"""
427
def keypress(self, maxcolrow, key):
428
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
393
def keypress(self, *args, **kwargs):
394
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
429
395
if ret in ("up", "down"):
430
396
return
431
397
return ret
435
401
"""This is the entire user interface - the whole screen
436
402
with boxes, lists of client widgets, etc.
437
403
"""
438
def __init__(self, max_log_length=1000):
404
def __init__(self, max_log_length=1000, log_level=1):
439
405
DBusGMainLoop(set_as_default=True)
440
406
441
407
self.screen = urwid.curses_display.Screen()
444
410
("normal",
445
411
"default", "default", None),
446
412
("bold",
447
"default", "default", "bold"),
413
"bold", "default", "bold"),
448
414
("underline-blink",
449
"default", "default", "underline"),
415
"underline,blink", "default", "underline,blink"),
450
416
("standout",
451
"default", "default", "standout"),
417
"standout", "default", "standout"),
452
418
("bold-underline-blink",
453
"default", "default", ("bold", "underline")),
419
"bold,underline,blink", "default", "bold,underline,blink"),
454
420
("bold-standout",
455
"default", "default", ("bold", "standout")),
421
"bold,standout", "default", "bold,standout"),
456
422
("underline-blink-standout",
457
"default", "default", ("underline", "standout")),
423
"underline,blink,standout", "default",
424
"underline,blink,standout"),
458
425
("bold-underline-blink-standout",
459
"default", "default", ("bold", "underline",
460
"standout")),
426
"bold,underline,blink,standout", "default",
427
"bold,underline,blink,standout"),
461
428
))
462
429
463
430
if urwid.supports_unicode():
478
445
self.log = []
479
446
self.max_log_length = max_log_length
480
447
448
self.log_level = log_level
449
481
450
# We keep a reference to the log widget so we can remove it
482
451
# from the ListWalker without it getting destroyed
483
452
self.logbox = ConstrainedListBox(self.log)
495
464
496
465
self.busname = domain + '.Mandos'
497
466
self.main_loop = gobject.MainLoop()
498
self.bus = dbus.SystemBus()
499
mandos_dbus_objc = self.bus.get_object(
500
self.busname, "/", follow_name_owner_changes=True)
501
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
502
dbus_interface
503
= server_interface)
504
try:
505
mandos_clients = (self.mandos_serv
506
.GetAllClientsWithProperties())
507
except dbus.exceptions.DBusException:
508
mandos_clients = dbus.Dictionary()
509
510
(self.mandos_serv
511
.connect_to_signal("ClientRemoved",
512
self.find_and_remove_client,
513
dbus_interface=server_interface,
514
byte_arrays=True))
515
(self.mandos_serv
516
.connect_to_signal("ClientAdded",
517
self.add_new_client,
518
dbus_interface=server_interface,
519
byte_arrays=True))
520
(self.mandos_serv
521
.connect_to_signal("ClientNotFound",
522
self.client_not_found,
523
dbus_interface=server_interface,
524
byte_arrays=True))
525
for path, client in mandos_clients.iteritems():
526
client_proxy_object = self.bus.get_object(self.busname,
527
path)
528
self.add_client(MandosClientWidget(server_proxy_object
529
=self.mandos_serv,
530
proxy_object
531
=client_proxy_object,
532
properties=client,
533
update_hook
534
=self.refresh,
535
delete_hook
536
=self.remove_client,
537
logger
538
=self.log_message),
539
path=path)
540
467
541
468
def client_not_found(self, fingerprint, address):
542
self.log_message(("Client with address %s and fingerprint %s"
543
" could not be found" % (address,
544
fingerprint)))
469
self.log_message("Client with address {} and fingerprint {}"
470
" could not be found"
471
.format(address, fingerprint))
545
472
546
473
def rebuild(self):
547
474
"""This rebuilds the User Interface.
557
484
self.divider)))
558
485
if self.log_visible:
559
486
self.uilist.append(self.logbox)
560
pass
561
487
self.topwidget = urwid.Pile(self.uilist)
562
488
563
def log_message(self, message):
489
def log_message(self, message, level=1):
490
"""Log message formatted with timestamp"""
491
if level < self.log_level:
492
return
564
493
timestamp = datetime.datetime.now().isoformat()
565
self.log_message_raw(timestamp + ": " + message)
494
self.log_message_raw("{}: {}".format(timestamp, message),
495
level=level)
566
496
567
def log_message_raw(self, markup):
497
def log_message_raw(self, markup, level=1):
568
498
"""Add a log message to the log buffer."""
499
if level < self.log_level:
500
return
569
501
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
570
502
if (self.max_log_length
571
503
and len(self.log) > self.max_log_length):
578
510
"""Toggle visibility of the log buffer."""
579
511
self.log_visible = not self.log_visible
580
512
self.rebuild()
581
#self.log_message("Log visibility changed to: "
582
# + unicode(self.log_visible))
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
583
515
584
516
def change_log_display(self):
585
517
"""Change type of log display.
590
522
self.log_wrap = "clip"
591
523
for textwidget in self.log:
592
524
textwidget.set_wrap_mode(self.log_wrap)
593
#self.log_message("Wrap mode: " + self.log_wrap)
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
526
level=0)
594
527
595
528
def find_and_remove_client(self, path, name):
596
529
"""Find a client by its object path and remove it.
601
534
client = self.clients_dict[path]
602
535
except KeyError:
603
536
# not found?
604
self.log_message("Unknown client %r (%r) removed", name,
605
path)
537
self.log_message("Unknown client {!r} ({!r}) removed"
538
.format(name, path))
606
539
return
607
540
client.delete()
608
541
625
558
if path is None:
626
559
path = client.proxy.object_path
627
560
self.clients_dict[path] = client
628
self.clients.sort(None, lambda c: c.properties["Name"])
561
self.clients.sort(key=lambda c: c.properties["Name"])
629
562
self.refresh()
630
563
631
564
def remove_client(self, client, path=None):
633
566
if path is None:
634
567
path = client.proxy.object_path
635
568
del self.clients_dict[path]
636
if not self.clients_dict:
637
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
638
# is completely emptied, we need to recreate it.
639
self.clients = urwid.SimpleListWalker([])
640
self.rebuild()
641
569
self.refresh()
642
570
643
571
def refresh(self):
647
575
648
576
def run(self):
649
577
"""Start the main loop and exit when it's done."""
578
self.bus = dbus.SystemBus()
579
mandos_dbus_objc = self.bus.get_object(
580
self.busname, "/", follow_name_owner_changes=True)
581
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
582
dbus_interface
583
= server_interface)
584
try:
585
mandos_clients = (self.mandos_serv
586
.GetAllClientsWithProperties())
587
if not mandos_clients:
588
self.log_message_raw(("bold", "Note: Server has no clients."))
589
except dbus.exceptions.DBusException:
590
self.log_message_raw(("bold", "Note: No Mandos server running."))
591
mandos_clients = dbus.Dictionary()
592
593
(self.mandos_serv
594
.connect_to_signal("ClientRemoved",
595
self.find_and_remove_client,
596
dbus_interface=server_interface,
597
byte_arrays=True))
598
(self.mandos_serv
599
.connect_to_signal("ClientAdded",
600
self.add_new_client,
601
dbus_interface=server_interface,
602
byte_arrays=True))
603
(self.mandos_serv
604
.connect_to_signal("ClientNotFound",
605
self.client_not_found,
606
dbus_interface=server_interface,
607
byte_arrays=True))
608
for path, client in mandos_clients.items():
609
client_proxy_object = self.bus.get_object(self.busname,
610
path)
611
self.add_client(MandosClientWidget(server_proxy_object
612
=self.mandos_serv,
613
proxy_object
614
=client_proxy_object,
615
properties=client,
616
update_hook
617
=self.refresh,
618
delete_hook
619
=self.remove_client,
620
logger
621
=self.log_message),
622
path=path)
623
650
624
self.refresh()
651
625
self._input_callback_tag = (gobject.io_add_watch
652
626
(sys.stdin.fileno(),
684
658
elif key == "window resize":
685
659
self.size = self.screen.get_cols_rows()
686
660
self.refresh()
687
elif key == "\f": # Ctrl-L
661
elif key == "ctrl l":
662
self.screen.clear()
688
663
self.refresh()
689
664
elif key == "l" or key == "D":
690
665
self.toggle_log_display()
702
677
"?: Help",
703
678
"l: Log window toggle",
704
679
"TAB: Switch window",
705
"w: Wrap (log)"))))
680
"w: Wrap (log lines)",
681
"v: Toggle verbose log",
682
))))
706
683
self.log_message_raw(("bold",
707
684
" "
708
685
.join(("Clients:",
721
698
else:
722
699
self.topwidget.set_focus(self.logbox)
723
700
self.refresh()
701
elif key == "v":
702
if self.log_level == 0:
703
self.log_level = 1
704
self.log_message("Verbose mode: Off")
705
else:
706
self.log_level = 0
707
self.log_message("Verbose mode: On")
724
708
#elif (key == "end" or key == "meta >" or key == "G"
725
709
# or key == ">"):
726
710
# pass # xxx end-of-buffer
749
733
ui.run()
750
734
except KeyboardInterrupt:
751
735
ui.screen.stop()
752
except Exception, e:
753
ui.log_message(unicode(e))
736
except Exception as e:
737
ui.log_message(str(e))
754
738
ui.screen.stop()
755
739
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0