/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: 2015-07-27 09:23:56 UTC
  • Revision ID: teddy@recompile.se-20150727092356-65ul6jsiozlkjw4e
Debian bug fix for mandos-client: Remove dhparams.pem on purge.

* debian/mandos-client.postrm (purge): Bug fix: Remove dhparams.pem.

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
domain = 'se.recompile'
61
61
server_interface = domain + '.Mandos'
62
62
client_interface = domain + '.Mandos.Client'
63
 
version = "1.7.1"
64
 
 
65
 
try:
66
 
    dbus.OBJECT_MANAGER_IFACE
67
 
except AttributeError:
68
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
63
version = "1.6.9"
69
64
 
70
65
def isoformat_to_datetime(iso):
71
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
110
105
        It updates the changed properties in the "properties" dict.
111
106
        """
112
107
        # Update properties dict with new value
113
 
        if interface == client_interface:
114
 
            self.properties.update(properties)
 
108
        self.properties.update(properties)
115
109
    
116
110
    def delete(self):
117
111
        self.property_changed_match.remove()
179
173
            gobject.source_remove(self._update_timer_callback_tag)
180
174
            self._update_timer_callback_tag = None
181
175
    
182
 
    def checker_completed(self, exitstatus, condition, command):
 
176
    def checker_completed(self, exitstatus, signal, command):
183
177
        if exitstatus == 0:
184
178
            self.logger('Checker for client {} (command "{}")'
185
179
                        ' succeeded'.format(self.properties["Name"],
187
181
            self.update()
188
182
            return
189
183
        # Checker failed
190
 
        if os.WIFEXITED(condition):
 
184
        if exitstatus >= 0:
191
185
            self.logger('Checker for client {} (command "{}") failed'
192
186
                        ' with exit code {}'
193
187
                        .format(self.properties["Name"], command,
194
 
                                os.WEXITSTATUS(condition)))
195
 
        elif os.WIFSIGNALED(condition):
 
188
                                exitstatus))
 
189
        elif signal != 0:
196
190
            self.logger('Checker for client {} (command "{}") was'
197
191
                        ' killed by signal {}'
198
192
                        .format(self.properties["Name"], command,
199
 
                                os.WTERMSIG(condition)))
 
193
                                signal))
 
194
        else:
 
195
            self.logger('Checker for client {} completed'
 
196
                        ' mysteriously'
 
197
                        .format(self.properties["Name"]))
200
198
        self.update()
201
199
    
202
200
    def checker_started(self, command):
335
333
        """Handle keys.
336
334
        This overrides the method from urwid.FlowWidget"""
337
335
        if key == "+":
338
 
            self.proxy.Set(client_interface, "Enabled",
339
 
                           dbus.Boolean(True), ignore_reply = True,
340
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
336
            self.proxy.Enable(dbus_interface = client_interface,
 
337
                              ignore_reply=True)
341
338
        elif key == "-":
342
 
            self.proxy.Set(client_interface, "Enabled", False,
343
 
                           ignore_reply = True,
344
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
339
            self.proxy.Disable(dbus_interface = client_interface,
 
340
                               ignore_reply=True)
345
341
        elif key == "a":
346
342
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
347
343
                               dbus_interface = client_interface,
355
351
                                                  .object_path,
356
352
                                                  ignore_reply=True)
357
353
        elif key == "s":
358
 
            self.proxy.Set(client_interface, "CheckerRunning",
359
 
                           dbus.Boolean(True), ignore_reply = True,
360
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
354
            self.proxy.StartChecker(dbus_interface = client_interface,
 
355
                                    ignore_reply=True)
361
356
        elif key == "S":
362
 
            self.proxy.Set(client_interface, "CheckerRunning",
363
 
                           dbus.Boolean(False), ignore_reply = True,
364
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
357
            self.proxy.StopChecker(dbus_interface = client_interface,
 
358
                                   ignore_reply=True)
365
359
        elif key == "C":
366
360
            self.proxy.CheckedOK(dbus_interface = client_interface,
367
361
                                 ignore_reply=True)
527
521
        self.log_message("Wrap mode: {}".format(self.log_wrap),
528
522
                         level=0)
529
523
    
530
 
    def find_and_remove_client(self, path, interfaces):
 
524
    def find_and_remove_client(self, path, name):
531
525
        """Find a client by its object path and remove it.
532
526
        
533
 
        This is connected to the InterfacesRemoved signal from the
 
527
        This is connected to the ClientRemoved signal from the
534
528
        Mandos server object."""
535
 
        if client_interface not in interfaces:
536
 
            # Not a Mandos client object; ignore
537
 
            return
538
529
        try:
539
530
            client = self.clients_dict[path]
540
531
        except KeyError:
541
532
            # not found?
542
 
            self.log_message("Unknown client {!r} removed"
543
 
                             .format(path))
 
533
            self.log_message("Unknown client {!r} ({!r}) removed"
 
534
                             .format(name, path))
544
535
            return
545
536
        client.delete()
546
537
    
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
 
538
    def add_new_client(self, path):
556
539
        client_proxy_object = self.bus.get_object(self.busname, path)
557
540
        self.add_client(MandosClientWidget(server_proxy_object
558
541
                                           =self.mandos_serv,
563
546
                                           delete_hook
564
547
                                           =self.remove_client,
565
548
                                           logger
566
 
                                           =self.log_message,
567
 
                                           properties
568
 
                                           = dict(ifs_and_props[
569
 
                                               client_interface])),
 
549
                                           =self.log_message),
570
550
                        path=path)
571
551
    
572
552
    def add_client(self, client, path=None):
607
587
            mandos_clients = dbus.Dictionary()
608
588
        
609
589
        (self.mandos_serv
610
 
         .connect_to_signal("InterfacesRemoved",
 
590
         .connect_to_signal("ClientRemoved",
611
591
                            self.find_and_remove_client,
612
 
                            dbus_interface
613
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
592
                            dbus_interface=server_interface,
614
593
                            byte_arrays=True))
615
594
        (self.mandos_serv
616
 
         .connect_to_signal("InterfacesAdded",
 
595
         .connect_to_signal("ClientAdded",
617
596
                            self.add_new_client,
618
 
                            dbus_interface
619
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
597
                            dbus_interface=server_interface,
620
598
                            byte_arrays=True))
621
599
        (self.mandos_serv
622
600
         .connect_to_signal("ClientNotFound",