/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

merge

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
73
 
75
74
class AvahiError(Exception):
103
102
    """
104
103
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
105
104
                 type = None, port = None, TXT = None, domain = "",
106
 
                 host = "", max_renames = 32768):
 
105
                 host = "", max_renames = 12):
107
106
        self.interface = interface
108
107
        self.name = name
109
108
        self.type = type
123
122
            raise AvahiServiceError("Too many renames")
124
123
        name = server.GetAlternativeServiceName(name)
125
124
        logger.error(u"Changing name to %r ...", name)
126
 
        syslogger.setFormatter(logging.Formatter\
127
 
                               ('Mandos (%s): %%(levelname)s:'
128
 
                               ' %%(message)s' % name))
129
125
        self.remove()
130
126
        self.add()
131
127
        self.rename_count += 1
167
163
    fingerprint: string (40 or 32 hexadecimal digits); used to
168
164
                 uniquely identify the client
169
165
    secret:    bytestring; sent verbatim (over TLS) to client
170
 
    host:      string; available for use by the checker command
 
166
    fqdn:      string (FQDN); available for use by the checker command
171
167
    created:   datetime.datetime(); object creation, not client host
172
168
    last_checked_ok: datetime.datetime() or None if not yet checked OK
173
169
    timeout:   datetime.timedelta(); How long from last_checked_ok
234
230
        else:
235
231
            raise TypeError(u"No secret or secfile for client %s"
236
232
                            % self.name)
237
 
        self.host = config.get("host", "")
 
233
        self.fqdn = config.get("fqdn", "")
238
234
        self.created = datetime.datetime.now()
239
235
        self.last_checked_ok = None
240
236
        self.timeout = string_to_delta(config["timeout"])
263
259
        The possibility that a client might be restarted is left open,
264
260
        but not currently used."""
265
261
        # If this client doesn't have a secret, it is already stopped.
266
 
        if hasattr(self, "secret") and self.secret:
 
262
        if self.secret:
267
263
            logger.info(u"Stopping client %s", self.name)
268
264
            self.secret = None
269
265
        else:
317
313
        if self.checker is None:
318
314
            try:
319
315
                # In case check_command has exactly one % operator
320
 
                command = self.check_command % self.host
 
316
                command = self.check_command % self.fqdn
321
317
            except TypeError:
322
318
                # Escape attributes for the shell
323
319
                escaped_attrs = dict((key, re.escape(str(val)))
350
346
            self.checker_callback_tag = None
351
347
        if getattr(self, "checker", None) is None:
352
348
            return
353
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
349
        logger.debug("Stopping checker for %(name)s", vars(self))
354
350
        try:
355
351
            os.kill(self.checker.pid, signal.SIGTERM)
356
352
            #os.sleep(0.5)
532
528
                in6addr_any = "::"
533
529
                self.server_address = (in6addr_any,
534
530
                                       self.server_address[1])
535
 
            elif not self.server_address[1]:
 
531
            elif self.server_address[1] is None:
536
532
                self.server_address = (self.server_address[0],
537
533
                                       0)
538
 
#                 if self.settings["interface"]:
539
 
#                     self.server_address = (self.server_address[0],
540
 
#                                            0, # port
541
 
#                                            0, # flowinfo
542
 
#                                            if_nametoindex
543
 
#                                            (self.settings
544
 
#                                             ["interface"]))
545
534
            return super(type(self), self).server_bind()
546
535
 
547
536
 
654
643
    global main_loop_started
655
644
    main_loop_started = False
656
645
    
657
 
    parser = OptionParser(version = "Mandos server %s" % version)
 
646
    parser = OptionParser()
658
647
    parser.add_option("-i", "--interface", type="string",
659
648
                      metavar="IF", help="Bind to interface IF")
660
649
    parser.add_option("-a", "--address", type="string",
663
652
                      help="Port number to receive requests on")
664
653
    parser.add_option("--check", action="store_true", default=False,
665
654
                      help="Run self-test")
666
 
    parser.add_option("--debug", action="store_true",
 
655
    parser.add_option("--debug", action="store_true", default=False,
667
656
                      help="Debug mode; run in foreground and log to"
668
657
                      " terminal")
669
658
    parser.add_option("--priority", type="string", help="GnuTLS"
713
702
    del options
714
703
    # Now we have our good server settings in "server_settings"
715
704
    
716
 
    debug = server_settings["debug"]
717
 
    
718
 
    if not debug:
719
 
        syslogger.setLevel(logging.WARNING)
720
 
    
721
 
    if server_settings["servicename"] != "Mandos":
722
 
        syslogger.setFormatter(logging.Formatter\
723
 
                               ('Mandos (%s): %%(levelname)s:'
724
 
                                ' %%(message)s'
725
 
                                % server_settings["servicename"]))
726
 
    
727
705
    # Parse config file with clients
728
706
    client_defaults = { "timeout": "1h",
729
707
                        "interval": "5m",
730
 
                        "checker": "fping -q -- %%(host)s",
 
708
                        "checker": "fping -q -- %%(fqdn)s",
731
709
                        }
732
710
    client_config = ConfigParser.SafeConfigParser(client_defaults)
733
711
    client_config.read(os.path.join(server_settings["configdir"],
751
729
            avahi.DBUS_INTERFACE_SERVER )
752
730
    # End of Avahi example code
753
731
    
 
732
    debug = server_settings["debug"]
 
733
    
754
734
    if debug:
755
735
        console = logging.StreamHandler()
756
736
        # console.setLevel(logging.DEBUG)
771
751
                              config
772
752
                              = dict(client_config.items(section)))
773
753
                       for section in client_config.sections()))
774
 
    if not clients:
775
 
        logger.critical(u"No clients defined")
776
 
        sys.exit(1)
777
754
    
778
755
    if not debug:
779
756
        daemon()
780
757
    
781
 
    pidfilename = "/var/run/mandos/mandos.pid"
782
 
    pid = os.getpid()
783
 
    try:
784
 
        pidfile = open(pidfilename, "w")
785
 
        pidfile.write(str(pid) + "\n")
786
 
        pidfile.close()
787
 
        del pidfile
788
 
    except IOError, err:
789
 
        logger.error(u"Could not write %s file with PID %d",
790
 
                     pidfilename, os.getpid())
791
 
    
792
758
    def cleanup():
793
759
        "Cleanup function; run on exit"
794
760
        global group
840
806
                             tcp_server.handle_request\
841
807
                             (*args[2:], **kwargs) or True)
842
808
        
843
 
        logger.debug(u"Starting main loop")
 
809
        logger.debug("Starting main loop")
844
810
        main_loop_started = True
845
811
        main_loop.run()
846
812
    except AvahiError, error: