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