/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

  • Committer: Teddy Hogeborn
  • Date: 2008-08-09 01:39:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080809013909-n3i3ll1voycmmw7l
* clients.conf: Better comments.
  (foo): Commented out and changed into a better example client.
  (braxen_client): Removed.
  (bar): New commented-out example client.

* mandos: Changed all log messages to be unicode strings.
  (Client.fqdn): Renamed to "host".  All users and documentation
                 changed.
  (main): Exit immediately if no clients are defined.

* mandos.conf: Better comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
61
61
from dbus.mainloop.glib import DBusGMainLoop
62
62
import ctypes
63
63
 
64
 
version = "1.0"
65
64
 
66
65
logger = logging.Logger('mandos')
67
66
syslogger = logging.handlers.SysLogHandler\
68
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
69
 
             address = "/dev/log")
 
67
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
70
68
syslogger.setFormatter(logging.Formatter\
71
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
69
                        ('%(levelname)s: %(message)s'))
72
70
logger.addHandler(syslogger)
 
71
del syslogger
73
72
 
74
 
console = logging.StreamHandler()
75
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
76
 
                                       ' %(message)s'))
77
 
logger.addHandler(console)
78
73
 
79
74
class AvahiError(Exception):
80
75
    def __init__(self, value):
107
102
    """
108
103
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
109
104
                 type = None, port = None, TXT = None, domain = "",
110
 
                 host = "", max_renames = 32768):
 
105
                 host = "", max_renames = 12):
111
106
        self.interface = interface
112
107
        self.name = name
113
108
        self.type = type
119
114
        self.domain = domain
120
115
        self.host = host
121
116
        self.rename_count = 0
122
 
        self.max_renames = max_renames
123
117
    def rename(self):
124
118
        """Derived from the Avahi example code"""
125
119
        if self.rename_count >= self.max_renames:
126
120
            logger.critical(u"No suitable service name found after %i"
127
121
                            u" retries, exiting.", rename_count)
128
122
            raise AvahiServiceError("Too many renames")
129
 
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
131
 
        syslogger.setFormatter(logging.Formatter\
132
 
                               ('Mandos (%s): %%(levelname)s:'
133
 
                               ' %%(message)s' % self.name))
 
123
        name = server.GetAlternativeServiceName(name)
 
124
        logger.error(u"Changing name to %r ...", name)
134
125
        self.remove()
135
126
        self.add()
136
127
        self.rename_count += 1
659
650
    global main_loop_started
660
651
    main_loop_started = False
661
652
    
662
 
    parser = OptionParser(version = "%%prog %s" % version)
 
653
    parser = OptionParser()
663
654
    parser.add_option("-i", "--interface", type="string",
664
655
                      metavar="IF", help="Bind to interface IF")
665
656
    parser.add_option("-a", "--address", type="string",
700
691
    server_config = ConfigParser.SafeConfigParser(server_defaults)
701
692
    del server_defaults
702
693
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
694
    server_section = "server"
703
695
    # Convert the SafeConfigParser object to a dict
704
 
    server_settings = server_config.defaults()
 
696
    server_settings = dict(server_config.items(server_section))
705
697
    # Use getboolean on the boolean config option
706
698
    server_settings["debug"] = server_config.getboolean\
707
 
                               ("DEFAULT", "debug")
 
699
                               (server_section, "debug")
708
700
    del server_config
709
701
    
710
702
    # Override the settings from the config file with command line
717
709
    del options
718
710
    # Now we have our good server settings in "server_settings"
719
711
    
720
 
    debug = server_settings["debug"]
721
 
    
722
 
    if not debug:
723
 
        syslogger.setLevel(logging.WARNING)
724
 
        console.setLevel(logging.WARNING)
725
 
    
726
 
    if server_settings["servicename"] != "Mandos":
727
 
        syslogger.setFormatter(logging.Formatter\
728
 
                               ('Mandos (%s): %%(levelname)s:'
729
 
                                ' %%(message)s'
730
 
                                % server_settings["servicename"]))
731
 
    
732
712
    # Parse config file with clients
733
713
    client_defaults = { "timeout": "1h",
734
714
                        "interval": "5m",
756
736
            avahi.DBUS_INTERFACE_SERVER )
757
737
    # End of Avahi example code
758
738
    
 
739
    debug = server_settings["debug"]
 
740
    
 
741
    if debug:
 
742
        console = logging.StreamHandler()
 
743
        # console.setLevel(logging.DEBUG)
 
744
        console.setFormatter(logging.Formatter\
 
745
                             ('%(levelname)s: %(message)s'))
 
746
        logger.addHandler(console)
 
747
        del console
 
748
    
759
749
    clients = Set()
760
750
    def remove_from_clients(client):
761
751
        clients.remove(client)
773
763
        sys.exit(1)
774
764
    
775
765
    if not debug:
776
 
        logger.removeHandler(console)
777
766
        daemon()
778
767
    
779
768
    pidfilename = "/var/run/mandos/mandos.pid"