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 779
- compare with another revision
- download diff
- download tarball
- view history from revision 779
- Committer: Teddy Hogeborn
- Date: 2015-07-27 09:23:56 UTC
- Revision ID: teddy@recompile.se-20150727092356-65ul6jsiozlkjw4e
Debian bug fix for mandos-client: Remove dhparams.pem on purge.
* debian/mandos-client.postrm (purge): Bug fix: Remove dhparams.pem.
* debian/mandos-client.postrm (purge): Bug fix: Remove dhparams.pem.
- files added:
- debian/mandos-client.examples
- debian/upstream
- network-hooks.d
- plugin-helpers
- 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-2015 Teddy Hogeborn
7
# Copyright © 2009-2015 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
def checker_completed(self, exitstatus, condition, command):
176
def checker_completed(self, exitstatus, signal, 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
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)))
220
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)))
225
elif os.WCOREDUMP(condition):
226
self.logger('Checker for client %s (command "%s")'
227
' dumped core'
228
% (self.properties["Name"], command))
184
if exitstatus >= 0:
185
self.logger('Checker for client {} (command "{}") failed'
186
' with exit code {}'
187
.format(self.properties["Name"], command,
188
exitstatus))
189
elif signal != 0:
190
self.logger('Checker for client {} (command "{}") was'
191
' killed by signal {}'
192
.format(self.properties["Name"], command,
193
signal))
229
194
else:
230
self.logger('Checker for client %s completed'
231
' mysteriously')
195
self.logger('Checker for client {} completed'
196
' mysteriously'
197
.format(self.properties["Name"]))
232
198
self.update()
233
199
234
200
def checker_started(self, command):
235
#self.logger('Client %s started checker "%s"'
236
# % (self.properties["Name"], unicode(command)))
237
pass
201
"""Server signals that a checker started."""
202
self.logger('Client {} started checker "{}"'
203
.format(self.properties["Name"],
204
command), level=0)
238
205
239
206
def got_secret(self):
240
self.last_checker_failed = False
241
self.logger('Client %s received its secret'
242
% self.properties["Name"])
207
self.logger('Client {} received its secret'
208
.format(self.properties["Name"]))
243
209
244
210
def need_approval(self, timeout, default):
245
211
if not default:
246
message = 'Client %s needs approval within %s seconds'
212
message = 'Client {} needs approval within {} seconds'
247
213
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)
214
message = 'Client {} will get its secret in {} seconds'
215
self.logger(message.format(self.properties["Name"],
216
timeout/1000))
252
217
253
218
def rejected(self, reason):
254
self.logger('Client %s was rejected; reason: %s'
255
% (self.properties["Name"], reason))
219
self.logger('Client {} was rejected; reason: {}'
220
.format(self.properties["Name"], reason))
256
221
257
222
def selectable(self):
258
223
"""Make this a "selectable" widget.
280
245
"bold-underline-blink":
281
246
"bold-underline-blink-standout",
282
247
}
283
248
284
249
# Rebuild focus and non-focus widgets using current properties
285
250
286
251
# Base part of a client. Name!
287
base = ('%(name)s: '
288
% {"name": self.properties["Name"]})
252
base = '{name}: '.format(name=self.properties["Name"])
289
253
if not self.properties["Enabled"]:
290
254
message = "DISABLED"
255
self.using_timer(False)
291
256
elif self.properties["ApprovalPending"]:
292
257
timeout = datetime.timedelta(milliseconds
293
258
= self.properties
295
260
last_approval_request = isoformat_to_datetime(
296
261
self.properties["LastApprovalRequest"])
297
262
if last_approval_request is not None:
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
263
timer = max(timeout - (datetime.datetime.utcnow()
264
- last_approval_request),
265
datetime.timedelta())
300
266
else:
301
267
timer = datetime.timedelta()
302
268
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)
269
message = "Approval in {}. (d)eny?"
270
else:
271
message = "Denial in {}. (a)pprove?"
272
message = message.format(str(timer).rsplit(".", 1)[0])
273
self.using_timer(True)
274
elif self.properties["LastCheckerStatus"] != 0:
275
# When checker has failed, show timer until client expires
276
expires = self.properties["Expires"]
277
if expires == "":
278
timer = datetime.timedelta(0)
279
else:
280
expires = (datetime.datetime.strptime
281
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
282
timer = max(expires - datetime.datetime.utcnow(),
283
datetime.timedelta())
316
284
message = ('A checker has failed! Time until client'
317
' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
285
' gets disabled: {}'
286
.format(str(timer).rsplit(".", 1)[0]))
287
self.using_timer(True)
319
288
else:
320
289
message = "enabled"
321
self._text = "%s%s" % (base, message)
322
290
self.using_timer(False)
291
self._text = "{}{}".format(base, message)
292
323
293
if not urwid.supports_unicode():
324
294
self._text = self._text.encode("ascii", "replace")
325
295
textlist = [("normal", self._text)]
337
307
self.update_hook()
338
308
339
309
def update_timer(self):
340
"called by gobject"
310
"""called by gobject. Will indefinitely loop until
311
gobject.source_remove() on tag is called"""
341
312
self.update()
342
313
return True # Keep calling this
343
314
344
def delete(self):
315
def delete(self, **kwargs):
345
316
if self._update_timer_callback_tag is not None:
346
317
gobject.source_remove(self._update_timer_callback_tag)
347
318
self._update_timer_callback_tag = None
319
for match in self.match_objects:
320
match.remove()
321
self.match_objects = ()
348
322
if self.delete_hook is not None:
349
323
self.delete_hook(self)
324
return super(MandosClientWidget, self).delete(**kwargs)
350
325
351
326
def render(self, maxcolrow, focus=False):
352
327
"""Render differently if we have focus.
358
333
"""Handle keys.
359
334
This overrides the method from urwid.FlowWidget"""
360
335
if key == "+":
361
self.proxy.Enable(dbus_interface = client_interface)
336
self.proxy.Enable(dbus_interface = client_interface,
337
ignore_reply=True)
362
338
elif key == "-":
363
self.proxy.Disable(dbus_interface = client_interface)
339
self.proxy.Disable(dbus_interface = client_interface,
340
ignore_reply=True)
364
341
elif key == "a":
365
342
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
dbus_interface = client_interface)
343
dbus_interface = client_interface,
344
ignore_reply=True)
367
345
elif key == "d":
368
346
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
dbus_interface = client_interface)
347
dbus_interface = client_interface,
348
ignore_reply=True)
370
349
elif key == "R" or key == "_" or key == "ctrl k":
371
350
self.server_proxy_object.RemoveClient(self.proxy
372
.object_path)
351
.object_path,
352
ignore_reply=True)
373
353
elif key == "s":
374
self.proxy.StartChecker(dbus_interface = client_interface)
354
self.proxy.StartChecker(dbus_interface = client_interface,
355
ignore_reply=True)
375
356
elif key == "S":
376
self.proxy.StopChecker(dbus_interface = client_interface)
357
self.proxy.StopChecker(dbus_interface = client_interface,
358
ignore_reply=True)
377
359
elif key == "C":
378
self.proxy.CheckedOK(dbus_interface = client_interface)
360
self.proxy.CheckedOK(dbus_interface = client_interface,
361
ignore_reply=True)
379
362
# xxx
380
363
# elif key == "p" or key == "=":
381
364
# self.proxy.pause()
386
369
else:
387
370
return key
388
371
389
def property_changed(self, property=None, value=None,
390
*args, **kwargs):
391
"""Call self.update() if old value is not new value.
372
def properties_changed(self, interface, properties, invalidated):
373
"""Call self.update() if any properties changed.
392
374
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:
375
old_values = { key: self.properties.get(key)
376
for key in properties.keys() }
377
super(MandosClientWidget, self).properties_changed(
378
interface, properties, invalidated)
379
if any(old_values[key] != self.properties.get(key)
380
for key in old_values):
398
381
self.update()
399
382
400
383
403
386
"down" key presses, thus not allowing any containing widgets to
404
387
use them as an excuse to shift focus away from this widget.
405
388
"""
406
def keypress(self, maxcolrow, key):
407
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
389
def keypress(self, *args, **kwargs):
390
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
408
391
if ret in ("up", "down"):
409
392
return
410
393
return ret
414
397
"""This is the entire user interface - the whole screen
415
398
with boxes, lists of client widgets, etc.
416
399
"""
417
def __init__(self, max_log_length=1000):
400
def __init__(self, max_log_length=1000, log_level=1):
418
401
DBusGMainLoop(set_as_default=True)
419
402
420
403
self.screen = urwid.curses_display.Screen()
423
406
("normal",
424
407
"default", "default", None),
425
408
("bold",
426
"default", "default", "bold"),
409
"bold", "default", "bold"),
427
410
("underline-blink",
428
"default", "default", "underline"),
411
"underline,blink", "default", "underline,blink"),
429
412
("standout",
430
"default", "default", "standout"),
413
"standout", "default", "standout"),
431
414
("bold-underline-blink",
432
"default", "default", ("bold", "underline")),
415
"bold,underline,blink", "default", "bold,underline,blink"),
433
416
("bold-standout",
434
"default", "default", ("bold", "standout")),
417
"bold,standout", "default", "bold,standout"),
435
418
("underline-blink-standout",
436
"default", "default", ("underline", "standout")),
419
"underline,blink,standout", "default",
420
"underline,blink,standout"),
437
421
("bold-underline-blink-standout",
438
"default", "default", ("bold", "underline",
439
"standout")),
422
"bold,underline,blink,standout", "default",
423
"bold,underline,blink,standout"),
440
424
))
441
425
442
426
if urwid.supports_unicode():
457
441
self.log = []
458
442
self.max_log_length = max_log_length
459
443
444
self.log_level = log_level
445
460
446
# We keep a reference to the log widget so we can remove it
461
447
# from the ListWalker without it getting destroyed
462
448
self.logbox = ConstrainedListBox(self.log)
474
460
475
461
self.busname = domain + '.Mandos'
476
462
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
463
520
464
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)))
465
self.log_message("Client with address {} and fingerprint {}"
466
" could not be found"
467
.format(address, fingerprint))
524
468
525
469
def rebuild(self):
526
470
"""This rebuilds the User Interface.
536
480
self.divider)))
537
481
if self.log_visible:
538
482
self.uilist.append(self.logbox)
539
pass
540
483
self.topwidget = urwid.Pile(self.uilist)
541
484
542
def log_message(self, message):
485
def log_message(self, message, level=1):
486
"""Log message formatted with timestamp"""
487
if level < self.log_level:
488
return
543
489
timestamp = datetime.datetime.now().isoformat()
544
self.log_message_raw(timestamp + ": " + message)
490
self.log_message_raw("{}: {}".format(timestamp, message),
491
level=level)
545
492
546
def log_message_raw(self, markup):
493
def log_message_raw(self, markup, level=1):
547
494
"""Add a log message to the log buffer."""
495
if level < self.log_level:
496
return
548
497
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
549
498
if (self.max_log_length
550
499
and len(self.log) > self.max_log_length):
557
506
"""Toggle visibility of the log buffer."""
558
507
self.log_visible = not self.log_visible
559
508
self.rebuild()
560
#self.log_message("Log visibility changed to: "
561
# + unicode(self.log_visible))
509
self.log_message("Log visibility changed to: {}"
510
.format(self.log_visible), level=0)
562
511
563
512
def change_log_display(self):
564
513
"""Change type of log display.
569
518
self.log_wrap = "clip"
570
519
for textwidget in self.log:
571
520
textwidget.set_wrap_mode(self.log_wrap)
572
#self.log_message("Wrap mode: " + self.log_wrap)
521
self.log_message("Wrap mode: {}".format(self.log_wrap),
522
level=0)
573
523
574
524
def find_and_remove_client(self, path, name):
575
"""Find an client from its object path and remove it.
525
"""Find a client by its object path and remove it.
576
526
577
527
This is connected to the ClientRemoved signal from the
578
528
Mandos server object."""
580
530
client = self.clients_dict[path]
581
531
except KeyError:
582
532
# not found?
533
self.log_message("Unknown client {!r} ({!r}) removed"
534
.format(name, path))
583
535
return
584
self.remove_client(client, path)
536
client.delete()
585
537
586
538
def add_new_client(self, path):
587
539
client_proxy_object = self.bus.get_object(self.busname, path)
602
554
if path is None:
603
555
path = client.proxy.object_path
604
556
self.clients_dict[path] = client
605
self.clients.sort(None, lambda c: c.properties["Name"])
557
self.clients.sort(key=lambda c: c.properties["Name"])
606
558
self.refresh()
607
559
608
560
def remove_client(self, client, path=None):
610
562
if path is None:
611
563
path = client.proxy.object_path
612
564
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
565
self.refresh()
619
566
620
567
def refresh(self):
624
571
625
572
def run(self):
626
573
"""Start the main loop and exit when it's done."""
574
self.bus = dbus.SystemBus()
575
mandos_dbus_objc = self.bus.get_object(
576
self.busname, "/", follow_name_owner_changes=True)
577
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
578
dbus_interface
579
= server_interface)
580
try:
581
mandos_clients = (self.mandos_serv
582
.GetAllClientsWithProperties())
583
if not mandos_clients:
584
self.log_message_raw(("bold", "Note: Server has no clients."))
585
except dbus.exceptions.DBusException:
586
self.log_message_raw(("bold", "Note: No Mandos server running."))
587
mandos_clients = dbus.Dictionary()
588
589
(self.mandos_serv
590
.connect_to_signal("ClientRemoved",
591
self.find_and_remove_client,
592
dbus_interface=server_interface,
593
byte_arrays=True))
594
(self.mandos_serv
595
.connect_to_signal("ClientAdded",
596
self.add_new_client,
597
dbus_interface=server_interface,
598
byte_arrays=True))
599
(self.mandos_serv
600
.connect_to_signal("ClientNotFound",
601
self.client_not_found,
602
dbus_interface=server_interface,
603
byte_arrays=True))
604
for path, client in mandos_clients.items():
605
client_proxy_object = self.bus.get_object(self.busname,
606
path)
607
self.add_client(MandosClientWidget(server_proxy_object
608
=self.mandos_serv,
609
proxy_object
610
=client_proxy_object,
611
properties=client,
612
update_hook
613
=self.refresh,
614
delete_hook
615
=self.remove_client,
616
logger
617
=self.log_message),
618
path=path)
619
627
620
self.refresh()
628
621
self._input_callback_tag = (gobject.io_add_watch
629
622
(sys.stdin.fileno(),
661
654
elif key == "window resize":
662
655
self.size = self.screen.get_cols_rows()
663
656
self.refresh()
664
elif key == "\f": # Ctrl-L
657
elif key == "ctrl l":
658
self.screen.clear()
665
659
self.refresh()
666
660
elif key == "l" or key == "D":
667
661
self.toggle_log_display()
679
673
"?: Help",
680
674
"l: Log window toggle",
681
675
"TAB: Switch window",
682
"w: Wrap (log)"))))
676
"w: Wrap (log lines)",
677
"v: Toggle verbose log",
678
))))
683
679
self.log_message_raw(("bold",
684
680
" "
685
681
.join(("Clients:",
698
694
else:
699
695
self.topwidget.set_focus(self.logbox)
700
696
self.refresh()
697
elif key == "v":
698
if self.log_level == 0:
699
self.log_level = 1
700
self.log_message("Verbose mode: Off")
701
else:
702
self.log_level = 0
703
self.log_message("Verbose mode: On")
701
704
#elif (key == "end" or key == "meta >" or key == "G"
702
705
# or key == ">"):
703
706
# pass # xxx end-of-buffer
726
729
ui.run()
727
730
except KeyboardInterrupt:
728
731
ui.screen.stop()
729
except Exception, e:
730
ui.log_message(unicode(e))
732
except Exception as e:
733
ui.log_message(str(e))
731
734
ui.screen.stop()
732
735
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0