/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

merge + fallback bugg

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\
67
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
 
68
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
69
             address = "/dev/log")
68
70
syslogger.setFormatter(logging.Formatter\
69
 
                        ('%(levelname)s: %(message)s'))
 
71
                        ('Mandos: %(levelname)s: %(message)s'))
70
72
logger.addHandler(syslogger)
71
 
del 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):
102
107
    """
103
108
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
104
109
                 type = None, port = None, TXT = None, domain = "",
105
 
                 host = "", max_renames = 12):
 
110
                 host = "", max_renames = 32768):
106
111
        self.interface = interface
107
112
        self.name = name
108
113
        self.type = type
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))
 
131
        syslogger.setFormatter(logging.Formatter\
 
132
                               ('Mandos (%s): %%(levelname)s:'
 
133
                               ' %%(message)s' % self.name))
125
134
        self.remove()
126
135
        self.add()
127
136
        self.rename_count += 1
163
172
    fingerprint: string (40 or 32 hexadecimal digits); used to
164
173
                 uniquely identify the client
165
174
    secret:    bytestring; sent verbatim (over TLS) to client
166
 
    fqdn:      string (FQDN); available for use by the checker command
 
175
    host:      string; available for use by the checker command
167
176
    created:   datetime.datetime(); object creation, not client host
168
177
    last_checked_ok: datetime.datetime() or None if not yet checked OK
169
178
    timeout:   datetime.timedelta(); How long from last_checked_ok
230
239
        else:
231
240
            raise TypeError(u"No secret or secfile for client %s"
232
241
                            % self.name)
233
 
        self.fqdn = config.get("fqdn", "")
 
242
        self.host = config.get("host", "")
234
243
        self.created = datetime.datetime.now()
235
244
        self.last_checked_ok = None
236
245
        self.timeout = string_to_delta(config["timeout"])
259
268
        The possibility that a client might be restarted is left open,
260
269
        but not currently used."""
261
270
        # If this client doesn't have a secret, it is already stopped.
262
 
        if self.secret:
 
271
        if hasattr(self, "secret") and self.secret:
263
272
            logger.info(u"Stopping client %s", self.name)
264
273
            self.secret = None
265
274
        else:
313
322
        if self.checker is None:
314
323
            try:
315
324
                # In case check_command has exactly one % operator
316
 
                command = self.check_command % self.fqdn
 
325
                command = self.check_command % self.host
317
326
            except TypeError:
318
327
                # Escape attributes for the shell
319
328
                escaped_attrs = dict((key, re.escape(str(val)))
328
337
            try:
329
338
                logger.info(u"Starting checker %r for %s",
330
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.)
331
344
                self.checker = subprocess.Popen(command,
332
345
                                                close_fds=True,
333
346
                                                shell=True, cwd="/")
334
347
                self.checker_callback_tag = gobject.child_watch_add\
335
348
                                            (self.checker.pid,
336
349
                                             self.checker_callback)
337
 
            except subprocess.OSError, error:
 
350
            except OSError, error:
338
351
                logger.error(u"Failed to start subprocess: %s",
339
352
                             error)
340
353
        # Re-run this periodically if run by gobject.timeout_add
346
359
            self.checker_callback_tag = None
347
360
        if getattr(self, "checker", None) is None:
348
361
            return
349
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
362
        logger.debug(u"Stopping checker for %(name)s", vars(self))
350
363
        try:
351
364
            os.kill(self.checker.pid, signal.SIGTERM)
352
365
            #os.sleep(0.5)
397
410
    gnutls.library.functions.gnutls_openpgp_crt_import\
398
411
                    (crt, ctypes.byref(datum),
399
412
                     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 != 0:
 
418
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
419
        raise gnutls.errors.CertificateSecurityError("Verify failed")
400
420
    # New buffer for the fingerprint
401
421
    buffer = ctypes.create_string_buffer(20)
402
422
    buffer_length = ctypes.c_size_t()
554
574
    datetime.timedelta(1)
555
575
    >>> string_to_delta(u'1w')
556
576
    datetime.timedelta(7)
 
577
    >>> string_to_delta('5m 30s')
 
578
    datetime.timedelta(0, 330)
557
579
    """
558
 
    try:
559
 
        suffix=unicode(interval[-1])
560
 
        value=int(interval[:-1])
561
 
        if suffix == u"d":
562
 
            delta = datetime.timedelta(value)
563
 
        elif suffix == u"s":
564
 
            delta = datetime.timedelta(0, value)
565
 
        elif suffix == u"m":
566
 
            delta = datetime.timedelta(0, 0, 0, 0, value)
567
 
        elif suffix == u"h":
568
 
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
569
 
        elif suffix == u"w":
570
 
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
571
 
        else:
 
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):
572
598
            raise ValueError
573
 
    except (ValueError, IndexError):
574
 
        raise ValueError
575
 
    return delta
 
599
        timevalue += delta
 
600
    return timevalue
576
601
 
577
602
 
578
603
def server_state_changed(state):
650
675
    global main_loop_started
651
676
    main_loop_started = False
652
677
    
653
 
    parser = OptionParser()
 
678
    parser = OptionParser(version = "%%prog %s" % version)
654
679
    parser.add_option("-i", "--interface", type="string",
655
680
                      metavar="IF", help="Bind to interface IF")
656
681
    parser.add_option("-a", "--address", type="string",
691
716
    server_config = ConfigParser.SafeConfigParser(server_defaults)
692
717
    del server_defaults
693
718
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
694
 
    server_section = "server"
695
719
    # Convert the SafeConfigParser object to a dict
696
 
    server_settings = dict(server_config.items(server_section))
 
720
    server_settings = server_config.defaults()
697
721
    # Use getboolean on the boolean config option
698
722
    server_settings["debug"] = server_config.getboolean\
699
 
                               (server_section, "debug")
 
723
                               ("DEFAULT", "debug")
700
724
    del server_config
701
725
    
702
726
    # Override the settings from the config file with command line
709
733
    del options
710
734
    # Now we have our good server settings in "server_settings"
711
735
    
 
736
    debug = server_settings["debug"]
 
737
    
 
738
    if not debug:
 
739
        syslogger.setLevel(logging.WARNING)
 
740
        console.setLevel(logging.WARNING)
 
741
    
 
742
    if server_settings["servicename"] != "Mandos":
 
743
        syslogger.setFormatter(logging.Formatter\
 
744
                               ('Mandos (%s): %%(levelname)s:'
 
745
                                ' %%(message)s'
 
746
                                % server_settings["servicename"]))
 
747
    
712
748
    # Parse config file with clients
713
749
    client_defaults = { "timeout": "1h",
714
750
                        "interval": "5m",
715
 
                        "checker": "fping -q -- %%(fqdn)s",
 
751
                        "checker": "fping -q -- %(host)s",
 
752
                        "host": "",
716
753
                        }
717
754
    client_config = ConfigParser.SafeConfigParser(client_defaults)
718
755
    client_config.read(os.path.join(server_settings["configdir"],
736
773
            avahi.DBUS_INTERFACE_SERVER )
737
774
    # End of Avahi example code
738
775
    
739
 
    debug = server_settings["debug"]
740
 
    
741
 
    if debug:
742
 
        console = logging.StreamHandler()
743
 
        # console.setLevel(logging.DEBUG)
744
 
        console.setFormatter(logging.Formatter\
745
 
                             ('%(levelname)s: %(message)s'))
746
 
        logger.addHandler(console)
747
 
        del console
748
 
    
749
776
    clients = Set()
750
777
    def remove_from_clients(client):
751
778
        clients.remove(client)
758
785
                              config
759
786
                              = dict(client_config.items(section)))
760
787
                       for section in client_config.sections()))
 
788
    if not clients:
 
789
        logger.critical(u"No clients defined")
 
790
        sys.exit(1)
761
791
    
762
 
    if not debug:
 
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.
763
802
        daemon()
764
803
    
 
804
    pidfilename = "/var/run/mandos/mandos.pid"
 
805
    pid = os.getpid()
 
806
    try:
 
807
        pidfile = open(pidfilename, "w")
 
808
        pidfile.write(str(pid) + "\n")
 
809
        pidfile.close()
 
810
        del pidfile
 
811
    except IOError, err:
 
812
        logger.error(u"Could not write %s file with PID %d",
 
813
                     pidfilename, os.getpid())
 
814
    
765
815
    def cleanup():
766
816
        "Cleanup function; run on exit"
767
817
        global group
813
863
                             tcp_server.handle_request\
814
864
                             (*args[2:], **kwargs) or True)
815
865
        
816
 
        logger.debug("Starting main loop")
 
866
        logger.debug(u"Starting main loop")
817
867
        main_loop_started = True
818
868
        main_loop.run()
819
869
    except AvahiError, error: