[patch] Let backslashes escape characters

001-escape-percent.diff (text/plain), 4.69 KB, created by Felix Schumacher on 2016-02-10 14:53:29 UTC

(hide)

Description: Let backslashes escape characters

Filename:

MIME Type:

Creator: Felix Schumacher

Created: 2016-02-10 14:53:29 UTC

Size: 4.69 KB

patch

obsolete

>diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java b/java/org/apache/catalina/valves/rewrite/Substitution.java >index 0f84792..79eede3 100644 >--- a/java/org/apache/catalina/valves/rewrite/Substitution.java >+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java >@@ -111,17 +111,27 @@ public class Substitution { > int pos = 0; > int percentPos = 0; > int dollarPos = 0; >+ int backslashPos = 0; > > while (pos < sub.length()) { > percentPos = sub.indexOf('%', pos); > dollarPos = sub.indexOf('$', pos); >- if (percentPos == -1 && dollarPos == -1) { >+ backslashPos = sub.indexOf('\\', pos); >+ if (percentPos == -1 && dollarPos == -1 && backslashPos == -1) { > // Static text > StaticElement newElement = new StaticElement(); > newElement.value = sub.substring(pos, sub.length()); > pos = sub.length(); > elements.add(newElement); >- } else if (percentPos == -1 || ((dollarPos != -1) && (dollarPos < percentPos))) { >+ } else if (isFirstPos(backslashPos, dollarPos, percentPos)) { >+ if (backslashPos + 1 == sub.length()) { >+ throw new IllegalArgumentException(sub); >+ } >+ StaticElement newElement = new StaticElement(); >+ newElement.value = sub.substring(pos, backslashPos) + sub.substring(backslashPos + 1, backslashPos + 2); >+ pos = backslashPos + 2; >+ elements.add(newElement); >+ } else if (isFirstPos(dollarPos, percentPos)) { > // $: back reference to rule or map lookup > if (dollarPos + 1 == sub.length()) { > throw new IllegalArgumentException(sub); >@@ -186,7 +196,7 @@ public class Substitution { > newElement.n = Character.digit(sub.charAt(percentPos + 1), 10); > pos = percentPos + 2; > elements.add(newElement); >- } else { >+ } else if (sub.charAt(percentPos + 1) == '{'){ > // %: server variable as %{variable} > SubstitutionElement newElement = null; > int open = sub.indexOf('{', percentPos); >@@ -218,6 +228,13 @@ public class Substitution { > } > pos = close + 1; > elements.add(newElement); >+ } else if (sub.charAt(percentPos + 1) == '%') { >+ StaticElement percentSign = new StaticElement(); >+ percentSign.value = "%"; >+ elements.add(percentSign); >+ pos = percentPos + 2; >+ } else { >+ throw new IllegalArgumentException(sub + ": Missing digit, curly brace or percent sign."); > } > } > } >@@ -239,4 +256,28 @@ public class Substitution { > } > return buf.toString(); > } >+ >+ /** >+ * Checks whether the first int is non negative and smaller than any non negative other int >+ * given with {@code others}. >+ * >+ * @param testPos >+ * integer to test against >+ * @param others >+ * list of integers that are paired against {@code testPos}. Any >+ * negative integer will be ignored. >+ * @return {@code true} if {@code testPos} is not negative and is less then any given other >+ * integer, {@code false} otherwise >+ */ >+ private boolean isFirstPos(int testPos, int... others) { >+ if (testPos < 0) { >+ return false; >+ } >+ for (int other : others) { >+ if (other >= 0 && other < testPos) { >+ return false; >+ } >+ } >+ return true; >+ } > } >diff --git a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java >index 47f9440..a1e33f2 100644 >--- a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java >+++ b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java >@@ -33,6 +33,16 @@ public class TestRewriteValve extends TomcatBaseTest { > } > > @Test >+ public void testPercentSign() throws Exception { >+ doTestRewrite("RewriteRule ^(.*) /a/%%5A", "/", "/a/%255A"); >+ } >+ >+ @Test >+ public void testBackslashPercentSign() throws Exception { >+ doTestRewrite("RewriteRule ^(.*) /a/\\%5A", "/", "/a/%255A"); >+ } >+ >+ @Test > public void testNoopRewrite() throws Exception { > doTestRewrite("RewriteRule ^(.*) $1", "/a/%255A", "/a/%255A"); > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]