Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java

@@ -42,6 +42,7 @@ public class ResponsePatternRule extends PatternRule
     /* ------------------------------------------------------------ */
     public ResponsePatternRule(@Name("pattern") String pattern, @Name("code") String code, @Name("reason") String reason)
     {
+        super(pattern);
         _handling = true;
         _terminating = true;
         setCode(code);

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewritePatternRule.java

@@ -45,6 +45,7 @@ public class RewritePatternRule extends PatternRule implements Rule.ApplyURI
     /* ------------------------------------------------------------ */
     public RewritePatternRule(@Name("pattern") String pattern, @Name("replacement") String replacement)
     {
+        super(pattern);
         _handling = false;
         _terminating = false;
         setReplacement(replacement);

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java

@@ -50,9 +50,9 @@ public class RewriteRegexRule extends RegexRule  implements Rule.ApplyURI
     /* ------------------------------------------------------------ */
     public RewriteRegexRule(@Name("regex") String regex, @Name("replacement") String replacement)
     {
+        super(regex);
         setHandling(false);
         setTerminating(false);
-        setRegex(regex);
         setReplacement(replacement);
     }
 

tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionExpiryTest.java

@@ -18,6 +18,13 @@
 
 package org.eclipse.jetty.nosql.mongodb;
 
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -40,14 +47,6 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 
 
 
@@ -86,6 +85,12 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
         super.testSessionExpiry();
     }
     
+    @Test
+    public void testRequestForSessionWithChangedTimeout() throws Exception
+    {
+        super.testRequestForSessionWithChangedTimeout();
+    }
+    
     @Test
     public void testBigSessionExpiry() throws Exception
     {
@@ -265,6 +270,8 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
         }     
     }
     
+
+    
     
     public void verifySessionTimeout (DBCollection sessions, String id, int sec) throws Exception
     {
@@ -328,29 +335,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
         System.err.println(o);
     }
     
-    public static class ChangeTimeoutServlet extends HttpServlet
-    {
 
-        @Override
-        protected void doGet(HttpServletRequest request, HttpServletResponse httpServletResponse) throws ServletException, IOException
-        {
-            String action = request.getParameter("action");
-            if ("init".equals(action))
-            {
-                HttpSession session = request.getSession(true);
-                session.setAttribute("test", "test");
-            }
-            else if ("change".equals(action))
-            {
-                String tmp = request.getParameter("val");
-                int val = (StringUtil.isBlank(tmp)?0:Integer.valueOf(tmp.trim()));
-                HttpSession session = request.getSession(false);
-                assertNotNull(session);
-                session.setMaxInactiveInterval(val);
-            }
-        }
-    }
-    
     public static class ImmediateChangeTimeoutServlet extends HttpServlet
     {
 

tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionExpiryTest.java

@@ -19,6 +19,8 @@
 package org.eclipse.jetty.server.session;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -39,6 +41,7 @@ import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.server.session.Session.SessionInactivityTimeout;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.StringUtil;
 import org.junit.Test;
 
 /**
@@ -49,11 +52,11 @@ import org.junit.Test;
 public abstract class AbstractSessionExpiryTest extends AbstractTestBase
 {
 
-    public void pause(int scavengePeriod)
+    public void pause(int period)
     {
         try
         {
-            Thread.sleep(scavengePeriod * 1000L);
+            Thread.sleep(period * 1000L);
         }
         catch (InterruptedException e)
         {
@@ -209,6 +212,73 @@ public abstract class AbstractSessionExpiryTest extends AbstractTestBase
             server1.stop();
         }     
     }
+    
+    
+    @Test
+    public void testRequestForSessionWithChangedTimeout () throws Exception
+    {
+      String contextPath = "";
+      String servletMapping = "/server";
+      int inactivePeriod = 5;
+      int scavengePeriod = 1;
+      AbstractTestServer server1 = createServer(0, inactivePeriod, scavengePeriod, SessionCache.NEVER_EVICT);
+      ChangeTimeoutServlet servlet = new ChangeTimeoutServlet();
+      ServletHolder holder = new ServletHolder(servlet);
+      ServletContextHandler context = server1.addContext(contextPath);
+      context.addServlet(holder, servletMapping);
+      TestHttpSessionListener listener = new TestHttpSessionListener();
+      
+      context.getSessionHandler().addEventListener(listener);
+      
+      server1.start();
+      int port1 = server1.getPort();
+
+      try
+      {
+          HttpClient client = new HttpClient();
+          client.start();
+          String url = "http://localhost:" + port1 + contextPath + servletMapping;
+
+          //make a request to set up a session on the server with the session manager's inactive timeout
+          ContentResponse response = client.GET(url + "?action=init");
+          assertEquals(HttpServletResponse.SC_OK,response.getStatus());
+          String sessionCookie = response.getHeaders().get("Set-Cookie");
+          assertTrue(sessionCookie != null);
+          // Mangle the cookie, replacing Path with $Path, etc.
+          sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path=");
+             
+         
+          //make another request to change the session timeout to a larger value
+          int newInactivePeriod = 100;
+          Request request = client.newRequest(url + "?action=change&val="+newInactivePeriod);
+          request.getHeaders().add("Cookie", sessionCookie);
+          response = request.send();
+          assertEquals(HttpServletResponse.SC_OK,response.getStatus());
+          
+          //stop and restart the session manager to ensure it needs to reload the session
+          context.stop();
+          context.start();
+
+          //wait until the session manager timeout has passed and re-request the session
+          //which should still be valid
+          pause(inactivePeriod);
+
+          request = client.newRequest(url + "?action=check");
+          request.getHeaders().add("Cookie", sessionCookie);
+          response = request.send();
+          assertEquals(HttpServletResponse.SC_OK,response.getStatus());
+          String sessionCookie2 = response.getHeaders().get("Set-Cookie");
+          assertNull(sessionCookie2);
+          
+      }
+      finally
+      {
+          server1.stop();
+      }     
+    }
+    
+    
+    
     public void verifySessionCreated (TestHttpSessionListener listener, String sessionId)
     {
         assertTrue(listener.createdSessions.contains(sessionId));
@@ -249,4 +319,34 @@ public abstract class AbstractSessionExpiryTest extends AbstractTestBase
 
         }
     }
+    
+    
+    public static class ChangeTimeoutServlet extends HttpServlet
+    {
+
+        @Override
+        protected void doGet(HttpServletRequest request, HttpServletResponse httpServletResponse) throws ServletException, IOException
+        {
+            String action = request.getParameter("action");
+            if ("init".equals(action))
+            {
+                HttpSession session = request.getSession(true);
+                session.setAttribute("test", "test");
+            }
+            else if ("change".equals(action))
+            {
+                String tmp = request.getParameter("val");
+                int val = (StringUtil.isBlank(tmp)?0:Integer.valueOf(tmp.trim()));
+                HttpSession session = request.getSession(false);
+                assertNotNull(session);
+                session.setMaxInactiveInterval(val);
+            }
+            else if ("check".equals(action))
+            {
+                HttpSession session = request.getSession(false);
+                assertNotNull(session);
+            }
+        }
+    }
+    
 }