Merge pull request #258 from paultuckey/matthiasblaesing_fixes

Matthiasblaesing fixes

container-test/example-webapp/pom.xml

@@ -66,6 +66,12 @@
             <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
+        <!-- required for proxying -->
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
     </dependencies>
 
     <properties>

container-test/example-webapp/src/main/java/org/tuckey/web/filters/urlrewriteviacontainer/CookieServlet.java

@@ -0,0 +1,25 @@
+
+package org.tuckey.web.filters.urlrewriteviacontainer;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Writer;
+
+public class CookieServlet extends HttpServlet {
+
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        try (Writer writer = resp.getWriter()) {
+            writer.write("Cookie-Servlet\n");
+            for(Cookie cookie: req.getCookies()) {
+                writer.write(cookie.getName());
+                writer.write((": "));
+                writer.write(cookie.getValue());
+            }
+        }
+    }
+}

container-test/example-webapp/src/main/webapp/WEB-INF/web.xml

@@ -39,6 +39,7 @@
 
                 # simple test rule
                 RewriteRule  ^/mod/simple/test$ /mod/index.jsp  [L]
+                RewriteRule  ^/mod/cookie$ http://localhost:8080/webapp/cookie [P]
 
             ]]></param-value>
         </init-param>
@@ -55,11 +56,14 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <servlet>
+        <servlet-name>Cookie Test</servlet-name>
+        <servlet-class>org.tuckey.web.filters.urlrewriteviacontainer.CookieServlet</servlet-class>
+    </servlet>
 
-
-
-
-
-
+    <servlet-mapping>
+        <servlet-name>Cookie Test</servlet-name>
+        <url-pattern>/cookie</url-pattern>
+    </servlet-mapping>
 
 </web-app>

container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpITTest.java

@@ -43,6 +43,8 @@
 import jakarta.servlet.ServletException;
 import java.io.IOException;
 
+import org.apache.commons.httpclient.Cookie;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -63,7 +65,13 @@ public void beforeEach() throws Exception {
 
     @AfterEach
     public void afterEach() throws InterruptedException {
-        super.tearDown();
+        tearDown();
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        client.getState().clearCookies();
     }
 
     @Test
@@ -91,4 +99,13 @@ public void testStatus1() throws IOException {
         assertFalse(method.getResponseBodyAsString().contains("Error"));
     }
 
+    @Test
+    public void testCookiePassing() throws ServletException, IOException, SAXException {
+        GetMethod method = new GetMethod(getBaseUrl() + "/mod/cookie");
+        method.setFollowRedirects(false);
+        method.setRequestHeader("Cookie", new Cookie("localhost", "Dummy", "TestValue").toExternalForm());
+        client.executeMethod(method);
+        assertEquals(200, method.getStatusCode());
+        assertEquals("Cookie-Servlet\nDummy: TestValue", method.getResponseBodyAsString());
+    }
 }

src/main/java/org/tuckey/web/filters/urlrewrite/utils/ModRewriteConfLoader.java

@@ -213,6 +213,8 @@ private NormalRule processRule(String line) {
         } else {
             log.error("cannot parse " + line);
         }
+        // mod_rewrite passes cookies through to the backend unmodified
+        rule.setDropCookies("false");
         return rule;
     }
 

src/test/java/org/tuckey/web/filters/urlrewrite/utils/ModRewriteConfLoaderTest.java

@@ -7,6 +7,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 
 public class ModRewriteConfLoaderTest extends TestCase {
 
@@ -30,19 +31,25 @@ public void testEngine2() {
         assertFalse(conf.isEngineEnabled());
     }
 
-    public void testLoadFromFile() throws IOException {
+    public void testLoadFromFile() throws Exception {
         InputStream is = ModRewriteConfLoaderTest.class.getResourceAsStream(BASE_PATH + "htaccess-test1.txt");
         loader.process(is, conf);
         assertTrue(conf.isEngineEnabled());
         assertEquals(1, conf.getRules().size());
+        Field dropCookiesField = NormalRule.class.getDeclaredField("dropCookies");
+        dropCookiesField.setAccessible(true);
+        assertFalse(dropCookiesField.getBoolean(conf.getRules().get(0)));
     }
 
-    public void testLoadFromFile2() throws IOException {
+    public void testLoadFromFile2() throws Exception {
         InputStream is = ModRewriteConfLoaderTest.class.getResourceAsStream(BASE_PATH + "htaccess-test1.txt");
         Conf conf = new Conf(null, is, "htaccess-test1.txt", null, true);
         assertTrue(conf.isEngineEnabled());
         assertTrue(conf.isOk());
         assertEquals(1, conf.getRules().size());
+        Field dropCookiesField = NormalRule.class.getDeclaredField("dropCookies");
+        dropCookiesField.setAccessible(true);
+        assertFalse(dropCookiesField.getBoolean(conf.getRules().get(0)));
     }
 
     public void testSimple2() {