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.11.18
- compare with another revision
- download diff
- download tarball
- view history from revision 237.11.18
- Committer: Teddy Hogeborn
- Date: 2011-10-14 18:39:01 UTC
- mfrom: (237.7.65 trunk)
- mto: (237.15.5 mandos-client-network-hooks)
- mto: This revision was merged to the branch mainline in revision 290.
- Revision ID: teddy@recompile.se-20111014183901-gsh7i8m3lyy4ty63
Merge from trunk.
- files added:
- debian/source/local-options
- files modified:
- DBUS-API
added
removed
mandos-monitor
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@fukt.bsnet.se>.
22
# Contact the authors at <mandos@recompile.se>.
23
23
#
24
24
25
from __future__ import division, absolute_import, print_function, unicode_literals
25
from __future__ import (division, absolute_import, print_function,
26
unicode_literals)
26
27
27
28
import sys
28
29
import os
48
49
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
50
50
51
# Some useful constants
51
domain = 'se.bsnet.fukt'
52
domain = 'se.recompile'
52
53
server_interface = domain + '.Mandos'
53
54
client_interface = domain + '.Mandos.Client'
54
version = "1.3.0"
55
version = "1.4.0"
55
56
56
57
# Always run in monochrome mode
57
58
urwid.curses_display.curses.has_colors = lambda : False
86
87
self.proxy = proxy_object # Mandos Client proxy object
87
88
88
89
self.properties = dict()
89
self.proxy.connect_to_signal("PropertyChanged",
90
self.property_changed,
91
client_interface,
92
byte_arrays=True)
90
self.property_changed_match = (
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
93
client_interface,
94
byte_arrays=True))
93
95
94
96
self.properties.update(
95
97
self.proxy.GetAll(client_interface,
96
98
dbus_interface = dbus.PROPERTIES_IFACE))
97
99
98
#XXX This break good super behaviour!
100
#XXX This breaks good super behaviour
99
101
# super(MandosClientPropertyCache, self).__init__(
100
102
# *args, **kwargs)
101
103
105
107
"""
106
108
# Update properties dict with new value
107
109
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)
108
115
109
116
110
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
154
161
if self.need_approval:
155
162
self.using_timer(True)
156
163
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)
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"]))
177
186
178
187
def property_changed(self, property=None, value=None):
179
188
super(self, MandosClientWidget).property_changed(property,
191
200
else:
192
201
self._update_timer_callback_lock -= 1
193
202
if old == 0 and self._update_timer_callback_lock:
203
# Will update the shown timer value every second
194
204
self._update_timer_callback_tag = (gobject.timeout_add
195
205
(1000,
196
206
self.update_timer))
305
315
message = "Denial in %s. (a)pprove?"
306
316
message = message % unicode(timer).rsplit(".", 1)[0]
307
317
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)
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()
316
326
message = ('A checker has failed! Time until client'
317
327
' gets disabled: %s'
318
328
% unicode(timer).rsplit(".", 1)[0])
337
347
self.update_hook()
338
348
339
349
def update_timer(self):
340
"called by gobject"
350
"""called by gobject. Will indefinitely loop until
351
gobject.source_remove() on tag is called"""
341
352
self.update()
342
353
return True # Keep calling this
343
354
344
def delete(self):
355
def delete(self, *args, **kwargs):
345
356
if self._update_timer_callback_tag is not None:
346
357
gobject.source_remove(self._update_timer_callback_tag)
347
358
self._update_timer_callback_tag = None
359
for match in self.match_objects:
360
match.remove()
361
self.match_objects = ()
348
362
if self.delete_hook is not None:
349
363
self.delete_hook(self)
364
return super(MandosClientWidget, self).delete(*args, **kwargs)
350
365
351
366
def render(self, maxcolrow, focus=False):
352
367
"""Render differently if we have focus.
358
373
"""Handle keys.
359
374
This overrides the method from urwid.FlowWidget"""
360
375
if key == "+":
361
self.proxy.Enable(dbus_interface = client_interface)
376
self.proxy.Enable(dbus_interface = client_interface,
377
ignore_reply=True)
362
378
elif key == "-":
363
self.proxy.Disable(dbus_interface = client_interface)
379
self.proxy.Disable(dbus_interface = client_interface,
380
ignore_reply=True)
364
381
elif key == "a":
365
382
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
dbus_interface = client_interface)
383
dbus_interface = client_interface,
384
ignore_reply=True)
367
385
elif key == "d":
368
386
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
dbus_interface = client_interface)
387
dbus_interface = client_interface,
388
ignore_reply=True)
370
389
elif key == "R" or key == "_" or key == "ctrl k":
371
390
self.server_proxy_object.RemoveClient(self.proxy
372
.object_path)
391
.object_path,
392
ignore_reply=True)
373
393
elif key == "s":
374
self.proxy.StartChecker(dbus_interface = client_interface)
394
self.proxy.StartChecker(dbus_interface = client_interface,
395
ignore_reply=True)
375
396
elif key == "S":
376
self.proxy.StopChecker(dbus_interface = client_interface)
397
self.proxy.StopChecker(dbus_interface = client_interface,
398
ignore_reply=True)
377
399
elif key == "C":
378
self.proxy.CheckedOK(dbus_interface = client_interface)
400
self.proxy.CheckedOK(dbus_interface = client_interface,
401
ignore_reply=True)
379
402
# xxx
380
403
# elif key == "p" or key == "=":
381
404
# self.proxy.pause()
572
595
#self.log_message("Wrap mode: " + self.log_wrap)
573
596
574
597
def find_and_remove_client(self, path, name):
575
"""Find an client from its object path and remove it.
598
"""Find a client by its object path and remove it.
576
599
577
600
This is connected to the ClientRemoved signal from the
578
601
Mandos server object."""
580
603
client = self.clients_dict[path]
581
604
except KeyError:
582
605
# not found?
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
583
608
return
584
self.remove_client(client, path)
609
client.delete()
585
610
586
611
def add_new_client(self, path):
587
612
client_proxy_object = self.bus.get_object(self.busname, path)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0