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