/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: 2014-10-05 20:08:58 UTC
  • mto: This revision was merged to the branch mainline in revision 736.
  • Revision ID: teddy@recompile.se-20141005200858-uw6lfgqq8lod1edf
Tags: version-1.6.9-1
http://bugs.debian.org/762349
* Makefile (version): Changed to "1.6.9".
* NEWS (Version 1.6.9): New entry.
* debian/changelog (1.6.9-1): - '' -

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-2016 Teddy Hogeborn
7
 
# Copyright © 2009-2016 Björn Påhlsson
 
6
# Copyright © 2009-2014 Teddy Hogeborn
 
7
# Copyright © 2009-2014 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
60
60
domain = 'se.recompile'
61
61
server_interface = domain + '.Mandos'
62
62
client_interface = domain + '.Mandos.Client'
63
 
version = "1.7.2"
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()
197
191
                        ' killed by signal {}'
198
192
                        .format(self.properties["Name"], command,
199
193
                                os.WTERMSIG(condition)))
 
194
        elif os.WCOREDUMP(condition):
 
195
            self.logger('Checker for client {} (command "{}") dumped'
 
196
                        ' core'.format(self.properties["Name"],
 
197
                                       command))
 
198
        else:
 
199
            self.logger('Checker for client {} completed'
 
200
                        ' mysteriously'
 
201
                        .format(self.properties["Name"]))
200
202
        self.update()
201
203
    
202
204
    def checker_started(self, command):
335
337
        """Handle keys.
336
338
        This overrides the method from urwid.FlowWidget"""
337
339
        if key == "+":
338
 
            self.proxy.Set(client_interface, "Enabled",
339
 
                           dbus.Boolean(True), ignore_reply = True,
340
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
340
            self.proxy.Enable(dbus_interface = client_interface,
 
341
                              ignore_reply=True)
341
342
        elif key == "-":
342
 
            self.proxy.Set(client_interface, "Enabled", False,
343
 
                           ignore_reply = True,
344
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
343
            self.proxy.Disable(dbus_interface = client_interface,
 
344
                               ignore_reply=True)
345
345
        elif key == "a":
346
346
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
347
347
                               dbus_interface = client_interface,
355
355
                                                  .object_path,
356
356
                                                  ignore_reply=True)
357
357
        elif key == "s":
358
 
            self.proxy.Set(client_interface, "CheckerRunning",
359
 
                           dbus.Boolean(True), ignore_reply = True,
360
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
358
            self.proxy.StartChecker(dbus_interface = client_interface,
 
359
                                    ignore_reply=True)
361
360
        elif key == "S":
362
 
            self.proxy.Set(client_interface, "CheckerRunning",
363
 
                           dbus.Boolean(False), ignore_reply = True,
364
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
361
            self.proxy.StopChecker(dbus_interface = client_interface,
 
362
                                   ignore_reply=True)
365
363
        elif key == "C":
366
364
            self.proxy.CheckedOK(dbus_interface = client_interface,
367
365
                                 ignore_reply=True)
527
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
528
526
                         level=0)
529
527
    
530
 
    def find_and_remove_client(self, path, interfaces):
 
528
    def find_and_remove_client(self, path, name):
531
529
        """Find a client by its object path and remove it.
532
530
        
533
 
        This is connected to the InterfacesRemoved signal from the
 
531
        This is connected to the ClientRemoved signal from the
534
532
        Mandos server object."""
535
 
        if client_interface not in interfaces:
536
 
            # Not a Mandos client object; ignore
537
 
            return
538
533
        try:
539
534
            client = self.clients_dict[path]
540
535
        except KeyError:
541
536
            # not found?
542
 
            self.log_message("Unknown client {!r} removed"
543
 
                             .format(path))
 
537
            self.log_message("Unknown client {!r} ({!r}) removed"
 
538
                             .format(name, path))
544
539
            return
545
540
        client.delete()
546
541
    
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
 
542
    def add_new_client(self, path):
556
543
        client_proxy_object = self.bus.get_object(self.busname, path)
557
544
        self.add_client(MandosClientWidget(server_proxy_object
558
545
                                           =self.mandos_serv,
563
550
                                           delete_hook
564
551
                                           =self.remove_client,
565
552
                                           logger
566
 
                                           =self.log_message,
567
 
                                           properties
568
 
                                           = dict(ifs_and_props[
569
 
                                               client_interface])),
 
553
                                           =self.log_message),
570
554
                        path=path)
571
555
    
572
556
    def add_client(self, client, path=None):
607
591
            mandos_clients = dbus.Dictionary()
608
592
        
609
593
        (self.mandos_serv
610
 
         .connect_to_signal("InterfacesRemoved",
 
594
         .connect_to_signal("ClientRemoved",
611
595
                            self.find_and_remove_client,
612
 
                            dbus_interface
613
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
596
                            dbus_interface=server_interface,
614
597
                            byte_arrays=True))
615
598
        (self.mandos_serv
616
 
         .connect_to_signal("InterfacesAdded",
 
599
         .connect_to_signal("ClientAdded",
617
600
                            self.add_new_client,
618
 
                            dbus_interface
619
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
601
                            dbus_interface=server_interface,
620
602
                            byte_arrays=True))
621
603
        (self.mandos_serv
622
604
         .connect_to_signal("ClientNotFound",