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 891
- compare with another revision
- download diff
- download tarball
- view history from revision 891
- Committer: Teddy Hogeborn
- Date: 2017-01-21 22:22:44 UTC
- Revision ID: teddy@recompile.se-20170121222244-brmii2hamdqq79lx
Fix mandos package dependencies for the GPGME library.
* debian/control (Package: mandos/Depends): Change "libgpgme11-dev" to
"libgpgme-dev | libgpgme11-dev".
* debian/control (Package: mandos/Depends): Change "libgpgme11-dev" to
"libgpgme-dev | libgpgme11-dev".
- files added:
- bugs.xml
- debian/upstream
- network-hooks.d
- 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-2011 Teddy Hogeborn
7
# Copyright © 2009-2011 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
#
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
#
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
22
#
23
# Contact the authors at <mandos@recompile.se>.
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
from gi.repository import GLib
38
43
39
44
import dbus
40
45
41
import UserList
42
43
46
import locale
44
47
48
import logging
49
50
if sys.version_info.major == 2:
51
str = unicode
52
45
53
locale.setlocale(locale.LC_ALL, '')
46
54
47
import logging
48
55
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
56
50
57
# Some useful constants
51
domain = 'se.bsnet.fukt'
58
domain = 'se.recompile'
52
59
server_interface = domain + '.Mandos'
53
60
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)
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
63
68
64
69
def isoformat_to_datetime(iso):
65
70
"Parse an ISO 8601 date string to a datetime.datetime()"
74
79
int(day),
75
80
int(hour),
76
81
int(minute),
77
int(second), # Whole seconds
78
int(fraction*1000000)) # Microseconds
82
int(second), # Whole seconds
83
int(fraction*1000000)) # Microseconds
84
79
85
80
86
class MandosClientPropertyCache(object):
81
87
"""This wraps a Mandos Client D-Bus proxy object, caches the
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):
86
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)
101
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.
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
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(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.
105
110
"""
106
111
# Update properties dict with new value
107
self.properties[property] = value
112
if interface == client_interface:
113
self.properties.update(properties)
114
115
def delete(self):
116
self.property_changed_match.remove()
108
117
109
118
110
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
111
120
"""A Mandos Client which is visible on the screen.
112
121
"""
113
122
114
123
def __init__(self, server_proxy_object=None, update_hook=None,
115
delete_hook=None, logger=None, *args, **kwargs):
124
delete_hook=None, logger=None, **kwargs):
116
125
# Called on update
117
126
self.update_hook = update_hook
118
127
# Called on delete
121
130
self.server_proxy_object = server_proxy_object
122
131
# Logger
123
132
self.logger = logger
124
133
125
134
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
128
135
129
136
# The widget shown normally
130
137
self._text_widget = urwid.Text("")
131
138
# The widget shown when we have focus
132
139
self._focus_text_widget = urwid.Text("")
133
super(MandosClientWidget, self).__init__(
134
update_hook=update_hook, delete_hook=delete_hook,
135
*args, **kwargs)
140
super(MandosClientWidget, self).__init__(**kwargs)
136
141
self.update()
137
142
self.opened = False
138
139
last_checked_ok = isoformat_to_datetime(self.properties
140
["LastCheckedOK"])
141
if last_checked_ok is None:
142
self.last_checker_failed = True
143
else:
144
self.last_checker_failed = ((datetime.datetime.utcnow()
145
- last_checked_ok)
146
> datetime.timedelta
147
(milliseconds=
148
self.properties
149
["Interval"]))
150
151
if self.last_checker_failed:
152
self.using_timer(True)
153
154
if self.need_approval:
155
self.using_timer(True)
156
157
self.proxy.connect_to_signal("CheckerCompleted",
158
self.checker_completed,
159
client_interface,
160
byte_arrays=True)
161
self.proxy.connect_to_signal("CheckerStarted",
162
self.checker_started,
163
client_interface,
164
byte_arrays=True)
165
self.proxy.connect_to_signal("GotSecret",
166
self.got_secret,
167
client_interface,
168
byte_arrays=True)
169
self.proxy.connect_to_signal("NeedApproval",
170
self.need_approval,
171
client_interface,
172
byte_arrays=True)
173
self.proxy.connect_to_signal("Rejected",
174
self.rejected,
175
client_interface,
176
byte_arrays=True)
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
143
144
self.match_objects = (
145
self.proxy.connect_to_signal("CheckerCompleted",
146
self.checker_completed,
147
client_interface,
148
byte_arrays=True),
149
self.proxy.connect_to_signal("CheckerStarted",
150
self.checker_started,
151
client_interface,
152
byte_arrays=True),
153
self.proxy.connect_to_signal("GotSecret",
154
self.got_secret,
155
client_interface,
156
byte_arrays=True),
157
self.proxy.connect_to_signal("NeedApproval",
158
self.need_approval,
159
client_interface,
160
byte_arrays=True),
161
self.proxy.connect_to_signal("Rejected",
162
self.rejected,
163
client_interface,
164
byte_arrays=True))
165
self.logger('Created client {}'
166
.format(self.properties["Name"]), level=0)
167
184
168
def using_timer(self, flag):
185
169
"""Call this method with True or False when timer should be
186
170
activated or deactivated.
187
171
"""
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
172
if flag and self._update_timer_callback_tag is None:
173
# Will update the shown timer value every second
174
self._update_timer_callback_tag = (GLib.timeout_add
195
175
(1000,
196
176
self.update_timer))
197
elif old and self._update_timer_callback_lock == 0:
198
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)
199
179
self._update_timer_callback_tag = None
200
180
201
181
def checker_completed(self, exitstatus, condition, command):
202
182
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))
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
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
215
189
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)))
190
self.logger('Checker for client {} (command "{}") failed'
191
' with exit code {}'
192
.format(self.properties["Name"], command,
193
os.WEXITSTATUS(condition)))
220
194
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')
195
self.logger('Checker for client {} (command "{}") was'
196
' killed by signal {}'
197
.format(self.properties["Name"], command,
198
os.WTERMSIG(condition)))
232
199
self.update()
233
200
234
201
def checker_started(self, command):
235
#self.logger('Client %s started checker "%s"'
236
# % (self.properties["Name"], unicode(command)))
237
pass
238
202
"""Server signals that a checker started."""
203
self.logger('Client {} started checker "{}"'
204
.format(self.properties["Name"],
205
command), level=0)
206
239
207
def got_secret(self):
240
self.last_checker_failed = False
241
self.logger('Client %s received its secret'
242
% self.properties["Name"])
243
208
self.logger('Client {} received its secret'
209
.format(self.properties["Name"]))
210
244
211
def need_approval(self, timeout, default):
245
212
if not default:
246
message = 'Client %s needs approval within %s seconds'
213
message = 'Client {} needs approval within {} seconds'
247
214
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)
252
215
message = 'Client {} will get its secret in {} seconds'
216
self.logger(message.format(self.properties["Name"],
217
timeout/1000))
218
253
219
def rejected(self, reason):
254
self.logger('Client %s was rejected; reason: %s'
255
% (self.properties["Name"], reason))
256
220
self.logger('Client {} was rejected; reason: {}'
221
.format(self.properties["Name"], reason))
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
286
252
# Base part of a client. Name!
287
base = ('%(name)s: '
288
% {"name": self.properties["Name"]})
253
base = '{name}: '.format(name=self.properties["Name"])
289
254
if not self.properties["Enabled"]:
290
255
message = "DISABLED"
256
self.using_timer(False)
291
257
elif self.properties["ApprovalPending"]:
292
timeout = datetime.timedelta(milliseconds
293
= self.properties
294
["ApprovalDelay"])
258
timeout = datetime.timedelta(
259
milliseconds=self.properties["ApprovalDelay"])
295
260
last_approval_request = isoformat_to_datetime(
296
261
self.properties["LastApprovalRequest"])
297
262
if last_approval_request is not None:
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
263
timer = max(timeout - (datetime.datetime.utcnow()
264
- last_approval_request),
265
datetime.timedelta())
300
266
else:
301
267
timer = datetime.timedelta()
302
268
if self.properties["ApprovedByDefault"]:
303
message = "Approval in %s. (d)eny?"
304
else:
305
message = "Denial in %s. (a)pprove?"
306
message = message % unicode(timer).rsplit(".", 1)[0]
307
elif self.last_checker_failed:
308
timeout = datetime.timedelta(milliseconds
309
= self.properties
310
["Timeout"])
311
last_ok = isoformat_to_datetime(
312
max((self.properties["LastCheckedOK"]
313
or self.properties["Created"]),
314
self.properties["LastEnabled"]))
315
timer = timeout - (datetime.datetime.utcnow() - last_ok)
269
message = "Approval in {}. (d)eny?"
270
else:
271
message = "Denial in {}. (a)pprove?"
272
message = message.format(str(timer).rsplit(".", 1)[0])
273
self.using_timer(True)
274
elif self.properties["LastCheckerStatus"] != 0:
275
# When checker has failed, show timer until client expires
276
expires = self.properties["Expires"]
277
if expires == "":
278
timer = datetime.timedelta(0)
279
else:
280
expires = (datetime.datetime.strptime
281
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
282
timer = max(expires - datetime.datetime.utcnow(),
283
datetime.timedelta())
316
284
message = ('A checker has failed! Time until client'
317
' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
285
' gets disabled: {}'
286
.format(str(timer).rsplit(".", 1)[0]))
287
self.using_timer(True)
319
288
else:
320
289
message = "enabled"
321
self._text = "%s%s" % (base, message)
322
290
self.using_timer(False)
291
self._text = "{}{}".format(base, message)
292
323
293
if not urwid.supports_unicode():
324
294
self._text = self._text.encode("ascii", "replace")
325
295
textlist = [("normal", self._text)]
335
305
# Run update hook, if any
336
306
if self.update_hook is not None:
337
307
self.update_hook()
338
308
339
309
def update_timer(self):
340
"called by gobject"
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):
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
320
for match in self.match_objects:
321
match.remove()
322
self.match_objects = ()
348
323
if self.delete_hook is not None:
349
324
self.delete_hook(self)
350
325
return super(MandosClientWidget, self).delete(**kwargs)
326
351
327
def render(self, maxcolrow, focus=False):
352
328
"""Render differently if we have focus.
353
329
This overrides the method from urwid.FlowWidget"""
354
330
return self.current_widget(focus).render(maxcolrow,
355
331
focus=focus)
356
332
357
333
def keypress(self, maxcolrow, key):
358
334
"""Handle keys.
359
335
This overrides the method from urwid.FlowWidget"""
360
336
if key == "+":
361
self.proxy.Enable(dbus_interface = client_interface,
362
ignore_reply=True)
337
self.proxy.Set(client_interface, "Enabled",
338
dbus.Boolean(True), ignore_reply=True,
339
dbus_interface=dbus.PROPERTIES_IFACE)
363
340
elif key == "-":
364
self.proxy.Disable(dbus_interface = client_interface,
365
ignore_reply=True)
341
self.proxy.Set(client_interface, "Enabled", False,
342
ignore_reply=True,
343
dbus_interface=dbus.PROPERTIES_IFACE)
366
344
elif key == "a":
367
345
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
368
dbus_interface = client_interface,
346
dbus_interface=client_interface,
369
347
ignore_reply=True)
370
348
elif key == "d":
371
349
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
372
dbus_interface = client_interface,
350
dbus_interface=client_interface,
373
351
ignore_reply=True)
374
352
elif key == "R" or key == "_" or key == "ctrl k":
375
353
self.server_proxy_object.RemoveClient(self.proxy
376
354
.object_path,
377
355
ignore_reply=True)
378
356
elif key == "s":
379
self.proxy.StartChecker(dbus_interface = client_interface,
380
ignore_reply=True)
357
self.proxy.Set(client_interface, "CheckerRunning",
358
dbus.Boolean(True), ignore_reply=True,
359
dbus_interface=dbus.PROPERTIES_IFACE)
381
360
elif key == "S":
382
self.proxy.StopChecker(dbus_interface = client_interface,
383
ignore_reply=True)
361
self.proxy.Set(client_interface, "CheckerRunning",
362
dbus.Boolean(False), ignore_reply=True,
363
dbus_interface=dbus.PROPERTIES_IFACE)
384
364
elif key == "C":
385
self.proxy.CheckedOK(dbus_interface = client_interface,
365
self.proxy.CheckedOK(dbus_interface=client_interface,
386
366
ignore_reply=True)
387
367
# xxx
388
368
# elif key == "p" or key == "=":
393
373
# self.open()
394
374
else:
395
375
return key
396
397
def property_changed(self, property=None, value=None,
398
*args, **kwargs):
399
"""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.
400
379
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:
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):
406
386
self.update()
407
387
408
388
411
391
"down" key presses, thus not allowing any containing widgets to
412
392
use them as an excuse to shift focus away from this widget.
413
393
"""
414
def keypress(self, maxcolrow, key):
415
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
394
def keypress(self, *args, **kwargs):
395
ret = (super(ConstrainedListBox, self)
396
.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()
429
410
430
411
self.screen.register_palette((
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",
422
"bold,underline,blink"),
441
423
("bold-standout",
442
"default", "default", ("bold", "standout")),
424
"bold,standout", "default", "bold,standout"),
443
425
("underline-blink-standout",
444
"default", "default", ("underline", "standout")),
426
"underline,blink,standout", "default",
427
"underline,blink,standout"),
445
428
("bold-underline-blink-standout",
446
"default", "default", ("bold", "underline",
447
"standout")),
429
"bold,underline,blink,standout", "default",
430
"bold,underline,blink,standout"),
448
431
))
449
432
450
433
if urwid.supports_unicode():
451
self.divider = "─" # \u2500
452
#self.divider = "━" # \u2501
434
self.divider = "─" # \u2500
453
435
else:
454
#self.divider = "-" # \u002d
455
self.divider = "_" # \u005f
456
436
self.divider = "_" # \u005f
437
457
438
self.screen.start()
458
439
459
440
self.size = self.screen.get_cols_rows()
460
441
461
442
self.clients = urwid.SimpleListWalker([])
462
443
self.clients_dict = {}
463
444
464
445
# We will add Text widgets to this list
465
446
self.log = []
466
447
self.max_log_length = max_log_length
467
448
449
self.log_level = log_level
450
468
451
# We keep a reference to the log widget so we can remove it
469
452
# from the ListWalker without it getting destroyed
470
453
self.logbox = ConstrainedListBox(self.log)
471
454
472
455
# This keeps track of whether self.uilist currently has
473
456
# self.logbox in it or not
474
457
self.log_visible = True
475
458
self.log_wrap = "any"
476
459
477
460
self.rebuild()
478
461
self.log_message_raw(("bold",
479
462
"Mandos Monitor version " + version))
480
463
self.log_message_raw(("bold",
481
464
"q: Quit ?: Help"))
482
465
483
466
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)
527
467
self.main_loop = GLib.MainLoop()
468
528
469
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)))
532
470
self.log_message("Client with address {} and fingerprint {}"
471
" could not be found"
472
.format(address, fingerprint))
473
533
474
def rebuild(self):
534
475
"""This rebuilds the User Interface.
535
476
Call this when the widget layout needs to change"""
536
477
self.uilist = []
537
#self.uilist.append(urwid.ListBox(self.clients))
478
# self.uilist.append(urwid.ListBox(self.clients))
538
479
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
539
480
clients),
540
#header=urwid.Divider(),
481
# header=urwid.Divider(),
541
482
header=None,
542
footer=
543
urwid.Divider(div_char=
544
self.divider)))
483
footer=urwid.Divider(
484
div_char=self.divider)))
545
485
if self.log_visible:
546
486
self.uilist.append(self.logbox)
547
pass
548
487
self.topwidget = urwid.Pile(self.uilist)
549
550
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
551
493
timestamp = datetime.datetime.now().isoformat()
552
self.log_message_raw(timestamp + ": " + message)
553
554
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):
555
498
"""Add a log message to the log buffer."""
499
if level < self.log_level:
500
return
556
501
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
557
if (self.max_log_length
558
and len(self.log) > self.max_log_length):
559
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]
560
505
self.logbox.set_focus(len(self.logbox.body.contents),
561
506
coming_from="above")
562
507
self.refresh()
563
508
564
509
def toggle_log_display(self):
565
510
"""Toggle visibility of the log buffer."""
566
511
self.log_visible = not self.log_visible
567
512
self.rebuild()
568
#self.log_message("Log visibility changed to: "
569
# + unicode(self.log_visible))
570
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
515
571
516
def change_log_display(self):
572
517
"""Change type of log display.
573
518
Currently, this toggles wrapping of text lines."""
577
522
self.log_wrap = "clip"
578
523
for textwidget in self.log:
579
524
textwidget.set_wrap_mode(self.log_wrap)
580
#self.log_message("Wrap mode: " + self.log_wrap)
581
582
def find_and_remove_client(self, path, name):
583
"""Find an client from its object path and remove it.
584
585
This is connected to the ClientRemoved signal from the
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
526
level=0)
527
528
def find_and_remove_client(self, path, interfaces):
529
"""Find a client by its object path and remove it.
530
531
This is connected to the InterfacesRemoved signal from the
586
532
Mandos server object."""
533
if client_interface not in interfaces:
534
# Not a Mandos client object; ignore
535
return
587
536
try:
588
537
client = self.clients_dict[path]
589
538
except KeyError:
590
539
# not found?
591
return
592
self.remove_client(client, path)
593
594
def add_new_client(self, path):
540
self.log_message("Unknown client {!r} removed"
541
.format(path))
542
return
543
client.delete()
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
595
554
client_proxy_object = self.bus.get_object(self.busname, path)
596
self.add_client(MandosClientWidget(server_proxy_object
597
=self.mandos_serv,
598
proxy_object
599
=client_proxy_object,
600
update_hook
601
=self.refresh,
602
delete_hook
603
=self.remove_client,
604
logger
605
=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])),
606
562
path=path)
607
563
608
564
def add_client(self, client, path=None):
609
565
self.clients.append(client)
610
566
if path is None:
611
567
path = client.proxy.object_path
612
568
self.clients_dict[path] = client
613
self.clients.sort(None, lambda c: c.properties["Name"])
569
self.clients.sort(key=lambda c: c.properties["Name"])
614
570
self.refresh()
615
571
616
572
def remove_client(self, client, path=None):
617
573
self.clients.remove(client)
618
574
if path is None:
619
575
path = client.proxy.object_path
620
576
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
577
self.refresh()
627
578
628
579
def refresh(self):
629
580
"""Redraw the screen"""
630
581
canvas = self.topwidget.render(self.size, focus=True)
631
582
self.screen.draw_screen(self.size, canvas)
632
583
633
584
def run(self):
634
585
"""Start the main loop and exit when it's done."""
586
self.bus = dbus.SystemBus()
587
mandos_dbus_objc = self.bus.get_object(
588
self.busname, "/", follow_name_owner_changes=True)
589
self.mandos_serv = dbus.Interface(
590
mandos_dbus_objc, dbus_interface=server_interface)
591
try:
592
mandos_clients = (self.mandos_serv
593
.GetAllClientsWithProperties())
594
if not mandos_clients:
595
self.log_message_raw(("bold",
596
"Note: Server has no clients."))
597
except dbus.exceptions.DBusException:
598
self.log_message_raw(("bold",
599
"Note: No Mandos server running."))
600
mandos_clients = dbus.Dictionary()
601
602
(self.mandos_serv
603
.connect_to_signal("InterfacesRemoved",
604
self.find_and_remove_client,
605
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
606
byte_arrays=True))
607
(self.mandos_serv
608
.connect_to_signal("InterfacesAdded",
609
self.add_new_client,
610
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
611
byte_arrays=True))
612
(self.mandos_serv
613
.connect_to_signal("ClientNotFound",
614
self.client_not_found,
615
dbus_interface=server_interface,
616
byte_arrays=True))
617
for path, client in mandos_clients.items():
618
client_proxy_object = self.bus.get_object(self.busname,
619
path)
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),
627
path=path)
628
635
629
self.refresh()
636
self._input_callback_tag = (gobject.io_add_watch
630
self._input_callback_tag = (GLib.io_add_watch
637
631
(sys.stdin.fileno(),
638
gobject.IO_IN,
632
GLib.IO_IN,
639
633
self.process_input))
640
634
self.main_loop.run()
641
635
# Main loop has finished, we should close everything now
642
gobject.source_remove(self._input_callback_tag)
636
GLib.source_remove(self._input_callback_tag)
643
637
self.screen.stop()
644
638
645
639
def stop(self):
646
640
self.main_loop.quit()
647
641
648
642
def process_input(self, source, condition):
649
643
keys = self.screen.get_input()
650
translations = { "ctrl n": "down", # Emacs
651
"ctrl p": "up", # Emacs
652
"ctrl v": "page down", # Emacs
653
"meta v": "page up", # Emacs
654
" ": "page down", # less
655
"f": "page down", # less
656
"b": "page up", # less
657
"j": "down", # vi
658
"k": "up", # vi
659
}
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
}
660
654
for key in keys:
661
655
try:
662
656
key = translations[key]
663
657
except KeyError: # :-)
664
658
pass
665
659
666
660
if key == "q" or key == "Q":
667
661
self.stop()
668
662
break
669
663
elif key == "window resize":
670
664
self.size = self.screen.get_cols_rows()
671
665
self.refresh()
672
elif key == "\f": # Ctrl-L
666
elif key == "ctrl l":
667
self.screen.clear()
673
668
self.refresh()
674
669
elif key == "l" or key == "D":
675
670
self.toggle_log_display()
687
682
"?: Help",
688
683
"l: Log window toggle",
689
684
"TAB: Switch window",
690
"w: Wrap (log)"))))
685
"w: Wrap (log lines)",
686
"v: Toggle verbose log",
687
))))
691
688
self.log_message_raw(("bold",
692
689
" "
693
690
.join(("Clients:",
706
703
else:
707
704
self.topwidget.set_focus(self.logbox)
708
705
self.refresh()
709
#elif (key == "end" or key == "meta >" or key == "G"
710
# or key == ">"):
711
# pass # xxx end-of-buffer
712
#elif (key == "home" or key == "meta <" or key == "g"
713
# or key == "<"):
714
# pass # xxx beginning-of-buffer
715
#elif key == "ctrl e" or key == "$":
716
# pass # xxx move-end-of-line
717
#elif key == "ctrl a" or key == "^":
718
# pass # xxx move-beginning-of-line
719
#elif key == "ctrl b" or key == "meta (" or key == "h":
720
# pass # xxx left
721
#elif key == "ctrl f" or key == "meta )" or key == "l":
722
# pass # xxx right
723
#elif key == "a":
724
# pass # scroll up log
725
#elif key == "z":
726
# 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
727
731
elif self.topwidget.selectable():
728
732
self.topwidget.keypress(self.size, key)
729
733
self.refresh()
730
734
return True
731
735
736
732
737
ui = UserInterface()
733
738
try:
734
739
ui.run()
735
740
except KeyboardInterrupt:
736
741
ui.screen.stop()
737
except Exception, e:
738
ui.log_message(unicode(e))
742
except Exception as e:
743
ui.log_message(str(e))
739
744
ui.screen.stop()
740
745
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0