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