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 336
- compare with another revision
- download diff
- download tarball
- view history from revision 336
- Committer: Teddy Hogeborn
- Date: 2016-03-05 22:12:12 UTC
- Revision ID: teddy@recompile.se-20160305221212-t0socp3zyopq49f9
Tags: version-1.7.4-1
* Makefile (version): Changed to "1.7.4".
* NEWS (Version 1.7.4): New entry.
* debian/changelog (1.7.4-1): - '' -
* NEWS (Version 1.7.4): New entry.
* debian/changelog (1.7.4-1): - '' -
- files added:
- bugs.xml
- 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-2016 Teddy Hogeborn
7
# Copyright © 2009-2016 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
from gi.repository import GObject
44
except ImportError:
45
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.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)
63
version = "1.7.4"
64
65
try:
66
dbus.OBJECT_MANAGER_IFACE
67
except AttributeError:
68
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
63
69
64
70
def isoformat_to_datetime(iso):
65
71
"Parse an ISO 8601 date string to a datetime.datetime()"
82
88
properties and calls a hook function when any of them are
83
89
changed.
84
90
"""
85
def __init__(self, proxy_object=None, *args, **kwargs):
91
def __init__(self, proxy_object=None, properties=None, **kwargs):
86
92
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)
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)
101
107
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.
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.
105
111
"""
106
112
# Update properties dict with new value
107
self.properties[property] = value
113
if interface == client_interface:
114
self.properties.update(properties)
115
116
def delete(self):
117
self.property_changed_match.remove()
108
118
109
119
110
120
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
112
122
"""
113
123
114
124
def __init__(self, server_proxy_object=None, update_hook=None,
115
delete_hook=None, logger=None, *args, **kwargs):
125
delete_hook=None, logger=None, **kwargs):
116
126
# Called on update
117
127
self.update_hook = update_hook
118
128
# Called on delete
123
133
self.logger = logger
124
134
125
135
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
128
136
129
137
# The widget shown normally
130
138
self._text_widget = urwid.Text("")
131
139
# The widget shown when we have focus
132
140
self._focus_text_widget = urwid.Text("")
133
super(MandosClientWidget, self).__init__(
134
update_hook=update_hook, delete_hook=delete_hook,
135
*args, **kwargs)
141
super(MandosClientWidget, self).__init__(**kwargs)
136
142
self.update()
137
143
self.opened = False
138
144
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)
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)
177
168
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
169
def using_timer(self, flag):
185
170
"""Call this method with True or False when timer should be
186
171
activated or deactivated.
187
172
"""
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:
194
self._update_timer_callback_tag = (gobject.timeout_add
173
if flag and self._update_timer_callback_tag is None:
174
# Will update the shown timer value every second
175
self._update_timer_callback_tag = (GObject.timeout_add
195
176
(1000,
196
177
self.update_timer))
197
elif old and self._update_timer_callback_lock == 0:
198
gobject.source_remove(self._update_timer_callback_tag)
178
elif not (flag or self._update_timer_callback_tag is None):
179
GObject.source_remove(self._update_timer_callback_tag)
199
180
self._update_timer_callback_tag = None
200
181
201
182
def checker_completed(self, exitstatus, condition, command):
202
183
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))
184
self.logger('Checker for client {} (command "{}")'
185
' succeeded'.format(self.properties["Name"],
186
command), level=0)
209
187
self.update()
210
188
return
211
189
# Checker failed
212
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
215
190
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)))
191
self.logger('Checker for client {} (command "{}") failed'
192
' with exit code {}'
193
.format(self.properties["Name"], command,
194
os.WEXITSTATUS(condition)))
220
195
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))
229
else:
230
self.logger('Checker for client %s completed'
231
' mysteriously')
196
self.logger('Checker for client {} (command "{}") was'
197
' killed by signal {}'
198
.format(self.properties["Name"], command,
199
os.WTERMSIG(condition)))
232
200
self.update()
233
201
234
202
def checker_started(self, command):
235
#self.logger('Client %s started checker "%s"'
236
# % (self.properties["Name"], unicode(command)))
237
pass
203
"""Server signals that a checker started."""
204
self.logger('Client {} started checker "{}"'
205
.format(self.properties["Name"],
206
command), level=0)
238
207
239
208
def got_secret(self):
240
self.last_checker_failed = False
241
self.logger('Client %s received its secret'
242
% self.properties["Name"])
209
self.logger('Client {} received its secret'
210
.format(self.properties["Name"]))
243
211
244
212
def need_approval(self, timeout, default):
245
213
if not default:
246
message = 'Client %s needs approval within %s seconds'
214
message = 'Client {} needs approval within {} seconds'
247
215
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)
216
message = 'Client {} will get its secret in {} seconds'
217
self.logger(message.format(self.properties["Name"],
218
timeout/1000))
252
219
253
220
def rejected(self, reason):
254
self.logger('Client %s was rejected; reason: %s'
255
% (self.properties["Name"], reason))
221
self.logger('Client {} was rejected; reason: {}'
222
.format(self.properties["Name"], reason))
256
223
257
224
def selectable(self):
258
225
"""Make this a "selectable" widget.
280
247
"bold-underline-blink":
281
248
"bold-underline-blink-standout",
282
249
}
283
250
284
251
# Rebuild focus and non-focus widgets using current properties
285
252
286
253
# Base part of a client. Name!
287
base = ('%(name)s: '
288
% {"name": self.properties["Name"]})
254
base = '{name}: '.format(name=self.properties["Name"])
289
255
if not self.properties["Enabled"]:
290
256
message = "DISABLED"
257
self.using_timer(False)
291
258
elif self.properties["ApprovalPending"]:
292
259
timeout = datetime.timedelta(milliseconds
293
260
= self.properties
295
262
last_approval_request = isoformat_to_datetime(
296
263
self.properties["LastApprovalRequest"])
297
264
if last_approval_request is not None:
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
265
timer = max(timeout - (datetime.datetime.utcnow()
266
- last_approval_request),
267
datetime.timedelta())
300
268
else:
301
269
timer = datetime.timedelta()
302
270
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)
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())
316
286
message = ('A checker has failed! Time until client'
317
' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
287
' gets disabled: {}'
288
.format(str(timer).rsplit(".", 1)[0]))
289
self.using_timer(True)
319
290
else:
320
291
message = "enabled"
321
self._text = "%s%s" % (base, message)
322
292
self.using_timer(False)
293
self._text = "{}{}".format(base, message)
294
323
295
if not urwid.supports_unicode():
324
296
self._text = self._text.encode("ascii", "replace")
325
297
textlist = [("normal", self._text)]
337
309
self.update_hook()
338
310
339
311
def update_timer(self):
340
"called by gobject"
312
"""called by GObject. Will indefinitely loop until
313
GObject.source_remove() on tag is called"""
341
314
self.update()
342
315
return True # Keep calling this
343
316
344
def delete(self):
317
def delete(self, **kwargs):
345
318
if self._update_timer_callback_tag is not None:
346
gobject.source_remove(self._update_timer_callback_tag)
319
GObject.source_remove(self._update_timer_callback_tag)
347
320
self._update_timer_callback_tag = None
321
for match in self.match_objects:
322
match.remove()
323
self.match_objects = ()
348
324
if self.delete_hook is not None:
349
325
self.delete_hook(self)
326
return super(MandosClientWidget, self).delete(**kwargs)
350
327
351
328
def render(self, maxcolrow, focus=False):
352
329
"""Render differently if we have focus.
358
335
"""Handle keys.
359
336
This overrides the method from urwid.FlowWidget"""
360
337
if key == "+":
361
self.proxy.Enable(dbus_interface = client_interface,
362
ignore_reply=True)
338
self.proxy.Set(client_interface, "Enabled",
339
dbus.Boolean(True), ignore_reply = True,
340
dbus_interface = dbus.PROPERTIES_IFACE)
363
341
elif key == "-":
364
self.proxy.Disable(dbus_interface = client_interface,
365
ignore_reply=True)
342
self.proxy.Set(client_interface, "Enabled", False,
343
ignore_reply = True,
344
dbus_interface = dbus.PROPERTIES_IFACE)
366
345
elif key == "a":
367
346
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
368
347
dbus_interface = client_interface,
376
355
.object_path,
377
356
ignore_reply=True)
378
357
elif key == "s":
379
self.proxy.StartChecker(dbus_interface = client_interface,
380
ignore_reply=True)
358
self.proxy.Set(client_interface, "CheckerRunning",
359
dbus.Boolean(True), ignore_reply = True,
360
dbus_interface = dbus.PROPERTIES_IFACE)
381
361
elif key == "S":
382
self.proxy.StopChecker(dbus_interface = client_interface,
383
ignore_reply=True)
362
self.proxy.Set(client_interface, "CheckerRunning",
363
dbus.Boolean(False), ignore_reply = True,
364
dbus_interface = dbus.PROPERTIES_IFACE)
384
365
elif key == "C":
385
366
self.proxy.CheckedOK(dbus_interface = client_interface,
386
367
ignore_reply=True)
394
375
else:
395
376
return key
396
377
397
def property_changed(self, property=None, value=None,
398
*args, **kwargs):
399
"""Call self.update() if old value is not new value.
378
def properties_changed(self, interface, properties, invalidated):
379
"""Call self.update() if any properties changed.
400
380
This overrides the method from MandosClientPropertyCache"""
401
property_name = unicode(property)
402
old_value = self.properties.get(property_name)
403
super(MandosClientWidget, self).property_changed(
404
property=property, value=value, *args, **kwargs)
405
if self.properties.get(property_name) != old_value:
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):
406
387
self.update()
407
388
408
389
411
392
"down" key presses, thus not allowing any containing widgets to
412
393
use them as an excuse to shift focus away from this widget.
413
394
"""
414
def keypress(self, maxcolrow, key):
415
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
395
def keypress(self, *args, **kwargs):
396
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
416
397
if ret in ("up", "down"):
417
398
return
418
399
return ret
422
403
"""This is the entire user interface - the whole screen
423
404
with boxes, lists of client widgets, etc.
424
405
"""
425
def __init__(self, max_log_length=1000):
406
def __init__(self, max_log_length=1000, log_level=1):
426
407
DBusGMainLoop(set_as_default=True)
427
408
428
409
self.screen = urwid.curses_display.Screen()
431
412
("normal",
432
413
"default", "default", None),
433
414
("bold",
434
"default", "default", "bold"),
415
"bold", "default", "bold"),
435
416
("underline-blink",
436
"default", "default", "underline"),
417
"underline,blink", "default", "underline,blink"),
437
418
("standout",
438
"default", "default", "standout"),
419
"standout", "default", "standout"),
439
420
("bold-underline-blink",
440
"default", "default", ("bold", "underline")),
421
"bold,underline,blink", "default", "bold,underline,blink"),
441
422
("bold-standout",
442
"default", "default", ("bold", "standout")),
423
"bold,standout", "default", "bold,standout"),
443
424
("underline-blink-standout",
444
"default", "default", ("underline", "standout")),
425
"underline,blink,standout", "default",
426
"underline,blink,standout"),
445
427
("bold-underline-blink-standout",
446
"default", "default", ("bold", "underline",
447
"standout")),
428
"bold,underline,blink,standout", "default",
429
"bold,underline,blink,standout"),
448
430
))
449
431
450
432
if urwid.supports_unicode():
465
447
self.log = []
466
448
self.max_log_length = max_log_length
467
449
450
self.log_level = log_level
451
468
452
# We keep a reference to the log widget so we can remove it
469
453
# from the ListWalker without it getting destroyed
470
454
self.logbox = ConstrainedListBox(self.log)
481
465
"q: Quit ?: Help"))
482
466
483
467
self.busname = domain + '.Mandos'
484
self.main_loop = gobject.MainLoop()
485
self.bus = dbus.SystemBus()
486
mandos_dbus_objc = self.bus.get_object(
487
self.busname, "/", follow_name_owner_changes=True)
488
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
489
dbus_interface
490
= server_interface)
491
try:
492
mandos_clients = (self.mandos_serv
493
.GetAllClientsWithProperties())
494
except dbus.exceptions.DBusException:
495
mandos_clients = dbus.Dictionary()
496
497
(self.mandos_serv
498
.connect_to_signal("ClientRemoved",
499
self.find_and_remove_client,
500
dbus_interface=server_interface,
501
byte_arrays=True))
502
(self.mandos_serv
503
.connect_to_signal("ClientAdded",
504
self.add_new_client,
505
dbus_interface=server_interface,
506
byte_arrays=True))
507
(self.mandos_serv
508
.connect_to_signal("ClientNotFound",
509
self.client_not_found,
510
dbus_interface=server_interface,
511
byte_arrays=True))
512
for path, client in mandos_clients.iteritems():
513
client_proxy_object = self.bus.get_object(self.busname,
514
path)
515
self.add_client(MandosClientWidget(server_proxy_object
516
=self.mandos_serv,
517
proxy_object
518
=client_proxy_object,
519
properties=client,
520
update_hook
521
=self.refresh,
522
delete_hook
523
=self.remove_client,
524
logger
525
=self.log_message),
526
path=path)
468
self.main_loop = GObject.MainLoop()
527
469
528
470
def client_not_found(self, fingerprint, address):
529
self.log_message(("Client with address %s and fingerprint %s"
530
" could not be found" % (address,
531
fingerprint)))
471
self.log_message("Client with address {} and fingerprint {}"
472
" could not be found"
473
.format(address, fingerprint))
532
474
533
475
def rebuild(self):
534
476
"""This rebuilds the User Interface.
544
486
self.divider)))
545
487
if self.log_visible:
546
488
self.uilist.append(self.logbox)
547
pass
548
489
self.topwidget = urwid.Pile(self.uilist)
549
490
550
def log_message(self, message):
491
def log_message(self, message, level=1):
492
"""Log message formatted with timestamp"""
493
if level < self.log_level:
494
return
551
495
timestamp = datetime.datetime.now().isoformat()
552
self.log_message_raw(timestamp + ": " + message)
496
self.log_message_raw("{}: {}".format(timestamp, message),
497
level=level)
553
498
554
def log_message_raw(self, markup):
499
def log_message_raw(self, markup, level=1):
555
500
"""Add a log message to the log buffer."""
501
if level < self.log_level:
502
return
556
503
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
557
504
if (self.max_log_length
558
505
and len(self.log) > self.max_log_length):
565
512
"""Toggle visibility of the log buffer."""
566
513
self.log_visible = not self.log_visible
567
514
self.rebuild()
568
#self.log_message("Log visibility changed to: "
569
# + unicode(self.log_visible))
515
self.log_message("Log visibility changed to: {}"
516
.format(self.log_visible), level=0)
570
517
571
518
def change_log_display(self):
572
519
"""Change type of log display.
577
524
self.log_wrap = "clip"
578
525
for textwidget in self.log:
579
526
textwidget.set_wrap_mode(self.log_wrap)
580
#self.log_message("Wrap mode: " + self.log_wrap)
527
self.log_message("Wrap mode: {}".format(self.log_wrap),
528
level=0)
581
529
582
def find_and_remove_client(self, path, name):
583
"""Find an client from its object path and remove it.
530
def find_and_remove_client(self, path, interfaces):
531
"""Find a client by its object path and remove it.
584
532
585
This is connected to the ClientRemoved signal from the
533
This is connected to the InterfacesRemoved signal from the
586
534
Mandos server object."""
535
if client_interface not in interfaces:
536
# Not a Mandos client object; ignore
537
return
587
538
try:
588
539
client = self.clients_dict[path]
589
540
except KeyError:
590
541
# not found?
542
self.log_message("Unknown client {!r} removed"
543
.format(path))
591
544
return
592
self.remove_client(client, path)
545
client.delete()
593
546
594
def add_new_client(self, path):
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
595
556
client_proxy_object = self.bus.get_object(self.busname, path)
596
557
self.add_client(MandosClientWidget(server_proxy_object
597
558
=self.mandos_serv,
602
563
delete_hook
603
564
=self.remove_client,
604
565
logger
605
=self.log_message),
566
=self.log_message,
567
properties
568
= dict(ifs_and_props[
569
client_interface])),
606
570
path=path)
607
571
608
572
def add_client(self, client, path=None):
610
574
if path is None:
611
575
path = client.proxy.object_path
612
576
self.clients_dict[path] = client
613
self.clients.sort(None, lambda c: c.properties["Name"])
577
self.clients.sort(key=lambda c: c.properties["Name"])
614
578
self.refresh()
615
579
616
580
def remove_client(self, client, path=None):
618
582
if path is None:
619
583
path = client.proxy.object_path
620
584
del self.clients_dict[path]
621
if not self.clients_dict:
622
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
623
# is completely emptied, we need to recreate it.
624
self.clients = urwid.SimpleListWalker([])
625
self.rebuild()
626
585
self.refresh()
627
586
628
587
def refresh(self):
632
591
633
592
def run(self):
634
593
"""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
635
642
self.refresh()
636
self._input_callback_tag = (gobject.io_add_watch
643
self._input_callback_tag = (GObject.io_add_watch
637
644
(sys.stdin.fileno(),
638
gobject.IO_IN,
645
GObject.IO_IN,
639
646
self.process_input))
640
647
self.main_loop.run()
641
648
# Main loop has finished, we should close everything now
642
gobject.source_remove(self._input_callback_tag)
649
GObject.source_remove(self._input_callback_tag)
643
650
self.screen.stop()
644
651
645
652
def stop(self):
669
676
elif key == "window resize":
670
677
self.size = self.screen.get_cols_rows()
671
678
self.refresh()
672
elif key == "\f": # Ctrl-L
679
elif key == "ctrl l":
680
self.screen.clear()
673
681
self.refresh()
674
682
elif key == "l" or key == "D":
675
683
self.toggle_log_display()
687
695
"?: Help",
688
696
"l: Log window toggle",
689
697
"TAB: Switch window",
690
"w: Wrap (log)"))))
698
"w: Wrap (log lines)",
699
"v: Toggle verbose log",
700
))))
691
701
self.log_message_raw(("bold",
692
702
" "
693
703
.join(("Clients:",
706
716
else:
707
717
self.topwidget.set_focus(self.logbox)
708
718
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")
709
726
#elif (key == "end" or key == "meta >" or key == "G"
710
727
# or key == ">"):
711
728
# pass # xxx end-of-buffer
734
751
ui.run()
735
752
except KeyboardInterrupt:
736
753
ui.screen.stop()
737
except Exception, e:
738
ui.log_message(unicode(e))
754
except Exception as e:
755
ui.log_message(str(e))
739
756
ui.screen.stop()
740
757
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0