This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 597290a Fix URI parsing with encodedSolidusHandling="passthrough" 597290a is described below commit 597290af4d55d3b01079a3845c081e6590265082 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Oct 9 11:46:03 2020 +0100 Fix URI parsing with encodedSolidusHandling="passthrough" Based on a pull request by willmeck. --- java/org/apache/tomcat/util/buf/UDecoder.java | 4 +- test/org/apache/tomcat/util/buf/TestUDecoder.java | 147 ++++++++++++++++++++++ webapps/docs/changelog.xml | 6 + 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index f560221..c821090 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -150,7 +150,9 @@ public final class UDecoder { throw EXCEPTION_SLASH; } case PASS_THROUGH: { - idx += 2; + buff[idx++] = buff[j-2]; + buff[idx++] = buff[j-1]; + buff[idx] = buff[j]; } } } else { diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java b/test/org/apache/tomcat/util/buf/TestUDecoder.java index ca7dd23..f3957b9 100644 --- a/test/org/apache/tomcat/util/buf/TestUDecoder.java +++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java @@ -16,6 +16,8 @@ */ package org.apache.tomcat.util.buf; +import java.io.CharConversionException; +import java.io.IOException; import java.nio.charset.StandardCharsets; import org.junit.Assert; @@ -99,4 +101,149 @@ public class TestUDecoder { String result = UDecoder.URLDecode("\u00ea%c3%aa", StandardCharsets.UTF_8); Assert.assertEquals("\u00ea\u00ea", result); } + + + @Test + public void testURLDecodeStringSolidus01() throws IOException { + doTestSolidus("xxxxxx", "xxxxxx"); + } + + + @Test + public void testURLDecodeStringSolidus02() throws IOException { + doTestSolidus("%20xxxx", " xxxx"); + } + + + @Test + public void testURLDecodeStringSolidus03() throws IOException { + doTestSolidus("xx%20xx", "xx xx"); + } + + + @Test + public void testURLDecodeStringSolidus04() throws IOException { + doTestSolidus("xxxx%20", "xxxx "); + } + + + @Test(expected = CharConversionException.class) + public void testURLDecodeStringSolidus05a() throws IOException { + doTestSolidus("%2fxxxx", EncodedSolidusHandling.REJECT); + } + + + @Test + public void testURLDecodeStringSolidus05b() throws IOException { + String result = doTestSolidus("%2fxxxx", EncodedSolidusHandling.PASS_THROUGH); + Assert.assertEquals("%2fxxxx", result); + } + + + @Test + public void testURLDecodeStringSolidus05c() throws IOException { + String result = doTestSolidus("%2fxxxx", EncodedSolidusHandling.DECODE); + Assert.assertEquals("/xxxx", result); + } + + + @Test(expected = CharConversionException.class) + public void testURLDecodeStringSolidus06a() throws IOException { + doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.REJECT); + } + + + @Test + public void testURLDecodeStringSolidus06b() throws IOException { + String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.PASS_THROUGH); + Assert.assertEquals("%2fxx xx", result); + } + + + @Test + public void testURLDecodeStringSolidus06c() throws IOException { + String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.DECODE); + Assert.assertEquals("/xx xx", result); + } + + + @Test(expected = CharConversionException.class) + public void testURLDecodeStringSolidus07a() throws IOException { + doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.REJECT); + } + + + @Test + public void testURLDecodeStringSolidus07b() throws IOException { + String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.PASS_THROUGH); + Assert.assertEquals("xx%2f xx", result); + } + + + @Test + public void testURLDecodeStringSolidus07c() throws IOException { + String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.DECODE); + Assert.assertEquals("xx/ xx", result); + } + + + @Test(expected = CharConversionException.class) + public void testURLDecodeStringSolidus08a() throws IOException { + doTestSolidus("xx%20%2fxx", EncodedSolidusHandling.REJECT); + } + + + @Test + public void testURLDecodeStringSolidus08b() throws IOException { + String result = doTestSolidus("xx%20%2fxx", EncodedSolidusHandling.PASS_THROUGH); + Assert.assertEquals("xx %2fxx", result); + } + + + @Test + public void testURLDecodeStringSolidus08c() throws IOException { + String result = doTestSolidus("xx%20%2fxx", EncodedSolidusHandling.DECODE); + Assert.assertEquals("xx /xx", result); + } + + + @Test(expected = CharConversionException.class) + public void testURLDecodeStringSolidus09a() throws IOException { + doTestSolidus("xx%20xx%2f", EncodedSolidusHandling.REJECT); + } + + + @Test + public void testURLDecodeStringSolidus09b() throws IOException { + String result = doTestSolidus("xx%20xx%2f", EncodedSolidusHandling.PASS_THROUGH); + Assert.assertEquals("xx xx%2f", result); + } + + + @Test + public void testURLDecodeStringSolidus09c() throws IOException { + String result = doTestSolidus("xx%20xx%2f", EncodedSolidusHandling.DECODE); + Assert.assertEquals("xx xx/", result); + } + + + private void doTestSolidus(String input, String expected) throws IOException { + for (EncodedSolidusHandling solidusHandling : EncodedSolidusHandling.values()) { + String result = doTestSolidus(input, solidusHandling); + Assert.assertEquals(expected, result); + } + } + + + private String doTestSolidus(String input, EncodedSolidusHandling solidusHandling) throws IOException { + byte[] b = input.getBytes(StandardCharsets.UTF_8); + ByteChunk bc = new ByteChunk(16); + bc.setBytes(b, 0, b.length); + bc.setCharset(StandardCharsets.UTF_8); + + UDecoder udecoder = new UDecoder(); + udecoder.convert(bc, solidusHandling); + + return bc.toString(); + } } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 64d42d9..07b69ba 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -63,6 +63,12 @@ ensure that the connection window is correctly updated after a data frame with zero length padding is received. (markt) </fix> + <fix> + Fix processing of URIs with %nn encoded solidus characters when + <code>encodedSolidusHandling</code> was set to <code>passthrough</code> + and the encoded solidus was preceeded by other %nn encoded characters. + Based on a pull request by willmeck. (markt) + </fix> </changelog> </subseciton> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org