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.13
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.13
- Committer: Teddy Hogeborn
- Date: 2011-02-27 17:14:48 UTC
- mfrom: (237.8.10 mandos-python26)
- mto: (237.12.2 mandos-persistent) (24.1.171 mandos) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 282.
- Revision ID: teddy@fukt.bsnet.se-20110227171448-cz13rrjix02t4l8b
Merge from Python 2.6 branch.
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,2010 Teddy Hogeborn
7
# Copyright © 2009,2010 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
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program. If not, see <http://www.gnu.org/licenses/>.
21
21
#
22
# Contact the authors at <mandos@recompile.se>.
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
23
#
24
24
25
from __future__ import (division, absolute_import, print_function,
26
unicode_literals)
25
from __future__ import division, absolute_import, print_function, unicode_literals
27
26
28
27
import sys
29
28
import os
49
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
49
51
50
# Some useful constants
52
domain = 'se.recompile'
51
domain = 'se.bsnet.fukt'
53
52
server_interface = domain + '.Mandos'
54
53
client_interface = domain + '.Mandos.Client'
55
version = "1.3.1"
54
version = "1.2.3"
56
55
57
56
# Always run in monochrome mode
58
57
urwid.curses_display.curses.has_colors = lambda : False
87
86
self.proxy = proxy_object # Mandos Client proxy object
88
87
89
88
self.properties = dict()
90
self.property_changed_match = (
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
93
client_interface,
94
byte_arrays=True))
89
self.proxy.connect_to_signal("PropertyChanged",
90
self.property_changed,
91
client_interface,
92
byte_arrays=True)
95
93
96
94
self.properties.update(
97
95
self.proxy.GetAll(client_interface,
98
96
dbus_interface = dbus.PROPERTIES_IFACE))
99
97
100
#XXX This breaks good super behaviour
98
#XXX This break good super behaviour!
101
99
# super(MandosClientPropertyCache, self).__init__(
102
100
# *args, **kwargs)
103
101
107
105
"""
108
106
# Update properties dict with new value
109
107
self.properties[property] = value
110
111
def delete(self, *args, **kwargs):
112
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
114
*args, **kwargs)
115
108
116
109
117
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
161
154
if self.need_approval:
162
155
self.using_timer(True)
163
156
164
self.match_objects = (
165
self.proxy.connect_to_signal("CheckerCompleted",
166
self.checker_completed,
167
client_interface,
168
byte_arrays=True),
169
self.proxy.connect_to_signal("CheckerStarted",
170
self.checker_started,
171
client_interface,
172
byte_arrays=True),
173
self.proxy.connect_to_signal("GotSecret",
174
self.got_secret,
175
client_interface,
176
byte_arrays=True),
177
self.proxy.connect_to_signal("NeedApproval",
178
self.need_approval,
179
client_interface,
180
byte_arrays=True),
181
self.proxy.connect_to_signal("Rejected",
182
self.rejected,
183
client_interface,
184
byte_arrays=True))
185
#self.logger('Created client %s' % (self.properties["Name"]))
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)
186
177
187
178
def property_changed(self, property=None, value=None):
188
179
super(self, MandosClientWidget).property_changed(property,
200
191
else:
201
192
self._update_timer_callback_lock -= 1
202
193
if old == 0 and self._update_timer_callback_lock:
203
# Will update the shown timer value every second
204
194
self._update_timer_callback_tag = (gobject.timeout_add
205
195
(1000,
206
196
self.update_timer))
315
305
message = "Denial in %s. (a)pprove?"
316
306
message = message % unicode(timer).rsplit(".", 1)[0]
317
307
elif self.last_checker_failed:
318
# When checker has failed, print a timer until client expires
319
expires = self.properties["Expires"]
320
if expires == "":
321
timer = datetime.timedelta(0)
322
else:
323
expires = datetime.datetime.strptime(expires,
324
'%Y-%m-%dT%H:%M:%S.%f')
325
timer = expires - datetime.datetime.utcnow()
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)
326
316
message = ('A checker has failed! Time until client'
327
317
' gets disabled: %s'
328
318
% unicode(timer).rsplit(".", 1)[0])
347
337
self.update_hook()
348
338
349
339
def update_timer(self):
350
"""called by gobject. Will indefinitely loop until
351
gobject.source_remove() on tag is called"""
340
"called by gobject"
352
341
self.update()
353
342
return True # Keep calling this
354
343
355
def delete(self, *args, **kwargs):
344
def delete(self):
356
345
if self._update_timer_callback_tag is not None:
357
346
gobject.source_remove(self._update_timer_callback_tag)
358
347
self._update_timer_callback_tag = None
359
for match in self.match_objects:
360
match.remove()
361
self.match_objects = ()
362
348
if self.delete_hook is not None:
363
349
self.delete_hook(self)
364
return super(MandosClientWidget, self).delete(*args, **kwargs)
365
350
366
351
def render(self, maxcolrow, focus=False):
367
352
"""Render differently if we have focus.
373
358
"""Handle keys.
374
359
This overrides the method from urwid.FlowWidget"""
375
360
if key == "+":
376
self.proxy.Enable(dbus_interface = client_interface,
377
ignore_reply=True)
361
self.proxy.Enable(dbus_interface = client_interface)
378
362
elif key == "-":
379
self.proxy.Disable(dbus_interface = client_interface,
380
ignore_reply=True)
363
self.proxy.Disable(dbus_interface = client_interface)
381
364
elif key == "a":
382
365
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
383
dbus_interface = client_interface,
384
ignore_reply=True)
366
dbus_interface = client_interface)
385
367
elif key == "d":
386
368
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
387
dbus_interface = client_interface,
388
ignore_reply=True)
369
dbus_interface = client_interface)
389
370
elif key == "R" or key == "_" or key == "ctrl k":
390
371
self.server_proxy_object.RemoveClient(self.proxy
391
.object_path,
392
ignore_reply=True)
372
.object_path)
393
373
elif key == "s":
394
self.proxy.StartChecker(dbus_interface = client_interface,
395
ignore_reply=True)
374
self.proxy.StartChecker(dbus_interface = client_interface)
396
375
elif key == "S":
397
self.proxy.StopChecker(dbus_interface = client_interface,
398
ignore_reply=True)
376
self.proxy.StopChecker(dbus_interface = client_interface)
399
377
elif key == "C":
400
self.proxy.CheckedOK(dbus_interface = client_interface,
401
ignore_reply=True)
378
self.proxy.CheckedOK(dbus_interface = client_interface)
402
379
# xxx
403
380
# elif key == "p" or key == "=":
404
381
# self.proxy.pause()
595
572
#self.log_message("Wrap mode: " + self.log_wrap)
596
573
597
574
def find_and_remove_client(self, path, name):
598
"""Find a client by its object path and remove it.
575
"""Find an client from its object path and remove it.
599
576
600
577
This is connected to the ClientRemoved signal from the
601
578
Mandos server object."""
603
580
client = self.clients_dict[path]
604
581
except KeyError:
605
582
# not found?
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
608
583
return
609
client.delete()
584
self.remove_client(client, path)
610
585
611
586
def add_new_client(self, path):
612
587
client_proxy_object = self.bus.get_object(self.busname, path)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0