/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-12 06:46:11 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080812064611-7wfjg391ypmff085
* mandos-keygen: New program to generate new client keys on
                 installation.

* Makefile (all): No longer build documentation.
  (doc): New; build documentation.
  (maintainer-clean): Remove build-local client keydir.
  (run-client): Make build-local keydir with keys.
  (run-server): Do not depend on "all".
  (install, install-server, install-client, uninstall,
  uninstall-server, uninstall-client, purge, purge-server,
  purge-client): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
119
119
        self.domain = domain
120
120
        self.host = host
121
121
        self.rename_count = 0
122
 
        self.max_renames = max_renames
123
122
    def rename(self):
124
123
        """Derived from the Avahi example code"""
125
124
        if self.rename_count >= self.max_renames:
126
125
            logger.critical(u"No suitable service name found after %i"
127
126
                            u" retries, exiting.", rename_count)
128
127
            raise AvahiServiceError("Too many renames")
129
 
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
128
        name = server.GetAlternativeServiceName(name)
 
129
        logger.error(u"Changing name to %r ...", name)
131
130
        syslogger.setFormatter(logging.Formatter\
132
131
                               ('Mandos (%s): %%(levelname)s:'
133
 
                               ' %%(message)s' % self.name))
 
132
                               ' %%(message)s' % name))
134
133
        self.remove()
135
134
        self.add()
136
135
        self.rename_count += 1
563
562
    datetime.timedelta(1)
564
563
    >>> string_to_delta(u'1w')
565
564
    datetime.timedelta(7)
566
 
    >>> string_to_delta('5m 30s')
567
 
    datetime.timedelta(0, 330)
568
565
    """
569
 
    timevalue = datetime.timedelta(0)
570
 
    for s in interval.split():
571
 
        try:
572
 
            suffix=unicode(s[-1])
573
 
            value=int(s[:-1])
574
 
            if suffix == u"d":
575
 
                delta = datetime.timedelta(value)
576
 
            elif suffix == u"s":
577
 
                delta = datetime.timedelta(0, value)
578
 
            elif suffix == u"m":
579
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
580
 
            elif suffix == u"h":
581
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
582
 
            elif suffix == u"w":
583
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
584
 
            else:
585
 
                raise ValueError
586
 
        except (ValueError, IndexError):
 
566
    try:
 
567
        suffix=unicode(interval[-1])
 
568
        value=int(interval[:-1])
 
569
        if suffix == u"d":
 
570
            delta = datetime.timedelta(value)
 
571
        elif suffix == u"s":
 
572
            delta = datetime.timedelta(0, value)
 
573
        elif suffix == u"m":
 
574
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
575
        elif suffix == u"h":
 
576
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
577
        elif suffix == u"w":
 
578
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
579
        else:
587
580
            raise ValueError
588
 
        timevalue += delta
589
 
    return timevalue
 
581
    except (ValueError, IndexError):
 
582
        raise ValueError
 
583
    return delta
590
584
 
591
585
 
592
586
def server_state_changed(state):
705
699
    server_config = ConfigParser.SafeConfigParser(server_defaults)
706
700
    del server_defaults
707
701
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
702
    server_section = "server"
708
703
    # Convert the SafeConfigParser object to a dict
709
 
    server_settings = server_config.defaults()
 
704
    server_settings = dict(server_config.items(server_section))
710
705
    # Use getboolean on the boolean config option
711
706
    server_settings["debug"] = server_config.getboolean\
712
 
                               ("DEFAULT", "debug")
 
707
                               (server_section, "debug")
713
708
    del server_config
714
709
    
715
710
    # Override the settings from the config file with command line
738
733
    client_defaults = { "timeout": "1h",
739
734
                        "interval": "5m",
740
735
                        "checker": "fping -q -- %%(host)s",
741
 
                        "host": "",
742
736
                        }
743
737
    client_config = ConfigParser.SafeConfigParser(client_defaults)
744
738
    client_config.read(os.path.join(server_settings["configdir"],