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