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