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.23
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.23
- Committer: teddy at bsnet
- Date: 2011-03-15 20:13:05 UTC
- mto: (24.1.171 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 284.
- Revision ID: teddy@fukt.bsnet.se-20110315201305-1eptd9mvxem1qtr2
* mandos-ctl: Use the new argparse library instead of optparse.
- files removed:
- 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-2016 Teddy Hogeborn
7
# Copyright © 2009-2016 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.7.1"
64
65
try:
66
dbus.OBJECT_MANAGER_IFACE
67
except AttributeError:
68
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
54
version = "1.3.0"
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)
69
63
70
64
def isoformat_to_datetime(iso):
71
65
"Parse an ISO 8601 date string to a datetime.datetime()"
88
82
properties and calls a hook function when any of them are
89
83
changed.
90
84
"""
91
def __init__(self, proxy_object=None, properties=None, **kwargs):
85
def __init__(self, proxy_object=None, *args, **kwargs):
92
86
self.proxy = proxy_object # Mandos Client proxy object
93
self.properties = dict() if properties is None else properties
94
self.property_changed_match = (
95
self.proxy.connect_to_signal("PropertiesChanged",
96
self.properties_changed,
97
dbus.PROPERTIES_IFACE,
98
byte_arrays=True))
99
100
if properties is None:
101
self.properties.update(
102
self.proxy.GetAll(client_interface,
103
dbus_interface
104
= dbus.PROPERTIES_IFACE))
105
106
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)
107
101
108
def properties_changed(self, interface, properties, invalidated):
109
"""This is called whenever we get a PropertiesChanged signal
110
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.
111
105
"""
112
106
# Update properties dict with new value
113
if interface == client_interface:
114
self.properties.update(properties)
115
116
def delete(self):
117
self.property_changed_match.remove()
107
self.properties[property] = value
118
108
119
109
120
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
122
112
"""
123
113
124
114
def __init__(self, server_proxy_object=None, update_hook=None,
125
delete_hook=None, logger=None, **kwargs):
115
delete_hook=None, logger=None, *args, **kwargs):
126
116
# Called on update
127
117
self.update_hook = update_hook
128
118
# Called on delete
133
123
self.logger = logger
134
124
135
125
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
136
128
137
129
# The widget shown normally
138
130
self._text_widget = urwid.Text("")
139
131
# The widget shown when we have focus
140
132
self._focus_text_widget = urwid.Text("")
141
super(MandosClientWidget, self).__init__(**kwargs)
133
super(MandosClientWidget, self).__init__(
134
update_hook=update_hook, delete_hook=delete_hook,
135
*args, **kwargs)
142
136
self.update()
143
137
self.opened = False
144
138
145
self.match_objects = (
146
self.proxy.connect_to_signal("CheckerCompleted",
147
self.checker_completed,
148
client_interface,
149
byte_arrays=True),
150
self.proxy.connect_to_signal("CheckerStarted",
151
self.checker_started,
152
client_interface,
153
byte_arrays=True),
154
self.proxy.connect_to_signal("GotSecret",
155
self.got_secret,
156
client_interface,
157
byte_arrays=True),
158
self.proxy.connect_to_signal("NeedApproval",
159
self.need_approval,
160
client_interface,
161
byte_arrays=True),
162
self.proxy.connect_to_signal("Rejected",
163
self.rejected,
164
client_interface,
165
byte_arrays=True))
166
self.logger('Created client {}'
167
.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)
168
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
169
184
def using_timer(self, flag):
170
185
"""Call this method with True or False when timer should be
171
186
activated or deactivated.
172
187
"""
173
if flag and self._update_timer_callback_tag is None:
174
# 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:
175
194
self._update_timer_callback_tag = (gobject.timeout_add
176
195
(1000,
177
196
self.update_timer))
178
elif not (flag or self._update_timer_callback_tag is None):
197
elif old and self._update_timer_callback_lock == 0:
179
198
gobject.source_remove(self._update_timer_callback_tag)
180
199
self._update_timer_callback_tag = None
181
200
182
201
def checker_completed(self, exitstatus, condition, command):
183
202
if exitstatus == 0:
184
self.logger('Checker for client {} (command "{}")'
185
' succeeded'.format(self.properties["Name"],
186
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))
187
209
self.update()
188
210
return
189
211
# Checker failed
212
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
190
215
if os.WIFEXITED(condition):
191
self.logger('Checker for client {} (command "{}") failed'
192
' with exit code {}'
193
.format(self.properties["Name"], command,
194
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)))
195
220
elif os.WIFSIGNALED(condition):
196
self.logger('Checker for client {} (command "{}") was'
197
' killed by signal {}'
198
.format(self.properties["Name"], command,
199
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)))
225
elif os.WCOREDUMP(condition):
226
self.logger('Checker for client %s (command "%s")'
227
' dumped core'
228
% (self.properties["Name"], command))
229
else:
230
self.logger('Checker for client %s completed'
231
' mysteriously')
200
232
self.update()
201
233
202
234
def checker_started(self, command):
203
"""Server signals that a checker started."""
204
self.logger('Client {} started checker "{}"'
205
.format(self.properties["Name"],
206
command), level=0)
235
#self.logger('Client %s started checker "%s"'
236
# % (self.properties["Name"], unicode(command)))
237
pass
207
238
208
239
def got_secret(self):
209
self.logger('Client {} received its secret'
210
.format(self.properties["Name"]))
240
self.last_checker_failed = False
241
self.logger('Client %s received its secret'
242
% self.properties["Name"])
211
243
212
244
def need_approval(self, timeout, default):
213
245
if not default:
214
message = 'Client {} needs approval within {} seconds'
246
message = 'Client %s needs approval within %s seconds'
215
247
else:
216
message = 'Client {} will get its secret in {} seconds'
217
self.logger(message.format(self.properties["Name"],
218
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)
219
252
220
253
def rejected(self, reason):
221
self.logger('Client {} was rejected; reason: {}'
222
.format(self.properties["Name"], reason))
254
self.logger('Client %s was rejected; reason: %s'
255
% (self.properties["Name"], reason))
223
256
224
257
def selectable(self):
225
258
"""Make this a "selectable" widget.
247
280
"bold-underline-blink":
248
281
"bold-underline-blink-standout",
249
282
}
250
283
251
284
# Rebuild focus and non-focus widgets using current properties
252
285
253
286
# Base part of a client. Name!
254
base = '{name}: '.format(name=self.properties["Name"])
287
base = ('%(name)s: '
288
% {"name": self.properties["Name"]})
255
289
if not self.properties["Enabled"]:
256
290
message = "DISABLED"
257
self.using_timer(False)
258
291
elif self.properties["ApprovalPending"]:
259
292
timeout = datetime.timedelta(milliseconds
260
293
= self.properties
262
295
last_approval_request = isoformat_to_datetime(
263
296
self.properties["LastApprovalRequest"])
264
297
if last_approval_request is not None:
265
timer = max(timeout - (datetime.datetime.utcnow()
266
- last_approval_request),
267
datetime.timedelta())
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
268
300
else:
269
301
timer = datetime.timedelta()
270
302
if self.properties["ApprovedByDefault"]:
271
message = "Approval in {}. (d)eny?"
272
else:
273
message = "Denial in {}. (a)pprove?"
274
message = message.format(str(timer).rsplit(".", 1)[0])
275
self.using_timer(True)
276
elif self.properties["LastCheckerStatus"] != 0:
277
# When checker has failed, show timer until client expires
278
expires = self.properties["Expires"]
279
if expires == "":
280
timer = datetime.timedelta(0)
281
else:
282
expires = (datetime.datetime.strptime
283
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
284
timer = max(expires - datetime.datetime.utcnow(),
285
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)
286
316
message = ('A checker has failed! Time until client'
287
' gets disabled: {}'
288
.format(str(timer).rsplit(".", 1)[0]))
289
self.using_timer(True)
317
' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
290
319
else:
291
320
message = "enabled"
292
self.using_timer(False)
293
self._text = "{}{}".format(base, message)
294
321
self._text = "%s%s" % (base, message)
322
295
323
if not urwid.supports_unicode():
296
324
self._text = self._text.encode("ascii", "replace")
297
325
textlist = [("normal", self._text)]
309
337
self.update_hook()
310
338
311
339
def update_timer(self):
312
"""called by gobject. Will indefinitely loop until
313
gobject.source_remove() on tag is called"""
340
"called by gobject"
314
341
self.update()
315
342
return True # Keep calling this
316
343
317
def delete(self, **kwargs):
344
def delete(self):
318
345
if self._update_timer_callback_tag is not None:
319
346
gobject.source_remove(self._update_timer_callback_tag)
320
347
self._update_timer_callback_tag = None
321
for match in self.match_objects:
322
match.remove()
323
self.match_objects = ()
324
348
if self.delete_hook is not None:
325
349
self.delete_hook(self)
326
return super(MandosClientWidget, self).delete(**kwargs)
327
350
328
351
def render(self, maxcolrow, focus=False):
329
352
"""Render differently if we have focus.
335
358
"""Handle keys.
336
359
This overrides the method from urwid.FlowWidget"""
337
360
if key == "+":
338
self.proxy.Set(client_interface, "Enabled",
339
dbus.Boolean(True), ignore_reply = True,
340
dbus_interface = dbus.PROPERTIES_IFACE)
361
self.proxy.Enable(dbus_interface = client_interface)
341
362
elif key == "-":
342
self.proxy.Set(client_interface, "Enabled", False,
343
ignore_reply = True,
344
dbus_interface = dbus.PROPERTIES_IFACE)
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.Set(client_interface, "CheckerRunning",
359
dbus.Boolean(True), ignore_reply = True,
360
dbus_interface = dbus.PROPERTIES_IFACE)
374
self.proxy.StartChecker(dbus_interface = client_interface)
361
375
elif key == "S":
362
self.proxy.Set(client_interface, "CheckerRunning",
363
dbus.Boolean(False), ignore_reply = True,
364
dbus_interface = dbus.PROPERTIES_IFACE)
376
self.proxy.StopChecker(dbus_interface = client_interface)
365
377
elif key == "C":
366
self.proxy.CheckedOK(dbus_interface = client_interface,
367
ignore_reply=True)
378
self.proxy.CheckedOK(dbus_interface = client_interface)
368
379
# xxx
369
380
# elif key == "p" or key == "=":
370
381
# self.proxy.pause()
375
386
else:
376
387
return key
377
388
378
def properties_changed(self, interface, properties, invalidated):
379
"""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.
380
392
This overrides the method from MandosClientPropertyCache"""
381
old_values = { key: self.properties.get(key)
382
for key in properties.keys() }
383
super(MandosClientWidget, self).properties_changed(
384
interface, properties, invalidated)
385
if any(old_values[key] != self.properties.get(key)
386
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:
387
398
self.update()
388
399
389
400
392
403
"down" key presses, thus not allowing any containing widgets to
393
404
use them as an excuse to shift focus away from this widget.
394
405
"""
395
def keypress(self, *args, **kwargs):
396
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
406
def keypress(self, maxcolrow, key):
407
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
397
408
if ret in ("up", "down"):
398
409
return
399
410
return ret
403
414
"""This is the entire user interface - the whole screen
404
415
with boxes, lists of client widgets, etc.
405
416
"""
406
def __init__(self, max_log_length=1000, log_level=1):
417
def __init__(self, max_log_length=1000):
407
418
DBusGMainLoop(set_as_default=True)
408
419
409
420
self.screen = urwid.curses_display.Screen()
412
423
("normal",
413
424
"default", "default", None),
414
425
("bold",
415
"bold", "default", "bold"),
426
"default", "default", "bold"),
416
427
("underline-blink",
417
"underline,blink", "default", "underline,blink"),
428
"default", "default", "underline"),
418
429
("standout",
419
"standout", "default", "standout"),
430
"default", "default", "standout"),
420
431
("bold-underline-blink",
421
"bold,underline,blink", "default", "bold,underline,blink"),
432
"default", "default", ("bold", "underline")),
422
433
("bold-standout",
423
"bold,standout", "default", "bold,standout"),
434
"default", "default", ("bold", "standout")),
424
435
("underline-blink-standout",
425
"underline,blink,standout", "default",
426
"underline,blink,standout"),
436
"default", "default", ("underline", "standout")),
427
437
("bold-underline-blink-standout",
428
"bold,underline,blink,standout", "default",
429
"bold,underline,blink,standout"),
438
"default", "default", ("bold", "underline",
439
"standout")),
430
440
))
431
441
432
442
if urwid.supports_unicode():
447
457
self.log = []
448
458
self.max_log_length = max_log_length
449
459
450
self.log_level = log_level
451
452
460
# We keep a reference to the log widget so we can remove it
453
461
# from the ListWalker without it getting destroyed
454
462
self.logbox = ConstrainedListBox(self.log)
466
474
467
475
self.busname = domain + '.Mandos'
468
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)
469
519
470
520
def client_not_found(self, fingerprint, address):
471
self.log_message("Client with address {} and fingerprint {}"
472
" could not be found"
473
.format(address, fingerprint))
521
self.log_message(("Client with address %s and fingerprint %s"
522
" could not be found" % (address,
523
fingerprint)))
474
524
475
525
def rebuild(self):
476
526
"""This rebuilds the User Interface.
486
536
self.divider)))
487
537
if self.log_visible:
488
538
self.uilist.append(self.logbox)
539
pass
489
540
self.topwidget = urwid.Pile(self.uilist)
490
541
491
def log_message(self, message, level=1):
492
"""Log message formatted with timestamp"""
493
if level < self.log_level:
494
return
542
def log_message(self, message):
495
543
timestamp = datetime.datetime.now().isoformat()
496
self.log_message_raw("{}: {}".format(timestamp, message),
497
level=level)
544
self.log_message_raw(timestamp + ": " + message)
498
545
499
def log_message_raw(self, markup, level=1):
546
def log_message_raw(self, markup):
500
547
"""Add a log message to the log buffer."""
501
if level < self.log_level:
502
return
503
548
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
504
549
if (self.max_log_length
505
550
and len(self.log) > self.max_log_length):
512
557
"""Toggle visibility of the log buffer."""
513
558
self.log_visible = not self.log_visible
514
559
self.rebuild()
515
self.log_message("Log visibility changed to: {}"
516
.format(self.log_visible), level=0)
560
#self.log_message("Log visibility changed to: "
561
# + unicode(self.log_visible))
517
562
518
563
def change_log_display(self):
519
564
"""Change type of log display.
524
569
self.log_wrap = "clip"
525
570
for textwidget in self.log:
526
571
textwidget.set_wrap_mode(self.log_wrap)
527
self.log_message("Wrap mode: {}".format(self.log_wrap),
528
level=0)
572
#self.log_message("Wrap mode: " + self.log_wrap)
529
573
530
def find_and_remove_client(self, path, interfaces):
531
"""Find a client by its object path and remove it.
574
def find_and_remove_client(self, path, name):
575
"""Find an client from its object path and remove it.
532
576
533
This is connected to the InterfacesRemoved signal from the
577
This is connected to the ClientRemoved signal from the
534
578
Mandos server object."""
535
if client_interface not in interfaces:
536
# Not a Mandos client object; ignore
537
return
538
579
try:
539
580
client = self.clients_dict[path]
540
581
except KeyError:
541
582
# not found?
542
self.log_message("Unknown client {!r} removed"
543
.format(path))
544
583
return
545
client.delete()
584
self.remove_client(client, path)
546
585
547
def add_new_client(self, path, ifs_and_props):
548
"""Find a client by its object path and remove it.
549
550
This is connected to the InterfacesAdded signal from the
551
Mandos server object.
552
"""
553
if client_interface not in ifs_and_props:
554
# Not a Mandos client object; ignore
555
return
586
def add_new_client(self, path):
556
587
client_proxy_object = self.bus.get_object(self.busname, path)
557
588
self.add_client(MandosClientWidget(server_proxy_object
558
589
=self.mandos_serv,
563
594
delete_hook
564
595
=self.remove_client,
565
596
logger
566
=self.log_message,
567
properties
568
= dict(ifs_and_props[
569
client_interface])),
597
=self.log_message),
570
598
path=path)
571
599
572
600
def add_client(self, client, path=None):
574
602
if path is None:
575
603
path = client.proxy.object_path
576
604
self.clients_dict[path] = client
577
self.clients.sort(key=lambda c: c.properties["Name"])
605
self.clients.sort(None, lambda c: c.properties["Name"])
578
606
self.refresh()
579
607
580
608
def remove_client(self, client, path=None):
582
610
if path is None:
583
611
path = client.proxy.object_path
584
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()
585
618
self.refresh()
586
619
587
620
def refresh(self):
591
624
592
625
def run(self):
593
626
"""Start the main loop and exit when it's done."""
594
self.bus = dbus.SystemBus()
595
mandos_dbus_objc = self.bus.get_object(
596
self.busname, "/", follow_name_owner_changes=True)
597
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
598
dbus_interface
599
= server_interface)
600
try:
601
mandos_clients = (self.mandos_serv
602
.GetAllClientsWithProperties())
603
if not mandos_clients:
604
self.log_message_raw(("bold", "Note: Server has no clients."))
605
except dbus.exceptions.DBusException:
606
self.log_message_raw(("bold", "Note: No Mandos server running."))
607
mandos_clients = dbus.Dictionary()
608
609
(self.mandos_serv
610
.connect_to_signal("InterfacesRemoved",
611
self.find_and_remove_client,
612
dbus_interface
613
= dbus.OBJECT_MANAGER_IFACE,
614
byte_arrays=True))
615
(self.mandos_serv
616
.connect_to_signal("InterfacesAdded",
617
self.add_new_client,
618
dbus_interface
619
= dbus.OBJECT_MANAGER_IFACE,
620
byte_arrays=True))
621
(self.mandos_serv
622
.connect_to_signal("ClientNotFound",
623
self.client_not_found,
624
dbus_interface=server_interface,
625
byte_arrays=True))
626
for path, client in mandos_clients.items():
627
client_proxy_object = self.bus.get_object(self.busname,
628
path)
629
self.add_client(MandosClientWidget(server_proxy_object
630
=self.mandos_serv,
631
proxy_object
632
=client_proxy_object,
633
properties=client,
634
update_hook
635
=self.refresh,
636
delete_hook
637
=self.remove_client,
638
logger
639
=self.log_message),
640
path=path)
641
642
627
self.refresh()
643
628
self._input_callback_tag = (gobject.io_add_watch
644
629
(sys.stdin.fileno(),
676
661
elif key == "window resize":
677
662
self.size = self.screen.get_cols_rows()
678
663
self.refresh()
679
elif key == "ctrl l":
680
self.screen.clear()
664
elif key == "\f": # Ctrl-L
681
665
self.refresh()
682
666
elif key == "l" or key == "D":
683
667
self.toggle_log_display()
695
679
"?: Help",
696
680
"l: Log window toggle",
697
681
"TAB: Switch window",
698
"w: Wrap (log lines)",
699
"v: Toggle verbose log",
700
))))
682
"w: Wrap (log)"))))
701
683
self.log_message_raw(("bold",
702
684
" "
703
685
.join(("Clients:",
716
698
else:
717
699
self.topwidget.set_focus(self.logbox)
718
700
self.refresh()
719
elif key == "v":
720
if self.log_level == 0:
721
self.log_level = 1
722
self.log_message("Verbose mode: Off")
723
else:
724
self.log_level = 0
725
self.log_message("Verbose mode: On")
726
701
#elif (key == "end" or key == "meta >" or key == "G"
727
702
# or key == ">"):
728
703
# pass # xxx end-of-buffer
751
726
ui.run()
752
727
except KeyboardInterrupt:
753
728
ui.screen.stop()
754
except Exception as e:
755
ui.log_message(str(e))
729
except Exception, e:
730
ui.log_message(unicode(e))
756
731
ui.screen.stop()
757
732
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0