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