/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
61
61
from dbus.mainloop.glib import DBusGMainLoop
62
62
import ctypes
63
63
 
64
 
version = "1.0"
65
64
 
66
65
logger = logging.Logger('mandos')
67
66
syslogger = logging.handlers.SysLogHandler\
71
70
                        ('Mandos: %(levelname)s: %(message)s'))
72
71
logger.addHandler(syslogger)
73
72
 
74
 
console = logging.StreamHandler()
75
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
76
 
                                       ' %(message)s'))
77
 
logger.addHandler(console)
78
73
 
79
74
class AvahiError(Exception):
80
75
    def __init__(self, value):
119
114
        self.domain = domain
120
115
        self.host = host
121
116
        self.rename_count = 0
122
 
        self.max_renames = max_renames
123
117
    def rename(self):
124
118
        """Derived from the Avahi example code"""
125
119
        if self.rename_count >= self.max_renames:
126
120
            logger.critical(u"No suitable service name found after %i"
127
121
                            u" retries, exiting.", rename_count)
128
122
            raise AvahiServiceError("Too many renames")
129
 
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
123
        name = server.GetAlternativeServiceName(name)
 
124
        logger.error(u"Changing name to %r ...", name)
131
125
        syslogger.setFormatter(logging.Formatter\
132
126
                               ('Mandos (%s): %%(levelname)s:'
133
 
                               ' %%(message)s' % self.name))
 
127
                               ' %%(message)s' % name))
134
128
        self.remove()
135
129
        self.add()
136
130
        self.rename_count += 1
337
331
            try:
338
332
                logger.info(u"Starting checker %r for %s",
339
333
                            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
334
                self.checker = subprocess.Popen(command,
345
335
                                                close_fds=True,
346
336
                                                shell=True, cwd="/")
347
337
                self.checker_callback_tag = gobject.child_watch_add\
348
338
                                            (self.checker.pid,
349
339
                                             self.checker_callback)
350
 
            except OSError, error:
 
340
            except subprocess.OSError, error:
351
341
                logger.error(u"Failed to start subprocess: %s",
352
342
                             error)
353
343
        # Re-run this periodically if run by gobject.timeout_add
410
400
    gnutls.library.functions.gnutls_openpgp_crt_import\
411
401
                    (crt, ctypes.byref(datum),
412
402
                     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
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
419
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
420
403
    # New buffer for the fingerprint
421
404
    buffer = ctypes.create_string_buffer(20)
422
405
    buffer_length = ctypes.c_size_t()
574
557
    datetime.timedelta(1)
575
558
    >>> string_to_delta(u'1w')
576
559
    datetime.timedelta(7)
577
 
    >>> string_to_delta('5m 30s')
578
 
    datetime.timedelta(0, 330)
579
560
    """
580
 
    timevalue = datetime.timedelta(0)
581
 
    for s in interval.split():
582
 
        try:
583
 
            suffix=unicode(s[-1])
584
 
            value=int(s[:-1])
585
 
            if suffix == u"d":
586
 
                delta = datetime.timedelta(value)
587
 
            elif suffix == u"s":
588
 
                delta = datetime.timedelta(0, value)
589
 
            elif suffix == u"m":
590
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
591
 
            elif suffix == u"h":
592
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
593
 
            elif suffix == u"w":
594
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
595
 
            else:
596
 
                raise ValueError
597
 
        except (ValueError, IndexError):
 
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:
598
575
            raise ValueError
599
 
        timevalue += delta
600
 
    return timevalue
 
576
    except (ValueError, IndexError):
 
577
        raise ValueError
 
578
    return delta
601
579
 
602
580
 
603
581
def server_state_changed(state):
675
653
    global main_loop_started
676
654
    main_loop_started = False
677
655
    
678
 
    parser = OptionParser(version = "%%prog %s" % version)
 
656
    parser = OptionParser()
679
657
    parser.add_option("-i", "--interface", type="string",
680
658
                      metavar="IF", help="Bind to interface IF")
681
659
    parser.add_option("-a", "--address", type="string",
716
694
    server_config = ConfigParser.SafeConfigParser(server_defaults)
717
695
    del server_defaults
718
696
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
697
    server_section = "server"
719
698
    # Convert the SafeConfigParser object to a dict
720
 
    server_settings = server_config.defaults()
 
699
    server_settings = dict(server_config.items(server_section))
721
700
    # Use getboolean on the boolean config option
722
701
    server_settings["debug"] = server_config.getboolean\
723
 
                               ("DEFAULT", "debug")
 
702
                               (server_section, "debug")
724
703
    del server_config
725
704
    
726
705
    # Override the settings from the config file with command line
737
716
    
738
717
    if not debug:
739
718
        syslogger.setLevel(logging.WARNING)
740
 
        console.setLevel(logging.WARNING)
741
719
    
742
720
    if server_settings["servicename"] != "Mandos":
743
721
        syslogger.setFormatter(logging.Formatter\
748
726
    # Parse config file with clients
749
727
    client_defaults = { "timeout": "1h",
750
728
                        "interval": "5m",
751
 
                        "checker": "fping -q -- %(host)s",
752
 
                        "host": "",
 
729
                        "checker": "fping -q -- %%(host)s",
753
730
                        }
754
731
    client_config = ConfigParser.SafeConfigParser(client_defaults)
755
732
    client_config.read(os.path.join(server_settings["configdir"],
773
750
            avahi.DBUS_INTERFACE_SERVER )
774
751
    # End of Avahi example code
775
752
    
 
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
    
776
761
    clients = Set()
777
762
    def remove_from_clients(client):
778
763
        clients.remove(client)
789
774
        logger.critical(u"No clients defined")
790
775
        sys.exit(1)
791
776
    
792
 
    if debug:
793
 
        # Redirect stdin so all checkers get /dev/null
794
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
795
 
        os.dup2(null, sys.stdin.fileno())
796
 
        if null > 2:
797
 
            os.close(null)
798
 
    else:
799
 
        # No console logging
800
 
        logger.removeHandler(console)
801
 
        # Close all input and output, do double fork, etc.
 
777
    if not debug:
802
778
        daemon()
803
779
    
804
780
    pidfilename = "/var/run/mandos/mandos.pid"