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 566
- compare with another revision
- download diff
- download tarball
- view history from revision 566
- Committer: Teddy Hogeborn
- Date: 2012-05-01 20:48:00 UTC
- Revision ID: teddy@recompile.se-20120501204800-0wkzdkcd3epzci45
* mandos (main): Simplify and shorten code selecting user and group ID
to switch to.
to switch to.
- files added:
- network-hooks.d/wireless
- 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:
189
179
value)
190
180
if property == "ApprovalPending":
191
181
using_timer(bool(value))
192
182
if property == "LastCheckerStatus":
183
using_timer(value != 0)
184
#self.logger('Checker for client %s (command "%s")'
185
# ' was successful'
186
# % (self.properties["Name"], command))
187
193
188
def using_timer(self, flag):
194
189
"""Call this method with True or False when timer should be
195
190
activated or deactivated.
210
205
211
206
def checker_completed(self, exitstatus, condition, command):
212
207
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
208
self.update()
220
209
return
221
210
# Checker failed
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
225
211
if os.WIFEXITED(condition):
226
212
self.logger('Checker for client %s (command "%s")'
227
213
' failed with exit code %s'
242
228
self.update()
243
229
244
230
def checker_started(self, command):
231
"""Server signals that a checker started. This could be useful
232
to log in the future. """
245
233
#self.logger('Client %s started checker "%s"'
246
234
# % (self.properties["Name"], unicode(command)))
247
235
pass
248
236
249
237
def got_secret(self):
250
self.last_checker_failed = False
251
238
self.logger('Client %s received its secret'
252
239
% self.properties["Name"])
253
240
314
301
else:
315
302
message = "Denial in %s. (a)pprove?"
316
303
message = message % unicode(timer).rsplit(".", 1)[0]
317
elif self.last_checker_failed:
304
elif self.properties["LastCheckerStatus"] != 0:
318
305
# When checker has failed, print a timer until client expires
319
306
expires = self.properties["Expires"]
320
307
if expires == "":
497
484
498
485
self.busname = domain + '.Mandos'
499
486
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
487
543
488
def client_not_found(self, fingerprint, address):
544
489
self.log_message(("Client with address %s and fingerprint %s"
559
504
self.divider)))
560
505
if self.log_visible:
561
506
self.uilist.append(self.logbox)
562
pass
563
507
self.topwidget = urwid.Pile(self.uilist)
564
508
565
509
def log_message(self, message):
649
593
650
594
def run(self):
651
595
"""Start the main loop and exit when it's done."""
596
self.bus = dbus.SystemBus()
597
mandos_dbus_objc = self.bus.get_object(
598
self.busname, "/", follow_name_owner_changes=True)
599
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
600
dbus_interface
601
= server_interface)
602
try:
603
mandos_clients = (self.mandos_serv
604
.GetAllClientsWithProperties())
605
except dbus.exceptions.DBusException:
606
mandos_clients = dbus.Dictionary()
607
608
(self.mandos_serv
609
.connect_to_signal("ClientRemoved",
610
self.find_and_remove_client,
611
dbus_interface=server_interface,
612
byte_arrays=True))
613
(self.mandos_serv
614
.connect_to_signal("ClientAdded",
615
self.add_new_client,
616
dbus_interface=server_interface,
617
byte_arrays=True))
618
(self.mandos_serv
619
.connect_to_signal("ClientNotFound",
620
self.client_not_found,
621
dbus_interface=server_interface,
622
byte_arrays=True))
623
for path, client in mandos_clients.iteritems():
624
client_proxy_object = self.bus.get_object(self.busname,
625
path)
626
self.add_client(MandosClientWidget(server_proxy_object
627
=self.mandos_serv,
628
proxy_object
629
=client_proxy_object,
630
properties=client,
631
update_hook
632
=self.refresh,
633
delete_hook
634
=self.remove_client,
635
logger
636
=self.log_message),
637
path=path)
638
652
639
self.refresh()
653
640
self._input_callback_tag = (gobject.io_add_watch
654
641
(sys.stdin.fileno(),
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0