/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

Fixed fallback on error in mandos-client
fixed a bug in password-request

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