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._update_timer_callback_lock = 0
106
self.last_checker_failed = False
107
79
108
80
# The widget shown normally
109
self._text_widget = urwid.Text(u"")
81
self._text_widget = urwid.Text("")
110
82
# The widget shown when we have focus
111
self._focus_text_widget = urwid.Text(u"")
83
self._focus_text_widget = urwid.Text("")
112
84
super(MandosClientWidget, self).__init__(
113
85
update_hook=update_hook, delete_hook=delete_hook,
114
86
*args, **kwargs)
115
87
self.update()
116
88
self.opened = False
117
118
last_checked_ok = isoformat_to_datetime(self.properties
119
[u"LastCheckedOK"])
120
if last_checked_ok is None:
121
self.last_checker_failed = True
122
else:
123
self.last_checker_failed = ((datetime.datetime.utcnow()
124
- last_checked_ok)
125
> datetime.timedelta
126
(milliseconds=
127
self.properties
128
[u"Interval"]))
129
130
if self.last_checker_failed:
131
self.using_timer(True)
132
133
if self.need_approval:
134
self.using_timer(True)
135
136
self.proxy.connect_to_signal(u"CheckerCompleted",
137
self.checker_completed,
138
client_interface,
139
byte_arrays=True)
140
self.proxy.connect_to_signal(u"CheckerStarted",
141
self.checker_started,
142
client_interface,
143
byte_arrays=True)
144
self.proxy.connect_to_signal(u"GotSecret",
145
self.got_secret,
146
client_interface,
147
byte_arrays=True)
148
self.proxy.connect_to_signal(u"NeedApproval",
149
self.need_approval,
150
client_interface,
151
byte_arrays=True)
152
self.proxy.connect_to_signal(u"Rejected",
153
self.rejected,
154
client_interface,
155
byte_arrays=True)
156
157
def property_changed(self, property=None, value=None):
158
super(self, MandosClientWidget).property_changed(property,
159
value)
160
if property == u"ApprovalPending":
161
using_timer(bool(value))
162
163
def using_timer(self, flag):
164
"""Call this method with True or False when timer should be
165
activated or deactivated.
166
"""
167
old = self._update_timer_callback_lock
168
if flag:
169
self._update_timer_callback_lock += 1
170
else:
171
self._update_timer_callback_lock -= 1
172
if old == 0 and self._update_timer_callback_lock:
173
self._update_timer_callback_tag = (gobject.timeout_add
174
(1000,
175
self.update_timer))
176
elif old and self._update_timer_callback_lock == 0:
177
gobject.source_remove(self._update_timer_callback_tag)
178
self._update_timer_callback_tag = None
179
180
def checker_completed(self, exitstatus, condition, command):
181
if exitstatus == 0:
182
if self.last_checker_failed:
183
self.last_checker_failed = False
184
self.using_timer(False)
185
#self.logger(u'Checker for client %s (command "%s")'
186
# u' was successful'
187
# % (self.properties[u"Name"], command))
188
self.update()
189
return
190
# Checker failed
191
if not self.last_checker_failed:
192
self.last_checker_failed = True
193
self.using_timer(True)
194
if os.WIFEXITED(condition):
195
self.logger(u'Checker for client %s (command "%s")'
196
u' failed with exit code %s'
197
% (self.properties[u"Name"], command,
198
os.WEXITSTATUS(condition)))
199
elif os.WIFSIGNALED(condition):
200
self.logger(u'Checker for client %s (command "%s")'
201
u' was killed by signal %s'
202
% (self.properties[u"Name"], command,
203
os.WTERMSIG(condition)))
204
elif os.WCOREDUMP(condition):
205
self.logger(u'Checker for client %s (command "%s")'
206
u' dumped core'
207
% (self.properties[u"Name"], command))
208
else:
209
self.logger(u'Checker for client %s completed'
210
u' mysteriously')
211
self.update()
212
213
def checker_started(self, command):
214
#self.logger(u'Client %s started checker "%s"'
215
# % (self.properties[u"Name"], unicode(command)))
216
pass
217
218
def got_secret(self):
219
self.last_checker_failed = False
220
self.logger(u'Client %s received its secret'
221
% self.properties[u"Name"])
222
223
def need_approval(self, timeout, default):
224
if not default:
225
message = u'Client %s needs approval within %s seconds'
226
else:
227
message = u'Client %s will get its secret in %s seconds'
228
self.logger(message
229
% (self.properties[u"Name"], timeout/1000))
230
self.using_timer(True)
231
232
def rejected(self, reason):
233
self.logger(u'Client %s was rejected; reason: %s'
234
% (self.properties[u"Name"], reason))
235
89
236
90
def selectable(self):
237
91
"""Make this a "selectable" widget.
259
113
u"bold-underline-blink":
260
114
u"bold-underline-blink-standout",
261
115
}
262
116
263
117
# Rebuild focus and non-focus widgets using current properties
264
265
# Base part of a client. Name!
266
base = (u'%(name)s: '
267
% {u"name": self.properties[u"Name"]})
268
if not self.properties[u"Enabled"]:
269
message = u"DISABLED"
270
elif self.properties[u"ApprovalPending"]:
271
timeout = datetime.timedelta(milliseconds
272
= self.properties
273
[u"ApprovalDelay"])
274
last_approval_request = isoformat_to_datetime(
275
self.properties[u"LastApprovalRequest"])
276
if last_approval_request is not None:
277
timer = timeout - (datetime.datetime.utcnow()
278
- last_approval_request)
279
else:
280
timer = datetime.timedelta()
281
if self.properties[u"ApprovedByDefault"]:
282
message = u"Approval in %s. (d)eny?"
283
else:
284
message = u"Denial in %s. (a)pprove?"
285
message = message % unicode(timer).rsplit(".", 1)[0]
286
elif self.last_checker_failed:
287
timeout = datetime.timedelta(milliseconds
288
= self.properties
289
[u"Timeout"])
290
last_ok = isoformat_to_datetime(
291
max((self.properties[u"LastCheckedOK"]
292
or self.properties[u"Created"]),
293
self.properties[u"LastEnabled"]))
294
timer = timeout - (datetime.datetime.utcnow() - last_ok)
295
message = (u'A checker has failed! Time until client'
296
u' gets disabled: %s'
297
% unicode(timer).rsplit(".", 1)[0])
298
else:
299
message = u"enabled"
300
self._text = "%s%s" % (base, message)
301
118
self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
% self.properties)
302
120
if not urwid.supports_unicode():
303
121
self._text = self._text.encode("ascii", "replace")
304
textlist = [(u"normal", self._text)]
122
textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
305
123
self._text_widget.set_text(textlist)
306
124
self._focus_text_widget.set_text([(with_standout[text[0]],
307
125
text[1])
315
133
if self.update_hook is not None:
316
134
self.update_hook()
317
135
318
def update_timer(self):
319
"called by gobject"
320
self.update()
321
return True # Keep calling this
322
323
136
def delete(self):
324
if self._update_timer_callback_tag is not None:
325
gobject.source_remove(self._update_timer_callback_tag)
326
self._update_timer_callback_tag = None
327
137
if self.delete_hook is not None:
328
138
self.delete_hook(self)
329
139
336
146
def keypress(self, (maxcol,), key):
337
147
"""Handle keys.
338
148
This overrides the method from urwid.FlowWidget"""
339
if key == u"+":
340
self.proxy.Enable(dbus_interface = client_interface)
341
elif key == u"-":
342
self.proxy.Disable(dbus_interface = client_interface)
343
elif key == u"a":
344
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
345
dbus_interface = client_interface)
346
elif key == u"d":
347
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
348
dbus_interface = client_interface)
349
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"_":
350
154
self.server_proxy_object.RemoveClient(self.proxy
351
155
.object_path)
352
156
elif key == u"s":
353
self.proxy.StartChecker(dbus_interface = client_interface)
157
self.proxy.StartChecker()
158
elif key == u"c":
159
self.proxy.StopChecker()
354
160
elif key == u"S":
355
self.proxy.StopChecker(dbus_interface = client_interface)
356
elif key == u"C":
357
self.proxy.CheckedOK(dbus_interface = client_interface)
161
self.proxy.CheckedOK()
358
162
# xxx
359
163
# elif key == u"p" or key == "=":
360
164
# self.proxy.pause()
383
187
use them as an excuse to shift focus away from this widget.
384
188
"""
385
189
def keypress(self, (maxcol, maxrow), key):
386
ret = super(ConstrainedListBox, self).keypress((maxcol,
387
maxrow), key)
190
ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
388
191
if ret in (u"up", u"down"):
389
192
return
390
193
return ret
420
223
))
421
224
422
225
if urwid.supports_unicode():
423
self.divider = u"─" # \u2500
424
#self.divider = u"━" # \u2501
226
#self.divider = u"─" # \u2500
227
self.divider = u"━" # \u2501
425
228
else:
426
229
#self.divider = u"-" # \u002d
427
230
self.divider = u"_" # \u005f
447
250
self.log_wrap = u"any"
448
251
449
252
self.rebuild()
450
self.log_message_raw((u"bold",
451
u"Mandos Monitor version " + version))
452
self.log_message_raw((u"bold",
453
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")
454
257
455
258
self.busname = domain + '.Mandos'
456
259
self.main_loop = gobject.MainLoop()
467
270
mandos_clients = dbus.Dictionary()
468
271
469
272
(self.mandos_serv
470
.connect_to_signal(u"ClientRemoved",
273
.connect_to_signal("ClientRemoved",
471
274
self.find_and_remove_client,
472
275
dbus_interface=server_interface,
473
276
byte_arrays=True))
474
277
(self.mandos_serv
475
.connect_to_signal(u"ClientAdded",
278
.connect_to_signal("ClientAdded",
476
279
self.add_new_client,
477
280
dbus_interface=server_interface,
478
281
byte_arrays=True))
479
(self.mandos_serv
480
.connect_to_signal(u"ClientNotFound",
481
self.client_not_found,
482
dbus_interface=server_interface,
483
byte_arrays=True))
484
282
for path, client in mandos_clients.iteritems():
485
283
client_proxy_object = self.bus.get_object(self.busname,
486
284
path)
492
290
update_hook
493
291
=self.refresh,
494
292
delete_hook
495
=self.remove_client,
496
logger
497
=self.log_message),
293
=self.remove_client),
498
294
path=path)
499
295
500
def client_not_found(self, fingerprint, address):
501
self.log_message((u"Client with address %s and fingerprint %s"
502
u" could not be found" % (address,
503
fingerprint)))
504
505
296
def rebuild(self):
506
297
"""This rebuilds the User Interface.
507
298
Call this when the widget layout needs to change"""
508
299
self.uilist = []
509
300
#self.uilist.append(urwid.ListBox(self.clients))
510
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
511
clients),
301
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
512
302
#header=urwid.Divider(),
513
303
header=None,
514
footer=
515
urwid.Divider(div_char=
516
self.divider)))
304
footer=urwid.Divider(div_char=self.divider)))
517
305
if self.log_visible:
518
306
self.uilist.append(self.logbox)
519
307
pass
520
308
self.topwidget = urwid.Pile(self.uilist)
521
309
522
def log_message(self, message):
523
timestamp = datetime.datetime.now().isoformat()
524
self.log_message_raw(timestamp + u": " + message)
525
526
def log_message_raw(self, markup):
310
def log_message(self, markup):
527
311
"""Add a log message to the log buffer."""
528
312
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
529
313
if (self.max_log_length
530
314
and len(self.log) > self.max_log_length):
531
315
del self.log[0:len(self.log)-self.max_log_length-1]
532
self.logbox.set_focus(len(self.logbox.body.contents),
533
coming_from=u"above")
534
self.refresh()
535
316
536
317
def toggle_log_display(self):
537
318
"""Toggle visibility of the log buffer."""
538
319
self.log_visible = not self.log_visible
539
320
self.rebuild()
540
#self.log_message(u"Log visibility changed to: "
541
# + unicode(self.log_visible))
321
self.log_message(u"Log visibility changed to: "
322
+ unicode(self.log_visible))
542
323
543
324
def change_log_display(self):
544
325
"""Change type of log display.
549
330
self.log_wrap = u"clip"
550
331
for textwidget in self.log:
551
332
textwidget.set_wrap_mode(self.log_wrap)
552
#self.log_message(u"Wrap mode: " + self.log_wrap)
333
self.log_message(u"Wrap mode: " + self.log_wrap)
553
334
554
335
def find_and_remove_client(self, path, name):
555
336
"""Find an client from its object path and remove it.
563
344
return
564
345
self.remove_client(client, path)
565
346
566
def add_new_client(self, path):
347
def add_new_client(self, path, properties):
567
348
client_proxy_object = self.bus.get_object(self.busname, path)
568
349
self.add_client(MandosClientWidget(server_proxy_object
569
350
=self.mandos_serv,
570
351
proxy_object
571
352
=client_proxy_object,
353
properties=properties,
572
354
update_hook
573
355
=self.refresh,
574
356
delete_hook
575
=self.remove_client,
576
logger
577
=self.log_message),
357
=self.remove_client),
578
358
path=path)
579
359
580
360
def add_client(self, client, path=None):
582
362
if path is None:
583
363
path = client.proxy.object_path
584
364
self.clients_dict[path] = client
585
self.clients.sort(None, lambda c: c.properties[u"Name"])
365
self.clients.sort(None, lambda c: c.properties[u"name"])
586
366
self.refresh()
587
367
588
368
def remove_client(self, client, path=None):
649
429
elif key == u"w" or key == u"i":
650
430
self.change_log_display()
651
431
self.refresh()
652
elif key == u"?" or key == u"f1" or key == u"esc":
653
if not self.log_visible:
654
self.log_visible = True
655
self.rebuild()
656
self.log_message_raw((u"bold",
657
u" ".
658
join((u"q: Quit",
659
u"?: Help",
660
u"l: Log window toggle",
661
u"TAB: Switch window",
662
u"w: Wrap (log)"))))
663
self.log_message_raw((u"bold",
664
u" "
665
.join((u"Clients:",
666
u"+: Enable",
667
u"-: Disable",
668
u"r: Remove",
669
u"s: Start new checker",
670
u"S: Stop checker",
671
u"C: Checker OK",
672
u"a: Approve",
673
u"d: Deny"))))
432
elif key == u"?" or key == u"f1":
433
self.log_message(u"Help!")
674
434
self.refresh()
675
435
elif key == u"tab":
676
436
if self.topwidget.get_focus() is self.logbox:
678
438
else:
679
439
self.topwidget.set_focus(self.logbox)
680
440
self.refresh()
681
#elif (key == u"end" or key == u"meta >" or key == u"G"
682
# or key == u">"):
683
# pass # xxx end-of-buffer
684
#elif (key == u"home" or key == u"meta <" or key == u"g"
685
# or key == u"<"):
686
# pass # xxx beginning-of-buffer
687
#elif key == u"ctrl e" or key == u"$":
688
# pass # xxx move-end-of-line
689
#elif key == u"ctrl a" or key == u"^":
690
# pass # xxx move-beginning-of-line
691
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
692
# pass # xxx left
693
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
694
# pass # xxx right
695
#elif key == u"a":
696
# pass # scroll up log
697
#elif key == u"z":
698
# 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
699
459
elif self.topwidget.selectable():
700
460
self.topwidget.keypress(self.size, key)
701
461
self.refresh()
704
464
ui = UserInterface()
705
465
try:
706
466
ui.run()
707
except KeyboardInterrupt:
708
ui.screen.stop()
709
except Exception, e:
710
ui.log_message(unicode(e))
467
except:
711
468
ui.screen.stop()
712
469
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0