/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 at recompile
  • Date: 2011-12-27 03:56:39 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111227035639-hvvgrqchckawlg02
Add wireless network hook

* network-hooks.s/bridge: Use canonical syntax for "ip" command.
* network-hooks.s/wireless: New.
* network-hooks.s/wireless.conf: - '' -
* plugins.d/mandos-client.c (run_network_hooks): Add new "CONNECT"
                                                 environment variable.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            "CONNECT"
                                                            environment
                                                            variable.

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-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
52
52
domain = 'se.recompile'
53
53
server_interface = domain + '.Mandos'
54
54
client_interface = domain + '.Mandos.Client'
55
 
version = "1.5.2"
 
55
version = "1.4.1"
56
56
 
57
57
# Always run in monochrome mode
58
58
urwid.curses_display.curses.has_colors = lambda : False
242
242
        self.update()
243
243
    
244
244
    def checker_started(self, command):
245
 
        """Server signals that a checker started. This could be useful
246
 
           to log in the future. """
247
245
        #self.logger('Client %s started checker "%s"'
248
246
        #            % (self.properties["Name"], unicode(command)))
249
247
        pass
499
497
        
500
498
        self.busname = domain + '.Mandos'
501
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)
502
542
    
503
543
    def client_not_found(self, fingerprint, address):
504
544
        self.log_message(("Client with address %s and fingerprint %s"
519
559
                                                     self.divider)))
520
560
        if self.log_visible:
521
561
            self.uilist.append(self.logbox)
 
562
            pass
522
563
        self.topwidget = urwid.Pile(self.uilist)
523
564
    
524
565
    def log_message(self, message):
608
649
    
609
650
    def run(self):
610
651
        """Start the main loop and exit when it's done."""
611
 
        self.bus = dbus.SystemBus()
612
 
        mandos_dbus_objc = self.bus.get_object(
613
 
            self.busname, "/", follow_name_owner_changes=True)
614
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
615
 
                                          dbus_interface
616
 
                                          = server_interface)
617
 
        try:
618
 
            mandos_clients = (self.mandos_serv
619
 
                              .GetAllClientsWithProperties())
620
 
        except dbus.exceptions.DBusException:
621
 
            mandos_clients = dbus.Dictionary()
622
 
        
623
 
        (self.mandos_serv
624
 
         .connect_to_signal("ClientRemoved",
625
 
                            self.find_and_remove_client,
626
 
                            dbus_interface=server_interface,
627
 
                            byte_arrays=True))
628
 
        (self.mandos_serv
629
 
         .connect_to_signal("ClientAdded",
630
 
                            self.add_new_client,
631
 
                            dbus_interface=server_interface,
632
 
                            byte_arrays=True))
633
 
        (self.mandos_serv
634
 
         .connect_to_signal("ClientNotFound",
635
 
                            self.client_not_found,
636
 
                            dbus_interface=server_interface,
637
 
                            byte_arrays=True))
638
 
        for path, client in mandos_clients.iteritems():
639
 
            client_proxy_object = self.bus.get_object(self.busname,
640
 
                                                      path)
641
 
            self.add_client(MandosClientWidget(server_proxy_object
642
 
                                               =self.mandos_serv,
643
 
                                               proxy_object
644
 
                                               =client_proxy_object,
645
 
                                               properties=client,
646
 
                                               update_hook
647
 
                                               =self.refresh,
648
 
                                               delete_hook
649
 
                                               =self.remove_client,
650
 
                                               logger
651
 
                                               =self.log_message),
652
 
                            path=path)
653
 
 
654
652
        self.refresh()
655
653
        self._input_callback_tag = (gobject.io_add_watch
656
654
                                    (sys.stdin.fileno(),