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