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