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.2.182
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.182
- Committer: teddy at bsnet
- Date: 2010-09-09 18:16:14 UTC
- mfrom: (269.1.3 mandos-empty-device)
- mto: (24.1.162 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: teddy@fukt.bsnet.se-20100909181614-oanlmvkzsiodbo3c
Merge in branch to interpret an empty device name to mean
"autodetect".
"autodetect".
added
removed
mandos-monitor
23
23
24
24
locale.setlocale(locale.LC_ALL, u'')
25
25
26
import logging
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
28
29
26
# Some useful constants
30
27
domain = 'se.bsnet.fukt'
31
28
server_interface = domain + '.Mandos'
32
29
client_interface = domain + '.Mandos.Client'
33
version = "1.0.15"
30
version = "1.0.14"
34
31
35
32
# Always run in monochrome mode
36
33
urwid.curses_display.curses.has_colors = lambda : False
73
70
self.properties.update(
74
71
self.proxy.GetAll(client_interface,
75
72
dbus_interface = dbus.PROPERTIES_IFACE))
76
77
#XXX This break good super behaviour!
78
# super(MandosClientPropertyCache, self).__init__(
79
# *args, **kwargs)
73
super(MandosClientPropertyCache, self).__init__(
74
proxy_object=proxy_object, *args, **kwargs)
80
75
81
76
def property_changed(self, property=None, value=None):
82
77
"""This is called whenever we get a PropertyChanged signal
125
120
self.got_secret,
126
121
client_interface,
127
122
byte_arrays=True)
128
self.proxy.connect_to_signal(u"NeedApproval",
129
self.need_approval,
130
client_interface,
131
byte_arrays=True)
132
123
self.proxy.connect_to_signal(u"Rejected",
133
124
self.rejected,
134
125
client_interface,
184
175
self.update()
185
176
186
177
def checker_started(self, command):
187
#self.logger(u'Client %s started checker "%s"'
188
# % (self.properties[u"name"], unicode(command)))
189
pass
178
self.logger(u'Client %s started checker "%s"'
179
% (self.properties[u"name"], unicode(command)))
190
180
191
181
def got_secret(self):
192
182
self.logger(u'Client %s received its secret'
193
183
% self.properties[u"name"])
194
184
195
def need_approval(self, timeout, default):
196
if not default:
197
message = u'Client %s needs approval within %s seconds'
198
else:
199
message = u'Client %s will get its secret in %s seconds'
200
self.logger(message
201
% (self.properties[u"name"], timeout/1000))
202
203
def rejected(self, reason):
204
self.logger(u'Client %s was rejected; reason: %s'
205
% (self.properties[u"name"], reason))
185
def rejected(self):
186
self.logger(u'Client %s was rejected'
187
% self.properties[u"name"])
206
188
207
189
def selectable(self):
208
190
"""Make this a "selectable" widget.
230
212
u"bold-underline-blink":
231
213
u"bold-underline-blink-standout",
232
214
}
233
215
234
216
# Rebuild focus and non-focus widgets using current properties
235
236
# Base part of a client. Name!
237
base = (u'%(name)s: '
238
% {u"name": self.properties[u"name"]})
239
if not self.properties[u"enabled"]:
240
message = u"DISABLED"
241
elif self.last_checker_failed:
242
timeout = datetime.timedelta(milliseconds
243
= self.properties[u"timeout"])
244
last_ok = isoformat_to_datetime(
245
max((self.properties["last_checked_ok"]
246
or self.properties["created"]),
247
self.properties[u"last_enabled"]))
248
timer = timeout - (datetime.datetime.utcnow() - last_ok)
249
message = (u'A checker has failed! Time until client gets diabled: %s'
250
% unicode(timer).rsplit(".", 1)[0])
251
elif self.properties[u"approved_pending"]:
252
if self.properties[u"approved_by_default"]:
253
message = u"Connection established to client. (d)eny?"
254
else:
255
message = u"Seeks approval to send secret. (a)pprove?"
256
else:
257
message = u"enabled"
258
self._text = "%s%s" % (base, message)
259
217
self._text = (u'%(name)s: %(enabled)s%(timer)s'
218
% { u"name": self.properties[u"name"],
219
u"enabled":
220
(u"enabled"
221
if self.properties[u"enabled"]
222
else u"DISABLED"),
223
u"timer": (unicode(datetime.timedelta
224
(milliseconds =
225
self.properties
226
[u"timeout"])
227
- (datetime.datetime
228
.utcnow()
229
- isoformat_to_datetime
230
(max((self.properties
231
["last_checked_ok"]
232
or
233
self.properties
234
["created"]),
235
self.properties[u"last_enabled"]))))
236
if (self.last_checker_failed
237
and self.properties
238
[u"enabled"])
239
else u"")})
260
240
if not urwid.supports_unicode():
261
241
self._text = self._text.encode("ascii", "replace")
262
242
textlist = [(u"normal", self._text)]
294
274
def keypress(self, (maxcol,), key):
295
275
"""Handle keys.
296
276
This overrides the method from urwid.FlowWidget"""
297
if key == u"+":
298
self.proxy.Enable(dbus_interface = client_interface)
299
elif key == u"-":
300
self.proxy.Disable(dbus_interface = client_interface)
301
elif key == u"a":
302
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
303
dbus_interface = client_interface)
304
elif key == u"d":
305
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
306
dbus_interface = client_interface)
277
if key == u"e" or key == u"+":
278
self.proxy.Enable()
279
elif key == u"d" or key == u"-":
280
self.proxy.Disable()
307
281
elif key == u"r" or key == u"_" or key == u"ctrl k":
308
282
self.server_proxy_object.RemoveClient(self.proxy
309
283
.object_path)
310
284
elif key == u"s":
311
self.proxy.StartChecker(dbus_interface = client_interface)
285
self.proxy.StartChecker()
312
286
elif key == u"S":
313
self.proxy.StopChecker(dbus_interface = client_interface)
287
self.proxy.StopChecker()
314
288
elif key == u"C":
315
self.proxy.CheckedOK(dbus_interface = client_interface)
289
self.proxy.CheckedOK()
316
290
# xxx
317
291
# elif key == u"p" or key == "=":
318
292
# self.proxy.pause()
320
294
# self.proxy.unpause()
321
295
# elif key == u"RET":
322
296
# self.open()
323
# elif key == u"+":
324
# self.proxy.Approve(True)
325
# elif key == u"-":
326
# self.proxy.Approve(False)
327
297
else:
328
298
return key
329
299
621
591
self.log_message_raw((u"bold",
622
592
u" "
623
593
.join((u"Clients:",
624
u"+: Enable",
625
u"-: Disable",
594
u"e: Enable",
595
u"d: Disable",
626
596
u"r: Remove",
627
597
u"s: Start new checker",
628
598
u"S: Stop checker",
629
u"C: Checker OK",
630
u"a: Approve",
631
u"d: Deny"))))
599
u"C: Checker OK"))))
632
600
self.refresh()
633
601
elif key == u"tab":
634
602
if self.topwidget.get_focus() is self.logbox:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0