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