James Moger
2014-05-29 2c50880dbd5de292e37d2533fccfcb62f6be9f95
src/main/java/com/gitblit/utils/ContainerUtils.java
@@ -22,12 +22,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
/**
 * This is the support class for all container specific code.
 *
 *
 * @author jpyeron
 */
public class ContainerUtils
@@ -37,41 +37,22 @@
    /**
     * The support class for managing and evaluating the environment with
     * regards to CVE-2007-0405.
     *
     *
     * @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0450
     * @author jpyeron
     */
    public static class CVE_2007_0450
    {
    public static class CVE_2007_0450 {
        /**
         * This method will test for know issues in certain containers where %2F
         * is blocked from use in URLs. It will emit a warning to the logger if
         * the configuration of Tomcat causes the URL processing to fail on %2F.
         */
        public static void test()
        {
            if (GitBlit.getBoolean(Keys.web.mountParameters, true)
                    && ((GitBlit.getChar(Keys.web.forwardSlashCharacter, '/')) == '/' || (GitBlit.getChar(
                            Keys.web.forwardSlashCharacter, '/')) == '\\'))
            {
                try
                {
                    if (GitBlit.isGO())
                        ;
                    else if (logCVE_2007_0450Tomcat())
                        ;
                    // else if (logCVE_2007_0450xxx());
                    else
                    {
                        LOGGER.info("Unknown container, cannot check for CVE-2007-0450 aplicability");
                    }
                }
                catch (Throwable t)
                {
                    LOGGER.warn("Failure in checking for CVE-2007-0450 aplicability", t);
                }
        public static void test(IStoredSettings settings) {
           boolean mounted = settings.getBoolean(Keys.web.mountParameters, true);
           char fsc = settings.getChar(Keys.web.forwardSlashCharacter, '/');
            if (mounted && ((fsc == '/') || (fsc == '\\'))) {
               logCVE_2007_0450Tomcat(settings);
            }
        }
        /**
@@ -80,14 +61,12 @@
         * blocked from use in certain URL s. It will emit a warning to the
         * logger if the configuration of Tomcat causes the URL processing to
         * fail on %2F.
         *
         *
         * @return true if it recognizes Tomcat, false if it does not recognize
         *         Tomcat
         */
        private static boolean logCVE_2007_0450Tomcat()
        {
            try
            {
        private static boolean logCVE_2007_0450Tomcat(IStoredSettings settings) {
            try {
                byte[] test = "http://server.domain:8080/context/servlet/param%2fparam".getBytes();
                // ByteChunk mb=new ByteChunk();
@@ -95,37 +74,34 @@
                Object mb = cByteChunk.newInstance();
                // mb.setBytes(test, 0, test.length);
                Method mByteChunck_setBytes = cByteChunk.getMethod("setBytes", byte[].class, int.class, int.class);
                mByteChunck_setBytes.invoke(mb, test, (int) 0, test.length);
                Method setBytes = cByteChunk.getMethod("setBytes", byte[].class, int.class, int.class);
                setBytes.invoke(mb, test, 0, test.length);
                // UDecoder ud=new UDecoder();
                Class<?> cUDecoder = Class.forName("org.apache.tomcat.util.buf.UDecoder");
                Object ud = cUDecoder.newInstance();
                // ud.convert(mb,false);
                Method mUDecoder_convert = cUDecoder.getMethod("convert", cByteChunk, boolean.class);
                Method convert = cUDecoder.getMethod("convert", cByteChunk, boolean.class);
                try
                {
                    mUDecoder_convert.invoke(ud, mb, false);
                }
                catch (InvocationTargetException e)
                {
                    if (e.getTargetException() != null && e.getTargetException() instanceof CharConversionException)
                    {
                try {
                    convert.invoke(ud, mb, false);
                } catch (InvocationTargetException e) {
                    if (e.getTargetException() != null && e.getTargetException() instanceof CharConversionException) {
                        LOGGER.warn("You are using a Tomcat-based server and your current settings will prevent grouped repositories, forks, personal repositories, and tree navigation from working properly. Please review the FAQ for details about running Gitblit on Tomcat. http://gitblit.com/faq.html and http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0450");
                        LOGGER.warn("Overriding {} and setting to {}", Keys.web.forwardSlashCharacter, "!");
                        settings.overrideSetting(Keys.web.forwardSlashCharacter, "!");
                        return true;
                    }
                    throw e;
                }
            }
            catch (Throwable t)
            {
            } catch (Throwable t) {
                // The apache url decoder internals are different, this is not a
                // Tomcat matching the failure pattern for CVE-2007-0450
                if (t instanceof ClassNotFoundException || t instanceof NoSuchMethodException
                        || t instanceof IllegalArgumentException)
                        || t instanceof IllegalArgumentException) {
                    return false;
                }
                LOGGER.debug("This is a tomcat, but the test operation failed somehow", t);
            }
            return true;