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.12.5
- compare with another revision
- download diff
- download tarball
- view history from revision 237.12.5
- Committer: Björn Påhlsson
- Date: 2011-11-24 19:27:53 UTC
- mto: (237.14.5 persistent-state-gpgme)
- mto: This revision was merged to the branch mainline in revision 290.
- Revision ID: belorn@fukt.bsnet.se-20111124192753-y5jxlc1h3tcxpubc
First run of python-lint. Fixed some *obviously* bad code and turned
them into good code.
them into good code.
- files removed:
- network-hooks.d
- files modified:
- DBUS-API
added
removed
mandos-monitor
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
#
6
# Copyright © 2009-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 Björn Påhlsson
6
# Copyright © 2009-2011 Teddy Hogeborn
7
# Copyright © 2009-2011 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
21
# <http://www.gnu.org/licenses/>.
20
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
21
#
23
22
# Contact the authors at <mandos@recompile.se>.
24
23
#
53
52
domain = 'se.recompile'
54
53
server_interface = domain + '.Mandos'
55
54
client_interface = domain + '.Mandos.Client'
56
version = "1.5.3"
55
version = "1.4.1"
57
56
58
57
# Always run in monochrome mode
59
58
urwid.curses_display.curses.has_colors = lambda : False
132
131
133
132
self._update_timer_callback_tag = None
134
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("")
145
145
146
146
last_checked_ok = isoformat_to_datetime(self.properties
147
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"]))
148
157
149
if self.properties ["LastCheckerStatus"] != 0:
158
if self.last_checker_failed:
150
159
self.using_timer(True)
151
160
152
161
if self.need_approval:
173
182
self.rejected,
174
183
client_interface,
175
184
byte_arrays=True))
176
#self.logger('Created client {0}'
177
# .format(self.properties["Name"]))
185
#self.logger('Created client %s' % (self.properties["Name"]))
178
186
179
187
def property_changed(self, property=None, value=None):
180
188
super(self, MandosClientWidget).property_changed(property,
181
189
value)
182
190
if property == "ApprovalPending":
183
191
using_timer(bool(value))
184
if property == "LastCheckerStatus":
185
using_timer(value != 0)
186
#self.logger('Checker for client {0} (command "{1}") was '
187
# ' successful'.format(self.properties["Name"],
188
# command))
189
192
190
193
def using_timer(self, flag):
191
194
"""Call this method with True or False when timer should be
192
195
activated or deactivated.
207
210
208
211
def checker_completed(self, exitstatus, condition, command):
209
212
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))
210
219
self.update()
211
220
return
212
221
# Checker failed
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
213
225
if os.WIFEXITED(condition):
214
self.logger('Checker for client {0} (command "{1}")'
215
' failed with exit code {2}'
216
.format(self.properties["Name"], command,
217
os.WEXITSTATUS(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)))
218
230
elif os.WIFSIGNALED(condition):
219
self.logger('Checker for client {0} (command "{1}") was'
220
' killed by signal {2}'
221
.format(self.properties["Name"], command,
222
os.WTERMSIG(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)))
223
235
elif os.WCOREDUMP(condition):
224
self.logger('Checker for client {0} (command "{1}")'
236
self.logger('Checker for client %s (command "%s")'
225
237
' dumped core'
226
.format(self.properties["Name"], command))
238
% (self.properties["Name"], command))
227
239
else:
228
self.logger('Checker for client {0} completed'
229
' mysteriously'
230
.format(self.properties["Name"]))
240
self.logger('Checker for client %s completed'
241
' mysteriously')
231
242
self.update()
232
243
233
244
def checker_started(self, command):
234
"""Server signals that a checker started. This could be useful
235
to log in the future. """
236
#self.logger('Client {0} started checker "{1}"'
237
# .format(self.properties["Name"],
238
# unicode(command)))
245
#self.logger('Client %s started checker "%s"'
246
# % (self.properties["Name"], unicode(command)))
239
247
pass
240
248
241
249
def got_secret(self):
242
self.logger('Client {0} received its secret'
243
.format(self.properties["Name"]))
250
self.last_checker_failed = False
251
self.logger('Client %s received its secret'
252
% self.properties["Name"])
244
253
245
254
def need_approval(self, timeout, default):
246
255
if not default:
247
message = 'Client {0} needs approval within {1} seconds'
256
message = 'Client %s needs approval within %s seconds'
248
257
else:
249
message = 'Client {0} will get its secret in {1} seconds'
250
self.logger(message.format(self.properties["Name"],
251
timeout/1000))
258
message = 'Client %s will get its secret in %s seconds'
259
self.logger(message
260
% (self.properties["Name"], timeout/1000))
252
261
self.using_timer(True)
253
262
254
263
def rejected(self, reason):
255
self.logger('Client {0} was rejected; reason: {1}'
256
.format(self.properties["Name"], reason))
264
self.logger('Client %s was rejected; reason: %s'
265
% (self.properties["Name"], reason))
257
266
258
267
def selectable(self):
259
268
"""Make this a "selectable" widget.
285
294
# Rebuild focus and non-focus widgets using current properties
286
295
287
296
# Base part of a client. Name!
288
base = '{name}: '.format(name=self.properties["Name"])
297
base = ('%(name)s: '
298
% {"name": self.properties["Name"]})
289
299
if not self.properties["Enabled"]:
290
300
message = "DISABLED"
291
301
elif self.properties["ApprovalPending"]:
300
310
else:
301
311
timer = datetime.timedelta()
302
312
if self.properties["ApprovedByDefault"]:
303
message = "Approval in {0}. (d)eny?"
313
message = "Approval in %s. (d)eny?"
304
314
else:
305
message = "Denial in {0}. (a)pprove?"
306
message = message.format(unicode(timer).rsplit(".", 1)[0])
307
elif self.properties["LastCheckerStatus"] != 0:
308
# When checker has failed, show timer until client expires
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
309
319
expires = self.properties["Expires"]
310
320
if expires == "":
311
321
timer = datetime.timedelta(0)
312
322
else:
313
expires = (datetime.datetime.strptime
314
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
323
expires = datetime.datetime.strptime(expires,
324
'%Y-%m-%dT%H:%M:%S.%f')
315
325
timer = expires - datetime.datetime.utcnow()
316
326
message = ('A checker has failed! Time until client'
317
' gets disabled: {0}'
318
.format(unicode(timer).rsplit(".", 1)[0]))
327
' gets disabled: %s'
328
% unicode(timer).rsplit(".", 1)[0])
319
329
else:
320
330
message = "enabled"
321
self._text = "{0}{1}".format(base, message)
331
self._text = "%s%s" % (base, message)
322
332
323
333
if not urwid.supports_unicode():
324
334
self._text = self._text.encode("ascii", "replace")
487
497
488
498
self.busname = domain + '.Mandos'
489
499
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)
490
542
491
543
def client_not_found(self, fingerprint, address):
492
self.log_message("Client with address {0} and fingerprint"
493
" {1} could not be found"
494
.format(address, fingerprint))
544
self.log_message(("Client with address %s and fingerprint %s"
545
" could not be found" % (address,
546
fingerprint)))
495
547
496
548
def rebuild(self):
497
549
"""This rebuilds the User Interface.
507
559
self.divider)))
508
560
if self.log_visible:
509
561
self.uilist.append(self.logbox)
562
pass
510
563
self.topwidget = urwid.Pile(self.uilist)
511
564
512
565
def log_message(self, message):
550
603
client = self.clients_dict[path]
551
604
except KeyError:
552
605
# not found?
553
self.log_message("Unknown client {0!r} ({1!r}) removed"
554
.format(name, path))
606
self.log_message("Unknown client %r (%r) removed", name,
607
path)
555
608
return
556
609
client.delete()
557
610
596
649
597
650
def run(self):
598
651
"""Start the main loop and exit when it's done."""
599
self.bus = dbus.SystemBus()
600
mandos_dbus_objc = self.bus.get_object(
601
self.busname, "/", follow_name_owner_changes=True)
602
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
603
dbus_interface
604
= server_interface)
605
try:
606
mandos_clients = (self.mandos_serv
607
.GetAllClientsWithProperties())
608
except dbus.exceptions.DBusException:
609
mandos_clients = dbus.Dictionary()
610
611
(self.mandos_serv
612
.connect_to_signal("ClientRemoved",
613
self.find_and_remove_client,
614
dbus_interface=server_interface,
615
byte_arrays=True))
616
(self.mandos_serv
617
.connect_to_signal("ClientAdded",
618
self.add_new_client,
619
dbus_interface=server_interface,
620
byte_arrays=True))
621
(self.mandos_serv
622
.connect_to_signal("ClientNotFound",
623
self.client_not_found,
624
dbus_interface=server_interface,
625
byte_arrays=True))
626
for path, client in mandos_clients.iteritems():
627
client_proxy_object = self.bus.get_object(self.busname,
628
path)
629
self.add_client(MandosClientWidget(server_proxy_object
630
=self.mandos_serv,
631
proxy_object
632
=client_proxy_object,
633
properties=client,
634
update_hook
635
=self.refresh,
636
delete_hook
637
=self.remove_client,
638
logger
639
=self.log_message),
640
path=path)
641
642
652
self.refresh()
643
653
self._input_callback_tag = (gobject.io_add_watch
644
654
(sys.stdin.fileno(),
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0