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