/mandos/trunk

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

  • Committer: Björn Påhlsson
  • Date: 2011-09-26 18:47:38 UTC
  • mto: This revision was merged to the branch mainline in revision 502.
  • Revision ID: belorn@fukt.bsnet.se-20110926184738-ee8kz5vc9pb3393m
updated TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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@recompile.se>.
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
23
24
24
 
25
25
from __future__ import (division, absolute_import, print_function,
49
49
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
50
 
51
51
# Some useful constants
52
 
domain = 'se.recompile'
 
52
domain = 'se.bsnet.fukt'
53
53
server_interface = domain + '.Mandos'
54
54
client_interface = domain + '.Mandos.Client'
55
 
version = "1.5.2"
 
55
version = "1.3.1"
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
134
135
        
135
136
        # The widget shown normally
136
137
        self._text_widget = urwid.Text("")
144
145
        
145
146
        last_checked_ok = isoformat_to_datetime(self.properties
146
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"]))
147
157
        
148
 
        if self.properties ["LastCheckerStatus"] != 0:
 
158
        if self.last_checker_failed:
149
159
            self.using_timer(True)
150
160
        
151
161
        if self.need_approval:
179
189
                                                         value)
180
190
        if property == "ApprovalPending":
181
191
            using_timer(bool(value))
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
 
    
 
192
        
188
193
    def using_timer(self, flag):
189
194
        """Call this method with True or False when timer should be
190
195
        activated or deactivated.
205
210
    
206
211
    def checker_completed(self, exitstatus, condition, command):
207
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))
208
219
            self.update()
209
220
            return
210
221
        # Checker failed
 
222
        if not self.last_checker_failed:
 
223
            self.last_checker_failed = True
 
224
            self.using_timer(True)
211
225
        if os.WIFEXITED(condition):
212
226
            self.logger('Checker for client %s (command "%s")'
213
227
                        ' failed with exit code %s'
228
242
        self.update()
229
243
    
230
244
    def checker_started(self, command):
231
 
        """Server signals that a checker started. This could be useful
232
 
           to log in the future. """
233
245
        #self.logger('Client %s started checker "%s"'
234
246
        #            % (self.properties["Name"], unicode(command)))
235
247
        pass
236
248
    
237
249
    def got_secret(self):
 
250
        self.last_checker_failed = False
238
251
        self.logger('Client %s received its secret'
239
252
                    % self.properties["Name"])
240
253
    
301
314
            else:
302
315
                message = "Denial in %s. (a)pprove?"
303
316
            message = message % unicode(timer).rsplit(".", 1)[0]
304
 
        elif self.properties["LastCheckerStatus"] != 0:
 
317
        elif self.last_checker_failed:
305
318
            # When checker has failed, print a timer until client expires
306
319
            expires = self.properties["Expires"]
307
320
            if expires == "":
484
497
        
485
498
        self.busname = domain + '.Mandos'
486
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)
487
542
    
488
543
    def client_not_found(self, fingerprint, address):
489
544
        self.log_message(("Client with address %s and fingerprint %s"
504
559
                                                     self.divider)))
505
560
        if self.log_visible:
506
561
            self.uilist.append(self.logbox)
 
562
            pass
507
563
        self.topwidget = urwid.Pile(self.uilist)
508
564
    
509
565
    def log_message(self, message):
593
649
    
594
650
    def run(self):
595
651
        """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
 
 
639
652
        self.refresh()
640
653
        self._input_callback_tag = (gobject.io_add_watch
641
654
                                    (sys.stdin.fileno(),