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