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