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 747
- compare with another revision
- download diff
- download tarball
- view history from revision 747
- Committer: Teddy Hogeborn
- Date: 2015-05-22 20:23:46 UTC
- Revision ID: teddy@recompile.se-20150522202346-taccq232srbszyd9
mandos-keygen: Bug fix: Only use one SSH key from ssh-keyscan
If ssh-keyscan found keys of more than one type, the generated output
would be incorrect. Restrict the output to one type of key.
If ssh-keyscan found keys of more than one type, the generated output
would be incorrect. Restrict the output to one type of key.
- 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,2010 Teddy Hogeborn
7
# Copyright © 2009,2010 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
from __future__ import division, absolute_import, print_function, unicode_literals
26
from __future__ import (division, absolute_import, print_function,
27
unicode_literals)
28
try:
29
from future_builtins import *
30
except ImportError:
31
pass
26
32
27
33
import sys
28
34
import os
29
import signal
30
35
31
36
import datetime
32
37
34
39
import urwid
35
40
36
41
from dbus.mainloop.glib import DBusGMainLoop
37
import gobject
42
try:
43
import gobject
44
except ImportError:
45
from gi.repository import GObject as gobject
38
46
39
47
import dbus
40
48
41
import UserList
42
43
49
import locale
44
50
51
if sys.version_info.major == 2:
52
str = unicode
53
45
54
locale.setlocale(locale.LC_ALL, '')
46
55
47
56
import logging
48
57
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
58
50
59
# Some useful constants
51
domain = 'se.bsnet.fukt'
60
domain = 'se.recompile'
52
61
server_interface = domain + '.Mandos'
53
62
client_interface = domain + '.Mandos.Client'
54
version = "1.2.3"
55
56
# Always run in monochrome mode
57
urwid.curses_display.curses.has_colors = lambda : False
58
59
# Urwid doesn't support blinking, but we want it. Since we have no
60
# use for underline on its own, we make underline also always blink.
61
urwid.curses_display.curses.A_UNDERLINE |= (
62
urwid.curses_display.curses.A_BLINK)
63
version = "1.6.9"
63
64
64
65
def isoformat_to_datetime(iso):
65
66
"Parse an ISO 8601 date string to a datetime.datetime()"
82
83
properties and calls a hook function when any of them are
83
84
changed.
84
85
"""
85
def __init__(self, proxy_object=None, *args, **kwargs):
86
def __init__(self, proxy_object=None, properties=None, **kwargs):
86
87
self.proxy = proxy_object # Mandos Client proxy object
87
88
self.properties = dict()
89
self.proxy.connect_to_signal("PropertyChanged",
90
self.property_changed,
91
client_interface,
92
byte_arrays=True)
93
94
self.properties.update(
95
self.proxy.GetAll(client_interface,
96
dbus_interface = dbus.PROPERTIES_IFACE))
97
98
#XXX This break good super behaviour!
99
# super(MandosClientPropertyCache, self).__init__(
100
# *args, **kwargs)
88
self.properties = dict() if properties is None else properties
89
self.property_changed_match = (
90
self.proxy.connect_to_signal("PropertiesChanged",
91
self.properties_changed,
92
dbus.PROPERTIES_IFACE,
93
byte_arrays=True))
94
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)
101
102
102
def property_changed(self, property=None, value=None):
103
"""This is called whenever we get a PropertyChanged signal
104
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.
105
106
"""
106
107
# Update properties dict with new value
107
self.properties[property] = value
108
self.properties.update(properties)
109
110
def delete(self):
111
self.property_changed_match.remove()
108
112
109
113
110
114
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
112
116
"""
113
117
114
118
def __init__(self, server_proxy_object=None, update_hook=None,
115
delete_hook=None, logger=None, *args, **kwargs):
119
delete_hook=None, logger=None, **kwargs):
116
120
# Called on update
117
121
self.update_hook = update_hook
118
122
# Called on delete
123
127
self.logger = logger
124
128
125
129
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
128
130
129
131
# The widget shown normally
130
132
self._text_widget = urwid.Text("")
131
133
# The widget shown when we have focus
132
134
self._focus_text_widget = urwid.Text("")
133
super(MandosClientWidget, self).__init__(
134
update_hook=update_hook, delete_hook=delete_hook,
135
*args, **kwargs)
135
super(MandosClientWidget, self).__init__(**kwargs)
136
136
self.update()
137
137
self.opened = False
138
138
139
last_checked_ok = isoformat_to_datetime(self.properties
140
["LastCheckedOK"])
141
if last_checked_ok is None:
142
self.last_checker_failed = True
143
else:
144
self.last_checker_failed = ((datetime.datetime.utcnow()
145
- last_checked_ok)
146
> datetime.timedelta
147
(milliseconds=
148
self.properties
149
["Interval"]))
150
151
if self.last_checker_failed:
152
self.using_timer(True)
153
154
if self.need_approval:
155
self.using_timer(True)
156
157
self.proxy.connect_to_signal("CheckerCompleted",
158
self.checker_completed,
159
client_interface,
160
byte_arrays=True)
161
self.proxy.connect_to_signal("CheckerStarted",
162
self.checker_started,
163
client_interface,
164
byte_arrays=True)
165
self.proxy.connect_to_signal("GotSecret",
166
self.got_secret,
167
client_interface,
168
byte_arrays=True)
169
self.proxy.connect_to_signal("NeedApproval",
170
self.need_approval,
171
client_interface,
172
byte_arrays=True)
173
self.proxy.connect_to_signal("Rejected",
174
self.rejected,
175
client_interface,
176
byte_arrays=True)
139
self.match_objects = (
140
self.proxy.connect_to_signal("CheckerCompleted",
141
self.checker_completed,
142
client_interface,
143
byte_arrays=True),
144
self.proxy.connect_to_signal("CheckerStarted",
145
self.checker_started,
146
client_interface,
147
byte_arrays=True),
148
self.proxy.connect_to_signal("GotSecret",
149
self.got_secret,
150
client_interface,
151
byte_arrays=True),
152
self.proxy.connect_to_signal("NeedApproval",
153
self.need_approval,
154
client_interface,
155
byte_arrays=True),
156
self.proxy.connect_to_signal("Rejected",
157
self.rejected,
158
client_interface,
159
byte_arrays=True))
160
self.logger('Created client {}'
161
.format(self.properties["Name"]), level=0)
177
162
178
def property_changed(self, property=None, value=None):
179
super(self, MandosClientWidget).property_changed(property,
180
value)
181
if property == "ApprovalPending":
182
using_timer(bool(value))
183
184
163
def using_timer(self, flag):
185
164
"""Call this method with True or False when timer should be
186
165
activated or deactivated.
187
166
"""
188
old = self._update_timer_callback_lock
189
if flag:
190
self._update_timer_callback_lock += 1
191
else:
192
self._update_timer_callback_lock -= 1
193
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
194
169
self._update_timer_callback_tag = (gobject.timeout_add
195
170
(1000,
196
171
self.update_timer))
197
elif old and self._update_timer_callback_lock == 0:
172
elif not (flag or self._update_timer_callback_tag is None):
198
173
gobject.source_remove(self._update_timer_callback_tag)
199
174
self._update_timer_callback_tag = None
200
175
201
176
def checker_completed(self, exitstatus, condition, command):
202
177
if exitstatus == 0:
203
if self.last_checker_failed:
204
self.last_checker_failed = False
205
self.using_timer(False)
206
#self.logger('Checker for client %s (command "%s")'
207
# ' was successful'
208
# % (self.properties["Name"], command))
178
self.logger('Checker for client {} (command "{}")'
179
' succeeded'.format(self.properties["Name"],
180
command), level=0)
209
181
self.update()
210
182
return
211
183
# Checker failed
212
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
215
184
if os.WIFEXITED(condition):
216
self.logger('Checker for client %s (command "%s")'
217
' failed with exit code %s'
218
% (self.properties["Name"], command,
219
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)))
220
189
elif os.WIFSIGNALED(condition):
221
self.logger('Checker for client %s (command "%s")'
222
' was killed by signal %s'
223
% (self.properties["Name"], command,
224
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)))
225
194
elif os.WCOREDUMP(condition):
226
self.logger('Checker for client %s (command "%s")'
227
' dumped core'
228
% (self.properties["Name"], command))
195
self.logger('Checker for client {} (command "{}") dumped'
196
' core'.format(self.properties["Name"],
197
command))
229
198
else:
230
self.logger('Checker for client %s completed'
231
' mysteriously')
199
self.logger('Checker for client {} completed'
200
' mysteriously'
201
.format(self.properties["Name"]))
232
202
self.update()
233
203
234
204
def checker_started(self, command):
235
#self.logger('Client %s started checker "%s"'
236
# % (self.properties["Name"], unicode(command)))
237
pass
205
"""Server signals that a checker started."""
206
self.logger('Client {} started checker "{}"'
207
.format(self.properties["Name"],
208
command), level=0)
238
209
239
210
def got_secret(self):
240
self.last_checker_failed = False
241
self.logger('Client %s received its secret'
242
% self.properties["Name"])
211
self.logger('Client {} received its secret'
212
.format(self.properties["Name"]))
243
213
244
214
def need_approval(self, timeout, default):
245
215
if not default:
246
message = 'Client %s needs approval within %s seconds'
216
message = 'Client {} needs approval within {} seconds'
247
217
else:
248
message = 'Client %s will get its secret in %s seconds'
249
self.logger(message
250
% (self.properties["Name"], timeout/1000))
251
self.using_timer(True)
218
message = 'Client {} will get its secret in {} seconds'
219
self.logger(message.format(self.properties["Name"],
220
timeout/1000))
252
221
253
222
def rejected(self, reason):
254
self.logger('Client %s was rejected; reason: %s'
255
% (self.properties["Name"], reason))
223
self.logger('Client {} was rejected; reason: {}'
224
.format(self.properties["Name"], reason))
256
225
257
226
def selectable(self):
258
227
"""Make this a "selectable" widget.
280
249
"bold-underline-blink":
281
250
"bold-underline-blink-standout",
282
251
}
283
252
284
253
# Rebuild focus and non-focus widgets using current properties
285
254
286
255
# Base part of a client. Name!
287
base = ('%(name)s: '
288
% {"name": self.properties["Name"]})
256
base = '{name}: '.format(name=self.properties["Name"])
289
257
if not self.properties["Enabled"]:
290
258
message = "DISABLED"
259
self.using_timer(False)
291
260
elif self.properties["ApprovalPending"]:
292
261
timeout = datetime.timedelta(milliseconds
293
262
= self.properties
295
264
last_approval_request = isoformat_to_datetime(
296
265
self.properties["LastApprovalRequest"])
297
266
if last_approval_request is not None:
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
267
timer = max(timeout - (datetime.datetime.utcnow()
268
- last_approval_request),
269
datetime.timedelta())
300
270
else:
301
271
timer = datetime.timedelta()
302
272
if self.properties["ApprovedByDefault"]:
303
message = "Approval in %s. (d)eny?"
304
else:
305
message = "Denial in %s. (a)pprove?"
306
message = message % unicode(timer).rsplit(".", 1)[0]
307
elif self.last_checker_failed:
308
timeout = datetime.timedelta(milliseconds
309
= self.properties
310
["Timeout"])
311
last_ok = isoformat_to_datetime(
312
max((self.properties["LastCheckedOK"]
313
or self.properties["Created"]),
314
self.properties["LastEnabled"]))
315
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())
316
288
message = ('A checker has failed! Time until client'
317
' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
289
' gets disabled: {}'
290
.format(str(timer).rsplit(".", 1)[0]))
291
self.using_timer(True)
319
292
else:
320
293
message = "enabled"
321
self._text = "%s%s" % (base, message)
322
294
self.using_timer(False)
295
self._text = "{}{}".format(base, message)
296
323
297
if not urwid.supports_unicode():
324
298
self._text = self._text.encode("ascii", "replace")
325
299
textlist = [("normal", self._text)]
337
311
self.update_hook()
338
312
339
313
def update_timer(self):
340
"called by gobject"
314
"""called by gobject. Will indefinitely loop until
315
gobject.source_remove() on tag is called"""
341
316
self.update()
342
317
return True # Keep calling this
343
318
344
def delete(self):
319
def delete(self, **kwargs):
345
320
if self._update_timer_callback_tag is not None:
346
321
gobject.source_remove(self._update_timer_callback_tag)
347
322
self._update_timer_callback_tag = None
323
for match in self.match_objects:
324
match.remove()
325
self.match_objects = ()
348
326
if self.delete_hook is not None:
349
327
self.delete_hook(self)
328
return super(MandosClientWidget, self).delete(**kwargs)
350
329
351
330
def render(self, maxcolrow, focus=False):
352
331
"""Render differently if we have focus.
358
337
"""Handle keys.
359
338
This overrides the method from urwid.FlowWidget"""
360
339
if key == "+":
361
self.proxy.Enable(dbus_interface = client_interface)
340
self.proxy.Enable(dbus_interface = client_interface,
341
ignore_reply=True)
362
342
elif key == "-":
363
self.proxy.Disable(dbus_interface = client_interface)
343
self.proxy.Disable(dbus_interface = client_interface,
344
ignore_reply=True)
364
345
elif key == "a":
365
346
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
dbus_interface = client_interface)
347
dbus_interface = client_interface,
348
ignore_reply=True)
367
349
elif key == "d":
368
350
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
dbus_interface = client_interface)
351
dbus_interface = client_interface,
352
ignore_reply=True)
370
353
elif key == "R" or key == "_" or key == "ctrl k":
371
354
self.server_proxy_object.RemoveClient(self.proxy
372
.object_path)
355
.object_path,
356
ignore_reply=True)
373
357
elif key == "s":
374
self.proxy.StartChecker(dbus_interface = client_interface)
358
self.proxy.StartChecker(dbus_interface = client_interface,
359
ignore_reply=True)
375
360
elif key == "S":
376
self.proxy.StopChecker(dbus_interface = client_interface)
361
self.proxy.StopChecker(dbus_interface = client_interface,
362
ignore_reply=True)
377
363
elif key == "C":
378
self.proxy.CheckedOK(dbus_interface = client_interface)
364
self.proxy.CheckedOK(dbus_interface = client_interface,
365
ignore_reply=True)
379
366
# xxx
380
367
# elif key == "p" or key == "=":
381
368
# self.proxy.pause()
386
373
else:
387
374
return key
388
375
389
def property_changed(self, property=None, value=None,
390
*args, **kwargs):
391
"""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.
392
378
This overrides the method from MandosClientPropertyCache"""
393
property_name = unicode(property)
394
old_value = self.properties.get(property_name)
395
super(MandosClientWidget, self).property_changed(
396
property=property, value=value, *args, **kwargs)
397
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):
398
385
self.update()
399
386
400
387
403
390
"down" key presses, thus not allowing any containing widgets to
404
391
use them as an excuse to shift focus away from this widget.
405
392
"""
406
def keypress(self, maxcolrow, key):
407
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
393
def keypress(self, *args, **kwargs):
394
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
408
395
if ret in ("up", "down"):
409
396
return
410
397
return ret
414
401
"""This is the entire user interface - the whole screen
415
402
with boxes, lists of client widgets, etc.
416
403
"""
417
def __init__(self, max_log_length=1000):
404
def __init__(self, max_log_length=1000, log_level=1):
418
405
DBusGMainLoop(set_as_default=True)
419
406
420
407
self.screen = urwid.curses_display.Screen()
423
410
("normal",
424
411
"default", "default", None),
425
412
("bold",
426
"default", "default", "bold"),
413
"bold", "default", "bold"),
427
414
("underline-blink",
428
"default", "default", "underline"),
415
"underline,blink", "default", "underline,blink"),
429
416
("standout",
430
"default", "default", "standout"),
417
"standout", "default", "standout"),
431
418
("bold-underline-blink",
432
"default", "default", ("bold", "underline")),
419
"bold,underline,blink", "default", "bold,underline,blink"),
433
420
("bold-standout",
434
"default", "default", ("bold", "standout")),
421
"bold,standout", "default", "bold,standout"),
435
422
("underline-blink-standout",
436
"default", "default", ("underline", "standout")),
423
"underline,blink,standout", "default",
424
"underline,blink,standout"),
437
425
("bold-underline-blink-standout",
438
"default", "default", ("bold", "underline",
439
"standout")),
426
"bold,underline,blink,standout", "default",
427
"bold,underline,blink,standout"),
440
428
))
441
429
442
430
if urwid.supports_unicode():
457
445
self.log = []
458
446
self.max_log_length = max_log_length
459
447
448
self.log_level = log_level
449
460
450
# We keep a reference to the log widget so we can remove it
461
451
# from the ListWalker without it getting destroyed
462
452
self.logbox = ConstrainedListBox(self.log)
474
464
475
465
self.busname = domain + '.Mandos'
476
466
self.main_loop = gobject.MainLoop()
477
self.bus = dbus.SystemBus()
478
mandos_dbus_objc = self.bus.get_object(
479
self.busname, "/", follow_name_owner_changes=True)
480
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
481
dbus_interface
482
= server_interface)
483
try:
484
mandos_clients = (self.mandos_serv
485
.GetAllClientsWithProperties())
486
except dbus.exceptions.DBusException:
487
mandos_clients = dbus.Dictionary()
488
489
(self.mandos_serv
490
.connect_to_signal("ClientRemoved",
491
self.find_and_remove_client,
492
dbus_interface=server_interface,
493
byte_arrays=True))
494
(self.mandos_serv
495
.connect_to_signal("ClientAdded",
496
self.add_new_client,
497
dbus_interface=server_interface,
498
byte_arrays=True))
499
(self.mandos_serv
500
.connect_to_signal("ClientNotFound",
501
self.client_not_found,
502
dbus_interface=server_interface,
503
byte_arrays=True))
504
for path, client in mandos_clients.iteritems():
505
client_proxy_object = self.bus.get_object(self.busname,
506
path)
507
self.add_client(MandosClientWidget(server_proxy_object
508
=self.mandos_serv,
509
proxy_object
510
=client_proxy_object,
511
properties=client,
512
update_hook
513
=self.refresh,
514
delete_hook
515
=self.remove_client,
516
logger
517
=self.log_message),
518
path=path)
519
467
520
468
def client_not_found(self, fingerprint, address):
521
self.log_message(("Client with address %s and fingerprint %s"
522
" could not be found" % (address,
523
fingerprint)))
469
self.log_message("Client with address {} and fingerprint {}"
470
" could not be found"
471
.format(address, fingerprint))
524
472
525
473
def rebuild(self):
526
474
"""This rebuilds the User Interface.
536
484
self.divider)))
537
485
if self.log_visible:
538
486
self.uilist.append(self.logbox)
539
pass
540
487
self.topwidget = urwid.Pile(self.uilist)
541
488
542
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
543
493
timestamp = datetime.datetime.now().isoformat()
544
self.log_message_raw(timestamp + ": " + message)
494
self.log_message_raw("{}: {}".format(timestamp, message),
495
level=level)
545
496
546
def log_message_raw(self, markup):
497
def log_message_raw(self, markup, level=1):
547
498
"""Add a log message to the log buffer."""
499
if level < self.log_level:
500
return
548
501
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
549
502
if (self.max_log_length
550
503
and len(self.log) > self.max_log_length):
557
510
"""Toggle visibility of the log buffer."""
558
511
self.log_visible = not self.log_visible
559
512
self.rebuild()
560
#self.log_message("Log visibility changed to: "
561
# + unicode(self.log_visible))
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
562
515
563
516
def change_log_display(self):
564
517
"""Change type of log display.
569
522
self.log_wrap = "clip"
570
523
for textwidget in self.log:
571
524
textwidget.set_wrap_mode(self.log_wrap)
572
#self.log_message("Wrap mode: " + self.log_wrap)
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
526
level=0)
573
527
574
528
def find_and_remove_client(self, path, name):
575
"""Find an client from its object path and remove it.
529
"""Find a client by its object path and remove it.
576
530
577
531
This is connected to the ClientRemoved signal from the
578
532
Mandos server object."""
580
534
client = self.clients_dict[path]
581
535
except KeyError:
582
536
# not found?
537
self.log_message("Unknown client {!r} ({!r}) removed"
538
.format(name, path))
583
539
return
584
self.remove_client(client, path)
540
client.delete()
585
541
586
542
def add_new_client(self, path):
587
543
client_proxy_object = self.bus.get_object(self.busname, path)
602
558
if path is None:
603
559
path = client.proxy.object_path
604
560
self.clients_dict[path] = client
605
self.clients.sort(None, lambda c: c.properties["Name"])
561
self.clients.sort(key=lambda c: c.properties["Name"])
606
562
self.refresh()
607
563
608
564
def remove_client(self, client, path=None):
610
566
if path is None:
611
567
path = client.proxy.object_path
612
568
del self.clients_dict[path]
613
if not self.clients_dict:
614
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
615
# is completely emptied, we need to recreate it.
616
self.clients = urwid.SimpleListWalker([])
617
self.rebuild()
618
569
self.refresh()
619
570
620
571
def refresh(self):
624
575
625
576
def run(self):
626
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
627
624
self.refresh()
628
625
self._input_callback_tag = (gobject.io_add_watch
629
626
(sys.stdin.fileno(),
661
658
elif key == "window resize":
662
659
self.size = self.screen.get_cols_rows()
663
660
self.refresh()
664
elif key == "\f": # Ctrl-L
661
elif key == "ctrl l":
662
self.screen.clear()
665
663
self.refresh()
666
664
elif key == "l" or key == "D":
667
665
self.toggle_log_display()
679
677
"?: Help",
680
678
"l: Log window toggle",
681
679
"TAB: Switch window",
682
"w: Wrap (log)"))))
680
"w: Wrap (log lines)",
681
"v: Toggle verbose log",
682
))))
683
683
self.log_message_raw(("bold",
684
684
" "
685
685
.join(("Clients:",
698
698
else:
699
699
self.topwidget.set_focus(self.logbox)
700
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")
701
708
#elif (key == "end" or key == "meta >" or key == "G"
702
709
# or key == ">"):
703
710
# pass # xxx end-of-buffer
726
733
ui.run()
727
734
except KeyboardInterrupt:
728
735
ui.screen.stop()
729
except Exception, e:
730
ui.log_message(unicode(e))
736
except Exception as e:
737
ui.log_message(str(e))
731
738
ui.screen.stop()
732
739
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0