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 24.1.172
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.172
- Committer: Björn Påhlsson
- Date: 2011-06-18 22:51:12 UTC
- mto: This revision was merged to the branch mainline in revision 485.
- Revision ID: belorn@fukt.bsnet.se-20110618225112-rnt2m4ek32758f80
using scandir instead of readdir
- files removed:
- debian/mandos-client.examples
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos-monitor
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2009-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 Björn Påhlsson
6
# Copyright © 2009-2011 Teddy Hogeborn
7
# Copyright © 2009-2011 Björn Påhlsson
8
8
#
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
17
17
# GNU General Public License for more details.
18
18
#
19
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/>.
20
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
21
#
23
# Contact the authors at <mandos@recompile.se>.
22
# Contact the authors at <mandos@fukt.bsnet.se>.
24
23
#
25
24
26
from __future__ import (division, absolute_import, print_function,
27
unicode_literals)
28
try:
29
from future_builtins import *
30
except ImportError:
31
pass
25
from __future__ import division, absolute_import, print_function, unicode_literals
32
26
33
27
import sys
34
28
import os
40
34
import urwid
41
35
42
36
from dbus.mainloop.glib import DBusGMainLoop
43
try:
44
import gobject
45
except ImportError:
46
from gi.repository import GObject as gobject
37
import gobject
47
38
48
39
import dbus
49
40
41
import UserList
42
50
43
import locale
51
44
52
if sys.version_info[0] == 2:
53
str = unicode
54
55
45
locale.setlocale(locale.LC_ALL, '')
56
46
57
47
import logging
58
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
59
49
60
50
# Some useful constants
61
domain = 'se.recompile'
51
domain = 'se.bsnet.fukt'
62
52
server_interface = domain + '.Mandos'
63
53
client_interface = domain + '.Mandos.Client'
64
version = "1.6.0"
54
version = "1.3.0"
55
56
# Always run in monochrome mode
57
urwid.curses_display.curses.has_colors = lambda : False
58
59
# Urwid doesn't support blinking, but we want it. Since we have no
60
# use for underline on its own, we make underline also always blink.
61
urwid.curses_display.curses.A_UNDERLINE |= (
62
urwid.curses_display.curses.A_BLINK)
65
63
66
64
def isoformat_to_datetime(iso):
67
65
"Parse an ISO 8601 date string to a datetime.datetime()"
84
82
properties and calls a hook function when any of them are
85
83
changed.
86
84
"""
87
def __init__(self, proxy_object=None, properties=None, **kwargs):
85
def __init__(self, proxy_object=None, *args, **kwargs):
88
86
self.proxy = proxy_object # Mandos Client proxy object
89
self.properties = dict() if properties is None else properties
90
self.property_changed_match = (
91
self.proxy.connect_to_signal("PropertyChanged",
92
self._property_changed,
93
client_interface,
94
byte_arrays=True))
95
96
if properties is None:
97
self.properties.update(
98
self.proxy.GetAll(client_interface,
99
dbus_interface
100
= dbus.PROPERTIES_IFACE))
101
102
super(MandosClientPropertyCache, self).__init__(**kwargs)
103
104
def _property_changed(self, property, value):
105
"""Helper which takes positional arguments"""
106
return self.property_changed(property=property, value=value)
87
88
self.properties = dict()
89
self.proxy.connect_to_signal("PropertyChanged",
90
self.property_changed,
91
client_interface,
92
byte_arrays=True)
93
94
self.properties.update(
95
self.proxy.GetAll(client_interface,
96
dbus_interface = dbus.PROPERTIES_IFACE))
97
98
#XXX This break good super behaviour!
99
# super(MandosClientPropertyCache, self).__init__(
100
# *args, **kwargs)
107
101
108
102
def property_changed(self, property=None, value=None):
109
103
"""This is called whenever we get a PropertyChanged signal
111
105
"""
112
106
# Update properties dict with new value
113
107
self.properties[property] = value
114
115
def delete(self):
116
self.property_changed_match.remove()
117
108
118
109
119
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
121
112
"""
122
113
123
114
def __init__(self, server_proxy_object=None, update_hook=None,
124
delete_hook=None, logger=None, **kwargs):
115
delete_hook=None, logger=None, *args, **kwargs):
125
116
# Called on update
126
117
self.update_hook = update_hook
127
118
# Called on delete
132
123
self.logger = logger
133
124
134
125
self._update_timer_callback_tag = None
126
self._update_timer_callback_lock = 0
127
self.last_checker_failed = False
135
128
136
129
# The widget shown normally
137
130
self._text_widget = urwid.Text("")
138
131
# The widget shown when we have focus
139
132
self._focus_text_widget = urwid.Text("")
140
super(MandosClientWidget, self).__init__(**kwargs)
133
super(MandosClientWidget, self).__init__(
134
update_hook=update_hook, delete_hook=delete_hook,
135
*args, **kwargs)
141
136
self.update()
142
137
self.opened = False
143
138
144
self.match_objects = (
145
self.proxy.connect_to_signal("CheckerCompleted",
146
self.checker_completed,
147
client_interface,
148
byte_arrays=True),
149
self.proxy.connect_to_signal("CheckerStarted",
150
self.checker_started,
151
client_interface,
152
byte_arrays=True),
153
self.proxy.connect_to_signal("GotSecret",
154
self.got_secret,
155
client_interface,
156
byte_arrays=True),
157
self.proxy.connect_to_signal("NeedApproval",
158
self.need_approval,
159
client_interface,
160
byte_arrays=True),
161
self.proxy.connect_to_signal("Rejected",
162
self.rejected,
163
client_interface,
164
byte_arrays=True))
165
#self.logger('Created client {0}'
166
# .format(self.properties["Name"]))
139
last_checked_ok = isoformat_to_datetime(self.properties
140
["LastCheckedOK"])
141
if last_checked_ok is None:
142
self.last_checker_failed = True
143
else:
144
self.last_checker_failed = ((datetime.datetime.utcnow()
145
- last_checked_ok)
146
> datetime.timedelta
147
(milliseconds=
148
self.properties
149
["Interval"]))
150
151
if self.last_checker_failed:
152
self.using_timer(True)
153
154
if self.need_approval:
155
self.using_timer(True)
156
157
self.proxy.connect_to_signal("CheckerCompleted",
158
self.checker_completed,
159
client_interface,
160
byte_arrays=True)
161
self.proxy.connect_to_signal("CheckerStarted",
162
self.checker_started,
163
client_interface,
164
byte_arrays=True)
165
self.proxy.connect_to_signal("GotSecret",
166
self.got_secret,
167
client_interface,
168
byte_arrays=True)
169
self.proxy.connect_to_signal("NeedApproval",
170
self.need_approval,
171
client_interface,
172
byte_arrays=True)
173
self.proxy.connect_to_signal("Rejected",
174
self.rejected,
175
client_interface,
176
byte_arrays=True)
167
177
178
def property_changed(self, property=None, value=None):
179
super(self, MandosClientWidget).property_changed(property,
180
value)
181
if property == "ApprovalPending":
182
using_timer(bool(value))
183
168
184
def using_timer(self, flag):
169
185
"""Call this method with True or False when timer should be
170
186
activated or deactivated.
171
187
"""
172
if flag and self._update_timer_callback_tag is None:
173
# Will update the shown timer value every second
188
old = self._update_timer_callback_lock
189
if flag:
190
self._update_timer_callback_lock += 1
191
else:
192
self._update_timer_callback_lock -= 1
193
if old == 0 and self._update_timer_callback_lock:
174
194
self._update_timer_callback_tag = (gobject.timeout_add
175
195
(1000,
176
196
self.update_timer))
177
elif not (flag or self._update_timer_callback_tag is None):
197
elif old and self._update_timer_callback_lock == 0:
178
198
gobject.source_remove(self._update_timer_callback_tag)
179
199
self._update_timer_callback_tag = None
180
200
181
201
def checker_completed(self, exitstatus, condition, command):
182
202
if exitstatus == 0:
203
if self.last_checker_failed:
204
self.last_checker_failed = False
205
self.using_timer(False)
206
#self.logger('Checker for client %s (command "%s")'
207
# ' was successful'
208
# % (self.properties["Name"], command))
183
209
self.update()
184
210
return
185
211
# Checker failed
212
if not self.last_checker_failed:
213
self.last_checker_failed = True
214
self.using_timer(True)
186
215
if os.WIFEXITED(condition):
187
self.logger('Checker for client {0} (command "{1}")'
188
' failed with exit code {2}'
189
.format(self.properties["Name"], command,
190
os.WEXITSTATUS(condition)))
216
self.logger('Checker for client %s (command "%s")'
217
' failed with exit code %s'
218
% (self.properties["Name"], command,
219
os.WEXITSTATUS(condition)))
191
220
elif os.WIFSIGNALED(condition):
192
self.logger('Checker for client {0} (command "{1}") was'
193
' killed by signal {2}'
194
.format(self.properties["Name"], command,
195
os.WTERMSIG(condition)))
221
self.logger('Checker for client %s (command "%s")'
222
' was killed by signal %s'
223
% (self.properties["Name"], command,
224
os.WTERMSIG(condition)))
196
225
elif os.WCOREDUMP(condition):
197
self.logger('Checker for client {0} (command "{1}")'
226
self.logger('Checker for client %s (command "%s")'
198
227
' dumped core'
199
.format(self.properties["Name"], command))
228
% (self.properties["Name"], command))
200
229
else:
201
self.logger('Checker for client {0} completed'
202
' mysteriously'
203
.format(self.properties["Name"]))
230
self.logger('Checker for client %s completed'
231
' mysteriously')
204
232
self.update()
205
233
206
234
def checker_started(self, command):
207
"""Server signals that a checker started. This could be useful
208
to log in the future. """
209
#self.logger('Client {0} started checker "{1}"'
210
# .format(self.properties["Name"],
211
# str(command)))
235
#self.logger('Client %s started checker "%s"'
236
# % (self.properties["Name"], unicode(command)))
212
237
pass
213
238
214
239
def got_secret(self):
215
self.logger('Client {0} received its secret'
216
.format(self.properties["Name"]))
240
self.last_checker_failed = False
241
self.logger('Client %s received its secret'
242
% self.properties["Name"])
217
243
218
244
def need_approval(self, timeout, default):
219
245
if not default:
220
message = 'Client {0} needs approval within {1} seconds'
246
message = 'Client %s needs approval within %s seconds'
221
247
else:
222
message = 'Client {0} will get its secret in {1} seconds'
223
self.logger(message.format(self.properties["Name"],
224
timeout/1000))
248
message = 'Client %s will get its secret in %s seconds'
249
self.logger(message
250
% (self.properties["Name"], timeout/1000))
251
self.using_timer(True)
225
252
226
253
def rejected(self, reason):
227
self.logger('Client {0} was rejected; reason: {1}'
228
.format(self.properties["Name"], reason))
254
self.logger('Client %s was rejected; reason: %s'
255
% (self.properties["Name"], reason))
229
256
230
257
def selectable(self):
231
258
"""Make this a "selectable" widget.
253
280
"bold-underline-blink":
254
281
"bold-underline-blink-standout",
255
282
}
256
283
257
284
# Rebuild focus and non-focus widgets using current properties
258
285
259
286
# Base part of a client. Name!
260
base = '{name}: '.format(name=self.properties["Name"])
287
base = ('%(name)s: '
288
% {"name": self.properties["Name"]})
261
289
if not self.properties["Enabled"]:
262
290
message = "DISABLED"
263
self.using_timer(False)
264
291
elif self.properties["ApprovalPending"]:
265
292
timeout = datetime.timedelta(milliseconds
266
293
= self.properties
268
295
last_approval_request = isoformat_to_datetime(
269
296
self.properties["LastApprovalRequest"])
270
297
if last_approval_request is not None:
271
timer = max(timeout - (datetime.datetime.utcnow()
272
- last_approval_request),
273
datetime.timedelta())
298
timer = timeout - (datetime.datetime.utcnow()
299
- last_approval_request)
274
300
else:
275
301
timer = datetime.timedelta()
276
302
if self.properties["ApprovedByDefault"]:
277
message = "Approval in {0}. (d)eny?"
278
else:
279
message = "Denial in {0}. (a)pprove?"
280
message = message.format(str(timer).rsplit(".", 1)[0])
281
self.using_timer(True)
282
elif self.properties["LastCheckerStatus"] != 0:
283
# When checker has failed, show timer until client expires
284
expires = self.properties["Expires"]
285
if expires == "":
286
timer = datetime.timedelta(0)
287
else:
288
expires = (datetime.datetime.strptime
289
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
290
timer = max(expires - datetime.datetime.utcnow(),
291
datetime.timedelta())
303
message = "Approval in %s. (d)eny?"
304
else:
305
message = "Denial in %s. (a)pprove?"
306
message = message % unicode(timer).rsplit(".", 1)[0]
307
elif self.last_checker_failed:
308
timeout = datetime.timedelta(milliseconds
309
= self.properties
310
["Timeout"])
311
last_ok = isoformat_to_datetime(
312
max((self.properties["LastCheckedOK"]
313
or self.properties["Created"]),
314
self.properties["LastEnabled"]))
315
timer = timeout - (datetime.datetime.utcnow() - last_ok)
292
316
message = ('A checker has failed! Time until client'
293
' gets disabled: {0}'
294
.format(str(timer).rsplit(".", 1)[0]))
295
self.using_timer(True)
317
' gets disabled: %s'
318
% unicode(timer).rsplit(".", 1)[0])
296
319
else:
297
320
message = "enabled"
298
self.using_timer(False)
299
self._text = "{0}{1}".format(base, message)
300
321
self._text = "%s%s" % (base, message)
322
301
323
if not urwid.supports_unicode():
302
324
self._text = self._text.encode("ascii", "replace")
303
325
textlist = [("normal", self._text)]
315
337
self.update_hook()
316
338
317
339
def update_timer(self):
318
"""called by gobject. Will indefinitely loop until
319
gobject.source_remove() on tag is called"""
340
"called by gobject"
320
341
self.update()
321
342
return True # Keep calling this
322
343
323
def delete(self, **kwargs):
344
def delete(self):
324
345
if self._update_timer_callback_tag is not None:
325
346
gobject.source_remove(self._update_timer_callback_tag)
326
347
self._update_timer_callback_tag = None
327
for match in self.match_objects:
328
match.remove()
329
self.match_objects = ()
330
348
if self.delete_hook is not None:
331
349
self.delete_hook(self)
332
return super(MandosClientWidget, self).delete(**kwargs)
333
350
334
351
def render(self, maxcolrow, focus=False):
335
352
"""Render differently if we have focus.
377
394
else:
378
395
return key
379
396
380
def property_changed(self, property=None, **kwargs):
397
def property_changed(self, property=None, value=None,
398
*args, **kwargs):
381
399
"""Call self.update() if old value is not new value.
382
400
This overrides the method from MandosClientPropertyCache"""
383
property_name = str(property)
401
property_name = unicode(property)
384
402
old_value = self.properties.get(property_name)
385
403
super(MandosClientWidget, self).property_changed(
386
property=property, **kwargs)
404
property=property, value=value, *args, **kwargs)
387
405
if self.properties.get(property_name) != old_value:
388
406
self.update()
389
407
393
411
"down" key presses, thus not allowing any containing widgets to
394
412
use them as an excuse to shift focus away from this widget.
395
413
"""
396
def keypress(self, *args, **kwargs):
397
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
414
def keypress(self, maxcolrow, key):
415
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
398
416
if ret in ("up", "down"):
399
417
return
400
418
return ret
413
431
("normal",
414
432
"default", "default", None),
415
433
("bold",
416
"bold", "default", "bold"),
434
"default", "default", "bold"),
417
435
("underline-blink",
418
"underline,blink", "default", "underline,blink"),
436
"default", "default", "underline"),
419
437
("standout",
420
"standout", "default", "standout"),
438
"default", "default", "standout"),
421
439
("bold-underline-blink",
422
"bold,underline,blink", "default", "bold,underline,blink"),
440
"default", "default", ("bold", "underline")),
423
441
("bold-standout",
424
"bold,standout", "default", "bold,standout"),
442
"default", "default", ("bold", "standout")),
425
443
("underline-blink-standout",
426
"underline,blink,standout", "default",
427
"underline,blink,standout"),
444
"default", "default", ("underline", "standout")),
428
445
("bold-underline-blink-standout",
429
"bold,underline,blink,standout", "default",
430
"bold,underline,blink,standout"),
446
"default", "default", ("bold", "underline",
447
"standout")),
431
448
))
432
449
433
450
if urwid.supports_unicode():
465
482
466
483
self.busname = domain + '.Mandos'
467
484
self.main_loop = gobject.MainLoop()
485
self.bus = dbus.SystemBus()
486
mandos_dbus_objc = self.bus.get_object(
487
self.busname, "/", follow_name_owner_changes=True)
488
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
489
dbus_interface
490
= server_interface)
491
try:
492
mandos_clients = (self.mandos_serv
493
.GetAllClientsWithProperties())
494
except dbus.exceptions.DBusException:
495
mandos_clients = dbus.Dictionary()
496
497
(self.mandos_serv
498
.connect_to_signal("ClientRemoved",
499
self.find_and_remove_client,
500
dbus_interface=server_interface,
501
byte_arrays=True))
502
(self.mandos_serv
503
.connect_to_signal("ClientAdded",
504
self.add_new_client,
505
dbus_interface=server_interface,
506
byte_arrays=True))
507
(self.mandos_serv
508
.connect_to_signal("ClientNotFound",
509
self.client_not_found,
510
dbus_interface=server_interface,
511
byte_arrays=True))
512
for path, client in mandos_clients.iteritems():
513
client_proxy_object = self.bus.get_object(self.busname,
514
path)
515
self.add_client(MandosClientWidget(server_proxy_object
516
=self.mandos_serv,
517
proxy_object
518
=client_proxy_object,
519
properties=client,
520
update_hook
521
=self.refresh,
522
delete_hook
523
=self.remove_client,
524
logger
525
=self.log_message),
526
path=path)
468
527
469
528
def client_not_found(self, fingerprint, address):
470
self.log_message("Client with address {0} and fingerprint"
471
" {1} could not be found"
472
.format(address, fingerprint))
529
self.log_message(("Client with address %s and fingerprint %s"
530
" could not be found" % (address,
531
fingerprint)))
473
532
474
533
def rebuild(self):
475
534
"""This rebuilds the User Interface.
485
544
self.divider)))
486
545
if self.log_visible:
487
546
self.uilist.append(self.logbox)
547
pass
488
548
self.topwidget = urwid.Pile(self.uilist)
489
549
490
550
def log_message(self, message):
491
"""Log message formatted with timestamp"""
492
551
timestamp = datetime.datetime.now().isoformat()
493
552
self.log_message_raw(timestamp + ": " + message)
494
553
507
566
self.log_visible = not self.log_visible
508
567
self.rebuild()
509
568
#self.log_message("Log visibility changed to: "
510
# + str(self.log_visible))
569
# + unicode(self.log_visible))
511
570
512
571
def change_log_display(self):
513
572
"""Change type of log display.
521
580
#self.log_message("Wrap mode: " + self.log_wrap)
522
581
523
582
def find_and_remove_client(self, path, name):
524
"""Find a client by its object path and remove it.
583
"""Find an client from its object path and remove it.
525
584
526
585
This is connected to the ClientRemoved signal from the
527
586
Mandos server object."""
529
588
client = self.clients_dict[path]
530
589
except KeyError:
531
590
# not found?
532
self.log_message("Unknown client {0!r} ({1!r}) removed"
533
.format(name, path))
534
591
return
535
client.delete()
592
self.remove_client(client, path)
536
593
537
594
def add_new_client(self, path):
538
595
client_proxy_object = self.bus.get_object(self.busname, path)
553
610
if path is None:
554
611
path = client.proxy.object_path
555
612
self.clients_dict[path] = client
556
self.clients.sort(key=lambda c: c.properties["Name"])
613
self.clients.sort(None, lambda c: c.properties["Name"])
557
614
self.refresh()
558
615
559
616
def remove_client(self, client, path=None):
561
618
if path is None:
562
619
path = client.proxy.object_path
563
620
del self.clients_dict[path]
621
if not self.clients_dict:
622
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
623
# is completely emptied, we need to recreate it.
624
self.clients = urwid.SimpleListWalker([])
625
self.rebuild()
564
626
self.refresh()
565
627
566
628
def refresh(self):
570
632
571
633
def run(self):
572
634
"""Start the main loop and exit when it's done."""
573
self.bus = dbus.SystemBus()
574
mandos_dbus_objc = self.bus.get_object(
575
self.busname, "/", follow_name_owner_changes=True)
576
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
577
dbus_interface
578
= server_interface)
579
try:
580
mandos_clients = (self.mandos_serv
581
.GetAllClientsWithProperties())
582
if not mandos_clients:
583
self.log_message_raw(("bold", "Note: Server has no clients."))
584
except dbus.exceptions.DBusException:
585
self.log_message_raw(("bold", "Note: No Mandos server running."))
586
mandos_clients = dbus.Dictionary()
587
588
(self.mandos_serv
589
.connect_to_signal("ClientRemoved",
590
self.find_and_remove_client,
591
dbus_interface=server_interface,
592
byte_arrays=True))
593
(self.mandos_serv
594
.connect_to_signal("ClientAdded",
595
self.add_new_client,
596
dbus_interface=server_interface,
597
byte_arrays=True))
598
(self.mandos_serv
599
.connect_to_signal("ClientNotFound",
600
self.client_not_found,
601
dbus_interface=server_interface,
602
byte_arrays=True))
603
for path, client in mandos_clients.items():
604
client_proxy_object = self.bus.get_object(self.busname,
605
path)
606
self.add_client(MandosClientWidget(server_proxy_object
607
=self.mandos_serv,
608
proxy_object
609
=client_proxy_object,
610
properties=client,
611
update_hook
612
=self.refresh,
613
delete_hook
614
=self.remove_client,
615
logger
616
=self.log_message),
617
path=path)
618
619
635
self.refresh()
620
636
self._input_callback_tag = (gobject.io_add_watch
621
637
(sys.stdin.fileno(),
718
734
ui.run()
719
735
except KeyboardInterrupt:
720
736
ui.screen.stop()
721
except Exception as e:
722
ui.log_message(str(e))
737
except Exception, e:
738
ui.log_message(unicode(e))
723
739
ui.screen.stop()
724
740
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0