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