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