Refactor

- Remove duplicate code - Use standard mechanism to pre-load classes for the SecurityManager git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1710313 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 24, 2015 · 0040f2a · 0040f2a
1 parent a890684
commit 0040f2a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 39 deletions.
diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java
@@ -81,9 +81,6 @@ public class Response
     private static final boolean ENFORCE_ENCODING_IN_GET_WRITER;
 
     static {
-        // Ensure that URL is loaded for SM
-        URL.isSchemeChar('c');
-
         ENFORCE_ENCODING_IN_GET_WRITER = Boolean.valueOf(
                 System.getProperty("org.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER",
                         "true")).booleanValue();
@@ -1593,7 +1590,7 @@ protected String toAbsolute(String location) {
                 throw iae;
             }
 
-        } else if (leadingSlash || !hasScheme(location)) {
+        } else if (leadingSlash || !URL.hasScheme(location)) {
 
             redirectURLCC.recycle();
 
@@ -1768,22 +1765,6 @@ private boolean hasPath(String uri) {
         return true;
     }
 
-    /**
-     * Determine if a URI string has a <code>scheme</code> component.
-     */
-    private boolean hasScheme(String uri) {
-        int len = uri.length();
-        for(int i=0; i < len ; i++) {
-            char c = uri.charAt(i);
-            if(c == ':') {
-                return i > 0;
-            } else if(!URL.isSchemeChar(c)) {
-                return false;
-            }
-        }
-        return false;
-    }
-
     /**
      * Return the specified URL with the specified session identifier
      * suitably encoded.

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -286,6 +286,7 @@ private static final void loadTomcatPackage(ClassLoader loader)
                 "util.net.NioBlockingSelector$BlockPoller$2");
         loader.loadClass(basePackage +
                 "util.net.NioBlockingSelector$BlockPoller$3");
+        loader.loadClass(basePackage + "util.net.URL");
         // security
         loader.loadClass(basePackage + "util.security.PrivilegedGetTccl");
         loader.loadClass(basePackage + "util.security.PrivilegedSetTccl");

diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -344,7 +344,7 @@ else if (index == urlString.length() - 1) {
                     // 1. this valve is associated with a context
                     // 2. the url starts with a leading slash
                     // 3. the url isn't absolute
-                    if (context && urlString.charAt(0) == '/' && !hasScheme(urlString)) {
+                    if (context && urlString.charAt(0) == '/' && !URL.hasScheme(urlString)) {
                         urlString.insert(0, request.getContext().getEncodedPath());
                     }
                     response.sendRedirect(urlString.toString());
@@ -735,21 +735,4 @@ protected static void parseRuleFlag(String line, RewriteRule rule, String flag)
             throw new IllegalArgumentException("Invalid flag in: " + line + " flag: " + flag);
         }
     }
-
-
-    /**
-     * Determine if a URI string has a <code>scheme</code> component.
-     */
-    protected static boolean hasScheme(StringBuffer uri) {
-        int len = uri.length();
-        for(int i=0; i < len ; i++) {
-            char c = uri.charAt(i);
-            if(c == ':') {
-                return i > 0;
-            } else if(!URL.isSchemeChar(c)) {
-                return false;
-            }
-        }
-        return false;
-    }
 }
diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java
@@ -648,10 +648,34 @@ private void parse(String spec, int start, int limit)
     /**
      * Determine if the character is allowed in the scheme of a URI.
      * See RFC 2396, Section 3.1
+     *
+     * @param c The character to test
+     *
+     * @return {@code true} if a the character is allowed, otherwise {@false}
      */
-    public static boolean isSchemeChar(char c) {
+    private static boolean isSchemeChar(char c) {
         return Character.isLetterOrDigit(c) ||
             c == '+' || c == '-' || c == '.';
     }
 
+
+    /**
+     * Determine if a URI string has a <code>scheme</code> component.
+     *
+     * @param uri The URI to test
+     *
+     * @return {@code true} if a scheme is present, otherwise {@false}
+     */
+    public static boolean hasScheme(CharSequence uri) {
+        int len = uri.length();
+        for(int i=0; i < len ; i++) {
+            char c = uri.charAt(i);
+            if(c == ':') {
+                return i > 0;
+            } else if(!URL.isSchemeChar(c)) {
+                return false;
+            }
+        }
+        return false;
+    }
 }