/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 15:56:13 UTC
  • mfrom: (24.1.29 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080809155613-pm1o10yh44nafc0g
Merge.

Show diffs side-by-side

added added

removed removed

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