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