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 886
- compare with another revision
- download diff
- download tarball
- view history from revision 886
- Committer: Teddy Hogeborn
- Date: 2016-10-30 03:02:49 UTC
- Revision ID: teddy@recompile.se-20161030030249-4tcvjkfie8eye3n2
debian/control: Allow GnuPG 2 with the server.
debian/control (Package: mandos/Depends:): Change "gnupg" to "gnupg2 |
gnupg".
debian/control (Package: mandos/Depends:): Change "gnupg" to "gnupg2 |
gnupg".
- files added:
- bugs.xml
- debian/upstream
- plugin-helpers
- files modified:
- .bzrignore
added
removed
mandos-monitor
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
#
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
#
6
# Copyright © 2009-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 Björn Påhlsson
8
#
5
#
6
# Copyright © 2009-2016 Teddy Hogeborn
7
# Copyright © 2009-2016 Björn Påhlsson
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
11
11
# the Free Software Foundation, either version 3 of the License, or
15
15
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16
16
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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/>.
21
#
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
22
#
22
23
# Contact the authors at <mandos@recompile.se>.
23
#
24
#
24
25
25
26
from __future__ import (division, absolute_import, print_function,
26
27
unicode_literals)
28
try:
29
from future_builtins import *
30
except ImportError:
31
pass
27
32
28
33
import sys
29
34
import os
30
import signal
31
35
32
36
import datetime
33
37
35
39
import urwid
36
40
37
41
from dbus.mainloop.glib import DBusGMainLoop
38
import gobject
42
from gi.repository import GLib
39
43
40
44
import dbus
41
45
42
import UserList
43
44
46
import locale
45
47
48
import logging
49
50
if sys.version_info.major == 2:
51
str = unicode
52
46
53
locale.setlocale(locale.LC_ALL, '')
47
54
48
import logging
49
55
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
56
51
57
# Some useful constants
52
58
domain = 'se.recompile'
53
59
server_interface = domain + '.Mandos'
54
60
client_interface = domain + '.Mandos.Client'
55
version = "1.5.3"
56
57
# Always run in monochrome mode
58
urwid.curses_display.curses.has_colors = lambda : False
59
60
# Urwid doesn't support blinking, but we want it. Since we have no
61
# use for underline on its own, we make underline also always blink.
62
urwid.curses_display.curses.A_UNDERLINE |= (
63
urwid.curses_display.curses.A_BLINK)
61
version = "1.7.13"
62
63
try:
64
dbus.OBJECT_MANAGER_IFACE
65
except AttributeError:
66
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
67
64
68
65
69
def isoformat_to_datetime(iso):
66
70
"Parse an ISO 8601 date string to a datetime.datetime()"
75
79
int(day),
76
80
int(hour),
77
81
int(minute),
78
int(second), # Whole seconds
79
int(fraction*1000000)) # Microseconds
82
int(second), # Whole seconds
83
int(fraction*1000000)) # Microseconds
84
80
85
81
86
class MandosClientPropertyCache(object):
82
87
"""This wraps a Mandos Client D-Bus proxy object, caches the
83
88
properties and calls a hook function when any of them are
84
89
changed.
85
90
"""
86
def __init__(self, proxy_object=None, *args, **kwargs):
87
self.proxy = proxy_object # Mandos Client proxy object
88
89
self.properties = dict()
91
def __init__(self, proxy_object=None, properties=None, **kwargs):
92
self.proxy = proxy_object # Mandos Client proxy object
93
self.properties = dict() if properties is None else properties
90
94
self.property_changed_match = (
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
93
client_interface,
95
self.proxy.connect_to_signal("PropertiesChanged",
96
self.properties_changed,
97
dbus.PROPERTIES_IFACE,
94
98
byte_arrays=True))
95
96
self.properties.update(
97
self.proxy.GetAll(client_interface,
98
dbus_interface = dbus.PROPERTIES_IFACE))
99
100
#XXX This breaks good super behaviour
101
# super(MandosClientPropertyCache, self).__init__(
102
# *args, **kwargs)
103
104
def property_changed(self, property=None, value=None):
105
"""This is called whenever we get a PropertyChanged signal
106
It updates the changed property in the "properties" dict.
99
100
if properties is None:
101
self.properties.update(self.proxy.GetAll(
102
client_interface,
103
dbus_interface=dbus.PROPERTIES_IFACE))
104
105
super(MandosClientPropertyCache, self).__init__(**kwargs)
106
107
def properties_changed(self, interface, properties, invalidated):
108
"""This is called whenever we get a PropertiesChanged signal
109
It updates the changed properties in the "properties" dict.
107
110
"""
108
111
# Update properties dict with new value
109
self.properties[property] = value
110
111
def delete(self, *args, **kwargs):
112
if interface == client_interface:
113
self.properties.update(properties)
114
115
def delete(self):
112
116
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
114
*args, **kwargs)
115
117
116
118
117
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
118
120
"""A Mandos Client which is visible on the screen.
119
121
"""
120
122
121
123
def __init__(self, server_proxy_object=None, update_hook=None,
122
delete_hook=None, logger=None, *args, **kwargs):
124
delete_hook=None, logger=None, **kwargs):
123
125
# Called on update
124
126
self.update_hook = update_hook
125
127
# Called on delete
128
130
self.server_proxy_object = server_proxy_object
129
131
# Logger
130
132
self.logger = logger
131
133
132
134
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
135
135
136
# The widget shown normally
136
137
self._text_widget = urwid.Text("")
137
138
# The widget shown when we have focus
138
139
self._focus_text_widget = urwid.Text("")
139
super(MandosClientWidget, self).__init__(
140
update_hook=update_hook, delete_hook=delete_hook,
141
*args, **kwargs)
140
super(MandosClientWidget, self).__init__(**kwargs)
142
141
self.update()
143
142
self.opened = False
144
145
last_checked_ok = isoformat_to_datetime(self.properties
146
["LastCheckedOK"])
147
148
if self.properties ["LastCheckerStatus"] != 0:
149
self.using_timer(True)
150
151
if self.need_approval:
152
self.using_timer(True)
153
143
154
144
self.match_objects = (
155
145
self.proxy.connect_to_signal("CheckerCompleted",
156
146
self.checker_completed,
172
162
self.rejected,
173
163
client_interface,
174
164
byte_arrays=True))
175
#self.logger('Created client {0}'
176
# .format(self.properties["Name"]))
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
if property == "LastCheckerStatus":
184
using_timer(value != 0)
185
#self.logger('Checker for client {0} (command "{1}") was '
186
# ' successful'.format(self.properties["Name"],
187
# command))
188
165
self.logger('Created client {}'
166
.format(self.properties["Name"]), level=0)
167
189
168
def using_timer(self, flag):
190
169
"""Call this method with True or False when timer should be
191
170
activated or deactivated.
192
171
"""
193
old = self._update_timer_callback_lock
194
if flag:
195
self._update_timer_callback_lock += 1
196
else:
197
self._update_timer_callback_lock -= 1
198
if old == 0 and self._update_timer_callback_lock:
172
if flag and self._update_timer_callback_tag is None:
199
173
# Will update the shown timer value every second
200
self._update_timer_callback_tag = (gobject.timeout_add
174
self._update_timer_callback_tag = (GLib.timeout_add
201
175
(1000,
202
176
self.update_timer))
203
elif old and self._update_timer_callback_lock == 0:
204
gobject.source_remove(self._update_timer_callback_tag)
177
elif not (flag or self._update_timer_callback_tag is None):
178
GLib.source_remove(self._update_timer_callback_tag)
205
179
self._update_timer_callback_tag = None
206
180
207
181
def checker_completed(self, exitstatus, condition, command):
208
182
if exitstatus == 0:
183
self.logger('Checker for client {} (command "{}")'
184
' succeeded'.format(self.properties["Name"],
185
command), level=0)
209
186
self.update()
210
187
return
211
188
# Checker failed
212
189
if os.WIFEXITED(condition):
213
self.logger('Checker for client {0} (command "{1}")'
214
' failed with exit code {2}'
190
self.logger('Checker for client {} (command "{}") failed'
191
' with exit code {}'
215
192
.format(self.properties["Name"], command,
216
193
os.WEXITSTATUS(condition)))
217
194
elif os.WIFSIGNALED(condition):
218
self.logger('Checker for client {0} (command "{1}") was'
219
' killed by signal {2}'
195
self.logger('Checker for client {} (command "{}") was'
196
' killed by signal {}'
220
197
.format(self.properties["Name"], command,
221
198
os.WTERMSIG(condition)))
222
elif os.WCOREDUMP(condition):
223
self.logger('Checker for client {0} (command "{1}")'
224
' dumped core'
225
.format(self.properties["Name"], command))
226
else:
227
self.logger('Checker for client {0} completed'
228
' mysteriously'
229
.format(self.properties["Name"]))
230
199
self.update()
231
200
232
201
def checker_started(self, command):
233
"""Server signals that a checker started. This could be useful
234
to log in the future. """
235
#self.logger('Client {0} started checker "{1}"'
236
# .format(self.properties["Name"],
237
# unicode(command)))
238
pass
239
202
"""Server signals that a checker started."""
203
self.logger('Client {} started checker "{}"'
204
.format(self.properties["Name"],
205
command), level=0)
206
240
207
def got_secret(self):
241
self.logger('Client {0} received its secret'
208
self.logger('Client {} received its secret'
242
209
.format(self.properties["Name"]))
243
210
244
211
def need_approval(self, timeout, default):
245
212
if not default:
246
message = 'Client {0} needs approval within {1} seconds'
213
message = 'Client {} needs approval within {} seconds'
247
214
else:
248
message = 'Client {0} will get its secret in {1} seconds'
215
message = 'Client {} will get its secret in {} seconds'
249
216
self.logger(message.format(self.properties["Name"],
250
217
timeout/1000))
251
self.using_timer(True)
252
218
253
219
def rejected(self, reason):
254
self.logger('Client {0} was rejected; reason: {1}'
220
self.logger('Client {} was rejected; reason: {}'
255
221
.format(self.properties["Name"], reason))
256
222
257
223
def selectable(self):
258
224
"""Make this a "selectable" widget.
259
225
This overrides the method from urwid.FlowWidget."""
260
226
return True
261
227
262
228
def rows(self, maxcolrow, focus=False):
263
229
"""How many rows this widget will occupy might depend on
264
230
whether we have focus or not.
265
231
This overrides the method from urwid.FlowWidget"""
266
232
return self.current_widget(focus).rows(maxcolrow, focus=focus)
267
233
268
234
def current_widget(self, focus=False):
269
235
if focus or self.opened:
270
236
return self._focus_widget
271
237
return self._widget
272
238
273
239
def update(self):
274
240
"Called when what is visible on the screen should be updated."
275
241
# How to add standout mode to a style
276
with_standout = { "normal": "standout",
277
"bold": "bold-standout",
278
"underline-blink":
279
"underline-blink-standout",
280
"bold-underline-blink":
281
"bold-underline-blink-standout",
282
}
242
with_standout = {"normal": "standout",
243
"bold": "bold-standout",
244
"underline-blink":
245
"underline-blink-standout",
246
"bold-underline-blink":
247
"bold-underline-blink-standout",
248
}
283
249
284
250
# Rebuild focus and non-focus widgets using current properties
285
251
287
253
base = '{name}: '.format(name=self.properties["Name"])
288
254
if not self.properties["Enabled"]:
289
255
message = "DISABLED"
256
self.using_timer(False)
290
257
elif self.properties["ApprovalPending"]:
291
timeout = datetime.timedelta(milliseconds
292
= self.properties
293
["ApprovalDelay"])
258
timeout = datetime.timedelta(
259
milliseconds=self.properties["ApprovalDelay"])
294
260
last_approval_request = isoformat_to_datetime(
295
261
self.properties["LastApprovalRequest"])
296
262
if last_approval_request is not None:
297
timer = timeout - (datetime.datetime.utcnow()
298
- last_approval_request)
263
timer = max(timeout - (datetime.datetime.utcnow()
264
- last_approval_request),
265
datetime.timedelta())
299
266
else:
300
267
timer = datetime.timedelta()
301
268
if self.properties["ApprovedByDefault"]:
302
message = "Approval in {0}. (d)eny?"
269
message = "Approval in {}. (d)eny?"
303
270
else:
304
message = "Denial in {0}. (a)pprove?"
305
message = message.format(unicode(timer).rsplit(".", 1)[0])
271
message = "Denial in {}. (a)pprove?"
272
message = message.format(str(timer).rsplit(".", 1)[0])
273
self.using_timer(True)
306
274
elif self.properties["LastCheckerStatus"] != 0:
307
# When checker has failed, print a timer until client expires
275
# When checker has failed, show timer until client expires
308
276
expires = self.properties["Expires"]
309
277
if expires == "":
310
278
timer = datetime.timedelta(0)
311
279
else:
312
expires = datetime.datetime.strptime(expires,
313
'%Y-%m-%dT%H:%M:%S.%f')
314
timer = expires - datetime.datetime.utcnow()
280
expires = (datetime.datetime.strptime
281
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
282
timer = max(expires - datetime.datetime.utcnow(),
283
datetime.timedelta())
315
284
message = ('A checker has failed! Time until client'
316
' gets disabled: {0}'
317
.format(unicode(timer).rsplit(".", 1)[0]))
285
' gets disabled: {}'
286
.format(str(timer).rsplit(".", 1)[0]))
287
self.using_timer(True)
318
288
else:
319
289
message = "enabled"
320
self._text = "{0}{1}".format(base, message)
321
290
self.using_timer(False)
291
self._text = "{}{}".format(base, message)
292
322
293
if not urwid.supports_unicode():
323
294
self._text = self._text.encode("ascii", "replace")
324
295
textlist = [("normal", self._text)]
334
305
# Run update hook, if any
335
306
if self.update_hook is not None:
336
307
self.update_hook()
337
308
338
309
def update_timer(self):
339
"""called by gobject. Will indefinitely loop until
340
gobject.source_remove() on tag is called"""
310
"""called by GLib. Will indefinitely loop until
311
GLib.source_remove() on tag is called
312
"""
341
313
self.update()
342
314
return True # Keep calling this
343
344
def delete(self, *args, **kwargs):
315
316
def delete(self, **kwargs):
345
317
if self._update_timer_callback_tag is not None:
346
gobject.source_remove(self._update_timer_callback_tag)
318
GLib.source_remove(self._update_timer_callback_tag)
347
319
self._update_timer_callback_tag = None
348
320
for match in self.match_objects:
349
321
match.remove()
350
322
self.match_objects = ()
351
323
if self.delete_hook is not None:
352
324
self.delete_hook(self)
353
return super(MandosClientWidget, self).delete(*args, **kwargs)
354
325
return super(MandosClientWidget, self).delete(**kwargs)
326
355
327
def render(self, maxcolrow, focus=False):
356
328
"""Render differently if we have focus.
357
329
This overrides the method from urwid.FlowWidget"""
358
330
return self.current_widget(focus).render(maxcolrow,
359
331
focus=focus)
360
332
361
333
def keypress(self, maxcolrow, key):
362
334
"""Handle keys.
363
335
This overrides the method from urwid.FlowWidget"""
364
336
if key == "+":
365
self.proxy.Enable(dbus_interface = client_interface,
366
ignore_reply=True)
337
self.proxy.Set(client_interface, "Enabled",
338
dbus.Boolean(True), ignore_reply=True,
339
dbus_interface=dbus.PROPERTIES_IFACE)
367
340
elif key == "-":
368
self.proxy.Disable(dbus_interface = client_interface,
369
ignore_reply=True)
341
self.proxy.Set(client_interface, "Enabled", False,
342
ignore_reply=True,
343
dbus_interface=dbus.PROPERTIES_IFACE)
370
344
elif key == "a":
371
345
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
372
dbus_interface = client_interface,
346
dbus_interface=client_interface,
373
347
ignore_reply=True)
374
348
elif key == "d":
375
349
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
376
dbus_interface = client_interface,
350
dbus_interface=client_interface,
377
351
ignore_reply=True)
378
352
elif key == "R" or key == "_" or key == "ctrl k":
379
353
self.server_proxy_object.RemoveClient(self.proxy
380
354
.object_path,
381
355
ignore_reply=True)
382
356
elif key == "s":
383
self.proxy.StartChecker(dbus_interface = client_interface,
384
ignore_reply=True)
357
self.proxy.Set(client_interface, "CheckerRunning",
358
dbus.Boolean(True), ignore_reply=True,
359
dbus_interface=dbus.PROPERTIES_IFACE)
385
360
elif key == "S":
386
self.proxy.StopChecker(dbus_interface = client_interface,
387
ignore_reply=True)
361
self.proxy.Set(client_interface, "CheckerRunning",
362
dbus.Boolean(False), ignore_reply=True,
363
dbus_interface=dbus.PROPERTIES_IFACE)
388
364
elif key == "C":
389
self.proxy.CheckedOK(dbus_interface = client_interface,
365
self.proxy.CheckedOK(dbus_interface=client_interface,
390
366
ignore_reply=True)
391
367
# xxx
392
368
# elif key == "p" or key == "=":
397
373
# self.open()
398
374
else:
399
375
return key
400
401
def property_changed(self, property=None, value=None,
402
*args, **kwargs):
403
"""Call self.update() if old value is not new value.
376
377
def properties_changed(self, interface, properties, invalidated):
378
"""Call self.update() if any properties changed.
404
379
This overrides the method from MandosClientPropertyCache"""
405
property_name = unicode(property)
406
old_value = self.properties.get(property_name)
407
super(MandosClientWidget, self).property_changed(
408
property=property, value=value, *args, **kwargs)
409
if self.properties.get(property_name) != old_value:
380
old_values = {key: self.properties.get(key)
381
for key in properties.keys()}
382
super(MandosClientWidget, self).properties_changed(
383
interface, properties, invalidated)
384
if any(old_values[key] != self.properties.get(key)
385
for key in old_values):
410
386
self.update()
411
387
412
388
415
391
"down" key presses, thus not allowing any containing widgets to
416
392
use them as an excuse to shift focus away from this widget.
417
393
"""
418
def keypress(self, maxcolrow, key):
419
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
394
def keypress(self, *args, **kwargs):
395
ret = (super(ConstrainedListBox, self)
396
.keypress(*args, **kwargs))
420
397
if ret in ("up", "down"):
421
398
return
422
399
return ret
426
403
"""This is the entire user interface - the whole screen
427
404
with boxes, lists of client widgets, etc.
428
405
"""
429
def __init__(self, max_log_length=1000):
406
def __init__(self, max_log_length=1000, log_level=1):
430
407
DBusGMainLoop(set_as_default=True)
431
408
432
409
self.screen = urwid.curses_display.Screen()
433
410
434
411
self.screen.register_palette((
435
412
("normal",
436
413
"default", "default", None),
437
414
("bold",
438
"default", "default", "bold"),
415
"bold", "default", "bold"),
439
416
("underline-blink",
440
"default", "default", "underline"),
417
"underline,blink", "default", "underline,blink"),
441
418
("standout",
442
"default", "default", "standout"),
419
"standout", "default", "standout"),
443
420
("bold-underline-blink",
444
"default", "default", ("bold", "underline")),
421
"bold,underline,blink", "default",
422
"bold,underline,blink"),
445
423
("bold-standout",
446
"default", "default", ("bold", "standout")),
424
"bold,standout", "default", "bold,standout"),
447
425
("underline-blink-standout",
448
"default", "default", ("underline", "standout")),
426
"underline,blink,standout", "default",
427
"underline,blink,standout"),
449
428
("bold-underline-blink-standout",
450
"default", "default", ("bold", "underline",
451
"standout")),
429
"bold,underline,blink,standout", "default",
430
"bold,underline,blink,standout"),
452
431
))
453
432
454
433
if urwid.supports_unicode():
455
self.divider = "─" # \u2500
456
#self.divider = "━" # \u2501
434
self.divider = "─" # \u2500
457
435
else:
458
#self.divider = "-" # \u002d
459
self.divider = "_" # \u005f
460
436
self.divider = "_" # \u005f
437
461
438
self.screen.start()
462
439
463
440
self.size = self.screen.get_cols_rows()
464
441
465
442
self.clients = urwid.SimpleListWalker([])
466
443
self.clients_dict = {}
467
444
468
445
# We will add Text widgets to this list
469
446
self.log = []
470
447
self.max_log_length = max_log_length
471
448
449
self.log_level = log_level
450
472
451
# We keep a reference to the log widget so we can remove it
473
452
# from the ListWalker without it getting destroyed
474
453
self.logbox = ConstrainedListBox(self.log)
475
454
476
455
# This keeps track of whether self.uilist currently has
477
456
# self.logbox in it or not
478
457
self.log_visible = True
479
458
self.log_wrap = "any"
480
459
481
460
self.rebuild()
482
461
self.log_message_raw(("bold",
483
462
"Mandos Monitor version " + version))
484
463
self.log_message_raw(("bold",
485
464
"q: Quit ?: Help"))
486
465
487
466
self.busname = domain + '.Mandos'
488
self.main_loop = gobject.MainLoop()
489
467
self.main_loop = GLib.MainLoop()
468
490
469
def client_not_found(self, fingerprint, address):
491
self.log_message("Client with address {0} and fingerprint"
492
" {1} could not be found"
470
self.log_message("Client with address {} and fingerprint {}"
471
" could not be found"
493
472
.format(address, fingerprint))
494
473
495
474
def rebuild(self):
496
475
"""This rebuilds the User Interface.
497
476
Call this when the widget layout needs to change"""
498
477
self.uilist = []
499
#self.uilist.append(urwid.ListBox(self.clients))
478
# self.uilist.append(urwid.ListBox(self.clients))
500
479
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
501
480
clients),
502
#header=urwid.Divider(),
481
# header=urwid.Divider(),
503
482
header=None,
504
footer=
505
urwid.Divider(div_char=
506
self.divider)))
483
footer=urwid.Divider(
484
div_char=self.divider)))
507
485
if self.log_visible:
508
486
self.uilist.append(self.logbox)
509
487
self.topwidget = urwid.Pile(self.uilist)
510
511
def log_message(self, message):
488
489
def log_message(self, message, level=1):
490
"""Log message formatted with timestamp"""
491
if level < self.log_level:
492
return
512
493
timestamp = datetime.datetime.now().isoformat()
513
self.log_message_raw(timestamp + ": " + message)
514
515
def log_message_raw(self, markup):
494
self.log_message_raw("{}: {}".format(timestamp, message),
495
level=level)
496
497
def log_message_raw(self, markup, level=1):
516
498
"""Add a log message to the log buffer."""
499
if level < self.log_level:
500
return
517
501
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
518
if (self.max_log_length
519
and len(self.log) > self.max_log_length):
520
del self.log[0:len(self.log)-self.max_log_length-1]
502
if self.max_log_length:
503
if len(self.log) > self.max_log_length:
504
del self.log[0:len(self.log)-self.max_log_length-1]
521
505
self.logbox.set_focus(len(self.logbox.body.contents),
522
506
coming_from="above")
523
507
self.refresh()
524
508
525
509
def toggle_log_display(self):
526
510
"""Toggle visibility of the log buffer."""
527
511
self.log_visible = not self.log_visible
528
512
self.rebuild()
529
#self.log_message("Log visibility changed to: "
530
# + unicode(self.log_visible))
531
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
515
532
516
def change_log_display(self):
533
517
"""Change type of log display.
534
518
Currently, this toggles wrapping of text lines."""
538
522
self.log_wrap = "clip"
539
523
for textwidget in self.log:
540
524
textwidget.set_wrap_mode(self.log_wrap)
541
#self.log_message("Wrap mode: " + self.log_wrap)
542
543
def find_and_remove_client(self, path, name):
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
526
level=0)
527
528
def find_and_remove_client(self, path, interfaces):
544
529
"""Find a client by its object path and remove it.
545
546
This is connected to the ClientRemoved signal from the
530
531
This is connected to the InterfacesRemoved signal from the
547
532
Mandos server object."""
533
if client_interface not in interfaces:
534
# Not a Mandos client object; ignore
535
return
548
536
try:
549
537
client = self.clients_dict[path]
550
538
except KeyError:
551
539
# not found?
552
self.log_message("Unknown client {0!r} ({1!r}) removed"
553
.format(name, path))
540
self.log_message("Unknown client {!r} removed"
541
.format(path))
554
542
return
555
543
client.delete()
556
557
def add_new_client(self, path):
544
545
def add_new_client(self, path, ifs_and_props):
546
"""Find a client by its object path and remove it.
547
548
This is connected to the InterfacesAdded signal from the
549
Mandos server object.
550
"""
551
if client_interface not in ifs_and_props:
552
# Not a Mandos client object; ignore
553
return
558
554
client_proxy_object = self.bus.get_object(self.busname, path)
559
self.add_client(MandosClientWidget(server_proxy_object
560
=self.mandos_serv,
561
proxy_object
562
=client_proxy_object,
563
update_hook
564
=self.refresh,
565
delete_hook
566
=self.remove_client,
567
logger
568
=self.log_message),
555
self.add_client(MandosClientWidget(
556
server_proxy_object=self.mandos_serv,
557
proxy_object=client_proxy_object,
558
update_hook=self.refresh,
559
delete_hook=self.remove_client,
560
logger=self.log_message,
561
properties=dict(ifs_and_props[client_interface])),
569
562
path=path)
570
563
571
564
def add_client(self, client, path=None):
572
565
self.clients.append(client)
573
566
if path is None:
574
567
path = client.proxy.object_path
575
568
self.clients_dict[path] = client
576
self.clients.sort(None, lambda c: c.properties["Name"])
569
self.clients.sort(key=lambda c: c.properties["Name"])
577
570
self.refresh()
578
571
579
572
def remove_client(self, client, path=None):
580
573
self.clients.remove(client)
581
574
if path is None:
582
575
path = client.proxy.object_path
583
576
del self.clients_dict[path]
584
if not self.clients_dict:
585
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
586
# is completely emptied, we need to recreate it.
587
self.clients = urwid.SimpleListWalker([])
588
self.rebuild()
589
577
self.refresh()
590
578
591
579
def refresh(self):
592
580
"""Redraw the screen"""
593
581
canvas = self.topwidget.render(self.size, focus=True)
594
582
self.screen.draw_screen(self.size, canvas)
595
583
596
584
def run(self):
597
585
"""Start the main loop and exit when it's done."""
598
586
self.bus = dbus.SystemBus()
599
587
mandos_dbus_objc = self.bus.get_object(
600
588
self.busname, "/", follow_name_owner_changes=True)
601
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
602
dbus_interface
603
= server_interface)
589
self.mandos_serv = dbus.Interface(
590
mandos_dbus_objc, dbus_interface=server_interface)
604
591
try:
605
592
mandos_clients = (self.mandos_serv
606
593
.GetAllClientsWithProperties())
594
if not mandos_clients:
595
self.log_message_raw(("bold",
596
"Note: Server has no clients."))
607
597
except dbus.exceptions.DBusException:
598
self.log_message_raw(("bold",
599
"Note: No Mandos server running."))
608
600
mandos_clients = dbus.Dictionary()
609
601
610
602
(self.mandos_serv
611
.connect_to_signal("ClientRemoved",
603
.connect_to_signal("InterfacesRemoved",
612
604
self.find_and_remove_client,
613
dbus_interface=server_interface,
605
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
614
606
byte_arrays=True))
615
607
(self.mandos_serv
616
.connect_to_signal("ClientAdded",
608
.connect_to_signal("InterfacesAdded",
617
609
self.add_new_client,
618
dbus_interface=server_interface,
610
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
619
611
byte_arrays=True))
620
612
(self.mandos_serv
621
613
.connect_to_signal("ClientNotFound",
622
614
self.client_not_found,
623
615
dbus_interface=server_interface,
624
616
byte_arrays=True))
625
for path, client in mandos_clients.iteritems():
617
for path, client in mandos_clients.items():
626
618
client_proxy_object = self.bus.get_object(self.busname,
627
619
path)
628
self.add_client(MandosClientWidget(server_proxy_object
629
=self.mandos_serv,
630
proxy_object
631
=client_proxy_object,
632
properties=client,
633
update_hook
634
=self.refresh,
635
delete_hook
636
=self.remove_client,
637
logger
638
=self.log_message),
620
self.add_client(MandosClientWidget(
621
server_proxy_object=self.mandos_serv,
622
proxy_object=client_proxy_object,
623
properties=client,
624
update_hook=self.refresh,
625
delete_hook=self.remove_client,
626
logger=self.log_message),
639
627
path=path)
640
628
641
629
self.refresh()
642
self._input_callback_tag = (gobject.io_add_watch
630
self._input_callback_tag = (GLib.io_add_watch
643
631
(sys.stdin.fileno(),
644
gobject.IO_IN,
632
GLib.IO_IN,
645
633
self.process_input))
646
634
self.main_loop.run()
647
635
# Main loop has finished, we should close everything now
648
gobject.source_remove(self._input_callback_tag)
636
GLib.source_remove(self._input_callback_tag)
649
637
self.screen.stop()
650
638
651
639
def stop(self):
652
640
self.main_loop.quit()
653
641
654
642
def process_input(self, source, condition):
655
643
keys = self.screen.get_input()
656
translations = { "ctrl n": "down", # Emacs
657
"ctrl p": "up", # Emacs
658
"ctrl v": "page down", # Emacs
659
"meta v": "page up", # Emacs
660
" ": "page down", # less
661
"f": "page down", # less
662
"b": "page up", # less
663
"j": "down", # vi
664
"k": "up", # vi
665
}
644
translations = {"ctrl n": "down", # Emacs
645
"ctrl p": "up", # Emacs
646
"ctrl v": "page down", # Emacs
647
"meta v": "page up", # Emacs
648
" ": "page down", # less
649
"f": "page down", # less
650
"b": "page up", # less
651
"j": "down", # vi
652
"k": "up", # vi
653
}
666
654
for key in keys:
667
655
try:
668
656
key = translations[key]
669
657
except KeyError: # :-)
670
658
pass
671
659
672
660
if key == "q" or key == "Q":
673
661
self.stop()
674
662
break
675
663
elif key == "window resize":
676
664
self.size = self.screen.get_cols_rows()
677
665
self.refresh()
678
elif key == "\f": # Ctrl-L
666
elif key == "ctrl l":
667
self.screen.clear()
679
668
self.refresh()
680
669
elif key == "l" or key == "D":
681
670
self.toggle_log_display()
693
682
"?: Help",
694
683
"l: Log window toggle",
695
684
"TAB: Switch window",
696
"w: Wrap (log)"))))
685
"w: Wrap (log lines)",
686
"v: Toggle verbose log",
687
))))
697
688
self.log_message_raw(("bold",
698
689
" "
699
690
.join(("Clients:",
712
703
else:
713
704
self.topwidget.set_focus(self.logbox)
714
705
self.refresh()
715
#elif (key == "end" or key == "meta >" or key == "G"
716
# or key == ">"):
717
# pass # xxx end-of-buffer
718
#elif (key == "home" or key == "meta <" or key == "g"
719
# or key == "<"):
720
# pass # xxx beginning-of-buffer
721
#elif key == "ctrl e" or key == "$":
722
# pass # xxx move-end-of-line
723
#elif key == "ctrl a" or key == "^":
724
# pass # xxx move-beginning-of-line
725
#elif key == "ctrl b" or key == "meta (" or key == "h":
726
# pass # xxx left
727
#elif key == "ctrl f" or key == "meta )" or key == "l":
728
# pass # xxx right
729
#elif key == "a":
730
# pass # scroll up log
731
#elif key == "z":
732
# pass # scroll down log
706
elif key == "v":
707
if self.log_level == 0:
708
self.log_level = 1
709
self.log_message("Verbose mode: Off")
710
else:
711
self.log_level = 0
712
self.log_message("Verbose mode: On")
713
# elif (key == "end" or key == "meta >" or key == "G"
714
# or key == ">"):
715
# pass # xxx end-of-buffer
716
# elif (key == "home" or key == "meta <" or key == "g"
717
# or key == "<"):
718
# pass # xxx beginning-of-buffer
719
# elif key == "ctrl e" or key == "$":
720
# pass # xxx move-end-of-line
721
# elif key == "ctrl a" or key == "^":
722
# pass # xxx move-beginning-of-line
723
# elif key == "ctrl b" or key == "meta (" or key == "h":
724
# pass # xxx left
725
# elif key == "ctrl f" or key == "meta )" or key == "l":
726
# pass # xxx right
727
# elif key == "a":
728
# pass # scroll up log
729
# elif key == "z":
730
# pass # scroll down log
733
731
elif self.topwidget.selectable():
734
732
self.topwidget.keypress(self.size, key)
735
733
self.refresh()
740
738
ui.run()
741
739
except KeyboardInterrupt:
742
740
ui.screen.stop()
743
except Exception, e:
744
ui.log_message(unicode(e))
741
except Exception as e:
742
ui.log_message(str(e))
745
743
ui.screen.stop()
746
744
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0