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 237.7.238
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.238
- Committer: Teddy Hogeborn
- Date: 2014-06-07 20:29:36 UTC
- mto: (237.7.272 trunk)
- mto: This revision was merged to the branch mainline in revision 317.
- Revision ID: teddy@recompile.se-20140607202936-crh5fxrdd804oora
Fix typo in code comment.
* debian/mandos.postinst: Fix typo in comment.
* debian/mandos.postinst: Fix typo in comment.
- files added:
- debian/mandos-client.examples
- debian/upstream
- 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
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
52
60
domain = 'se.recompile'
53
61
server_interface = domain + '.Mandos'
54
62
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)
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:
203
172
# Will update the shown timer value every second
204
173
self._update_timer_callback_tag = (gobject.timeout_add
205
174
(1000,
206
175
self.update_timer))
207
elif old and self._update_timer_callback_lock == 0:
176
elif not (flag or self._update_timer_callback_tag is None):
208
177
gobject.source_remove(self._update_timer_callback_tag)
209
178
self._update_timer_callback_tag = None
210
179
211
180
def checker_completed(self, exitstatus, condition, command):
212
181
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
182
self.update()
220
183
return
221
184
# Checker failed
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
225
185
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)))
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)))
230
190
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)))
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)))
235
195
elif os.WCOREDUMP(condition):
236
self.logger('Checker for client %s (command "%s")'
196
self.logger('Checker for client {0} (command "{1}")'
237
197
' dumped core'
238
% (self.properties["Name"], command))
198
.format(self.properties["Name"], command))
239
199
else:
240
self.logger('Checker for client %s completed'
241
' mysteriously')
200
self.logger('Checker for client {0} completed'
201
' mysteriously'
202
.format(self.properties["Name"]))
242
203
self.update()
243
204
244
205
def checker_started(self, command):
245
#self.logger('Client %s started checker "%s"'
246
# % (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)))
247
211
pass
248
212
249
213
def got_secret(self):
250
self.last_checker_failed = False
251
self.logger('Client %s received its secret'
252
% self.properties["Name"])
214
self.logger('Client {0} received its secret'
215
.format(self.properties["Name"]))
253
216
254
217
def need_approval(self, timeout, default):
255
218
if not default:
256
message = 'Client %s needs approval within %s seconds'
219
message = 'Client {0} needs approval within {1} seconds'
257
220
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)
221
message = 'Client {0} will get its secret in {1} seconds'
222
self.logger(message.format(self.properties["Name"],
223
timeout/1000))
262
224
263
225
def rejected(self, reason):
264
self.logger('Client %s was rejected; reason: %s'
265
% (self.properties["Name"], reason))
226
self.logger('Client {0} was rejected; reason: {1}'
227
.format(self.properties["Name"], reason))
266
228
267
229
def selectable(self):
268
230
"""Make this a "selectable" widget.
290
252
"bold-underline-blink":
291
253
"bold-underline-blink-standout",
292
254
}
293
255
294
256
# Rebuild focus and non-focus widgets using current properties
295
257
296
258
# Base part of a client. Name!
297
base = ('%(name)s: '
298
% {"name": self.properties["Name"]})
259
base = '{name}: '.format(name=self.properties["Name"])
299
260
if not self.properties["Enabled"]:
300
261
message = "DISABLED"
262
self.using_timer(False)
301
263
elif self.properties["ApprovalPending"]:
302
264
timeout = datetime.timedelta(milliseconds
303
265
= self.properties
305
267
last_approval_request = isoformat_to_datetime(
306
268
self.properties["LastApprovalRequest"])
307
269
if last_approval_request is not None:
308
timer = timeout - (datetime.datetime.utcnow()
309
- last_approval_request)
270
timer = max(timeout - (datetime.datetime.utcnow()
271
- last_approval_request),
272
datetime.timedelta())
310
273
else:
311
274
timer = datetime.timedelta()
312
275
if self.properties["ApprovedByDefault"]:
313
message = "Approval in %s. (d)eny?"
276
message = "Approval in {0}. (d)eny?"
314
277
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
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
319
283
expires = self.properties["Expires"]
320
284
if expires == "":
321
285
timer = datetime.timedelta(0)
322
286
else:
323
expires = datetime.datetime.strptime(expires,
324
'%Y-%m-%dT%H:%M:%S.%f')
325
timer = expires - datetime.datetime.utcnow()
287
expires = (datetime.datetime.strptime
288
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
289
timer = max(expires - datetime.datetime.utcnow(),
290
datetime.timedelta())
326
291
message = ('A checker has failed! Time until client'
327
' gets disabled: %s'
328
% unicode(timer).rsplit(".", 1)[0])
292
' gets disabled: {0}'
293
.format(str(timer).rsplit(".", 1)[0]))
294
self.using_timer(True)
329
295
else:
330
296
message = "enabled"
331
self._text = "%s%s" % (base, message)
332
297
self.using_timer(False)
298
self._text = "{0}{1}".format(base, message)
299
333
300
if not urwid.supports_unicode():
334
301
self._text = self._text.encode("ascii", "replace")
335
302
textlist = [("normal", self._text)]
352
319
self.update()
353
320
return True # Keep calling this
354
321
355
def delete(self, *args, **kwargs):
322
def delete(self, **kwargs):
356
323
if self._update_timer_callback_tag is not None:
357
324
gobject.source_remove(self._update_timer_callback_tag)
358
325
self._update_timer_callback_tag = None
361
328
self.match_objects = ()
362
329
if self.delete_hook is not None:
363
330
self.delete_hook(self)
364
return super(MandosClientWidget, self).delete(*args, **kwargs)
331
return super(MandosClientWidget, self).delete(**kwargs)
365
332
366
333
def render(self, maxcolrow, focus=False):
367
334
"""Render differently if we have focus.
409
376
else:
410
377
return key
411
378
412
def property_changed(self, property=None, value=None,
413
*args, **kwargs):
379
def property_changed(self, property=None, **kwargs):
414
380
"""Call self.update() if old value is not new value.
415
381
This overrides the method from MandosClientPropertyCache"""
416
property_name = unicode(property)
382
property_name = str(property)
417
383
old_value = self.properties.get(property_name)
418
384
super(MandosClientWidget, self).property_changed(
419
property=property, value=value, *args, **kwargs)
385
property=property, **kwargs)
420
386
if self.properties.get(property_name) != old_value:
421
387
self.update()
422
388
426
392
"down" key presses, thus not allowing any containing widgets to
427
393
use them as an excuse to shift focus away from this widget.
428
394
"""
429
def keypress(self, maxcolrow, key):
430
ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
395
def keypress(self, *args, **kwargs):
396
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
431
397
if ret in ("up", "down"):
432
398
return
433
399
return ret
446
412
("normal",
447
413
"default", "default", None),
448
414
("bold",
449
"default", "default", "bold"),
415
"bold", "default", "bold"),
450
416
("underline-blink",
451
"default", "default", "underline"),
417
"underline,blink", "default", "underline,blink"),
452
418
("standout",
453
"default", "default", "standout"),
419
"standout", "default", "standout"),
454
420
("bold-underline-blink",
455
"default", "default", ("bold", "underline")),
421
"bold,underline,blink", "default", "bold,underline,blink"),
456
422
("bold-standout",
457
"default", "default", ("bold", "standout")),
423
"bold,standout", "default", "bold,standout"),
458
424
("underline-blink-standout",
459
"default", "default", ("underline", "standout")),
425
"underline,blink,standout", "default",
426
"underline,blink,standout"),
460
427
("bold-underline-blink-standout",
461
"default", "default", ("bold", "underline",
462
"standout")),
428
"bold,underline,blink,standout", "default",
429
"bold,underline,blink,standout"),
463
430
))
464
431
465
432
if urwid.supports_unicode():
497
464
498
465
self.busname = domain + '.Mandos'
499
466
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
467
543
468
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)))
469
self.log_message("Client with address {0} and fingerprint"
470
" {1} could not be found"
471
.format(address, fingerprint))
547
472
548
473
def rebuild(self):
549
474
"""This rebuilds the User Interface.
559
484
self.divider)))
560
485
if self.log_visible:
561
486
self.uilist.append(self.logbox)
562
pass
563
487
self.topwidget = urwid.Pile(self.uilist)
564
488
565
489
def log_message(self, message):
490
"""Log message formatted with timestamp"""
566
491
timestamp = datetime.datetime.now().isoformat()
567
492
self.log_message_raw(timestamp + ": " + message)
568
493
581
506
self.log_visible = not self.log_visible
582
507
self.rebuild()
583
508
#self.log_message("Log visibility changed to: "
584
# + unicode(self.log_visible))
509
# + str(self.log_visible))
585
510
586
511
def change_log_display(self):
587
512
"""Change type of log display.
603
528
client = self.clients_dict[path]
604
529
except KeyError:
605
530
# not found?
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
531
self.log_message("Unknown client {0!r} ({1!r}) removed"
532
.format(name, path))
608
533
return
609
534
client.delete()
610
535
627
552
if path is None:
628
553
path = client.proxy.object_path
629
554
self.clients_dict[path] = client
630
self.clients.sort(None, lambda c: c.properties["Name"])
555
self.clients.sort(key=lambda c: c.properties["Name"])
631
556
self.refresh()
632
557
633
558
def remove_client(self, client, path=None):
635
560
if path is None:
636
561
path = client.proxy.object_path
637
562
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
563
self.refresh()
644
564
645
565
def refresh(self):
649
569
650
570
def run(self):
651
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
652
618
self.refresh()
653
619
self._input_callback_tag = (gobject.io_add_watch
654
620
(sys.stdin.fileno(),
751
717
ui.run()
752
718
except KeyboardInterrupt:
753
719
ui.screen.stop()
754
except Exception, e:
755
ui.log_message(unicode(e))
720
except Exception as e:
721
ui.log_message(str(e))
756
722
ui.screen.stop()
757
723
raise
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0