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