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 406
- compare with another revision
- download diff
- download tarball
- view history from revision 406
- Committer: Teddy Hogeborn
- Date: 2009-11-09 07:35:16 UTC
- Revision ID: teddy@fukt.bsnet.se-20091109073516-v1vem352uz0vuwrd
* dbus-mandos.conf: New; to be copied to
"/etc/dbus-1/system.d/mandos.conf".
"/etc/dbus-1/system.d/mandos.conf".
added
removed
mandos-monitor
4
4
from __future__ import division, absolute_import, with_statement
5
5
6
6
import sys
7
import os
8
7
import signal
9
8
10
import datetime
11
12
9
import urwid.curses_display
13
10
import urwid
14
11
19
16
20
17
import UserList
21
18
22
import locale
23
24
locale.setlocale(locale.LC_ALL, u'')
25
26
19
# Some useful constants
27
20
domain = 'se.bsnet.fukt'
28
21
server_interface = domain + '.Mandos'
37
30
urwid.curses_display.curses.A_UNDERLINE |= (
38
31
urwid.curses_display.curses.A_BLINK)
39
32
40
def isoformat_to_datetime(iso):
41
"Parse an ISO 8601 date string to a datetime.datetime()"
42
if not iso:
43
return None
44
d, t = iso.split(u"T", 1)
45
year, month, day = d.split(u"-", 2)
46
hour, minute, second = t.split(u":", 2)
47
second, fraction = divmod(float(second), 1)
48
return datetime.datetime(int(year),
49
int(month),
50
int(day),
51
int(hour),
52
int(minute),
53
int(second), # Whole seconds
54
int(fraction*1000000)) # Microseconds
55
56
33
class MandosClientPropertyCache(object):
57
34
"""This wraps a Mandos Client D-Bus proxy object, caches the
58
35
properties and calls a hook function when any of them are
59
36
changed.
60
37
"""
61
def __init__(self, proxy_object=None, *args, **kwargs):
38
def __init__(self, proxy_object=None, properties=None, *args,
39
**kwargs):
62
40
self.proxy = proxy_object # Mandos Client proxy object
63
41
64
self.properties = dict()
65
self.proxy.connect_to_signal(u"PropertyChanged",
42
if properties is None:
43
self.properties = dict()
44
else:
45
self.properties = properties
46
self.proxy.connect_to_signal("PropertyChanged",
66
47
self.property_changed,
67
48
client_interface,
68
49
byte_arrays=True)
69
50
70
self.properties.update(
71
self.proxy.GetAll(client_interface,
72
dbus_interface = dbus.PROPERTIES_IFACE))
51
if properties is None:
52
self.properties.update(self.proxy.GetAll(client_interface,
53
dbus_interface =
54
dbus.PROPERTIES_IFACE))
73
55
super(MandosClientPropertyCache, self).__init__(
74
proxy_object=proxy_object, *args, **kwargs)
56
proxy_object=proxy_object,
57
properties=properties, *args, **kwargs)
75
58
76
59
def property_changed(self, property=None, value=None):
77
60
"""This is called whenever we get a PropertyChanged signal
86
69
"""
87
70
88
71
def __init__(self, server_proxy_object=None, update_hook=None,
89
delete_hook=None, logger=None, *args, **kwargs):
72
delete_hook=None, *args, **kwargs):
90
73
# Called on update
91
74
self.update_hook = update_hook
92
75
# Called on delete
93
76
self.delete_hook = delete_hook
94
77
# Mandos Server proxy object
95
78
self.server_proxy_object = server_proxy_object
96
# Logger
97
self.logger = logger
98
99
self._update_timer_callback_tag = None
100
self.last_checker_failed = False
101
79
102
80
# The widget shown normally
103
self._text_widget = urwid.Text(u"")
81
self._text_widget = urwid.Text("")
104
82
# The widget shown when we have focus
105
self._focus_text_widget = urwid.Text(u"")
83
self._focus_text_widget = urwid.Text("")
106
84
super(MandosClientWidget, self).__init__(
107
85
update_hook=update_hook, delete_hook=delete_hook,
108
86
*args, **kwargs)
109
87
self.update()
110
88
self.opened = False
111
self.proxy.connect_to_signal(u"CheckerCompleted",
112
self.checker_completed,
113
client_interface,
114
byte_arrays=True)
115
self.proxy.connect_to_signal(u"CheckerStarted",
116
self.checker_started,
117
client_interface,
118
byte_arrays=True)
119
self.proxy.connect_to_signal(u"GotSecret",
120
self.got_secret,
121
client_interface,
122
byte_arrays=True)
123
self.proxy.connect_to_signal(u"Rejected",
124
self.rejected,
125
client_interface,
126
byte_arrays=True)
127
last_checked_ok = isoformat_to_datetime(self.properties
128
["last_checked_ok"])
129
if last_checked_ok is None:
130
self.last_checker_failed = True
131
else:
132
self.last_checker_failed = ((datetime.datetime.utcnow()
133
- last_checked_ok)
134
> datetime.timedelta
135
(milliseconds=
136
self.properties["interval"]))
137
if self.last_checker_failed:
138
self._update_timer_callback_tag = (gobject.timeout_add
139
(1000,
140
self.update_timer))
141
142
def checker_completed(self, exitstatus, condition, command):
143
if exitstatus == 0:
144
if self.last_checker_failed:
145
self.last_checker_failed = False
146
gobject.source_remove(self._update_timer_callback_tag)
147
self._update_timer_callback_tag = None
148
self.logger(u'Checker for client %s (command "%s")'
149
u' was successful'
150
% (self.properties[u"name"], command))
151
self.update()
152
return
153
# Checker failed
154
if not self.last_checker_failed:
155
self.last_checker_failed = True
156
self._update_timer_callback_tag = (gobject.timeout_add
157
(1000,
158
self.update_timer))
159
if os.WIFEXITED(condition):
160
self.logger(u'Checker for client %s (command "%s")'
161
u' failed with exit code %s'
162
% (self.properties[u"name"], command,
163
os.WEXITSTATUS(condition)))
164
elif os.WIFSIGNALED(condition):
165
self.logger(u'Checker for client %s (command "%s")'
166
u' was killed by signal %s'
167
% (self.properties[u"name"], command,
168
os.WTERMSIG(condition)))
169
elif os.WCOREDUMP(condition):
170
self.logger(u'Checker for client %s (command "%s")'
171
u' dumped core'
172
% (self.properties[u"name"], command))
173
else:
174
self.logger(u'Checker for client %s completed mysteriously')
175
self.update()
176
177
def checker_started(self, command):
178
self.logger(u'Client %s started checker "%s"'
179
% (self.properties[u"name"], unicode(command)))
180
181
def got_secret(self):
182
self.logger(u'Client %s received its secret'
183
% self.properties[u"name"])
184
185
def rejected(self):
186
self.logger(u'Client %s was rejected'
187
% self.properties[u"name"])
188
89
189
90
def selectable(self):
190
91
"""Make this a "selectable" widget.
214
115
}
215
116
216
117
# Rebuild focus and non-focus widgets using current properties
217
self._text = (u'%(name)s: %(enabled)s%(timer)s'
218
% { u"name": self.properties[u"name"],
219
u"enabled":
220
(u"enabled"
221
if self.properties[u"enabled"]
222
else u"DISABLED"),
223
u"timer": (unicode(datetime.timedelta
224
(milliseconds =
225
self.properties
226
[u"timeout"])
227
- (datetime.datetime
228
.utcnow()
229
- isoformat_to_datetime
230
(max((self.properties
231
["last_checked_ok"]
232
or
233
self.properties
234
["created"]),
235
self.properties[u"last_enabled"]))))
236
if (self.last_checker_failed
237
and self.properties
238
[u"enabled"])
239
else u"")})
118
self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
% self.properties)
240
120
if not urwid.supports_unicode():
241
121
self._text = self._text.encode("ascii", "replace")
242
textlist = [(u"normal", self._text)]
122
textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
243
123
self._text_widget.set_text(textlist)
244
124
self._focus_text_widget.set_text([(with_standout[text[0]],
245
125
text[1])
253
133
if self.update_hook is not None:
254
134
self.update_hook()
255
135
256
def update_timer(self):
257
"called by gobject"
258
self.update()
259
return True # Keep calling this
260
261
136
def delete(self):
262
if self._update_timer_callback_tag is not None:
263
gobject.source_remove(self._update_timer_callback_tag)
264
self._update_timer_callback_tag = None
265
137
if self.delete_hook is not None:
266
138
self.delete_hook(self)
267
139
278
150
self.proxy.Enable()
279
151
elif key == u"d" or key == u"-":
280
152
self.proxy.Disable()
281
elif key == u"r" or key == u"_" or key == u"ctrl k":
153
elif key == u"r" or key == u"_":
282
154
self.server_proxy_object.RemoveClient(self.proxy
283
155
.object_path)
284
156
elif key == u"s":
285
157
self.proxy.StartChecker()
158
elif key == u"c":
159
self.proxy.StopChecker()
286
160
elif key == u"S":
287
self.proxy.StopChecker()
288
elif key == u"C":
289
161
self.proxy.CheckedOK()
290
162
# xxx
291
163
# elif key == u"p" or key == "=":
351
223
))
352
224
353
225
if urwid.supports_unicode():
354
self.divider = u"─" # \u2500
355
#self.divider = u"━" # \u2501
226
#self.divider = u"─" # \u2500
227
self.divider = u"━" # \u2501
356
228
else:
357
229
#self.divider = u"-" # \u002d
358
230
self.divider = u"_" # \u005f
378
250
self.log_wrap = u"any"
379
251
380
252
self.rebuild()
381
self.log_message_raw((u"bold",
382
u"Mandos Monitor version " + version))
383
self.log_message_raw((u"bold",
384
u"q: Quit ?: Help"))
253
self.log_message(u"Message")
254
self.log_message(u"Message0 Message1 Message2 Message3 Message4 Message5 Message6 Message7 Message8 Message9")
255
self.log_message(u"Message10 Message11 Message12 Message13 Message14 Message15 Message16 Message17 Message18 Message19")
256
self.log_message(u"Message20 Message21 Message22 Message23 Message24 Message25 Message26 Message27 Message28 Message29")
385
257
386
258
self.busname = domain + '.Mandos'
387
259
self.main_loop = gobject.MainLoop()
398
270
mandos_clients = dbus.Dictionary()
399
271
400
272
(self.mandos_serv
401
.connect_to_signal(u"ClientRemoved",
273
.connect_to_signal("ClientRemoved",
402
274
self.find_and_remove_client,
403
275
dbus_interface=server_interface,
404
276
byte_arrays=True))
405
277
(self.mandos_serv
406
.connect_to_signal(u"ClientAdded",
278
.connect_to_signal("ClientAdded",
407
279
self.add_new_client,
408
280
dbus_interface=server_interface,
409
281
byte_arrays=True))
410
(self.mandos_serv
411
.connect_to_signal(u"ClientNotFound",
412
self.client_not_found,
413
dbus_interface=server_interface,
414
byte_arrays=True))
415
282
for path, client in mandos_clients.iteritems():
416
283
client_proxy_object = self.bus.get_object(self.busname,
417
284
path)
423
290
update_hook
424
291
=self.refresh,
425
292
delete_hook
426
=self.remove_client,
427
logger
428
=self.log_message),
293
=self.remove_client),
429
294
path=path)
430
295
431
def client_not_found(self, fingerprint, address):
432
self.log_message((u"Client with address %s and fingerprint %s"
433
u" could not be found" % (address,
434
fingerprint)))
435
436
296
def rebuild(self):
437
297
"""This rebuilds the User Interface.
438
298
Call this when the widget layout needs to change"""
447
307
pass
448
308
self.topwidget = urwid.Pile(self.uilist)
449
309
450
def log_message(self, message):
451
timestamp = datetime.datetime.now().isoformat()
452
self.log_message_raw(timestamp + u": " + message)
453
454
def log_message_raw(self, markup):
310
def log_message(self, markup):
455
311
"""Add a log message to the log buffer."""
456
312
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
457
313
if (self.max_log_length
458
314
and len(self.log) > self.max_log_length):
459
315
del self.log[0:len(self.log)-self.max_log_length-1]
460
self.logbox.set_focus(len(self.logbox.body.contents),
461
coming_from=u"above")
462
self.refresh()
463
316
464
317
def toggle_log_display(self):
465
318
"""Toggle visibility of the log buffer."""
491
344
return
492
345
self.remove_client(client, path)
493
346
494
def add_new_client(self, path):
347
def add_new_client(self, path, properties):
495
348
client_proxy_object = self.bus.get_object(self.busname, path)
496
349
self.add_client(MandosClientWidget(server_proxy_object
497
350
=self.mandos_serv,
498
351
proxy_object
499
352
=client_proxy_object,
353
properties=properties,
500
354
update_hook
501
355
=self.refresh,
502
356
delete_hook
503
=self.remove_client,
504
logger
505
=self.log_message),
357
=self.remove_client),
506
358
path=path)
507
359
508
360
def add_client(self, client, path=None):
577
429
elif key == u"w" or key == u"i":
578
430
self.change_log_display()
579
431
self.refresh()
580
elif key == u"?" or key == u"f1" or key == u"esc":
581
if not self.log_visible:
582
self.log_visible = True
583
self.rebuild()
584
self.log_message_raw((u"bold",
585
u" ".
586
join((u"q: Quit",
587
u"?: Help",
588
u"l: Log window toggle",
589
u"TAB: Switch window",
590
u"w: Wrap (log)"))))
591
self.log_message_raw((u"bold",
592
u" "
593
.join((u"Clients:",
594
u"e: Enable",
595
u"d: Disable",
596
u"r: Remove",
597
u"s: Start new checker",
598
u"S: Stop checker",
599
u"C: Checker OK"))))
432
elif key == u"?" or key == u"f1":
433
self.log_message(u"Help!")
600
434
self.refresh()
601
435
elif key == u"tab":
602
436
if self.topwidget.get_focus() is self.logbox:
604
438
else:
605
439
self.topwidget.set_focus(self.logbox)
606
440
self.refresh()
607
#elif (key == u"end" or key == u"meta >" or key == u"G"
608
# or key == u">"):
609
# pass # xxx end-of-buffer
610
#elif (key == u"home" or key == u"meta <" or key == u"g"
611
# or key == u"<"):
612
# pass # xxx beginning-of-buffer
613
#elif key == u"ctrl e" or key == u"$":
614
# pass # xxx move-end-of-line
615
#elif key == u"ctrl a" or key == u"^":
616
# pass # xxx move-beginning-of-line
617
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
618
# pass # xxx left
619
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
620
# pass # xxx right
621
#elif key == u"a":
622
# pass # scroll up log
623
#elif key == u"z":
624
# pass # scroll down log
441
elif (key == u"end" or key == u"meta >" or key == u"G"
442
or key == u">"):
443
pass # xxx end-of-buffer
444
elif (key == u"home" or key == u"meta <" or key == u"g"
445
or key == u"<"):
446
pass # xxx beginning-of-buffer
447
elif key == u"ctrl e" or key == u"$":
448
pass # xxx move-end-of-line
449
elif key == u"ctrl a" or key == u"^":
450
pass # xxx move-beginning-of-line
451
elif key == u"ctrl b" or key == u"meta (" or key == u"h":
452
pass # xxx left
453
elif key == u"ctrl f" or key == u"meta )" or key == u"l":
454
pass # xxx right
455
elif key == u"a":
456
pass # scroll up log
457
elif key == u"z":
458
pass # scroll down log
625
459
elif self.topwidget.selectable():
626
460
self.topwidget.keypress(self.size, key)
627
461
self.refresh()
630
464
ui = UserInterface()
631
465
try:
632
466
ui.run()
633
except Exception, e:
634
ui.log_message(unicode(e))
467
except:
635
468
ui.screen.stop()
636
469
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0