/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
71
71
                        ('Mandos: %(levelname)s: %(message)s'))
72
72
logger.addHandler(syslogger)
73
73
 
74
 
console = logging.StreamHandler()
75
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
76
 
                                       ' %(message)s'))
77
 
logger.addHandler(console)
78
74
 
79
75
class AvahiError(Exception):
80
76
    def __init__(self, value):
119
115
        self.domain = domain
120
116
        self.host = host
121
117
        self.rename_count = 0
122
 
        self.max_renames = max_renames
123
118
    def rename(self):
124
119
        """Derived from the Avahi example code"""
125
120
        if self.rename_count >= self.max_renames:
126
121
            logger.critical(u"No suitable service name found after %i"
127
122
                            u" retries, exiting.", rename_count)
128
123
            raise AvahiServiceError("Too many renames")
129
 
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
124
        name = server.GetAlternativeServiceName(name)
 
125
        logger.error(u"Changing name to %r ...", name)
131
126
        syslogger.setFormatter(logging.Formatter\
132
127
                               ('Mandos (%s): %%(levelname)s:'
133
 
                               ' %%(message)s' % self.name))
 
128
                               ' %%(message)s' % name))
134
129
        self.remove()
135
130
        self.add()
136
131
        self.rename_count += 1
337
332
            try:
338
333
                logger.info(u"Starting checker %r for %s",
339
334
                            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
335
                self.checker = subprocess.Popen(command,
345
336
                                                close_fds=True,
346
337
                                                shell=True, cwd="/")
347
338
                self.checker_callback_tag = gobject.child_watch_add\
348
339
                                            (self.checker.pid,
349
340
                                             self.checker_callback)
350
 
            except OSError, error:
 
341
            except subprocess.OSError, error:
351
342
                logger.error(u"Failed to start subprocess: %s",
352
343
                             error)
353
344
        # Re-run this periodically if run by gobject.timeout_add
410
401
    gnutls.library.functions.gnutls_openpgp_crt_import\
411
402
                    (crt, ctypes.byref(datum),
412
403
                     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
404
    # New buffer for the fingerprint
424
405
    buffer = ctypes.create_string_buffer(20)
425
406
    buffer_length = ctypes.c_size_t()
577
558
    datetime.timedelta(1)
578
559
    >>> string_to_delta(u'1w')
579
560
    datetime.timedelta(7)
580
 
    >>> string_to_delta('5m 30s')
581
 
    datetime.timedelta(0, 330)
582
561
    """
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):
 
562
    try:
 
563
        suffix=unicode(interval[-1])
 
564
        value=int(interval[:-1])
 
565
        if suffix == u"d":
 
566
            delta = datetime.timedelta(value)
 
567
        elif suffix == u"s":
 
568
            delta = datetime.timedelta(0, value)
 
569
        elif suffix == u"m":
 
570
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
571
        elif suffix == u"h":
 
572
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
573
        elif suffix == u"w":
 
574
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
575
        else:
601
576
            raise ValueError
602
 
        timevalue += delta
603
 
    return timevalue
 
577
    except (ValueError, IndexError):
 
578
        raise ValueError
 
579
    return delta
604
580
 
605
581
 
606
582
def server_state_changed(state):
678
654
    global main_loop_started
679
655
    main_loop_started = False
680
656
    
681
 
    parser = OptionParser(version = "%%prog %s" % version)
 
657
    parser = OptionParser(version = "Mandos server %s" % version)
682
658
    parser.add_option("-i", "--interface", type="string",
683
659
                      metavar="IF", help="Bind to interface IF")
684
660
    parser.add_option("-a", "--address", type="string",
719
695
    server_config = ConfigParser.SafeConfigParser(server_defaults)
720
696
    del server_defaults
721
697
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
698
    server_section = "server"
722
699
    # Convert the SafeConfigParser object to a dict
723
 
    server_settings = server_config.defaults()
 
700
    server_settings = dict(server_config.items(server_section))
724
701
    # Use getboolean on the boolean config option
725
702
    server_settings["debug"] = server_config.getboolean\
726
 
                               ("DEFAULT", "debug")
 
703
                               (server_section, "debug")
727
704
    del server_config
728
705
    
729
706
    # Override the settings from the config file with command line
740
717
    
741
718
    if not debug:
742
719
        syslogger.setLevel(logging.WARNING)
743
 
        console.setLevel(logging.WARNING)
744
720
    
745
721
    if server_settings["servicename"] != "Mandos":
746
722
        syslogger.setFormatter(logging.Formatter\
751
727
    # Parse config file with clients
752
728
    client_defaults = { "timeout": "1h",
753
729
                        "interval": "5m",
754
 
                        "checker": "fping -q -- %(host)s",
755
 
                        "host": "",
 
730
                        "checker": "fping -q -- %%(host)s",
756
731
                        }
757
732
    client_config = ConfigParser.SafeConfigParser(client_defaults)
758
733
    client_config.read(os.path.join(server_settings["configdir"],
776
751
            avahi.DBUS_INTERFACE_SERVER )
777
752
    # End of Avahi example code
778
753
    
 
754
    if debug:
 
755
        console = logging.StreamHandler()
 
756
        # console.setLevel(logging.DEBUG)
 
757
        console.setFormatter(logging.Formatter\
 
758
                             ('%(levelname)s: %(message)s'))
 
759
        logger.addHandler(console)
 
760
        del console
 
761
    
779
762
    clients = Set()
780
763
    def remove_from_clients(client):
781
764
        clients.remove(client)
792
775
        logger.critical(u"No clients defined")
793
776
        sys.exit(1)
794
777
    
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
803
 
        logger.removeHandler(console)
804
 
        # Close all input and output, do double fork, etc.
 
778
    if not debug:
805
779
        daemon()
806
780
    
807
781
    pidfilename = "/var/run/mandos/mandos.pid"