This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new e99071e Fix URI parsing with encodedSolidusHandling="passthrough"
e99071e is described below
commit e99071ebac74391e5a8f8790da76d5aff8c71417
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 | 248 ++++++++++++++++++++++
webapps/docs/changelog.xml | 10 +
3 files changed, 261 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 6acc893..8bd2dd0 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -161,7 +161,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
new file mode 100644
index 0000000..edb593a
--- /dev/null
+++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java
@@ -0,0 +1,248 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.buf;
+
+import java.io.CharConversionException;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestUDecoder {
+
+ @Test
+ public void testURLDecodeStringInvalid() {
+ // %n rather than %nn should throw an IAE according to the Javadoc
+ Exception exception = null;
+ try {
+ UDecoder.URLDecode("%5xxxxx", B2CConverter.UTF_8);
+ } catch (Exception e) {
+ exception = e;
+ }
+ Assert.assertTrue(exception instanceof IllegalArgumentException);
+
+ // Edge case trying to trigger ArrayIndexOutOfBoundsException
+ exception = null;
+ try {
+ UDecoder.URLDecode("%5", B2CConverter.UTF_8);
+ } catch (Exception e) {
+ exception = e;
+ }
+ Assert.assertTrue(exception instanceof IllegalArgumentException);
+ }
+
+
+ @Test
+ public void testURLDecodeStringValidIso88591Start() {
+ String result = UDecoder.URLDecode("%41xxxx", B2CConverter.ISO_8859_1);
+ Assert.assertEquals("Axxxx", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringValidIso88591Middle() {
+ String result = UDecoder.URLDecode("xx%41xx", B2CConverter.ISO_8859_1);
+ Assert.assertEquals("xxAxx", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringValidIso88591End() {
+ String result = UDecoder.URLDecode("xxxx%41", B2CConverter.ISO_8859_1);
+ Assert.assertEquals("xxxxA", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringValidUtf8Start() {
+ String result = UDecoder.URLDecode("%c3%aaxxxx", B2CConverter.UTF_8);
+ Assert.assertEquals("\u00eaxxxx", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringValidUtf8Middle() {
+ String result = UDecoder.URLDecode("xx%c3%aaxx", B2CConverter.UTF_8);
+ Assert.assertEquals("xx\u00eaxx", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringValidUtf8End() {
+ String result = UDecoder.URLDecode("xxxx%c3%aa", B2CConverter.UTF_8);
+ Assert.assertEquals("xxxx\u00ea", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringNonAsciiValidNone() {
+ String result = UDecoder.URLDecode("\u00eaxxxx", B2CConverter.UTF_8);
+ Assert.assertEquals("\u00eaxxxx", result);
+ }
+
+
+ @Test
+ public void testURLDecodeStringNonAsciiValidUtf8() {
+ String result = UDecoder.URLDecode("\u00ea%c3%aa", B2CConverter.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(B2CConverter.UTF_8);
+ ByteChunk bc = new ByteChunk(16);
+ bc.setBytes(b, 0, b.length);
+ bc.setCharset(B2CConverter.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 6ea8ec4..6cb12cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,16 @@
</add>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <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>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
