/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-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

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"
64
65
 
65
66
logger = logging.Logger('mandos')
66
67
syslogger = logging.handlers.SysLogHandler\
70
71
                        ('Mandos: %(levelname)s: %(message)s'))
71
72
logger.addHandler(syslogger)
72
73
 
 
74
console = logging.StreamHandler()
 
75
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
76
                                       ' %(message)s'))
 
77
logger.addHandler(console)
73
78
 
74
79
class AvahiError(Exception):
75
80
    def __init__(self, value):
114
119
        self.domain = domain
115
120
        self.host = host
116
121
        self.rename_count = 0
 
122
        self.max_renames = max_renames
117
123
    def rename(self):
118
124
        """Derived from the Avahi example code"""
119
125
        if self.rename_count >= self.max_renames:
120
126
            logger.critical(u"No suitable service name found after %i"
121
127
                            u" retries, exiting.", rename_count)
122
128
            raise AvahiServiceError("Too many renames")
123
 
        name = server.GetAlternativeServiceName(name)
124
 
        logger.error(u"Changing name to %r ...", name)
 
129
        self.name = server.GetAlternativeServiceName(self.name)
 
130
        logger.info(u"Changing name to %r ...", str(self.name))
125
131
        syslogger.setFormatter(logging.Formatter\
126
132
                               ('Mandos (%s): %%(levelname)s:'
127
 
                               ' %%(message)s' % name))
 
133
                               ' %%(message)s' % self.name))
128
134
        self.remove()
129
135
        self.add()
130
136
        self.rename_count += 1
331
337
            try:
332
338
                logger.info(u"Starting checker %r for %s",
333
339
                            command, self.name)
 
340
                # We don't need to redirect stdout and stderr, since
 
341
                # in normal mode, that is already done by daemon(),
 
342
                # and in debug mode we don't want to.  (Stdin is
 
343
                # always replaced by /dev/null.)
334
344
                self.checker = subprocess.Popen(command,
335
345
                                                close_fds=True,
336
346
                                                shell=True, cwd="/")
337
347
                self.checker_callback_tag = gobject.child_watch_add\
338
348
                                            (self.checker.pid,
339
349
                                             self.checker_callback)
340
 
            except subprocess.OSError, error:
 
350
            except OSError, error:
341
351
                logger.error(u"Failed to start subprocess: %s",
342
352
                             error)
343
353
        # Re-run this periodically if run by gobject.timeout_add
557
567
    datetime.timedelta(1)
558
568
    >>> string_to_delta(u'1w')
559
569
    datetime.timedelta(7)
 
570
    >>> string_to_delta('5m 30s')
 
571
    datetime.timedelta(0, 330)
560
572
    """
561
 
    try:
562
 
        suffix=unicode(interval[-1])
563
 
        value=int(interval[:-1])
564
 
        if suffix == u"d":
565
 
            delta = datetime.timedelta(value)
566
 
        elif suffix == u"s":
567
 
            delta = datetime.timedelta(0, value)
568
 
        elif suffix == u"m":
569
 
            delta = datetime.timedelta(0, 0, 0, 0, value)
570
 
        elif suffix == u"h":
571
 
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
572
 
        elif suffix == u"w":
573
 
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
574
 
        else:
 
573
    timevalue = datetime.timedelta(0)
 
574
    for s in interval.split():
 
575
        try:
 
576
            suffix=unicode(s[-1])
 
577
            value=int(s[:-1])
 
578
            if suffix == u"d":
 
579
                delta = datetime.timedelta(value)
 
580
            elif suffix == u"s":
 
581
                delta = datetime.timedelta(0, value)
 
582
            elif suffix == u"m":
 
583
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
584
            elif suffix == u"h":
 
585
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
586
            elif suffix == u"w":
 
587
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
588
            else:
 
589
                raise ValueError
 
590
        except (ValueError, IndexError):
575
591
            raise ValueError
576
 
    except (ValueError, IndexError):
577
 
        raise ValueError
578
 
    return delta
 
592
        timevalue += delta
 
593
    return timevalue
579
594
 
580
595
 
581
596
def server_state_changed(state):
653
668
    global main_loop_started
654
669
    main_loop_started = False
655
670
    
656
 
    parser = OptionParser()
 
671
    parser = OptionParser(version = "%%prog %s" % version)
657
672
    parser.add_option("-i", "--interface", type="string",
658
673
                      metavar="IF", help="Bind to interface IF")
659
674
    parser.add_option("-a", "--address", type="string",
694
709
    server_config = ConfigParser.SafeConfigParser(server_defaults)
695
710
    del server_defaults
696
711
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
697
 
    server_section = "server"
698
712
    # Convert the SafeConfigParser object to a dict
699
 
    server_settings = dict(server_config.items(server_section))
 
713
    server_settings = server_config.defaults()
700
714
    # Use getboolean on the boolean config option
701
715
    server_settings["debug"] = server_config.getboolean\
702
 
                               (server_section, "debug")
 
716
                               ("DEFAULT", "debug")
703
717
    del server_config
704
718
    
705
719
    # Override the settings from the config file with command line
716
730
    
717
731
    if not debug:
718
732
        syslogger.setLevel(logging.WARNING)
 
733
        console.setLevel(logging.WARNING)
719
734
    
720
735
    if server_settings["servicename"] != "Mandos":
721
736
        syslogger.setFormatter(logging.Formatter\
726
741
    # Parse config file with clients
727
742
    client_defaults = { "timeout": "1h",
728
743
                        "interval": "5m",
729
 
                        "checker": "fping -q -- %%(host)s",
 
744
                        "checker": "fping -q -- %(host)s",
 
745
                        "host": "",
730
746
                        }
731
747
    client_config = ConfigParser.SafeConfigParser(client_defaults)
732
748
    client_config.read(os.path.join(server_settings["configdir"],
750
766
            avahi.DBUS_INTERFACE_SERVER )
751
767
    # End of Avahi example code
752
768
    
753
 
    if debug:
754
 
        console = logging.StreamHandler()
755
 
        # console.setLevel(logging.DEBUG)
756
 
        console.setFormatter(logging.Formatter\
757
 
                             ('%(levelname)s: %(message)s'))
758
 
        logger.addHandler(console)
759
 
        del console
760
 
    
761
769
    clients = Set()
762
770
    def remove_from_clients(client):
763
771
        clients.remove(client)
774
782
        logger.critical(u"No clients defined")
775
783
        sys.exit(1)
776
784
    
777
 
    if not debug:
 
785
    if debug:
 
786
        # Redirect stdin so all checkers get /dev/null
 
787
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
788
        os.dup2(null, sys.stdin.fileno())
 
789
        if null > 2:
 
790
            os.close(null)
 
791
    else:
 
792
        # No console logging
 
793
        logger.removeHandler(console)
 
794
        # Close all input and output, do double fork, etc.
778
795
        daemon()
779
796
    
780
797
    pidfilename = "/var/run/mandos/mandos.pid"