Fix unintentional conversion of + to during rule processing

Also silences exception logging when running tests or when using the
RewriteValve in embedded mode and setting the configuration directly.

Author: markt-asf

java/org/apache/catalina/valves/rewrite/RewriteValve.java

@@ -17,11 +17,11 @@
 package org.apache.catalina.valves.rewrite;
 
 import java.io.BufferedReader;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
-import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -173,7 +173,8 @@ protected void startInternal() throws LifecycleException {
             String webInfResourcePath = "/WEB-INF/" + resourcePath;
             is = ((Context) getContainer()).getServletContext().getResourceAsStream(webInfResourcePath);
             if (is == null) {
-                if (containerLog.isInfoEnabled()) {
+                // Don't log if the rules have been set directly via setConfiguration()
+                if (containerLog.isInfoEnabled() && rules == null) {
                     containerLog.info(sm.getString("rewriteValve.noConfiguration", webInfResourcePath));
                 }
             } else {
@@ -186,6 +187,13 @@ protected void startInternal() throws LifecycleException {
             try {
                 ConfigurationSource.Resource resource = ConfigFileLoader.getSource().getResource(resourceName);
                 is = resource.getInputStream();
+            } catch (FileNotFoundException fnfe) {
+                // Don't log if the rules have been set directly via setConfiguration()
+                if (rules == null) {
+                    if (containerLog.isInfoEnabled()) {
+                        containerLog.info(sm.getString("rewriteValve.noConfiguration", resourceName), fnfe);
+                    }
+                }
             } catch (IOException ioe) {
                 if (containerLog.isInfoEnabled()) {
                     containerLog.info(sm.getString("rewriteValve.noConfiguration", resourceName), ioe);
@@ -584,7 +592,7 @@ public void invoke(Request request, Response response) throws IOException, Servl
                     chunk.append(REWRITE_DEFAULT_ENCODER.encode(urlStringRewriteEncoded, uriCharset));
                     // Rewriting may have denormalized the URL and added encoded characters
                     // Decode then normalize
-                    String urlStringRewriteDecoded = URLDecoder.decode(urlStringRewriteEncoded, uriCharset);
+                    String urlStringRewriteDecoded = UDecoder.URLDecode(urlStringRewriteEncoded, uriCharset);
                     urlStringRewriteDecoded = RequestUtil.normalize(urlStringRewriteDecoded);
                     if (urlStringRewriteDecoded == null) {
                         // Assume bad input caused the re-write to try and escape root

test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.HttpURLConnection;
-import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -45,6 +44,7 @@
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.catalina.valves.ValveBase;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.http.Method;
 
 /*
@@ -1081,6 +1081,12 @@ public void testEncodedUriEncodedSemicolon03() throws Exception {
     }
 
 
+    @Test
+    public void testEncodedUriPlus() throws Exception {
+        doTestRewriteWithEncoding("a+b");
+    }
+
+
     private void doTestRewriteWithEncoding(String segment) throws Exception {
         doTestRewriteWithEncoding(segment, segment, null);
     }
@@ -1111,7 +1117,7 @@ private void doTestRewriteWithEncoding(String segment, String expectedSegment, S
         String body = res.toString();
         Assert.assertTrue(body, body.contains("REQUEST-URI: /target/" + expectedSegment));
         Assert.assertTrue(body, body.contains("PATH-INFO: /" +
-                URLDecoder.decode(expectedSegment, StandardCharsets.UTF_8)));
+                UDecoder.URLDecode(expectedSegment, StandardCharsets.UTF_8)));
         Assert.assertTrue(body, body.contains("REQUEST-QUERY-STRING: " + expectedQueryString));
     }
 

webapps/docs/changelog.xml

@@ -260,6 +260,10 @@
       <fix>
         Various edge cases for SSI substitutions, quoting and escaping. (remm)
       </fix>
+      <fix>
+        Fix unintentional conversion of literal <code>+</code> to a space during
+        rule processing in the <code>RewriteValve</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">