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