Author: markt
Date: Tue Apr 28 20:35:21 2015
New Revision: 1676615
URL: http://svn.apache.org/r1676615
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57863
Correct RewriteMap support
Based on a patch provided by Tatsuya Bessho.
Added:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java?rev=1676615&r1=1676614&r2=1676615&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java Tue
Apr 28 20:35:21 2015
@@ -30,8 +30,7 @@ public class Substitution {
public String value;
@Override
- public String evaluate
- (Matcher rule, Matcher cond, Resolver resolver) {
+ public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
return value;
}
@@ -89,9 +88,10 @@ public class Substitution {
public RewriteMap map = null;
public String key;
public String defaultValue = null;
+ public int n;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
- String result = map.lookup(key);
+ String result = map.lookup(rule.group(n));
if (result == null) {
result = defaultValue;
}
@@ -162,6 +162,9 @@ public class Substitution {
} else {
newElement.key = sub.substring(colon + 1, close);
}
+ if (newElement.key.startsWith("$")) {
+ newElement.n =
Integer.parseInt(newElement.key.substring(1));
+ }
pos = close + 1;
elements.add(newElement);
}
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1676615&r1=1676614&r2=1676615&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Tue Apr 28 20:35:21 2015
@@ -46,6 +46,19 @@ public class TestRewriteValve extends To
doTestRewrite("RewriteRule ^/b/(.*) /b/../a/$1", "/b/%255A",
"/b/../a/%255A");
}
+ // BZ 57863
+ @Test
+ public void testRewriteMap01() throws Exception {
+ doTestRewrite("RewriteMap mapa
org.apache.catalina.valves.rewrite.TesterRewriteMapA\n" +
+ "RewriteRule /b/(.*).html$ /c/${mapa:$1}", "/b/a.html",
"/c/aa");
+ }
+
+ @Test
+ public void testRewriteMap02() throws Exception {
+ doTestRewrite("RewriteMap mapa
org.apache.catalina.valves.rewrite.TesterRewriteMapA\n" +
+ "RewriteRule /b/(.*).html$ /c/${mapa:$1|dd}", "/b/x.html",
"/c/dd");
+ }
+
private void doTestRewrite(String config, String request, String
expectedURI) throws Exception {
Tomcat tomcat = getTomcatInstance();
@@ -61,6 +74,7 @@ public class TestRewriteValve extends To
// (http://svn.apache.org/r285186)
Tomcat.addServlet(ctx, "snoop", new SnoopServlet());
ctx.addServletMapping("/a/%255A", "snoop");
+ ctx.addServletMapping("/c/*", "snoop");
tomcat.start();
Added:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java?rev=1676615&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
Tue Apr 28 20:35:21 2015
@@ -0,0 +1,41 @@
+/*
+ * 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.catalina.valves.rewrite;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TesterRewriteMapA implements RewriteMap {
+
+ private static final Map<String,String> map = new HashMap<>();
+
+ static {
+ map.put("a", "aa");
+ map.put("b", "bb");
+ }
+
+ @Override
+ public String setParameters(String params) {
+ // NO-OP
+ return null;
+ }
+
+ @Override
+ public String lookup(String key) {
+ return map.get(key);
+ }
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
