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 431
- compare with another revision
- download diff
- download tarball
- view history from revision 431
- Committer: teddy at bsnet
- Date: 2010-09-15 17:17:46 UTC
- Revision ID: teddy@fukt.bsnet.se-20100915171746-bg5cppurdd0pcvcy
* debian/watch: Also watch for "*.tar.xz" files.
* plugins.d/plymouth.c (getargv): Use argz_count() and argz_extract().
* plugins.d/usplash.c (main): - '' -
* plugins.d/plymouth.c (getargv): Use argz_count() and argz_extract().
* plugins.d/usplash.c (main): - '' -
- files removed:
- 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
# 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.6.0"
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
105
self.last_checker_failed = False
137
106
138
107
# The widget shown normally
139
self._text_widget = urwid.Text("")
108
self._text_widget = urwid.Text(u"")
140
109
# The widget shown when we have focus
141
self._focus_text_widget = urwid.Text("")
142
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)
143
114
self.update()
144
115
self.opened = False
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
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)
136
last_checked_ok = isoformat_to_datetime(self.properties
137
[u"LastCheckedOK"])
138
if last_checked_ok is None:
139
self.last_checker_failed = True
140
else:
141
self.last_checker_failed = ((datetime.datetime.utcnow()
142
- last_checked_ok)
143
> datetime.timedelta
144
(milliseconds=
145
self.properties
146
[u"Interval"]))
147
if self.last_checker_failed:
176
148
self._update_timer_callback_tag = (gobject.timeout_add
177
149
(1000,
178
150
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
182
151
183
152
def checker_completed(self, exitstatus, condition, command):
184
153
if exitstatus == 0:
154
if self.last_checker_failed:
155
self.last_checker_failed = False
156
gobject.source_remove(self._update_timer_callback_tag)
157
self._update_timer_callback_tag = None
158
#self.logger(u'Checker for client %s (command "%s")'
159
# u' was successful'
160
# % (self.properties[u"Name"], command))
185
161
self.update()
186
162
return
187
163
# Checker failed
164
if not self.last_checker_failed:
165
self.last_checker_failed = True
166
self._update_timer_callback_tag = (gobject.timeout_add
167
(1000,
168
self.update_timer))
188
169
if os.WIFEXITED(condition):
189
self.logger('Checker for client {0} (command "{1}")'
190
' failed with exit code {2}'
191
.format(self.properties["Name"], command,
192
os.WEXITSTATUS(condition)))
170
self.logger(u'Checker for client %s (command "%s")'
171
u' failed with exit code %s'
172
% (self.properties[u"Name"], command,
173
os.WEXITSTATUS(condition)))
193
174
elif os.WIFSIGNALED(condition):
194
self.logger('Checker for client {0} (command "{1}") was'
195
' killed by signal {2}'
196
.format(self.properties["Name"], command,
197
os.WTERMSIG(condition)))
175
self.logger(u'Checker for client %s (command "%s")'
176
u' was killed by signal %s'
177
% (self.properties[u"Name"], command,
178
os.WTERMSIG(condition)))
198
179
elif os.WCOREDUMP(condition):
199
self.logger('Checker for client {0} (command "{1}")'
200
' dumped core'
201
.format(self.properties["Name"], command))
180
self.logger(u'Checker for client %s (command "%s")'
181
u' dumped core'
182
% (self.properties[u"Name"], command))
202
183
else:
203
self.logger('Checker for client {0} completed'
204
' mysteriously'
205
.format(self.properties["Name"]))
184
self.logger(u'Checker for client %s completed'
185
u' mysteriously')
206
186
self.update()
207
187
208
188
def checker_started(self, 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)))
189
#self.logger(u'Client %s started checker "%s"'
190
# % (self.properties[u"Name"], unicode(command)))
214
191
pass
215
192
216
193
def got_secret(self):
217
self.logger('Client {0} received its secret'
218
.format(self.properties["Name"]))
194
self.last_checker_failed = False
195
self.logger(u'Client %s received its secret'
196
% self.properties[u"Name"])
219
197
220
198
def need_approval(self, timeout, default):
221
199
if not default:
222
message = 'Client {0} needs approval within {1} seconds'
200
message = u'Client %s needs approval within %s seconds'
223
201
else:
224
message = 'Client {0} will get its secret in {1} seconds'
225
self.logger(message.format(self.properties["Name"],
226
timeout/1000))
202
message = u'Client %s will get its secret in %s seconds'
203
self.logger(message
204
% (self.properties[u"Name"], timeout/1000))
227
205
228
206
def rejected(self, reason):
229
self.logger('Client {0} was rejected; reason: {1}'
230
.format(self.properties["Name"], reason))
207
self.logger(u'Client %s was rejected; reason: %s'
208
% (self.properties[u"Name"], reason))
231
209
232
210
def selectable(self):
233
211
"""Make this a "selectable" widget.
234
212
This overrides the method from urwid.FlowWidget."""
235
213
return True
236
214
237
def rows(self, maxcolrow, focus=False):
215
def rows(self, (maxcol,), focus=False):
238
216
"""How many rows this widget will occupy might depend on
239
217
whether we have focus or not.
240
218
This overrides the method from urwid.FlowWidget"""
241
return self.current_widget(focus).rows(maxcolrow, focus=focus)
219
return self.current_widget(focus).rows((maxcol,), focus=focus)
242
220
243
221
def current_widget(self, focus=False):
244
222
if focus or self.opened:
248
226
def update(self):
249
227
"Called when what is visible on the screen should be updated."
250
228
# How to add standout mode to a style
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",
229
with_standout = { u"normal": u"standout",
230
u"bold": u"bold-standout",
231
u"underline-blink":
232
u"underline-blink-standout",
233
u"bold-underline-blink":
234
u"bold-underline-blink-standout",
257
235
}
258
236
259
237
# Rebuild focus and non-focus widgets using current properties
260
238
261
239
# 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"]:
240
base = (u'%(name)s: '
241
% {u"name": self.properties[u"Name"]})
242
if not self.properties[u"Enabled"]:
243
message = u"DISABLED"
244
elif self.properties[u"ApprovalPending"]:
245
if self.properties[u"ApprovedByDefault"]:
246
message = u"Connection established to client. (d)eny?"
247
else:
248
message = u"Seeks approval to send secret. (a)pprove?"
249
elif self.last_checker_failed:
267
250
timeout = datetime.timedelta(milliseconds
268
251
= 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)
252
[u"Timeout"])
253
last_ok = isoformat_to_datetime(
254
max((self.properties[u"LastCheckedOK"]
255
or self.properties[u"Created"]),
256
self.properties[u"LastEnabled"]))
257
timer = timeout - (datetime.datetime.utcnow() - last_ok)
258
message = (u'A checker has failed! Time until client'
259
u' gets diabled: %s'
260
% unicode(timer).rsplit(".", 1)[0])
298
261
else:
299
message = "enabled"
300
self.using_timer(False)
301
self._text = "{0}{1}".format(base, message)
302
262
message = u"enabled"
263
self._text = "%s%s" % (base, message)
264
303
265
if not urwid.supports_unicode():
304
266
self._text = self._text.encode("ascii", "replace")
305
textlist = [("normal", self._text)]
267
textlist = [(u"normal", self._text)]
306
268
self._text_widget.set_text(textlist)
307
269
self._focus_text_widget.set_text([(with_standout[text[0]],
308
270
text[1])
317
279
self.update_hook()
318
280
319
281
def update_timer(self):
320
"""called by gobject. Will indefinitely loop until
321
gobject.source_remove() on tag is called"""
282
"called by gobject"
322
283
self.update()
323
284
return True # Keep calling this
324
285
325
def delete(self, **kwargs):
286
def delete(self):
326
287
if self._update_timer_callback_tag is not None:
327
288
gobject.source_remove(self._update_timer_callback_tag)
328
289
self._update_timer_callback_tag = None
329
for match in self.match_objects:
330
match.remove()
331
self.match_objects = ()
332
290
if self.delete_hook is not None:
333
291
self.delete_hook(self)
334
return super(MandosClientWidget, self).delete(**kwargs)
335
292
336
def render(self, maxcolrow, focus=False):
293
def render(self, (maxcol,), focus=False):
337
294
"""Render differently if we have focus.
338
295
This overrides the method from urwid.FlowWidget"""
339
return self.current_widget(focus).render(maxcolrow,
296
return self.current_widget(focus).render((maxcol,),
340
297
focus=focus)
341
298
342
def keypress(self, maxcolrow, key):
299
def keypress(self, (maxcol,), key):
343
300
"""Handle keys.
344
301
This overrides the method from urwid.FlowWidget"""
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":
302
if key == u"+":
303
self.proxy.Enable(dbus_interface = client_interface)
304
elif key == u"-":
305
self.proxy.Disable(dbus_interface = client_interface)
306
elif key == u"a":
352
307
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
353
dbus_interface = client_interface,
354
ignore_reply=True)
355
elif key == "d":
308
dbus_interface = client_interface)
309
elif key == u"d":
356
310
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":
311
dbus_interface = client_interface)
312
elif key == u"r" or key == u"_" or key == u"ctrl k":
360
313
self.server_proxy_object.RemoveClient(self.proxy
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)
314
.object_path)
315
elif key == u"s":
316
self.proxy.StartChecker(dbus_interface = client_interface)
317
elif key == u"S":
318
self.proxy.StopChecker(dbus_interface = client_interface)
319
elif key == u"C":
320
self.proxy.CheckedOK(dbus_interface = client_interface)
372
321
# xxx
373
# elif key == "p" or key == "=":
322
# elif key == u"p" or key == "=":
374
323
# self.proxy.pause()
375
# elif key == "u" or key == ":":
324
# elif key == u"u" or key == ":":
376
325
# self.proxy.unpause()
377
# elif key == "RET":
326
# elif key == u"RET":
378
327
# self.open()
379
328
else:
380
329
return key
381
330
382
def property_changed(self, property=None, **kwargs):
331
def property_changed(self, property=None, value=None,
332
*args, **kwargs):
383
333
"""Call self.update() if old value is not new value.
384
334
This overrides the method from MandosClientPropertyCache"""
385
335
property_name = unicode(property)
386
336
old_value = self.properties.get(property_name)
387
337
super(MandosClientWidget, self).property_changed(
388
property=property, **kwargs)
338
property=property, value=value, *args, **kwargs)
389
339
if self.properties.get(property_name) != old_value:
390
340
self.update()
391
341
395
345
"down" key presses, thus not allowing any containing widgets to
396
346
use them as an excuse to shift focus away from this widget.
397
347
"""
398
def keypress(self, *args, **kwargs):
399
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
400
if ret in ("up", "down"):
348
def keypress(self, (maxcol, maxrow), key):
349
ret = super(ConstrainedListBox, self).keypress((maxcol,
350
maxrow), key)
351
if ret in (u"up", u"down"):
401
352
return
402
353
return ret
403
354
412
363
self.screen = urwid.curses_display.Screen()
413
364
414
365
self.screen.register_palette((
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")),
366
(u"normal",
367
u"default", u"default", None),
368
(u"bold",
369
u"default", u"default", u"bold"),
370
(u"underline-blink",
371
u"default", u"default", u"underline"),
372
(u"standout",
373
u"default", u"default", u"standout"),
374
(u"bold-underline-blink",
375
u"default", u"default", (u"bold", u"underline")),
376
(u"bold-standout",
377
u"default", u"default", (u"bold", u"standout")),
378
(u"underline-blink-standout",
379
u"default", u"default", (u"underline", u"standout")),
380
(u"bold-underline-blink-standout",
381
u"default", u"default", (u"bold", u"underline",
382
u"standout")),
432
383
))
433
384
434
385
if urwid.supports_unicode():
435
self.divider = "─" # \u2500
436
#self.divider = "━" # \u2501
386
self.divider = u"─" # \u2500
387
#self.divider = u"━" # \u2501
437
388
else:
438
#self.divider = "-" # \u002d
439
self.divider = "_" # \u005f
389
#self.divider = u"-" # \u002d
390
self.divider = u"_" # \u005f
440
391
441
392
self.screen.start()
442
393
456
407
# This keeps track of whether self.uilist currently has
457
408
# self.logbox in it or not
458
409
self.log_visible = True
459
self.log_wrap = "any"
410
self.log_wrap = u"any"
460
411
461
412
self.rebuild()
462
self.log_message_raw(("bold",
463
"Mandos Monitor version " + version))
464
self.log_message_raw(("bold",
465
"q: Quit ?: Help"))
413
self.log_message_raw((u"bold",
414
u"Mandos Monitor version " + version))
415
self.log_message_raw((u"bold",
416
u"q: Quit ?: Help"))
466
417
467
418
self.busname = domain + '.Mandos'
468
419
self.main_loop = gobject.MainLoop()
420
self.bus = dbus.SystemBus()
421
mandos_dbus_objc = self.bus.get_object(
422
self.busname, u"/", follow_name_owner_changes=True)
423
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
424
dbus_interface
425
= server_interface)
426
try:
427
mandos_clients = (self.mandos_serv
428
.GetAllClientsWithProperties())
429
except dbus.exceptions.DBusException:
430
mandos_clients = dbus.Dictionary()
431
432
(self.mandos_serv
433
.connect_to_signal(u"ClientRemoved",
434
self.find_and_remove_client,
435
dbus_interface=server_interface,
436
byte_arrays=True))
437
(self.mandos_serv
438
.connect_to_signal(u"ClientAdded",
439
self.add_new_client,
440
dbus_interface=server_interface,
441
byte_arrays=True))
442
(self.mandos_serv
443
.connect_to_signal(u"ClientNotFound",
444
self.client_not_found,
445
dbus_interface=server_interface,
446
byte_arrays=True))
447
for path, client in mandos_clients.iteritems():
448
client_proxy_object = self.bus.get_object(self.busname,
449
path)
450
self.add_client(MandosClientWidget(server_proxy_object
451
=self.mandos_serv,
452
proxy_object
453
=client_proxy_object,
454
properties=client,
455
update_hook
456
=self.refresh,
457
delete_hook
458
=self.remove_client,
459
logger
460
=self.log_message),
461
path=path)
469
462
470
463
def client_not_found(self, fingerprint, address):
471
self.log_message("Client with address {0} and fingerprint"
472
" {1} could not be found"
473
.format(address, fingerprint))
464
self.log_message((u"Client with address %s and fingerprint %s"
465
u" could not be found" % (address,
466
fingerprint)))
474
467
475
468
def rebuild(self):
476
469
"""This rebuilds the User Interface.
486
479
self.divider)))
487
480
if self.log_visible:
488
481
self.uilist.append(self.logbox)
482
pass
489
483
self.topwidget = urwid.Pile(self.uilist)
490
484
491
485
def log_message(self, message):
492
486
timestamp = datetime.datetime.now().isoformat()
493
self.log_message_raw(timestamp + ": " + message)
487
self.log_message_raw(timestamp + u": " + message)
494
488
495
489
def log_message_raw(self, markup):
496
490
"""Add a log message to the log buffer."""
499
493
and len(self.log) > self.max_log_length):
500
494
del self.log[0:len(self.log)-self.max_log_length-1]
501
495
self.logbox.set_focus(len(self.logbox.body.contents),
502
coming_from="above")
496
coming_from=u"above")
503
497
self.refresh()
504
498
505
499
def toggle_log_display(self):
506
500
"""Toggle visibility of the log buffer."""
507
501
self.log_visible = not self.log_visible
508
502
self.rebuild()
509
#self.log_message("Log visibility changed to: "
503
#self.log_message(u"Log visibility changed to: "
510
504
# + unicode(self.log_visible))
511
505
512
506
def change_log_display(self):
513
507
"""Change type of log display.
514
508
Currently, this toggles wrapping of text lines."""
515
if self.log_wrap == "clip":
516
self.log_wrap = "any"
509
if self.log_wrap == u"clip":
510
self.log_wrap = u"any"
517
511
else:
518
self.log_wrap = "clip"
512
self.log_wrap = u"clip"
519
513
for textwidget in self.log:
520
514
textwidget.set_wrap_mode(self.log_wrap)
521
#self.log_message("Wrap mode: " + self.log_wrap)
515
#self.log_message(u"Wrap mode: " + self.log_wrap)
522
516
523
517
def find_and_remove_client(self, path, name):
524
"""Find a client by its object path and remove it.
518
"""Find an client from its object path and remove it.
525
519
526
520
This is connected to the ClientRemoved signal from the
527
521
Mandos server object."""
529
523
client = self.clients_dict[path]
530
524
except KeyError:
531
525
# not found?
532
self.log_message("Unknown client {0!r} ({1!r}) removed"
533
.format(name, path))
534
526
return
535
client.delete()
527
self.remove_client(client, path)
536
528
537
529
def add_new_client(self, path):
538
530
client_proxy_object = self.bus.get_object(self.busname, path)
553
545
if path is None:
554
546
path = client.proxy.object_path
555
547
self.clients_dict[path] = client
556
self.clients.sort(None, lambda c: c.properties["Name"])
548
self.clients.sort(None, lambda c: c.properties[u"Name"])
557
549
self.refresh()
558
550
559
551
def remove_client(self, client, path=None):
575
567
576
568
def run(self):
577
569
"""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
621
570
self.refresh()
622
571
self._input_callback_tag = (gobject.io_add_watch
623
572
(sys.stdin.fileno(),
633
582
634
583
def process_input(self, source, condition):
635
584
keys = self.screen.get_input()
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
585
translations = { u"ctrl n": u"down", # Emacs
586
u"ctrl p": u"up", # Emacs
587
u"ctrl v": u"page down", # Emacs
588
u"meta v": u"page up", # Emacs
589
u" ": u"page down", # less
590
u"f": u"page down", # less
591
u"b": u"page up", # less
592
u"j": u"down", # vi
593
u"k": u"up", # vi
645
594
}
646
595
for key in keys:
647
596
try:
649
598
except KeyError: # :-)
650
599
pass
651
600
652
if key == "q" or key == "Q":
601
if key == u"q" or key == u"Q":
653
602
self.stop()
654
603
break
655
elif key == "window resize":
604
elif key == u"window resize":
656
605
self.size = self.screen.get_cols_rows()
657
606
self.refresh()
658
elif key == "\f": # Ctrl-L
607
elif key == u"\f": # Ctrl-L
659
608
self.refresh()
660
elif key == "l" or key == "D":
609
elif key == u"l" or key == u"D":
661
610
self.toggle_log_display()
662
611
self.refresh()
663
elif key == "w" or key == "i":
612
elif key == u"w" or key == u"i":
664
613
self.change_log_display()
665
614
self.refresh()
666
elif key == "?" or key == "f1" or key == "esc":
615
elif key == u"?" or key == u"f1" or key == u"esc":
667
616
if not self.log_visible:
668
617
self.log_visible = True
669
618
self.rebuild()
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"))))
619
self.log_message_raw((u"bold",
620
u" ".
621
join((u"q: Quit",
622
u"?: Help",
623
u"l: Log window toggle",
624
u"TAB: Switch window",
625
u"w: Wrap (log)"))))
626
self.log_message_raw((u"bold",
627
u" "
628
.join((u"Clients:",
629
u"+: Enable",
630
u"-: Disable",
631
u"r: Remove",
632
u"s: Start new checker",
633
u"S: Stop checker",
634
u"C: Checker OK",
635
u"a: Approve",
636
u"d: Deny"))))
688
637
self.refresh()
689
elif key == "tab":
638
elif key == u"tab":
690
639
if self.topwidget.get_focus() is self.logbox:
691
640
self.topwidget.set_focus(0)
692
641
else:
693
642
self.topwidget.set_focus(self.logbox)
694
643
self.refresh()
695
#elif (key == "end" or key == "meta >" or key == "G"
696
# or key == ">"):
644
#elif (key == u"end" or key == u"meta >" or key == u"G"
645
# or key == u">"):
697
646
# pass # xxx end-of-buffer
698
#elif (key == "home" or key == "meta <" or key == "g"
699
# or key == "<"):
647
#elif (key == u"home" or key == u"meta <" or key == u"g"
648
# or key == u"<"):
700
649
# pass # xxx beginning-of-buffer
701
#elif key == "ctrl e" or key == "$":
650
#elif key == u"ctrl e" or key == u"$":
702
651
# pass # xxx move-end-of-line
703
#elif key == "ctrl a" or key == "^":
652
#elif key == u"ctrl a" or key == u"^":
704
653
# pass # xxx move-beginning-of-line
705
#elif key == "ctrl b" or key == "meta (" or key == "h":
654
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
706
655
# pass # xxx left
707
#elif key == "ctrl f" or key == "meta )" or key == "l":
656
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
708
657
# pass # xxx right
709
#elif key == "a":
658
#elif key == u"a":
710
659
# pass # scroll up log
711
#elif key == "z":
660
#elif key == u"z":
712
661
# pass # scroll down log
713
662
elif self.topwidget.selectable():
714
663
self.topwidget.keypress(self.size, key)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0