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 237.4.35
- compare with another revision
- download diff
- download tarball
- view history from revision 237.4.35
- Committer: Teddy Hogeborn
- Date: 2013-10-13 17:05:59 UTC
- mto: This revision was merged to the branch mainline in revision 625.
- Revision ID: teddy@recompile.se-20131013170559-44x665vs0pl3n8sf
Tags: version-1.6.1-1
* Makefile (version): Changed to "1.6.1".
* NEWS (Version 1.6.1): New entry.
* debian/changelog (1.6.1-1): - '' -
* NEWS (Version 1.6.1): New entry.
* debian/changelog (1.6.1-1): - '' -
- files added:
- debian/mandos-client.examples
- 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-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 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
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
35
40
import urwid
36
41
37
42
from dbus.mainloop.glib import DBusGMainLoop
38
import gobject
43
try:
44
import gobject
45
except ImportError:
46
from gi.repository import GObject as gobject
39
47
40
48
import dbus
41
49
42
import UserList
43
44
50
import locale
45
51
52
if sys.version_info[0] == 2:
53
str = unicode
54
46
55
locale.setlocale(locale.LC_ALL, '')
47
56
48
57
import logging
52
61
domain = 'se.recompile'
53
62
server_interface = domain + '.Mandos'
54
63
client_interface = domain + '.Mandos.Client'
55
version = "1.4.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)
64
version = "1.6.1"
64
65
65
66
def isoformat_to_datetime(iso):
66
67
"Parse an ISO 8601 date string to a datetime.datetime()"
83
84
properties and calls a hook function when any of them are
84
85
changed.
85
86
"""
86
def __init__(self, proxy_object=None, *args, **kwargs):
87
def __init__(self, proxy_object=None, properties=None, **kwargs):
87
88
self.proxy = proxy_object # Mandos Client proxy object
88
89
self.properties = dict()
89
self.properties = dict() if properties is None else properties
90
90
self.property_changed_match = (
91
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
92
self._property_changed,
93
93
client_interface,
94
94
byte_arrays=True))
95
95
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)
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)
103
107
104
108
def property_changed(self, property=None, value=None):
105
109
"""This is called whenever we get a PropertyChanged signal
108
112
# Update properties dict with new value
109
113
self.properties[property] = value
110
114
111
def delete(self, *args, **kwargs):
115
def delete(self):
112
116
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
114
*args, **kwargs)
115
117
116
118
117
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
121
"""
120
122
121
123
def __init__(self, server_proxy_object=None, update_hook=None,
122
delete_hook=None, logger=None, *args, **kwargs):
124
delete_hook=None, logger=None, **kwargs):
123
125
# Called on update
124
126
self.update_hook = update_hook
125
127
# Called on delete
130
132
self.logger = logger
131
133
132
134
self._update_timer_callback_tag = None
133
self._update_timer_callback_lock = 0
134
self.last_checker_failed = False
135
135
136
136
# The widget shown normally
137
137
self._text_widget = urwid.Text("")
138
138
# The widget shown when we have focus
139
139
self._focus_text_widget = urwid.Text("")
140
super(MandosClientWidget, self).__init__(
141
update_hook=update_hook, delete_hook=delete_hook,
142
*args, **kwargs)
140
super(MandosClientWidget, self).__init__(**kwargs)
143
141
self.update()
144
142
self.opened = False
145
143
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
144
self.match_objects = (
165
145
self.proxy.connect_to_signal("CheckerCompleted",
166
146
self.checker_completed,
182
162
self.rejected,
183
163
client_interface,
184
164
byte_arrays=True))
185
#self.logger('Created client %s' % (self.properties["Name"]))
165
#self.logger('Created client {0}'
166
# .format(self.properties["Name"]))
186
167
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
168
def using_timer(self, flag):
194
169
"""Call this method with True or False when timer should be
195
170
activated or deactivated.
196
171
"""
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:
172
if flag and self._update_timer_callback_tag is None:
203
173
# Will update the shown timer value every second
204
174
self._update_timer_callback_tag = (gobject.timeout_add
205
175
(1000,
206
176
self.update_timer))
207
elif old and self._update_timer_callback_lock == 0:
177
elif not (flag or self._update_timer_callback_tag is None):
208
178
gobject.source_remove(self._update_timer_callback_tag)
209
179
self._update_timer_callback_tag = None
210
180
211
181
def checker_completed(self, exitstatus, condition, command):
212
182
if exitstatus == 0:
213
if self.last_checker_failed:
214
self.last_checker_failed = False
215
self.using_timer(False)
216
#self.logger('Checker for client %s (command "%s")'
217
# ' was successful'
218
# % (self.properties["Name"], command))
219
183
self.update()
220
184
return
221
185
# Checker failed
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
225
186
if os.WIFEXITED(condition):
226
self.logger('Checker for client %s (command "%s")'
227
' failed with exit code %s'
228
% (self.properties["Name"], command,
229
os.WEXITSTATUS(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)))
230
191
elif os.WIFSIGNALED(condition):
231
self.logger('Checker for client %s (command "%s")'
232
' was killed by signal %s'
233
% (self.properties["Name"], command,
234
os.WTERMSIG(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)))
235
196
elif os.WCOREDUMP(condition):
236
self.logger('Checker for client %s (command "%s")'
197
self.logger('Checker for client {0} (command "{1}")'
237
198
' dumped core'
238
% (self.properties["Name"], command))
199
.format(self.properties["Name"], command))
239
200
else:
240
self.logger('Checker for client %s completed'
241
' mysteriously')
201
self.logger('Checker for client {0} completed'
202
' mysteriously'
203
.format(self.properties["Name"]))
242
204
self.update()
243
205
244
206
def checker_started(self, command):
245
#self.logger('Client %s started checker "%s"'
246
# % (self.properties["Name"], unicode(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)))
247
212
pass
248
213
249
214
def got_secret(self):
250
self.last_checker_failed = False
251
self.logger('Client %s received its secret'
252
% self.properties["Name"])
215
self.logger('Client {0} received its secret'
216
.format(self.properties["Name"]))
253
217
254
218
def need_approval(self, timeout, default):
255
219
if not default:
256
message = 'Client %s needs approval within %s seconds'
220
message = 'Client {0} needs approval within {1} seconds'
257
221
else:
258
message = 'Client %s will get its secret in %s seconds'
259
self.logger(message
260
% (self.properties["Name"], timeout/1000))
261
self.using_timer(True)
222
message = 'Client {0} will get its secret in {1} seconds'
223
self.logger(message.format(self.properties["Name"],
224
timeout/1000))
262
225
263
226
def rejected(self, reason):
264
self.logger('Client %s was rejected; reason: %s'
265
% (self.properties["Name"], reason))
227
self.logger('Client {0} was rejected; reason: {1}'
228
.format(self.properties["Name"], reason))
266
229
267
230
def selectable(self):
268
231
"""Make this a "selectable" widget.
290
253
"bold-underline-blink":
291
254
"bold-underline-blink-standout",
292
255
}
293
256
294
257
# Rebuild focus and non-focus widgets using current properties
295
258
296
259
# Base part of a client. Name!
297
base = ('%(name)s: '
298
% {"name": self.properties["Name"]})
260
base = '{name}: '.format(name=self.properties["Name"])
299
261
if not self.properties["Enabled"]:
300
262
message = "DISABLED"
263
self.using_timer(False)
301
264
elif self.properties["ApprovalPending"]:
302
265
timeout = datetime.timedelta(milliseconds
303
266
= self.properties
305
268
last_approval_request = isoformat_to_datetime(
306
269
self.properties["LastApprovalRequest"])
307
270
if last_approval_request is not None:
308
timer = timeout - (datetime.datetime.utcnow()
309
- last_approval_request)
271
timer = max(timeout - (datetime.datetime.utcnow()
272
- last_approval_request),
273
datetime.timedelta())
310
274
else:
311
275
timer = datetime.timedelta()
312
276
if self.properties["ApprovedByDefault"]:
313
message = "Approval in %s. (d)eny?"
277
message = "Approval in {0}. (d)eny?"
314
278
else:
315
message = "Denial in %s. (a)pprove?"
316
message = message % unicode(timer).rsplit(".", 1)[0]
317
elif self.last_checker_failed:
318
# When checker has failed, print a timer until client expires
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
319
284
expires = self.properties["Expires"]
320
285
if expires == "":
321
286
timer = datetime.timedelta(0)
322
287
else:
323
expires = datetime.datetime.strptime(expires,
324
'%Y-%m-%dT%H:%M:%S.%f')
325
timer = expires - datetime.datetime.utcnow()
288
expires = (datetime.datetime.strptime
289
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
290
timer = max(expires - datetime.datetime.utcnow(),
291
datetime.timedelta())
326
292
message = ('A checker has failed! Time until client'
327
' gets disabled: %s'
328
% unicode(timer).rsplit(".", 1)[0])
293
' gets disabled: {0}'
294
.format(str(timer).rsplit(".", 1)[0]))
295
self.using_timer(True)
329
296
else:
330
297
message = "enabled"
331
self._text = "%s%s" % (base, message)
332
298
self.using_timer(False)
299
self._text = "{0}{1}".format(base, message)
300
333
301
if not urwid.supports_unicode():
334
302
self._text = self._text.encode("ascii", "replace")
335
303
textlist = [("normal", self._text)]
352
320
self.update()
353
321
return True # Keep calling this
354
322
355
def delete(self, *args, **kwargs):
323
def delete(self, **kwargs):
356
324
if self._update_timer_callback_tag is not None:
357
325
gobject.source_remove(self._update_timer_callback_tag)
358
326
self._update_timer_callback_tag = None
361
329
self.match_objects = ()
362
330
if self.delete_hook is not None:
363
331
self.delete_hook(self)
364
return super(MandosClientWidget, self).delete(*args, **kwargs)
332
return super(MandosClientWidget, self).delete(**kwargs)
365
333
366
334
def render(self, maxcolrow, focus=False):
367
335
"""Render differently if we have focus.
409
377
else:
410
378
return key
411
379
412
def property_changed(self, property=None, value=None,
413
*args, **kwargs):
380
def property_changed(self, property=None, **kwargs):
414
381
"""Call self.update() if old value is not new value.
415
382
This overrides the method from MandosClientPropertyCache"""
416
property_name = unicode(property)
383
property_name = str(property)
417
384
old_value = self.properties.get(property_name)
418
385
super(MandosClientWidget, self).property_changed(
419
property=property, value=value, *args, **kwargs)
386
property=property, **kwargs)
420
387
if self.properties.get(property_name) != old_value:
421
388
self.update()
422
389
426
393
"down" key presses, thus not allowing any containing widgets to
427
394
use them as an excuse to shift focus away from this widget.
428
395
"""
429
def keypress(self, maxcolrow, key):
430
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
396
def keypress(self, *args, **kwargs):
397
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
431
398
if ret in ("up", "down"):
432
399
return
433
400
return ret
446
413
("normal",
447
414
"default", "default", None),
448
415
("bold",
449
"default", "default", "bold"),
416
"bold", "default", "bold"),
450
417
("underline-blink",
451
"default", "default", "underline"),
418
"underline,blink", "default", "underline,blink"),
452
419
("standout",
453
"default", "default", "standout"),
420
"standout", "default", "standout"),
454
421
("bold-underline-blink",
455
"default", "default", ("bold", "underline")),
422
"bold,underline,blink", "default", "bold,underline,blink"),
456
423
("bold-standout",
457
"default", "default", ("bold", "standout")),
424
"bold,standout", "default", "bold,standout"),
458
425
("underline-blink-standout",
459
"default", "default", ("underline", "standout")),
426
"underline,blink,standout", "default",
427
"underline,blink,standout"),
460
428
("bold-underline-blink-standout",
461
"default", "default", ("bold", "underline",
462
"standout")),
429
"bold,underline,blink,standout", "default",
430
"bold,underline,blink,standout"),
463
431
))
464
432
465
433
if urwid.supports_unicode():
497
465
498
466
self.busname = domain + '.Mandos'
499
467
self.main_loop = gobject.MainLoop()
500
self.bus = dbus.SystemBus()
501
mandos_dbus_objc = self.bus.get_object(
502
self.busname, "/", follow_name_owner_changes=True)
503
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
504
dbus_interface
505
= server_interface)
506
try:
507
mandos_clients = (self.mandos_serv
508
.GetAllClientsWithProperties())
509
except dbus.exceptions.DBusException:
510
mandos_clients = dbus.Dictionary()
511
512
(self.mandos_serv
513
.connect_to_signal("ClientRemoved",
514
self.find_and_remove_client,
515
dbus_interface=server_interface,
516
byte_arrays=True))
517
(self.mandos_serv
518
.connect_to_signal("ClientAdded",
519
self.add_new_client,
520
dbus_interface=server_interface,
521
byte_arrays=True))
522
(self.mandos_serv
523
.connect_to_signal("ClientNotFound",
524
self.client_not_found,
525
dbus_interface=server_interface,
526
byte_arrays=True))
527
for path, client in mandos_clients.iteritems():
528
client_proxy_object = self.bus.get_object(self.busname,
529
path)
530
self.add_client(MandosClientWidget(server_proxy_object
531
=self.mandos_serv,
532
proxy_object
533
=client_proxy_object,
534
properties=client,
535
update_hook
536
=self.refresh,
537
delete_hook
538
=self.remove_client,
539
logger
540
=self.log_message),
541
path=path)
542
468
543
469
def client_not_found(self, fingerprint, address):
544
self.log_message(("Client with address %s and fingerprint %s"
545
" could not be found" % (address,
546
fingerprint)))
470
self.log_message("Client with address {0} and fingerprint"
471
" {1} could not be found"
472
.format(address, fingerprint))
547
473
548
474
def rebuild(self):
549
475
"""This rebuilds the User Interface.
559
485
self.divider)))
560
486
if self.log_visible:
561
487
self.uilist.append(self.logbox)
562
pass
563
488
self.topwidget = urwid.Pile(self.uilist)
564
489
565
490
def log_message(self, message):
491
"""Log message formatted with timestamp"""
566
492
timestamp = datetime.datetime.now().isoformat()
567
493
self.log_message_raw(timestamp + ": " + message)
568
494
581
507
self.log_visible = not self.log_visible
582
508
self.rebuild()
583
509
#self.log_message("Log visibility changed to: "
584
# + unicode(self.log_visible))
510
# + str(self.log_visible))
585
511
586
512
def change_log_display(self):
587
513
"""Change type of log display.
603
529
client = self.clients_dict[path]
604
530
except KeyError:
605
531
# not found?
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
532
self.log_message("Unknown client {0!r} ({1!r}) removed"
533
.format(name, path))
608
534
return
609
535
client.delete()
610
536
627
553
if path is None:
628
554
path = client.proxy.object_path
629
555
self.clients_dict[path] = client
630
self.clients.sort(None, lambda c: c.properties["Name"])
556
self.clients.sort(key=lambda c: c.properties["Name"])
631
557
self.refresh()
632
558
633
559
def remove_client(self, client, path=None):
635
561
if path is None:
636
562
path = client.proxy.object_path
637
563
del self.clients_dict[path]
638
if not self.clients_dict:
639
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
640
# is completely emptied, we need to recreate it.
641
self.clients = urwid.SimpleListWalker([])
642
self.rebuild()
643
564
self.refresh()
644
565
645
566
def refresh(self):
649
570
650
571
def run(self):
651
572
"""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
652
619
self.refresh()
653
620
self._input_callback_tag = (gobject.io_add_watch
654
621
(sys.stdin.fileno(),
751
718
ui.run()
752
719
except KeyboardInterrupt:
753
720
ui.screen.stop()
754
except Exception, e:
755
ui.log_message(unicode(e))
721
except Exception as e:
722
ui.log_message(str(e))
756
723
ui.screen.stop()
757
724
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0