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