/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-27 01:18:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080827011825-ka3ni6xvy2ehi1y8
* .bzrignore: New.

* clients.conf ([foo]): Remove Radix-64 checksum.

* mandos (AvahiService.rename, server_state_changed,
          entry_group_state_changed): Make Avahi log messages more
                                      clear that they are about
                                      Zeroconf.
  (fingerprint): Use plain "0" instead of "ctypes.c_uint(0)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
24
24
#     GNU General Public License for more details.
25
25
# 
26
26
# You should have received a copy of the GNU General Public License
27
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see
 
28
# <http://www.gnu.org/licenses/>.
28
29
# 
29
30
# Contact the authors at <mandos@fukt.bsnet.se>.
30
31
# 
119
120
        self.domain = domain
120
121
        self.host = host
121
122
        self.rename_count = 0
 
123
        self.max_renames = max_renames
122
124
    def rename(self):
123
125
        """Derived from the Avahi example code"""
124
126
        if self.rename_count >= self.max_renames:
125
 
            logger.critical(u"No suitable service name found after %i"
126
 
                            u" retries, exiting.", rename_count)
 
127
            logger.critical(u"No suitable Zeroconf service name found"
 
128
                            u" after %i retries, exiting.",
 
129
                            rename_count)
127
130
            raise AvahiServiceError("Too many renames")
128
 
        name = server.GetAlternativeServiceName(name)
129
 
        logger.error(u"Changing name to %r ...", name)
 
131
        self.name = server.GetAlternativeServiceName(self.name)
 
132
        logger.info(u"Changing Zeroconf service name to %r ...",
 
133
                    str(self.name))
130
134
        syslogger.setFormatter(logging.Formatter\
131
135
                               ('Mandos (%s): %%(levelname)s:'
132
 
                               ' %%(message)s' % name))
 
136
                               ' %%(message)s' % self.name))
133
137
        self.remove()
134
138
        self.add()
135
139
        self.rename_count += 1
147
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
148
152
            group.connect_to_signal('StateChanged',
149
153
                                    entry_group_state_changed)
150
 
        logger.debug(u"Adding service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
151
155
                     service.name, service.type)
152
156
        group.AddService(
153
157
                self.interface,         # interface
336
340
            try:
337
341
                logger.info(u"Starting checker %r for %s",
338
342
                            command, self.name)
 
343
                # We don't need to redirect stdout and stderr, since
 
344
                # in normal mode, that is already done by daemon(),
 
345
                # and in debug mode we don't want to.  (Stdin is
 
346
                # always replaced by /dev/null.)
339
347
                self.checker = subprocess.Popen(command,
340
348
                                                close_fds=True,
341
349
                                                shell=True, cwd="/")
342
350
                self.checker_callback_tag = gobject.child_watch_add\
343
351
                                            (self.checker.pid,
344
352
                                             self.checker_callback)
345
 
            except subprocess.OSError, error:
 
353
            except OSError, error:
346
354
                logger.error(u"Failed to start subprocess: %s",
347
355
                             error)
348
356
        # Re-run this periodically if run by gobject.timeout_add
405
413
    gnutls.library.functions.gnutls_openpgp_crt_import\
406
414
                    (crt, ctypes.byref(datum),
407
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
416
    # Verify the self signature in the key
 
417
    crtverify = ctypes.c_uint();
 
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
419
        (crt, 0, ctypes.byref(crtverify))
 
420
    if crtverify.value != 0:
 
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
408
423
    # New buffer for the fingerprint
409
424
    buffer = ctypes.create_string_buffer(20)
410
425
    buffer_length = ctypes.c_size_t()
562
577
    datetime.timedelta(1)
563
578
    >>> string_to_delta(u'1w')
564
579
    datetime.timedelta(7)
 
580
    >>> string_to_delta('5m 30s')
 
581
    datetime.timedelta(0, 330)
565
582
    """
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:
 
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):
580
601
            raise ValueError
581
 
    except (ValueError, IndexError):
582
 
        raise ValueError
583
 
    return delta
 
602
        timevalue += delta
 
603
    return timevalue
584
604
 
585
605
 
586
606
def server_state_changed(state):
587
607
    """Derived from the Avahi example code"""
588
608
    if state == avahi.SERVER_COLLISION:
589
 
        logger.error(u"Server name collision")
 
609
        logger.error(u"Zeroconf server name collision")
590
610
        service.remove()
591
611
    elif state == avahi.SERVER_RUNNING:
592
612
        service.add()
594
614
 
595
615
def entry_group_state_changed(state, error):
596
616
    """Derived from the Avahi example code"""
597
 
    logger.debug(u"state change: %i", state)
 
617
    logger.debug(u"Avahi state change: %i", state)
598
618
    
599
619
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
600
 
        logger.debug(u"Service established.")
 
620
        logger.debug(u"Zeroconf service established.")
601
621
    elif state == avahi.ENTRY_GROUP_COLLISION:
602
 
        logger.warning(u"Service name collision.")
 
622
        logger.warning(u"Zeroconf service name collision.")
603
623
        service.rename()
604
624
    elif state == avahi.ENTRY_GROUP_FAILURE:
605
 
        logger.critical(u"Error in group state changed %s",
 
625
        logger.critical(u"Avahi: Error in group state changed %s",
606
626
                        unicode(error))
607
627
        raise AvahiGroupError("State changed: %s", str(error))
608
628
 
699
719
    server_config = ConfigParser.SafeConfigParser(server_defaults)
700
720
    del server_defaults
701
721
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
702
 
    server_section = "server"
703
722
    # Convert the SafeConfigParser object to a dict
704
 
    server_settings = dict(server_config.items(server_section))
 
723
    server_settings = server_config.defaults()
705
724
    # Use getboolean on the boolean config option
706
725
    server_settings["debug"] = server_config.getboolean\
707
 
                               (server_section, "debug")
 
726
                               ("DEFAULT", "debug")
708
727
    del server_config
709
728
    
710
729
    # Override the settings from the config file with command line
732
751
    # Parse config file with clients
733
752
    client_defaults = { "timeout": "1h",
734
753
                        "interval": "5m",
735
 
                        "checker": "fping -q -- %%(host)s",
 
754
                        "checker": "fping -q -- %(host)s",
 
755
                        "host": "",
736
756
                        }
737
757
    client_config = ConfigParser.SafeConfigParser(client_defaults)
738
758
    client_config.read(os.path.join(server_settings["configdir"],
742
762
    service = AvahiService(name = server_settings["servicename"],
743
763
                           type = "_mandos._tcp", );
744
764
    if server_settings["interface"]:
745
 
        service.interface = if_nametoindex(server_settings["interface"])
 
765
        service.interface = if_nametoindex\
 
766
                            (server_settings["interface"])
746
767
    
747
768
    global main_loop
748
769
    global bus
751
772
    DBusGMainLoop(set_as_default=True )
752
773
    main_loop = gobject.MainLoop()
753
774
    bus = dbus.SystemBus()
754
 
    server = dbus.Interface(
755
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
756
 
            avahi.DBUS_INTERFACE_SERVER )
 
775
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
776
                                           avahi.DBUS_PATH_SERVER),
 
777
                            avahi.DBUS_INTERFACE_SERVER)
757
778
    # End of Avahi example code
758
779
    
759
780
    clients = Set()
772
793
        logger.critical(u"No clients defined")
773
794
        sys.exit(1)
774
795
    
775
 
    if not debug:
 
796
    if debug:
 
797
        # Redirect stdin so all checkers get /dev/null
 
798
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
799
        os.dup2(null, sys.stdin.fileno())
 
800
        if null > 2:
 
801
            os.close(null)
 
802
    else:
 
803
        # No console logging
776
804
        logger.removeHandler(console)
 
805
        # Close all input and output, do double fork, etc.
777
806
        daemon()
778
807
    
779
808
    pidfilename = "/var/run/mandos/mandos.pid"