/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: Teddy Hogeborn
  • Date: 2016-03-08 00:03:43 UTC
  • Revision ID: teddy@recompile.se-20160308000343-kjoyixwksmboql1s
Server bug fix: Work around bug when stopping server

* init.d-mandos (do_stop): Work around SIGTERM ignoring bug by doing
  "mandos-ctl >/dev/null 2>&1" after sending signal.
* mandos.service (ExecStop): New; set to "/bin/kill -TERM $MAINPID ;
  /usr/sbin/mandos-ctl >/dev/null 2>&1" to work around SIGTERM
  ignoring bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2015 Teddy Hogeborn
7
 
# Copyright © 2009-2015 Björn Påhlsson
 
6
# Copyright © 2009-2016 Teddy Hogeborn
 
7
# Copyright © 2009-2016 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
40
40
 
41
41
from dbus.mainloop.glib import DBusGMainLoop
42
42
try:
43
 
    import gobject
 
43
    from gi.repository import GObject
44
44
except ImportError:
45
 
    from gi.repository import GObject as gobject
 
45
    import gobject as GObject
46
46
 
47
47
import dbus
48
48
 
60
60
domain = 'se.recompile'
61
61
server_interface = domain + '.Mandos'
62
62
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.9"
 
63
version = "1.7.4"
 
64
 
 
65
try:
 
66
    dbus.OBJECT_MANAGER_IFACE
 
67
except AttributeError:
 
68
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
64
69
 
65
70
def isoformat_to_datetime(iso):
66
71
    "Parse an ISO 8601 date string to a datetime.datetime()"
105
110
        It updates the changed properties in the "properties" dict.
106
111
        """
107
112
        # Update properties dict with new value
108
 
        self.properties.update(properties)
 
113
        if interface == client_interface:
 
114
            self.properties.update(properties)
109
115
    
110
116
    def delete(self):
111
117
        self.property_changed_match.remove()
166
172
        """
167
173
        if flag and self._update_timer_callback_tag is None:
168
174
            # Will update the shown timer value every second
169
 
            self._update_timer_callback_tag = (gobject.timeout_add
 
175
            self._update_timer_callback_tag = (GObject.timeout_add
170
176
                                               (1000,
171
177
                                                self.update_timer))
172
178
        elif not (flag or self._update_timer_callback_tag is None):
173
 
            gobject.source_remove(self._update_timer_callback_tag)
 
179
            GObject.source_remove(self._update_timer_callback_tag)
174
180
            self._update_timer_callback_tag = None
175
181
    
176
 
    def checker_completed(self, exitstatus, signal, command):
 
182
    def checker_completed(self, exitstatus, condition, command):
177
183
        if exitstatus == 0:
178
184
            self.logger('Checker for client {} (command "{}")'
179
185
                        ' succeeded'.format(self.properties["Name"],
181
187
            self.update()
182
188
            return
183
189
        # Checker failed
184
 
        if exitstatus >= 0:
 
190
        if os.WIFEXITED(condition):
185
191
            self.logger('Checker for client {} (command "{}") failed'
186
192
                        ' with exit code {}'
187
193
                        .format(self.properties["Name"], command,
188
 
                                exitstatus))
189
 
        elif signal != 0:
 
194
                                os.WEXITSTATUS(condition)))
 
195
        elif os.WIFSIGNALED(condition):
190
196
            self.logger('Checker for client {} (command "{}") was'
191
197
                        ' killed by signal {}'
192
198
                        .format(self.properties["Name"], command,
193
 
                                signal))
194
 
        else:
195
 
            self.logger('Checker for client {} completed'
196
 
                        ' mysteriously'
197
 
                        .format(self.properties["Name"]))
 
199
                                os.WTERMSIG(condition)))
198
200
        self.update()
199
201
    
200
202
    def checker_started(self, command):
307
309
            self.update_hook()
308
310
    
309
311
    def update_timer(self):
310
 
        """called by gobject. Will indefinitely loop until
311
 
        gobject.source_remove() on tag is called"""
 
312
        """called by GObject. Will indefinitely loop until
 
313
        GObject.source_remove() on tag is called"""
312
314
        self.update()
313
315
        return True             # Keep calling this
314
316
    
315
317
    def delete(self, **kwargs):
316
318
        if self._update_timer_callback_tag is not None:
317
 
            gobject.source_remove(self._update_timer_callback_tag)
 
319
            GObject.source_remove(self._update_timer_callback_tag)
318
320
            self._update_timer_callback_tag = None
319
321
        for match in self.match_objects:
320
322
            match.remove()
463
465
                              "q: Quit  ?: Help"))
464
466
        
465
467
        self.busname = domain + '.Mandos'
466
 
        self.main_loop = gobject.MainLoop()
 
468
        self.main_loop = GObject.MainLoop()
467
469
    
468
470
    def client_not_found(self, fingerprint, address):
469
471
        self.log_message("Client with address {} and fingerprint {}"
525
527
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
528
                         level=0)
527
529
    
528
 
    def find_and_remove_client(self, path, name):
 
530
    def find_and_remove_client(self, path, interfaces):
529
531
        """Find a client by its object path and remove it.
530
532
        
531
 
        This is connected to the ClientRemoved signal from the
 
533
        This is connected to the InterfacesRemoved signal from the
532
534
        Mandos server object."""
 
535
        if client_interface not in interfaces:
 
536
            # Not a Mandos client object; ignore
 
537
            return
533
538
        try:
534
539
            client = self.clients_dict[path]
535
540
        except KeyError:
536
541
            # not found?
537
 
            self.log_message("Unknown client {!r} ({!r}) removed"
538
 
                             .format(name, path))
 
542
            self.log_message("Unknown client {!r} removed"
 
543
                             .format(path))
539
544
            return
540
545
        client.delete()
541
546
    
542
 
    def add_new_client(self, path):
 
547
    def add_new_client(self, path, ifs_and_props):
 
548
        """Find a client by its object path and remove it.
 
549
        
 
550
        This is connected to the InterfacesAdded signal from the
 
551
        Mandos server object.
 
552
        """
 
553
        if client_interface not in ifs_and_props:
 
554
            # Not a Mandos client object; ignore
 
555
            return
543
556
        client_proxy_object = self.bus.get_object(self.busname, path)
544
557
        self.add_client(MandosClientWidget(server_proxy_object
545
558
                                           =self.mandos_serv,
550
563
                                           delete_hook
551
564
                                           =self.remove_client,
552
565
                                           logger
553
 
                                           =self.log_message),
 
566
                                           =self.log_message,
 
567
                                           properties
 
568
                                           = dict(ifs_and_props[
 
569
                                               client_interface])),
554
570
                        path=path)
555
571
    
556
572
    def add_client(self, client, path=None):
591
607
            mandos_clients = dbus.Dictionary()
592
608
        
593
609
        (self.mandos_serv
594
 
         .connect_to_signal("ClientRemoved",
 
610
         .connect_to_signal("InterfacesRemoved",
595
611
                            self.find_and_remove_client,
596
 
                            dbus_interface=server_interface,
 
612
                            dbus_interface
 
613
                            = dbus.OBJECT_MANAGER_IFACE,
597
614
                            byte_arrays=True))
598
615
        (self.mandos_serv
599
 
         .connect_to_signal("ClientAdded",
 
616
         .connect_to_signal("InterfacesAdded",
600
617
                            self.add_new_client,
601
 
                            dbus_interface=server_interface,
 
618
                            dbus_interface
 
619
                            = dbus.OBJECT_MANAGER_IFACE,
602
620
                            byte_arrays=True))
603
621
        (self.mandos_serv
604
622
         .connect_to_signal("ClientNotFound",
622
640
                            path=path)
623
641
        
624
642
        self.refresh()
625
 
        self._input_callback_tag = (gobject.io_add_watch
 
643
        self._input_callback_tag = (GObject.io_add_watch
626
644
                                    (sys.stdin.fileno(),
627
 
                                     gobject.IO_IN,
 
645
                                     GObject.IO_IN,
628
646
                                     self.process_input))
629
647
        self.main_loop.run()
630
648
        # Main loop has finished, we should close everything now
631
 
        gobject.source_remove(self._input_callback_tag)
 
649
        GObject.source_remove(self._input_callback_tag)
632
650
        self.screen.stop()
633
651
    
634
652
    def stop(self):