/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

Fixed fallback on error in mandos-client
fixed a bug in password-request

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
337
336
            try:
338
337
                logger.info(u"Starting checker %r for %s",
339
338
                            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.)
344
339
                self.checker = subprocess.Popen(command,
345
340
                                                close_fds=True,
346
341
                                                shell=True, cwd="/")
347
342
                self.checker_callback_tag = gobject.child_watch_add\
348
343
                                            (self.checker.pid,
349
344
                                             self.checker_callback)
350
 
            except OSError, error:
 
345
            except subprocess.OSError, error:
351
346
                logger.error(u"Failed to start subprocess: %s",
352
347
                             error)
353
348
        # Re-run this periodically if run by gobject.timeout_add
410
405
    gnutls.library.functions.gnutls_openpgp_crt_import\
411
406
                    (crt, ctypes.byref(datum),
412
407
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
413
 
    # Verify the self signature in the key
414
 
    crtverify = ctypes.c_uint();
415
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
416
 
        (crt, ctypes.c_uint(0), ctypes.byref(crtverify))
417
 
    if crtverify.value != 0:
418
 
        tmp = open("/tmp/tmp.gpg", "w")
419
 
        tmp.write(openpgp)
420
 
        tmp.close()
421
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
422
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
423
408
    # New buffer for the fingerprint
424
409
    buffer = ctypes.create_string_buffer(20)
425
410
    buffer_length = ctypes.c_size_t()
577
562
    datetime.timedelta(1)
578
563
    >>> string_to_delta(u'1w')
579
564
    datetime.timedelta(7)
580
 
    >>> string_to_delta('5m 30s')
581
 
    datetime.timedelta(0, 330)
582
565
    """
583
 
    timevalue = datetime.timedelta(0)
584
 
    for s in interval.split():
585
 
        try:
586
 
            suffix=unicode(s[-1])
587
 
            value=int(s[:-1])
588
 
            if suffix == u"d":
589
 
                delta = datetime.timedelta(value)
590
 
            elif suffix == u"s":
591
 
                delta = datetime.timedelta(0, value)
592
 
            elif suffix == u"m":
593
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
594
 
            elif suffix == u"h":
595
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
596
 
            elif suffix == u"w":
597
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
598
 
            else:
599
 
                raise ValueError
600
 
        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:
601
580
            raise ValueError
602
 
        timevalue += delta
603
 
    return timevalue
 
581
    except (ValueError, IndexError):
 
582
        raise ValueError
 
583
    return delta
604
584
 
605
585
 
606
586
def server_state_changed(state):
719
699
    server_config = ConfigParser.SafeConfigParser(server_defaults)
720
700
    del server_defaults
721
701
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
702
    server_section = "server"
722
703
    # Convert the SafeConfigParser object to a dict
723
 
    server_settings = server_config.defaults()
 
704
    server_settings = dict(server_config.items(server_section))
724
705
    # Use getboolean on the boolean config option
725
706
    server_settings["debug"] = server_config.getboolean\
726
 
                               ("DEFAULT", "debug")
 
707
                               (server_section, "debug")
727
708
    del server_config
728
709
    
729
710
    # Override the settings from the config file with command line
751
732
    # Parse config file with clients
752
733
    client_defaults = { "timeout": "1h",
753
734
                        "interval": "5m",
754
 
                        "checker": "fping -q -- %(host)s",
755
 
                        "host": "",
 
735
                        "checker": "fping -q -- %%(host)s",
756
736
                        }
757
737
    client_config = ConfigParser.SafeConfigParser(client_defaults)
758
738
    client_config.read(os.path.join(server_settings["configdir"],
792
772
        logger.critical(u"No clients defined")
793
773
        sys.exit(1)
794
774
    
795
 
    if debug:
796
 
        # Redirect stdin so all checkers get /dev/null
797
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
798
 
        os.dup2(null, sys.stdin.fileno())
799
 
        if null > 2:
800
 
            os.close(null)
801
 
    else:
802
 
        # No console logging
 
775
    if not debug:
803
776
        logger.removeHandler(console)
804
 
        # Close all input and output, do double fork, etc.
805
777
        daemon()
806
778
    
807
779
    pidfilename = "/var/run/mandos/mandos.pid"