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
import logging
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
28
29
19
# Some useful constants
30
20
domain = 'se.bsnet.fukt'
31
21
server_interface = domain + '.Mandos'
32
22
client_interface = domain + '.Mandos.Client'
33
version = "1.0.15"
23
version = "1.0.14"
34
24
35
25
# Always run in monochrome mode
36
26
urwid.curses_display.curses.has_colors = lambda : False
40
30
urwid.curses_display.curses.A_UNDERLINE |= (
41
31
urwid.curses_display.curses.A_BLINK)
42
32
43
def isoformat_to_datetime(iso):
44
"Parse an ISO 8601 date string to a datetime.datetime()"
45
if not iso:
46
return None
47
d, t = iso.split(u"T", 1)
48
year, month, day = d.split(u"-", 2)
49
hour, minute, second = t.split(u":", 2)
50
second, fraction = divmod(float(second), 1)
51
return datetime.datetime(int(year),
52
int(month),
53
int(day),
54
int(hour),
55
int(minute),
56
int(second), # Whole seconds
57
int(fraction*1000000)) # Microseconds
58
59
33
class MandosClientPropertyCache(object):
60
34
"""This wraps a Mandos Client D-Bus proxy object, caches the
61
35
properties and calls a hook function when any of them are
62
36
changed.
63
37
"""
64
def __init__(self, proxy_object=None, *args, **kwargs):
38
def __init__(self, proxy_object=None, properties=None, *args,
39
**kwargs):
65
40
self.proxy = proxy_object # Mandos Client proxy object
66
41
67
self.properties = dict()
68
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",
69
47
self.property_changed,
70
48
client_interface,
71
49
byte_arrays=True)
72
50
73
self.properties.update(
74
self.proxy.GetAll(client_interface,
75
dbus_interface = dbus.PROPERTIES_IFACE))
76
77
#XXX This break good super behaviour!
78
# super(MandosClientPropertyCache, self).__init__(
79
# *args, **kwargs)
51
if properties is None:
52
self.properties.update(self.proxy.GetAll(client_interface,
53
dbus_interface =
54
dbus.PROPERTIES_IFACE))
55
super(MandosClientPropertyCache, self).__init__(
56
proxy_object=proxy_object,
57
properties=properties, *args, **kwargs)
80
58
81
59
def property_changed(self, property=None, value=None):
82
60
"""This is called whenever we get a PropertyChanged signal
91
69
"""
92
70
93
71
def __init__(self, server_proxy_object=None, update_hook=None,
94
delete_hook=None, logger=None, *args, **kwargs):
72
delete_hook=None, *args, **kwargs):
95
73
# Called on update
96
74
self.update_hook = update_hook
97
75
# Called on delete
98
76
self.delete_hook = delete_hook
99
77
# Mandos Server proxy object
100
78
self.server_proxy_object = server_proxy_object
101
# Logger
102
self.logger = logger
103
104
self._update_timer_callback_tag = None
105
self.last_checker_failed = False
106
79
107
80
# The widget shown normally
108
self._text_widget = urwid.Text(u"")
81
self._text_widget = urwid.Text("")
109
82
# The widget shown when we have focus
110
self._focus_text_widget = urwid.Text(u"")
83
self._focus_text_widget = urwid.Text("")
111
84
super(MandosClientWidget, self).__init__(
112
85
update_hook=update_hook, delete_hook=delete_hook,
113
86
*args, **kwargs)
114
87
self.update()
115
88
self.opened = False
116
self.proxy.connect_to_signal(u"CheckerCompleted",
117
self.checker_completed,
118
client_interface,
119
byte_arrays=True)
120
self.proxy.connect_to_signal(u"CheckerStarted",
121
self.checker_started,
122
client_interface,
123
byte_arrays=True)
124
self.proxy.connect_to_signal(u"GotSecret",
125
self.got_secret,
126
client_interface,
127
byte_arrays=True)
128
self.proxy.connect_to_signal(u"NeedApproval",
129
self.need_approval,
130
client_interface,
131
byte_arrays=True)
132
self.proxy.connect_to_signal(u"Rejected",
133
self.rejected,
134
client_interface,
135
byte_arrays=True)
136
last_checked_ok = isoformat_to_datetime(self.properties
137
[u"LastCheckedOK"])
138
if last_checked_ok is None:
139
self.last_checker_failed = True
140
else:
141
self.last_checker_failed = ((datetime.datetime.utcnow()
142
- last_checked_ok)
143
> datetime.timedelta
144
(milliseconds=
145
self.properties
146
[u"Interval"]))
147
if self.last_checker_failed:
148
self._update_timer_callback_tag = (gobject.timeout_add
149
(1000,
150
self.update_timer))
151
152
def checker_completed(self, exitstatus, condition, command):
153
if exitstatus == 0:
154
if self.last_checker_failed:
155
self.last_checker_failed = False
156
gobject.source_remove(self._update_timer_callback_tag)
157
self._update_timer_callback_tag = None
158
#self.logger(u'Checker for client %s (command "%s")'
159
# u' was successful'
160
# % (self.properties[u"Name"], command))
161
self.update()
162
return
163
# Checker failed
164
if not self.last_checker_failed:
165
self.last_checker_failed = True
166
self._update_timer_callback_tag = (gobject.timeout_add
167
(1000,
168
self.update_timer))
169
if os.WIFEXITED(condition):
170
self.logger(u'Checker for client %s (command "%s")'
171
u' failed with exit code %s'
172
% (self.properties[u"Name"], command,
173
os.WEXITSTATUS(condition)))
174
elif os.WIFSIGNALED(condition):
175
self.logger(u'Checker for client %s (command "%s")'
176
u' was killed by signal %s'
177
% (self.properties[u"Name"], command,
178
os.WTERMSIG(condition)))
179
elif os.WCOREDUMP(condition):
180
self.logger(u'Checker for client %s (command "%s")'
181
u' dumped core'
182
% (self.properties[u"Name"], command))
183
else:
184
self.logger(u'Checker for client %s completed'
185
u' mysteriously')
186
self.update()
187
188
def checker_started(self, command):
189
#self.logger(u'Client %s started checker "%s"'
190
# % (self.properties[u"Name"], unicode(command)))
191
pass
192
193
def got_secret(self):
194
self.last_checker_failed = False
195
self.logger(u'Client %s received its secret'
196
% self.properties[u"Name"])
197
198
def need_approval(self, timeout, default):
199
if not default:
200
message = u'Client %s needs approval within %s seconds'
201
else:
202
message = u'Client %s will get its secret in %s seconds'
203
self.logger(message
204
% (self.properties[u"Name"], timeout/1000))
205
206
def rejected(self, reason):
207
self.logger(u'Client %s was rejected; reason: %s'
208
% (self.properties[u"Name"], reason))
209
89
210
90
def selectable(self):
211
91
"""Make this a "selectable" widget.
233
113
u"bold-underline-blink":
234
114
u"bold-underline-blink-standout",
235
115
}
236
116
237
117
# Rebuild focus and non-focus widgets using current properties
238
239
# Base part of a client. Name!
240
base = (u'%(name)s: '
241
% {u"name": self.properties[u"Name"]})
242
if not self.properties[u"Enabled"]:
243
message = u"DISABLED"
244
elif self.properties[u"ApprovalPending"]:
245
if self.properties[u"ApprovedByDefault"]:
246
message = u"Connection established to client. (d)eny?"
247
else:
248
message = u"Seeks approval to send secret. (a)pprove?"
249
elif self.last_checker_failed:
250
timeout = datetime.timedelta(milliseconds
251
= self.properties
252
[u"Timeout"])
253
last_ok = isoformat_to_datetime(
254
max((self.properties[u"LastCheckedOK"]
255
or self.properties[u"Created"]),
256
self.properties[u"LastEnabled"]))
257
timer = timeout - (datetime.datetime.utcnow() - last_ok)
258
message = (u'A checker has failed! Time until client'
259
u' gets diabled: %s'
260
% unicode(timer).rsplit(".", 1)[0])
261
else:
262
message = u"enabled"
263
self._text = "%s%s" % (base, message)
264
118
self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
% self.properties)
265
120
if not urwid.supports_unicode():
266
121
self._text = self._text.encode("ascii", "replace")
267
textlist = [(u"normal", self._text)]
122
textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
268
123
self._text_widget.set_text(textlist)
269
124
self._focus_text_widget.set_text([(with_standout[text[0]],
270
125
text[1])
278
133
if self.update_hook is not None:
279
134
self.update_hook()
280
135
281
def update_timer(self):
282
"called by gobject"
283
self.update()
284
return True # Keep calling this
285
286
136
def delete(self):
287
if self._update_timer_callback_tag is not None:
288
gobject.source_remove(self._update_timer_callback_tag)
289
self._update_timer_callback_tag = None
290
137
if self.delete_hook is not None:
291
138
self.delete_hook(self)
292
139
299
146
def keypress(self, (maxcol,), key):
300
147
"""Handle keys.
301
148
This overrides the method from urwid.FlowWidget"""
302
if key == u"+":
303
self.proxy.Enable(dbus_interface = client_interface)
304
elif key == u"-":
305
self.proxy.Disable(dbus_interface = client_interface)
306
elif key == u"a":
307
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
308
dbus_interface = client_interface)
309
elif key == u"d":
310
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
311
dbus_interface = client_interface)
312
elif key == u"r" or key == u"_" or key == u"ctrl k":
149
if key == u"e" or key == u"+":
150
self.proxy.Enable()
151
elif key == u"d" or key == u"-":
152
self.proxy.Disable()
153
elif key == u"r" or key == u"_":
313
154
self.server_proxy_object.RemoveClient(self.proxy
314
155
.object_path)
315
156
elif key == u"s":
316
self.proxy.StartChecker(dbus_interface = client_interface)
157
self.proxy.StartChecker()
158
elif key == u"c":
159
self.proxy.StopChecker()
317
160
elif key == u"S":
318
self.proxy.StopChecker(dbus_interface = client_interface)
319
elif key == u"C":
320
self.proxy.CheckedOK(dbus_interface = client_interface)
161
self.proxy.CheckedOK()
321
162
# xxx
322
163
# elif key == u"p" or key == "=":
323
164
# self.proxy.pause()
346
187
use them as an excuse to shift focus away from this widget.
347
188
"""
348
189
def keypress(self, (maxcol, maxrow), key):
349
ret = super(ConstrainedListBox, self).keypress((maxcol,
350
maxrow), key)
190
ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
351
191
if ret in (u"up", u"down"):
352
192
return
353
193
return ret
383
223
))
384
224
385
225
if urwid.supports_unicode():
386
self.divider = u"─" # \u2500
387
#self.divider = u"━" # \u2501
226
#self.divider = u"─" # \u2500
227
self.divider = u"━" # \u2501
388
228
else:
389
229
#self.divider = u"-" # \u002d
390
230
self.divider = u"_" # \u005f
410
250
self.log_wrap = u"any"
411
251
412
252
self.rebuild()
413
self.log_message_raw((u"bold",
414
u"Mandos Monitor version " + version))
415
self.log_message_raw((u"bold",
416
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")
417
257
418
258
self.busname = domain + '.Mandos'
419
259
self.main_loop = gobject.MainLoop()
430
270
mandos_clients = dbus.Dictionary()
431
271
432
272
(self.mandos_serv
433
.connect_to_signal(u"ClientRemoved",
273
.connect_to_signal("ClientRemoved",
434
274
self.find_and_remove_client,
435
275
dbus_interface=server_interface,
436
276
byte_arrays=True))
437
277
(self.mandos_serv
438
.connect_to_signal(u"ClientAdded",
278
.connect_to_signal("ClientAdded",
439
279
self.add_new_client,
440
280
dbus_interface=server_interface,
441
281
byte_arrays=True))
442
(self.mandos_serv
443
.connect_to_signal(u"ClientNotFound",
444
self.client_not_found,
445
dbus_interface=server_interface,
446
byte_arrays=True))
447
282
for path, client in mandos_clients.iteritems():
448
283
client_proxy_object = self.bus.get_object(self.busname,
449
284
path)
455
290
update_hook
456
291
=self.refresh,
457
292
delete_hook
458
=self.remove_client,
459
logger
460
=self.log_message),
293
=self.remove_client),
461
294
path=path)
462
295
463
def client_not_found(self, fingerprint, address):
464
self.log_message((u"Client with address %s and fingerprint %s"
465
u" could not be found" % (address,
466
fingerprint)))
467
468
296
def rebuild(self):
469
297
"""This rebuilds the User Interface.
470
298
Call this when the widget layout needs to change"""
471
299
self.uilist = []
472
300
#self.uilist.append(urwid.ListBox(self.clients))
473
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
474
clients),
301
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
475
302
#header=urwid.Divider(),
476
303
header=None,
477
footer=
478
urwid.Divider(div_char=
479
self.divider)))
304
footer=urwid.Divider(div_char=self.divider)))
480
305
if self.log_visible:
481
306
self.uilist.append(self.logbox)
482
307
pass
483
308
self.topwidget = urwid.Pile(self.uilist)
484
309
485
def log_message(self, message):
486
timestamp = datetime.datetime.now().isoformat()
487
self.log_message_raw(timestamp + u": " + message)
488
489
def log_message_raw(self, markup):
310
def log_message(self, markup):
490
311
"""Add a log message to the log buffer."""
491
312
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
492
313
if (self.max_log_length
493
314
and len(self.log) > self.max_log_length):
494
315
del self.log[0:len(self.log)-self.max_log_length-1]
495
self.logbox.set_focus(len(self.logbox.body.contents),
496
coming_from=u"above")
497
self.refresh()
498
316
499
317
def toggle_log_display(self):
500
318
"""Toggle visibility of the log buffer."""
501
319
self.log_visible = not self.log_visible
502
320
self.rebuild()
503
#self.log_message(u"Log visibility changed to: "
504
# + unicode(self.log_visible))
321
self.log_message(u"Log visibility changed to: "
322
+ unicode(self.log_visible))
505
323
506
324
def change_log_display(self):
507
325
"""Change type of log display.
512
330
self.log_wrap = u"clip"
513
331
for textwidget in self.log:
514
332
textwidget.set_wrap_mode(self.log_wrap)
515
#self.log_message(u"Wrap mode: " + self.log_wrap)
333
self.log_message(u"Wrap mode: " + self.log_wrap)
516
334
517
335
def find_and_remove_client(self, path, name):
518
336
"""Find an client from its object path and remove it.
526
344
return
527
345
self.remove_client(client, path)
528
346
529
def add_new_client(self, path):
347
def add_new_client(self, path, properties):
530
348
client_proxy_object = self.bus.get_object(self.busname, path)
531
349
self.add_client(MandosClientWidget(server_proxy_object
532
350
=self.mandos_serv,
533
351
proxy_object
534
352
=client_proxy_object,
353
properties=properties,
535
354
update_hook
536
355
=self.refresh,
537
356
delete_hook
538
=self.remove_client,
539
logger
540
=self.log_message),
357
=self.remove_client),
541
358
path=path)
542
359
543
360
def add_client(self, client, path=None):
545
362
if path is None:
546
363
path = client.proxy.object_path
547
364
self.clients_dict[path] = client
548
self.clients.sort(None, lambda c: c.properties[u"Name"])
365
self.clients.sort(None, lambda c: c.properties[u"name"])
549
366
self.refresh()
550
367
551
368
def remove_client(self, client, path=None):
612
429
elif key == u"w" or key == u"i":
613
430
self.change_log_display()
614
431
self.refresh()
615
elif key == u"?" or key == u"f1" or key == u"esc":
616
if not self.log_visible:
617
self.log_visible = True
618
self.rebuild()
619
self.log_message_raw((u"bold",
620
u" ".
621
join((u"q: Quit",
622
u"?: Help",
623
u"l: Log window toggle",
624
u"TAB: Switch window",
625
u"w: Wrap (log)"))))
626
self.log_message_raw((u"bold",
627
u" "
628
.join((u"Clients:",
629
u"+: Enable",
630
u"-: Disable",
631
u"r: Remove",
632
u"s: Start new checker",
633
u"S: Stop checker",
634
u"C: Checker OK",
635
u"a: Approve",
636
u"d: Deny"))))
432
elif key == u"?" or key == u"f1":
433
self.log_message(u"Help!")
637
434
self.refresh()
638
435
elif key == u"tab":
639
436
if self.topwidget.get_focus() is self.logbox:
641
438
else:
642
439
self.topwidget.set_focus(self.logbox)
643
440
self.refresh()
644
#elif (key == u"end" or key == u"meta >" or key == u"G"
645
# or key == u">"):
646
# pass # xxx end-of-buffer
647
#elif (key == u"home" or key == u"meta <" or key == u"g"
648
# or key == u"<"):
649
# pass # xxx beginning-of-buffer
650
#elif key == u"ctrl e" or key == u"$":
651
# pass # xxx move-end-of-line
652
#elif key == u"ctrl a" or key == u"^":
653
# pass # xxx move-beginning-of-line
654
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
655
# pass # xxx left
656
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
657
# pass # xxx right
658
#elif key == u"a":
659
# pass # scroll up log
660
#elif key == u"z":
661
# 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
662
459
elif self.topwidget.selectable():
663
460
self.topwidget.keypress(self.size, key)
664
461
self.refresh()
667
464
ui = UserInterface()
668
465
try:
669
466
ui.run()
670
except KeyboardInterrupt:
671
ui.screen.stop()
672
except Exception, e:
673
ui.log_message(unicode(e))
467
except:
674
468
ui.screen.stop()
675
469
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0