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 317
- compare with another revision
- download diff
- download tarball
- view history from revision 317
- Committer: Teddy Hogeborn
- Date: 2014-07-13 20:37:44 UTC
- mfrom: (237.7.258 trunk)
- Revision ID: teddy@recompile.se-20140713203744-538hqhk81vw9dixv
Merge from trunk.
- files added:
- 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-2011 Teddy Hogeborn
7
# Copyright © 2009-2011 Björn Påhlsson
6
# Copyright © 2009-2014 Teddy Hogeborn
7
# Copyright © 2009-2014 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 <http://www.gnu.org/licenses/>.
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
21
22
#
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
# Contact the authors at <mandos@recompile.se>.
23
24
#
24
25
25
26
from __future__ import (division, absolute_import, print_function,
26
27
unicode_literals)
28
try:
29
from future_builtins import *
30
except ImportError:
31
pass
27
32
28
33
import sys
29
34
import os
30
import signal
31
35
32
36
import datetime
33
37
35
39
import urwid
36
40
37
41
from dbus.mainloop.glib import DBusGMainLoop
38
import gobject
42
try:
43
import gobject
44
except ImportError:
45
from gi.repository import GObject as gobject
39
46
40
47
import dbus
41
48
42
import UserList
43
44
49
import locale
45
50
51
if sys.version_info[0] == 2:
52
str = unicode
53
46
54
locale.setlocale(locale.LC_ALL, '')
47
55
48
56
import logging
49
57
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
58
51
59
# Some useful constants
52
domain = 'se.bsnet.fukt'
60
domain = 'se.recompile'
53
61
server_interface = domain + '.Mandos'
54
62
client_interface = domain + '.Mandos.Client'
55
version = "1.3.1"
56
57
# Always run in monochrome mode
58
urwid.curses_display.curses.has_colors = lambda : False
59
60
# Urwid doesn't support blinking, but we want it. Since we have no
61
# use for underline on its own, we make underline also always blink.
62
urwid.curses_display.curses.A_UNDERLINE |= (
63
urwid.curses_display.curses.A_BLINK)
63
version = "1.6.5"
64
64
65
65
def isoformat_to_datetime(iso):
66
66
"Parse an ISO 8601 date string to a datetime.datetime()"
83
83
properties and calls a hook function when any of them are
84
84
changed.
85
85
"""
86
def __init__(self, proxy_object=None, *args, **kwargs):
86
def __init__(self, proxy_object=None, properties=None, **kwargs):
87
87
self.proxy = proxy_object # Mandos Client proxy object
88
89
self.properties = dict()
88
self.properties = dict() if properties is None else properties
90
89
self.property_changed_match = (
91
90
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
91
self._property_changed,
93
92
client_interface,
94
93
byte_arrays=True))
95
94
96
self.properties.update(
97
self.proxy.GetAll(client_interface,
98
dbus_interface = dbus.PROPERTIES_IFACE))
99
100
#XXX This breaks good super behaviour
101
# super(MandosClientPropertyCache, self).__init__(
102
# *args, **kwargs)
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)
103
106
104
107
def property_changed(self, property=None, value=None):
105
108
"""This is called whenever we get a PropertyChanged signal
108
111
# Update properties dict with new value
109
112
self.properties[property] = value
110
113
111
def delete(self, *args, **kwargs):
114
def delete(self):
112
115
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
114
*args, **kwargs)
115
116
116
117
117
118
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
120
"""
120
121
121
122
def __init__(self, server_proxy_object=None, update_hook=None,
122
delete_hook=None, logger=None, *args, **kwargs):
123
delete_hook=None, logger=None, **kwargs):
123
124
# Called on update
124
125
self.update_hook = update_hook
125
126
# Called on delete
130
131
self.logger = logger
131
132
132
133
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
self.last_checker_failed = False
135
134
136
135
# The widget shown normally
137
136
self._text_widget = urwid.Text("")
138
137
# The widget shown when we have focus
139
138
self._focus_text_widget = urwid.Text("")
140
super(MandosClientWidget, self).__init__(
141
update_hook=update_hook, delete_hook=delete_hook,
142
*args, **kwargs)
139
super(MandosClientWidget, self).__init__(**kwargs)
143
140
self.update()
144
141
self.opened = False
145
142
146
last_checked_ok = isoformat_to_datetime(self.properties
147
["LastCheckedOK"])
148
if last_checked_ok is None:
149
self.last_checker_failed = True
150
else:
151
self.last_checker_failed = ((datetime.datetime.utcnow()
152
- last_checked_ok)
153
> datetime.timedelta
154
(milliseconds=
155
self.properties
156
["Interval"]))
157
158
if self.last_checker_failed:
159
self.using_timer(True)
160
161
if self.need_approval:
162
self.using_timer(True)
163
164
143
self.match_objects = (
165
144
self.proxy.connect_to_signal("CheckerCompleted",
166
145
self.checker_completed,
182
161
self.rejected,
183
162
client_interface,
184
163
byte_arrays=True))
185
#self.logger('Created client %s' % (self.properties["Name"]))
164
#self.logger('Created client {0}'
165
# .format(self.properties["Name"]))
186
166
187
def property_changed(self, property=None, value=None):
188
super(self, MandosClientWidget).property_changed(property,
189
value)
190
if property == "ApprovalPending":
191
using_timer(bool(value))
192
193
167
def using_timer(self, flag):
194
168
"""Call this method with True or False when timer should be
195
169
activated or deactivated.
196
170
"""
197
old = self._update_timer_callback_lock
198
if flag:
199
self._update_timer_callback_lock += 1
200
else:
201
self._update_timer_callback_lock -= 1
202
if old == 0 and self._update_timer_callback_lock:
171
if flag and self._update_timer_callback_tag is None:
172
# Will update the shown timer value every second
203
173
self._update_timer_callback_tag = (gobject.timeout_add
204
174
(1000,
205
175
self.update_timer))
206
elif old and self._update_timer_callback_lock == 0:
176
elif not (flag or self._update_timer_callback_tag is None):
207
177
gobject.source_remove(self._update_timer_callback_tag)
208
178
self._update_timer_callback_tag = None
209
179
210
180
def checker_completed(self, exitstatus, condition, command):
211
181
if exitstatus == 0:
212
if self.last_checker_failed:
213
self.last_checker_failed = False
214
self.using_timer(False)
215
#self.logger('Checker for client %s (command "%s")'
216
# ' was successful'
217
# % (self.properties["Name"], command))
218
182
self.update()
219
183
return
220
184
# Checker failed
221
if not self.last_checker_failed:
222
self.last_checker_failed = True
223
self.using_timer(True)
224
185
if os.WIFEXITED(condition):
225
self.logger('Checker for client %s (command "%s")'
226
' failed with exit code %s'
227
% (self.properties["Name"], command,
228
os.WEXITSTATUS(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)))
229
190
elif os.WIFSIGNALED(condition):
230
self.logger('Checker for client %s (command "%s")'
231
' was killed by signal %s'
232
% (self.properties["Name"], command,
233
os.WTERMSIG(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)))
234
195
elif os.WCOREDUMP(condition):
235
self.logger('Checker for client %s (command "%s")'
196
self.logger('Checker for client {0} (command "{1}")'
236
197
' dumped core'
237
% (self.properties["Name"], command))
198
.format(self.properties["Name"], command))
238
199
else:
239
self.logger('Checker for client %s completed'
240
' mysteriously')
200
self.logger('Checker for client {0} completed'
201
' mysteriously'
202
.format(self.properties["Name"]))
241
203
self.update()
242
204
243
205
def checker_started(self, command):
244
#self.logger('Client %s started checker "%s"'
245
# % (self.properties["Name"], unicode(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)))
246
211
pass
247
212
248
213
def got_secret(self):
249
self.last_checker_failed = False
250
self.logger('Client %s received its secret'
251
% self.properties["Name"])
214
self.logger('Client {0} received its secret'
215
.format(self.properties["Name"]))
252
216
253
217
def need_approval(self, timeout, default):
254
218
if not default:
255
message = 'Client %s needs approval within %s seconds'
219
message = 'Client {0} needs approval within {1} seconds'
256
220
else:
257
message = 'Client %s will get its secret in %s seconds'
258
self.logger(message
259
% (self.properties["Name"], timeout/1000))
260
self.using_timer(True)
221
message = 'Client {0} will get its secret in {1} seconds'
222
self.logger(message.format(self.properties["Name"],
223
timeout/1000))
261
224
262
225
def rejected(self, reason):
263
self.logger('Client %s was rejected; reason: %s'
264
% (self.properties["Name"], reason))
226
self.logger('Client {0} was rejected; reason: {1}'
227
.format(self.properties["Name"], reason))
265
228
266
229
def selectable(self):
267
230
"""Make this a "selectable" widget.
289
252
"bold-underline-blink":
290
253
"bold-underline-blink-standout",
291
254
}
292
255
293
256
# Rebuild focus and non-focus widgets using current properties
294
257
295
258
# Base part of a client. Name!
296
base = ('%(name)s: '
297
% {"name": self.properties["Name"]})
259
base = '{name}: '.format(name=self.properties["Name"])
298
260
if not self.properties["Enabled"]:
299
261
message = "DISABLED"
262
self.using_timer(False)
300
263
elif self.properties["ApprovalPending"]:
301
264
timeout = datetime.timedelta(milliseconds
302
265
= self.properties
304
267
last_approval_request = isoformat_to_datetime(
305
268
self.properties["LastApprovalRequest"])
306
269
if last_approval_request is not None:
307
timer = timeout - (datetime.datetime.utcnow()
308
- last_approval_request)
270
timer = max(timeout - (datetime.datetime.utcnow()
271
- last_approval_request),
272
datetime.timedelta())
309
273
else:
310
274
timer = datetime.timedelta()
311
275
if self.properties["ApprovedByDefault"]:
312
message = "Approval in %s. (d)eny?"
313
else:
314
message = "Denial in %s. (a)pprove?"
315
message = message % unicode(timer).rsplit(".", 1)[0]
316
elif self.last_checker_failed:
317
timeout = datetime.timedelta(milliseconds
318
= self.properties
319
["Timeout"])
320
last_ok = isoformat_to_datetime(
321
max((self.properties["LastCheckedOK"]
322
or self.properties["Created"]),
323
self.properties["LastEnabled"]))
324
timer = timeout - (datetime.datetime.utcnow() - last_ok)
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())
325
291
message = ('A checker has failed! Time until client'
326
' gets disabled: %s'
327
% unicode(timer).rsplit(".", 1)[0])
292
' gets disabled: {0}'
293
.format(str(timer).rsplit(".", 1)[0]))
294
self.using_timer(True)
328
295
else:
329
296
message = "enabled"
330
self._text = "%s%s" % (base, message)
331
297
self.using_timer(False)
298
self._text = "{0}{1}".format(base, message)
299
332
300
if not urwid.supports_unicode():
333
301
self._text = self._text.encode("ascii", "replace")
334
302
textlist = [("normal", self._text)]
346
314
self.update_hook()
347
315
348
316
def update_timer(self):
349
"called by gobject"
317
"""called by gobject. Will indefinitely loop until
318
gobject.source_remove() on tag is called"""
350
319
self.update()
351
320
return True # Keep calling this
352
321
353
def delete(self, *args, **kwargs):
322
def delete(self, **kwargs):
354
323
if self._update_timer_callback_tag is not None:
355
324
gobject.source_remove(self._update_timer_callback_tag)
356
325
self._update_timer_callback_tag = None
359
328
self.match_objects = ()
360
329
if self.delete_hook is not None:
361
330
self.delete_hook(self)
362
return super(MandosClientWidget, self).delete(*args, **kwargs)
331
return super(MandosClientWidget, self).delete(**kwargs)
363
332
364
333
def render(self, maxcolrow, focus=False):
365
334
"""Render differently if we have focus.
407
376
else:
408
377
return key
409
378
410
def property_changed(self, property=None, value=None,
411
*args, **kwargs):
379
def property_changed(self, property=None, **kwargs):
412
380
"""Call self.update() if old value is not new value.
413
381
This overrides the method from MandosClientPropertyCache"""
414
property_name = unicode(property)
382
property_name = str(property)
415
383
old_value = self.properties.get(property_name)
416
384
super(MandosClientWidget, self).property_changed(
417
property=property, value=value, *args, **kwargs)
385
property=property, **kwargs)
418
386
if self.properties.get(property_name) != old_value:
419
387
self.update()
420
388
424
392
"down" key presses, thus not allowing any containing widgets to
425
393
use them as an excuse to shift focus away from this widget.
426
394
"""
427
def keypress(self, maxcolrow, key):
428
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
395
def keypress(self, *args, **kwargs):
396
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
429
397
if ret in ("up", "down"):
430
398
return
431
399
return ret
444
412
("normal",
445
413
"default", "default", None),
446
414
("bold",
447
"default", "default", "bold"),
415
"bold", "default", "bold"),
448
416
("underline-blink",
449
"default", "default", "underline"),
417
"underline,blink", "default", "underline,blink"),
450
418
("standout",
451
"default", "default", "standout"),
419
"standout", "default", "standout"),
452
420
("bold-underline-blink",
453
"default", "default", ("bold", "underline")),
421
"bold,underline,blink", "default", "bold,underline,blink"),
454
422
("bold-standout",
455
"default", "default", ("bold", "standout")),
423
"bold,standout", "default", "bold,standout"),
456
424
("underline-blink-standout",
457
"default", "default", ("underline", "standout")),
425
"underline,blink,standout", "default",
426
"underline,blink,standout"),
458
427
("bold-underline-blink-standout",
459
"default", "default", ("bold", "underline",
460
"standout")),
428
"bold,underline,blink,standout", "default",
429
"bold,underline,blink,standout"),
461
430
))
462
431
463
432
if urwid.supports_unicode():
495
464
496
465
self.busname = domain + '.Mandos'
497
466
self.main_loop = gobject.MainLoop()
498
self.bus = dbus.SystemBus()
499
mandos_dbus_objc = self.bus.get_object(
500
self.busname, "/", follow_name_owner_changes=True)
501
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
502
dbus_interface
503
= server_interface)
504
try:
505
mandos_clients = (self.mandos_serv
506
.GetAllClientsWithProperties())
507
except dbus.exceptions.DBusException:
508
mandos_clients = dbus.Dictionary()
509
510
(self.mandos_serv
511
.connect_to_signal("ClientRemoved",
512
self.find_and_remove_client,
513
dbus_interface=server_interface,
514
byte_arrays=True))
515
(self.mandos_serv
516
.connect_to_signal("ClientAdded",
517
self.add_new_client,
518
dbus_interface=server_interface,
519
byte_arrays=True))
520
(self.mandos_serv
521
.connect_to_signal("ClientNotFound",
522
self.client_not_found,
523
dbus_interface=server_interface,
524
byte_arrays=True))
525
for path, client in mandos_clients.iteritems():
526
client_proxy_object = self.bus.get_object(self.busname,
527
path)
528
self.add_client(MandosClientWidget(server_proxy_object
529
=self.mandos_serv,
530
proxy_object
531
=client_proxy_object,
532
properties=client,
533
update_hook
534
=self.refresh,
535
delete_hook
536
=self.remove_client,
537
logger
538
=self.log_message),
539
path=path)
540
467
541
468
def client_not_found(self, fingerprint, address):
542
self.log_message(("Client with address %s and fingerprint %s"
543
" could not be found" % (address,
544
fingerprint)))
469
self.log_message("Client with address {0} and fingerprint"
470
" {1} could not be found"
471
.format(address, fingerprint))
545
472
546
473
def rebuild(self):
547
474
"""This rebuilds the User Interface.
557
484
self.divider)))
558
485
if self.log_visible:
559
486
self.uilist.append(self.logbox)
560
pass
561
487
self.topwidget = urwid.Pile(self.uilist)
562
488
563
489
def log_message(self, message):
490
"""Log message formatted with timestamp"""
564
491
timestamp = datetime.datetime.now().isoformat()
565
492
self.log_message_raw(timestamp + ": " + message)
566
493
579
506
self.log_visible = not self.log_visible
580
507
self.rebuild()
581
508
#self.log_message("Log visibility changed to: "
582
# + unicode(self.log_visible))
509
# + str(self.log_visible))
583
510
584
511
def change_log_display(self):
585
512
"""Change type of log display.
601
528
client = self.clients_dict[path]
602
529
except KeyError:
603
530
# not found?
604
self.log_message("Unknown client %r (%r) removed", name,
605
path)
531
self.log_message("Unknown client {0!r} ({1!r}) removed"
532
.format(name, path))
606
533
return
607
534
client.delete()
608
535
625
552
if path is None:
626
553
path = client.proxy.object_path
627
554
self.clients_dict[path] = client
628
self.clients.sort(None, lambda c: c.properties["Name"])
555
self.clients.sort(key=lambda c: c.properties["Name"])
629
556
self.refresh()
630
557
631
558
def remove_client(self, client, path=None):
633
560
if path is None:
634
561
path = client.proxy.object_path
635
562
del self.clients_dict[path]
636
if not self.clients_dict:
637
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
638
# is completely emptied, we need to recreate it.
639
self.clients = urwid.SimpleListWalker([])
640
self.rebuild()
641
563
self.refresh()
642
564
643
565
def refresh(self):
647
569
648
570
def run(self):
649
571
"""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
650
618
self.refresh()
651
619
self._input_callback_tag = (gobject.io_add_watch
652
620
(sys.stdin.fileno(),
749
717
ui.run()
750
718
except KeyboardInterrupt:
751
719
ui.screen.stop()
752
except Exception, e:
753
ui.log_message(unicode(e))
720
except Exception as e:
721
ui.log_message(str(e))
754
722
ui.screen.stop()
755
723
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0