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