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