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