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