/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
# 
123
124
    def rename(self):
124
125
        """Derived from the Avahi example code"""
125
126
        if self.rename_count >= self.max_renames:
126
 
            logger.critical(u"No suitable service name found after %i"
127
 
                            u" retries, exiting.", rename_count)
 
127
            logger.critical(u"No suitable Zeroconf service name found"
 
128
                            u" after %i retries, exiting.",
 
129
                            rename_count)
128
130
            raise AvahiServiceError("Too many renames")
129
131
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
132
        logger.info(u"Changing Zeroconf service name to %r ...",
 
133
                    str(self.name))
131
134
        syslogger.setFormatter(logging.Formatter\
132
135
                               ('Mandos (%s): %%(levelname)s:'
133
136
                               ' %%(message)s' % self.name))
148
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
149
152
            group.connect_to_signal('StateChanged',
150
153
                                    entry_group_state_changed)
151
 
        logger.debug(u"Adding service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
152
155
                     service.name, service.type)
153
156
        group.AddService(
154
157
                self.interface,         # interface
337
340
            try:
338
341
                logger.info(u"Starting checker %r for %s",
339
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.)
340
347
                self.checker = subprocess.Popen(command,
341
348
                                                close_fds=True,
342
349
                                                shell=True, cwd="/")
343
350
                self.checker_callback_tag = gobject.child_watch_add\
344
351
                                            (self.checker.pid,
345
352
                                             self.checker_callback)
346
 
            except subprocess.OSError, error:
 
353
            except OSError, error:
347
354
                logger.error(u"Failed to start subprocess: %s",
348
355
                             error)
349
356
        # Re-run this periodically if run by gobject.timeout_add
406
413
    gnutls.library.functions.gnutls_openpgp_crt_import\
407
414
                    (crt, ctypes.byref(datum),
408
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")
409
423
    # New buffer for the fingerprint
410
424
    buffer = ctypes.create_string_buffer(20)
411
425
    buffer_length = ctypes.c_size_t()
592
606
def server_state_changed(state):
593
607
    """Derived from the Avahi example code"""
594
608
    if state == avahi.SERVER_COLLISION:
595
 
        logger.error(u"Server name collision")
 
609
        logger.error(u"Zeroconf server name collision")
596
610
        service.remove()
597
611
    elif state == avahi.SERVER_RUNNING:
598
612
        service.add()
600
614
 
601
615
def entry_group_state_changed(state, error):
602
616
    """Derived from the Avahi example code"""
603
 
    logger.debug(u"state change: %i", state)
 
617
    logger.debug(u"Avahi state change: %i", state)
604
618
    
605
619
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
606
 
        logger.debug(u"Service established.")
 
620
        logger.debug(u"Zeroconf service established.")
607
621
    elif state == avahi.ENTRY_GROUP_COLLISION:
608
 
        logger.warning(u"Service name collision.")
 
622
        logger.warning(u"Zeroconf service name collision.")
609
623
        service.rename()
610
624
    elif state == avahi.ENTRY_GROUP_FAILURE:
611
 
        logger.critical(u"Error in group state changed %s",
 
625
        logger.critical(u"Avahi: Error in group state changed %s",
612
626
                        unicode(error))
613
627
        raise AvahiGroupError("State changed: %s", str(error))
614
628
 
737
751
    # Parse config file with clients
738
752
    client_defaults = { "timeout": "1h",
739
753
                        "interval": "5m",
740
 
                        "checker": "fping -q -- %%(host)s",
 
754
                        "checker": "fping -q -- %(host)s",
741
755
                        "host": "",
742
756
                        }
743
757
    client_config = ConfigParser.SafeConfigParser(client_defaults)
748
762
    service = AvahiService(name = server_settings["servicename"],
749
763
                           type = "_mandos._tcp", );
750
764
    if server_settings["interface"]:
751
 
        service.interface = if_nametoindex(server_settings["interface"])
 
765
        service.interface = if_nametoindex\
 
766
                            (server_settings["interface"])
752
767
    
753
768
    global main_loop
754
769
    global bus
757
772
    DBusGMainLoop(set_as_default=True )
758
773
    main_loop = gobject.MainLoop()
759
774
    bus = dbus.SystemBus()
760
 
    server = dbus.Interface(
761
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
762
 
            avahi.DBUS_INTERFACE_SERVER )
 
775
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
776
                                           avahi.DBUS_PATH_SERVER),
 
777
                            avahi.DBUS_INTERFACE_SERVER)
763
778
    # End of Avahi example code
764
779
    
765
780
    clients = Set()
778
793
        logger.critical(u"No clients defined")
779
794
        sys.exit(1)
780
795
    
781
 
    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
782
804
        logger.removeHandler(console)
 
805
        # Close all input and output, do double fork, etc.
783
806
        daemon()
784
807
    
785
808
    pidfilename = "/var/run/mandos/mandos.pid"