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 699
- compare with another revision
- download diff
- download tarball
- view history from revision 699
- Committer: Teddy Hogeborn
- Date: 2014-06-13 22:13:56 UTC
- Revision ID: teddy@recompile.se-20140613221356-b9c36ctxmw4pelja
Fix free() of possibly uninitialized pointer in mandos-client.
* plugins.d/mandos-client (main): Initialize "direntries" to NULL so
it can be free()'d even if scandir()
fails.
* plugins.d/mandos-client (main): Initialize "direntries" to NULL so
it can be free()'d even if scandir()
fails.
- files added:
- DBUS-API
- debian/source
- debian/upstream
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-monitor
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
#
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
11
# the Free Software Foundation, either version 3 of the License, or
12
# (at your option) any later version.
13
#
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
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17
# GNU General Public License for more details.
18
#
19
# 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
#
23
# Contact the authors at <mandos@recompile.se>.
24
#
3
25
4
from __future__ import division, absolute_import, with_statement
26
from __future__ import (division, absolute_import, print_function,
27
unicode_literals)
28
try:
29
from future_builtins import *
30
except ImportError:
31
pass
5
32
6
33
import sys
7
import signal
34
import os
35
36
import datetime
8
37
9
38
import urwid.curses_display
10
39
import urwid
11
40
12
41
from dbus.mainloop.glib import DBusGMainLoop
13
import gobject
42
try:
43
import gobject
44
except ImportError:
45
from gi.repository import GObject as gobject
14
46
15
47
import dbus
16
48
17
import UserList
49
import locale
50
51
if sys.version_info[0] == 2:
52
str = unicode
53
54
locale.setlocale(locale.LC_ALL, '')
55
56
import logging
57
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
18
58
19
59
# Some useful constants
20
domain = 'se.bsnet.fukt'
60
domain = 'se.recompile'
21
61
server_interface = domain + '.Mandos'
22
62
client_interface = domain + '.Mandos.Client'
23
version = "1.0.14"
24
25
# Always run in monochrome mode
26
urwid.curses_display.curses.has_colors = lambda : False
27
28
# Urwid doesn't support blinking, but we want it. Since we have no
29
# use for underline on its own, we make underline also always blink.
30
urwid.curses_display.curses.A_UNDERLINE |= (
31
urwid.curses_display.curses.A_BLINK)
63
version = "1.6.5"
64
65
def isoformat_to_datetime(iso):
66
"Parse an ISO 8601 date string to a datetime.datetime()"
67
if not iso:
68
return None
69
d, t = iso.split("T", 1)
70
year, month, day = d.split("-", 2)
71
hour, minute, second = t.split(":", 2)
72
second, fraction = divmod(float(second), 1)
73
return datetime.datetime(int(year),
74
int(month),
75
int(day),
76
int(hour),
77
int(minute),
78
int(second), # Whole seconds
79
int(fraction*1000000)) # Microseconds
32
80
33
81
class MandosClientPropertyCache(object):
34
82
"""This wraps a Mandos Client D-Bus proxy object, caches the
35
83
properties and calls a hook function when any of them are
36
84
changed.
37
85
"""
38
def __init__(self, proxy_object=None, properties=None, *args,
39
**kwargs):
40
# Type conversion mapping
41
self.type_map = {
42
dbus.ObjectPath: unicode,
43
dbus.ByteArray: str,
44
dbus.Signature: unicode,
45
dbus.Byte: chr,
46
dbus.Int16: int,
47
dbus.UInt16: int,
48
dbus.Int32: int,
49
dbus.UInt32: int,
50
dbus.Int64: int,
51
dbus.UInt64: int,
52
dbus.Dictionary: dict,
53
dbus.Array: list,
54
dbus.String: unicode,
55
dbus.Boolean: bool,
56
dbus.Double: float,
57
dbus.Struct: tuple,
58
}
86
def __init__(self, proxy_object=None, properties=None, **kwargs):
59
87
self.proxy = proxy_object # Mandos Client proxy object
60
61
if properties is None:
62
self.properties = dict()
63
else:
64
self.properties = dict(self.convert_property(prop, val)
65
for prop, val in
66
properties.iteritems())
67
self.proxy.connect_to_signal("PropertyChanged",
68
self.property_changed,
69
client_interface,
70
byte_arrays=True)
88
self.properties = dict() if properties is None else properties
89
self.property_changed_match = (
90
self.proxy.connect_to_signal("PropertyChanged",
91
self._property_changed,
92
client_interface,
93
byte_arrays=True))
71
94
72
95
if properties is None:
73
96
self.properties.update(
74
self.convert_property(prop, val)
75
for prop, val in
76
97
self.proxy.GetAll(client_interface,
77
dbus_interface =
78
dbus.PROPERTIES_IFACE).iteritems())
79
super(MandosClientPropertyCache, self).__init__(
80
proxy_object=proxy_object,
81
properties=properties, *args, **kwargs)
82
83
def convert_property(self, property, value):
84
"""This converts the arguments from a D-Bus signal, which are
85
D-Bus types, into normal Python types, using a conversion
86
function from "self.type_map".
87
"""
88
property_name = unicode(property) # Always a dbus.String
89
if isinstance(value, dbus.UTF8String):
90
# Should not happen, but prepare for it anyway
91
value = dbus.String(str(value).decode("utf-8"))
92
try:
93
convfunc = self.type_map[type(value)]
94
except KeyError:
95
# Unknown type, return unmodified
96
return property_name, value
97
return property_name, convfunc(value)
98
dbus_interface
99
= dbus.PROPERTIES_IFACE))
100
101
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
98
107
def property_changed(self, property=None, value=None):
99
108
"""This is called whenever we get a PropertyChanged signal
100
109
It updates the changed property in the "properties" dict.
101
110
"""
102
# Convert name and value
103
property_name, cvalue = self.convert_property(property, value)
104
111
# Update properties dict with new value
105
self.properties[property_name] = cvalue
112
self.properties[property] = value
113
114
def delete(self):
115
self.property_changed_match.remove()
106
116
107
117
108
118
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
110
120
"""
111
121
112
122
def __init__(self, server_proxy_object=None, update_hook=None,
113
delete_hook=None, *args, **kwargs):
123
delete_hook=None, logger=None, **kwargs):
114
124
# Called on update
115
125
self.update_hook = update_hook
116
126
# Called on delete
117
127
self.delete_hook = delete_hook
118
128
# Mandos Server proxy object
119
129
self.server_proxy_object = server_proxy_object
130
# Logger
131
self.logger = logger
132
133
self._update_timer_callback_tag = None
120
134
121
135
# The widget shown normally
122
136
self._text_widget = urwid.Text("")
123
137
# The widget shown when we have focus
124
138
self._focus_text_widget = urwid.Text("")
125
super(MandosClientWidget, self).__init__(
126
update_hook=update_hook, delete_hook=delete_hook,
127
*args, **kwargs)
139
super(MandosClientWidget, self).__init__(**kwargs)
128
140
self.update()
129
141
self.opened = False
142
143
self.match_objects = (
144
self.proxy.connect_to_signal("CheckerCompleted",
145
self.checker_completed,
146
client_interface,
147
byte_arrays=True),
148
self.proxy.connect_to_signal("CheckerStarted",
149
self.checker_started,
150
client_interface,
151
byte_arrays=True),
152
self.proxy.connect_to_signal("GotSecret",
153
self.got_secret,
154
client_interface,
155
byte_arrays=True),
156
self.proxy.connect_to_signal("NeedApproval",
157
self.need_approval,
158
client_interface,
159
byte_arrays=True),
160
self.proxy.connect_to_signal("Rejected",
161
self.rejected,
162
client_interface,
163
byte_arrays=True))
164
#self.logger('Created client {0}'
165
# .format(self.properties["Name"]))
166
167
def using_timer(self, flag):
168
"""Call this method with True or False when timer should be
169
activated or deactivated.
170
"""
171
if flag and self._update_timer_callback_tag is None:
172
# Will update the shown timer value every second
173
self._update_timer_callback_tag = (gobject.timeout_add
174
(1000,
175
self.update_timer))
176
elif not (flag or self._update_timer_callback_tag is None):
177
gobject.source_remove(self._update_timer_callback_tag)
178
self._update_timer_callback_tag = None
179
180
def checker_completed(self, exitstatus, condition, command):
181
if exitstatus == 0:
182
self.update()
183
return
184
# Checker failed
185
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)))
190
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"]))
203
self.update()
204
205
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
213
def got_secret(self):
214
self.logger('Client {0} received its secret'
215
.format(self.properties["Name"]))
216
217
def need_approval(self, timeout, default):
218
if not default:
219
message = 'Client {0} needs approval within {1} seconds'
220
else:
221
message = 'Client {0} will get its secret in {1} seconds'
222
self.logger(message.format(self.properties["Name"],
223
timeout/1000))
224
225
def rejected(self, reason):
226
self.logger('Client {0} was rejected; reason: {1}'
227
.format(self.properties["Name"], reason))
130
228
131
229
def selectable(self):
132
230
"""Make this a "selectable" widget.
133
231
This overrides the method from urwid.FlowWidget."""
134
232
return True
135
233
136
def rows(self, (maxcol,), focus=False):
234
def rows(self, maxcolrow, focus=False):
137
235
"""How many rows this widget will occupy might depend on
138
236
whether we have focus or not.
139
237
This overrides the method from urwid.FlowWidget"""
140
return self.current_widget(focus).rows((maxcol,), focus=focus)
238
return self.current_widget(focus).rows(maxcolrow, focus=focus)
141
239
142
240
def current_widget(self, focus=False):
143
241
if focus or self.opened:
147
245
def update(self):
148
246
"Called when what is visible on the screen should be updated."
149
247
# How to add standout mode to a style
150
with_standout = { u"normal": u"standout",
151
u"bold": u"bold-standout",
152
u"underline-blink":
153
u"underline-blink-standout",
154
u"bold-underline-blink":
155
u"bold-underline-blink-standout",
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",
156
254
}
157
255
158
256
# Rebuild focus and non-focus widgets using current properties
159
self._text = (u'name="%(name)s", enabled=%(enabled)s'
160
% self.properties)
257
258
# Base part of a client. Name!
259
base = '{name}: '.format(name=self.properties["Name"])
260
if not self.properties["Enabled"]:
261
message = "DISABLED"
262
self.using_timer(False)
263
elif self.properties["ApprovalPending"]:
264
timeout = datetime.timedelta(milliseconds
265
= self.properties
266
["ApprovalDelay"])
267
last_approval_request = isoformat_to_datetime(
268
self.properties["LastApprovalRequest"])
269
if last_approval_request is not None:
270
timer = max(timeout - (datetime.datetime.utcnow()
271
- last_approval_request),
272
datetime.timedelta())
273
else:
274
timer = datetime.timedelta()
275
if self.properties["ApprovedByDefault"]:
276
message = "Approval in {0}. (d)eny?"
277
else:
278
message = "Denial in {0}. (a)pprove?"
279
message = message.format(str(timer).rsplit(".", 1)[0])
280
self.using_timer(True)
281
elif self.properties["LastCheckerStatus"] != 0:
282
# When checker has failed, show timer until client expires
283
expires = self.properties["Expires"]
284
if expires == "":
285
timer = datetime.timedelta(0)
286
else:
287
expires = (datetime.datetime.strptime
288
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
289
timer = max(expires - datetime.datetime.utcnow(),
290
datetime.timedelta())
291
message = ('A checker has failed! Time until client'
292
' gets disabled: {0}'
293
.format(str(timer).rsplit(".", 1)[0]))
294
self.using_timer(True)
295
else:
296
message = "enabled"
297
self.using_timer(False)
298
self._text = "{0}{1}".format(base, message)
299
161
300
if not urwid.supports_unicode():
162
301
self._text = self._text.encode("ascii", "replace")
163
textlist = [(u"normal", u"BLÄRGH: "), (u"bold", self._text)]
302
textlist = [("normal", self._text)]
164
303
self._text_widget.set_text(textlist)
165
304
self._focus_text_widget.set_text([(with_standout[text[0]],
166
305
text[1])
174
313
if self.update_hook is not None:
175
314
self.update_hook()
176
315
177
def delete(self):
316
def update_timer(self):
317
"""called by gobject. Will indefinitely loop until
318
gobject.source_remove() on tag is called"""
319
self.update()
320
return True # Keep calling this
321
322
def delete(self, **kwargs):
323
if self._update_timer_callback_tag is not None:
324
gobject.source_remove(self._update_timer_callback_tag)
325
self._update_timer_callback_tag = None
326
for match in self.match_objects:
327
match.remove()
328
self.match_objects = ()
178
329
if self.delete_hook is not None:
179
330
self.delete_hook(self)
331
return super(MandosClientWidget, self).delete(**kwargs)
180
332
181
def render(self, (maxcol,), focus=False):
333
def render(self, maxcolrow, focus=False):
182
334
"""Render differently if we have focus.
183
335
This overrides the method from urwid.FlowWidget"""
184
return self.current_widget(focus).render((maxcol,),
336
return self.current_widget(focus).render(maxcolrow,
185
337
focus=focus)
186
338
187
def keypress(self, (maxcol,), key):
339
def keypress(self, maxcolrow, key):
188
340
"""Handle keys.
189
341
This overrides the method from urwid.FlowWidget"""
190
if key == u"e" or key == u"+":
191
self.proxy.Enable()
192
elif key == u"d" or key == u"-":
193
self.proxy.Disable()
194
elif key == u"r" or key == u"_":
342
if key == "+":
343
self.proxy.Enable(dbus_interface = client_interface,
344
ignore_reply=True)
345
elif key == "-":
346
self.proxy.Disable(dbus_interface = client_interface,
347
ignore_reply=True)
348
elif key == "a":
349
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
350
dbus_interface = client_interface,
351
ignore_reply=True)
352
elif key == "d":
353
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
354
dbus_interface = client_interface,
355
ignore_reply=True)
356
elif key == "R" or key == "_" or key == "ctrl k":
195
357
self.server_proxy_object.RemoveClient(self.proxy
196
.object_path)
197
elif key == u"s":
198
self.proxy.StartChecker()
199
elif key == u"c":
200
self.proxy.StopChecker()
201
elif key == u"S":
202
self.proxy.CheckedOK()
358
.object_path,
359
ignore_reply=True)
360
elif key == "s":
361
self.proxy.StartChecker(dbus_interface = client_interface,
362
ignore_reply=True)
363
elif key == "S":
364
self.proxy.StopChecker(dbus_interface = client_interface,
365
ignore_reply=True)
366
elif key == "C":
367
self.proxy.CheckedOK(dbus_interface = client_interface,
368
ignore_reply=True)
203
369
# xxx
204
# elif key == u"p" or key == "=":
370
# elif key == "p" or key == "=":
205
371
# self.proxy.pause()
206
# elif key == u"u" or key == ":":
372
# elif key == "u" or key == ":":
207
373
# self.proxy.unpause()
208
# elif key == u"RET":
374
# elif key == "RET":
209
375
# self.open()
210
376
else:
211
377
return key
212
378
213
def property_changed(self, property=None, value=None,
214
*args, **kwargs):
379
def property_changed(self, property=None, **kwargs):
215
380
"""Call self.update() if old value is not new value.
216
381
This overrides the method from MandosClientPropertyCache"""
217
property_name = unicode(property)
382
property_name = str(property)
218
383
old_value = self.properties.get(property_name)
219
384
super(MandosClientWidget, self).property_changed(
220
property=property, value=value, *args, **kwargs)
385
property=property, **kwargs)
221
386
if self.properties.get(property_name) != old_value:
222
387
self.update()
223
388
224
389
390
class ConstrainedListBox(urwid.ListBox):
391
"""Like a normal urwid.ListBox, but will consume all "up" or
392
"down" key presses, thus not allowing any containing widgets to
393
use them as an excuse to shift focus away from this widget.
394
"""
395
def keypress(self, *args, **kwargs):
396
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
397
if ret in ("up", "down"):
398
return
399
return ret
400
401
225
402
class UserInterface(object):
226
403
"""This is the entire user interface - the whole screen
227
404
with boxes, lists of client widgets, etc.
228
405
"""
229
def __init__(self):
230
DBusGMainLoop(set_as_default=True )
406
def __init__(self, max_log_length=1000):
407
DBusGMainLoop(set_as_default=True)
231
408
232
409
self.screen = urwid.curses_display.Screen()
233
410
234
411
self.screen.register_palette((
235
(u"normal",
236
u"default", u"default", None),
237
(u"bold",
238
u"default", u"default", u"bold"),
239
(u"underline-blink",
240
u"default", u"default", u"underline"),
241
(u"standout",
242
u"default", u"default", u"standout"),
243
(u"bold-underline-blink",
244
u"default", u"default", (u"bold", u"underline")),
245
(u"bold-standout",
246
u"default", u"default", (u"bold", u"standout")),
247
(u"underline-blink-standout",
248
u"default", u"default", (u"underline", u"standout")),
249
(u"bold-underline-blink-standout",
250
u"default", u"default", (u"bold", u"underline",
251
u"standout")),
412
("normal",
413
"default", "default", None),
414
("bold",
415
"bold", "default", "bold"),
416
("underline-blink",
417
"underline,blink", "default", "underline,blink"),
418
("standout",
419
"standout", "default", "standout"),
420
("bold-underline-blink",
421
"bold,underline,blink", "default", "bold,underline,blink"),
422
("bold-standout",
423
"bold,standout", "default", "bold,standout"),
424
("underline-blink-standout",
425
"underline,blink,standout", "default",
426
"underline,blink,standout"),
427
("bold-underline-blink-standout",
428
"bold,underline,blink,standout", "default",
429
"bold,underline,blink,standout"),
252
430
))
253
431
432
if urwid.supports_unicode():
433
self.divider = "─" # \u2500
434
#self.divider = "━" # \u2501
435
else:
436
#self.divider = "-" # \u002d
437
self.divider = "_" # \u005f
438
254
439
self.screen.start()
255
440
256
441
self.size = self.screen.get_cols_rows()
257
442
258
443
self.clients = urwid.SimpleListWalker([])
259
444
self.clients_dict = {}
260
self.topwidget = urwid.LineBox(urwid.ListBox(self.clients))
261
#self.topwidget = urwid.ListBox(clients)
445
446
# We will add Text widgets to this list
447
self.log = []
448
self.max_log_length = max_log_length
449
450
# We keep a reference to the log widget so we can remove it
451
# from the ListWalker without it getting destroyed
452
self.logbox = ConstrainedListBox(self.log)
453
454
# This keeps track of whether self.uilist currently has
455
# self.logbox in it or not
456
self.log_visible = True
457
self.log_wrap = "any"
458
459
self.rebuild()
460
self.log_message_raw(("bold",
461
"Mandos Monitor version " + version))
462
self.log_message_raw(("bold",
463
"q: Quit ?: Help"))
262
464
263
465
self.busname = domain + '.Mandos'
264
466
self.main_loop = gobject.MainLoop()
265
self.bus = dbus.SystemBus()
266
mandos_dbus_objc = self.bus.get_object(
267
self.busname, u"/", follow_name_owner_changes=True)
268
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
269
dbus_interface
270
= server_interface)
271
try:
272
mandos_clients = (self.mandos_serv
273
.GetAllClientsWithProperties())
274
except dbus.exceptions.DBusException:
275
mandos_clients = dbus.Dictionary()
276
277
(self.mandos_serv
278
.connect_to_signal("ClientRemoved",
279
self.find_and_remove_client,
280
dbus_interface=server_interface,
281
byte_arrays=True))
282
(self.mandos_serv
283
.connect_to_signal("ClientAdded",
284
self.add_new_client,
285
dbus_interface=server_interface,
286
byte_arrays=True))
287
for path, client in (mandos_clients.iteritems()):
288
client_proxy_object = self.bus.get_object(self.busname,
289
path)
290
self.add_client(MandosClientWidget(server_proxy_object
291
=self.mandos_serv,
292
proxy_object
293
=client_proxy_object,
294
properties=client,
295
update_hook
296
=self.refresh,
297
delete_hook
298
=self.remove_client),
299
path=path)
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
473
def rebuild(self):
474
"""This rebuilds the User Interface.
475
Call this when the widget layout needs to change"""
476
self.uilist = []
477
#self.uilist.append(urwid.ListBox(self.clients))
478
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
479
clients),
480
#header=urwid.Divider(),
481
header=None,
482
footer=
483
urwid.Divider(div_char=
484
self.divider)))
485
if self.log_visible:
486
self.uilist.append(self.logbox)
487
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."""
496
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),
501
coming_from="above")
502
self.refresh()
503
504
def toggle_log_display(self):
505
"""Toggle visibility of the log buffer."""
506
self.log_visible = not self.log_visible
507
self.rebuild()
508
#self.log_message("Log visibility changed to: "
509
# + str(self.log_visible))
510
511
def change_log_display(self):
512
"""Change type of log display.
513
Currently, this toggles wrapping of text lines."""
514
if self.log_wrap == "clip":
515
self.log_wrap = "any"
516
else:
517
self.log_wrap = "clip"
518
for textwidget in self.log:
519
textwidget.set_wrap_mode(self.log_wrap)
520
#self.log_message("Wrap mode: " + self.log_wrap)
300
521
301
522
def find_and_remove_client(self, path, name):
302
"""Find an client from its object path and remove it.
523
"""Find a client by its object path and remove it.
303
524
304
525
This is connected to the ClientRemoved signal from the
305
526
Mandos server object."""
307
528
client = self.clients_dict[path]
308
529
except KeyError:
309
530
# not found?
531
self.log_message("Unknown client {0!r} ({1!r}) removed"
532
.format(name, path))
310
533
return
311
self.remove_client(client, path)
534
client.delete()
312
535
313
def add_new_client(self, path, properties):
536
def add_new_client(self, path):
314
537
client_proxy_object = self.bus.get_object(self.busname, path)
315
538
self.add_client(MandosClientWidget(server_proxy_object
316
539
=self.mandos_serv,
317
540
proxy_object
318
541
=client_proxy_object,
319
properties=properties,
320
542
update_hook
321
543
=self.refresh,
322
544
delete_hook
323
=self.remove_client),
545
=self.remove_client,
546
logger
547
=self.log_message),
324
548
path=path)
325
549
326
550
def add_client(self, client, path=None):
328
552
if path is None:
329
553
path = client.proxy.object_path
330
554
self.clients_dict[path] = client
331
self.clients.sort(None, lambda c: c.properties[u"name"])
555
self.clients.sort(key=lambda c: c.properties["Name"])
332
556
self.refresh()
333
557
334
558
def remove_client(self, client, path=None):
345
569
346
570
def run(self):
347
571
"""Start the main loop and exit when it's done."""
572
self.bus = dbus.SystemBus()
573
mandos_dbus_objc = self.bus.get_object(
574
self.busname, "/", follow_name_owner_changes=True)
575
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
576
dbus_interface
577
= server_interface)
578
try:
579
mandos_clients = (self.mandos_serv
580
.GetAllClientsWithProperties())
581
if not mandos_clients:
582
self.log_message_raw(("bold", "Note: Server has no clients."))
583
except dbus.exceptions.DBusException:
584
self.log_message_raw(("bold", "Note: No Mandos server running."))
585
mandos_clients = dbus.Dictionary()
586
587
(self.mandos_serv
588
.connect_to_signal("ClientRemoved",
589
self.find_and_remove_client,
590
dbus_interface=server_interface,
591
byte_arrays=True))
592
(self.mandos_serv
593
.connect_to_signal("ClientAdded",
594
self.add_new_client,
595
dbus_interface=server_interface,
596
byte_arrays=True))
597
(self.mandos_serv
598
.connect_to_signal("ClientNotFound",
599
self.client_not_found,
600
dbus_interface=server_interface,
601
byte_arrays=True))
602
for path, client in mandos_clients.items():
603
client_proxy_object = self.bus.get_object(self.busname,
604
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),
616
path=path)
617
348
618
self.refresh()
349
619
self._input_callback_tag = (gobject.io_add_watch
350
620
(sys.stdin.fileno(),
360
630
361
631
def process_input(self, source, condition):
362
632
keys = self.screen.get_input()
363
translations = { u"j": u"down",
364
u"k": u"up",
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
365
642
}
366
643
for key in keys:
367
644
try:
369
646
except KeyError: # :-)
370
647
pass
371
648
372
if key == u"q" or key == u"Q":
649
if key == "q" or key == "Q":
373
650
self.stop()
374
651
break
375
elif key == u"window resize":
652
elif key == "window resize":
376
653
self.size = self.screen.get_cols_rows()
377
654
self.refresh()
378
elif key == " ":
379
self.refresh()
655
elif key == "\f": # Ctrl-L
656
self.refresh()
657
elif key == "l" or key == "D":
658
self.toggle_log_display()
659
self.refresh()
660
elif key == "w" or key == "i":
661
self.change_log_display()
662
self.refresh()
663
elif key == "?" or key == "f1" or key == "esc":
664
if not self.log_visible:
665
self.log_visible = True
666
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"))))
685
self.refresh()
686
elif key == "tab":
687
if self.topwidget.get_focus() is self.logbox:
688
self.topwidget.set_focus(0)
689
else:
690
self.topwidget.set_focus(self.logbox)
691
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
380
710
elif self.topwidget.selectable():
381
711
self.topwidget.keypress(self.size, key)
382
712
self.refresh()
385
715
ui = UserInterface()
386
716
try:
387
717
ui.run()
388
except:
718
except KeyboardInterrupt:
719
ui.screen.stop()
720
except Exception as e:
721
ui.log_message(str(e))
389
722
ui.screen.stop()
390
723
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0