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