Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

464564 NoSql sessions created inside a forward not persisted correctly

This commit is contained in:
Jan Bartel 2015-04-23 14:25:34 +10:00
parent f7adc1aa5f
commit 184c4d4af8
7 changed files with 511 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
View File

@ -158,7 +158,7 @@ public class SessionHandler extends ScopedHandler
session = baseRequest.getSession(false);
if (session != null)
{
if (session != old_session)
if ((session != old_session) && (request.getDispatcherType() == DispatcherType.ASYNC || request.getDispatcherType() == DispatcherType.REQUEST))
{
access = session;
HttpCookie cookie = _sessionManager.access(session,request.isSecure());
@ -192,11 +192,14 @@ public class SessionHandler extends ScopedHandler
}
finally
{
//if we accessed an existing session entering this context, then complete it
if (access != null)
_sessionManager.complete(access);
//if there is a session that was created during handling this context, then complete it
HttpSession session = baseRequest.getSession(false);
if (session != null && old_session == null && session != access)
if ((session != null && old_session == null && session != access) && (request.getDispatcherType() == DispatcherType.ASYNC || request.getDispatcherType() == DispatcherType.REQUEST))
_sessionManager.complete(session);
if (old_session_manager != null && old_session_manager != _sessionManager)

91
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java Normal file
View File

@ -0,0 +1,91 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.server.session;
import java.io.File;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.util.IO;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
/**
* ForwardedSessionTest
*
*
*/
public class ForwardedSessionTest extends AbstractForwardedSessionTest
{
File tmpDir;
@Before
public void before() throws Exception
{
tmpDir = File.createTempFile("hash-session-forward-test", null);
tmpDir.delete();
tmpDir.mkdirs();
tmpDir.deleteOnExit();
}
@After
public void after()
{
IO.delete(tmpDir);
}
@Override
public AbstractTestServer createServer(int port)
{
return new HashTestServer(port)
{
@Override
public SessionManager newSessionManager()
{
HashSessionManager sessionManager = (HashSessionManager)super.newSessionManager();
sessionManager.setSavePeriod(2);
try
{
sessionManager.setStoreDirectory(tmpDir);
}
catch (Exception e)
{
throw new IllegalStateException(e);
}
return sessionManager;
}
};
}
@Test
public void testSessionCreateInForward() throws Exception
{
super.testSessionCreateInForward();
}
}

66
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java Normal file
View File

@ -0,0 +1,66 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.server.session;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* ForwardedSessionTest
*
*
*/
public class ForwardedSessionTest extends AbstractForwardedSessionTest
{
public static InfinispanTestSupport __testSupport;
@BeforeClass
public static void setup () throws Exception
{
__testSupport = new InfinispanTestSupport();
__testSupport.setup();
}
@AfterClass
public static void teardown () throws Exception
{
__testSupport.teardown();
}
@Override
public AbstractTestServer createServer(int port)
{
InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, __testSupport.getCache());
return server;
}
@Test
public void testSessionCreateInForward() throws Exception
{
super.testSessionCreateInForward();
}
}

68
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteForwardedSessionTest.java Normal file
View File

@ -0,0 +1,68 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.server.session.remote;
import org.eclipse.jetty.server.session.AbstractForwardedSessionTest;
import org.eclipse.jetty.server.session.AbstractTestServer;
import org.eclipse.jetty.server.session.InfinispanTestSessionServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* RemoteForwardedSessionTest
*
*
*/
public class RemoteForwardedSessionTest extends AbstractForwardedSessionTest
{
public static RemoteInfinispanTestSupport __testSupport;
@BeforeClass
public static void setup () throws Exception
{
__testSupport = new RemoteInfinispanTestSupport("remote-session-test");
__testSupport.setup();
}
@AfterClass
public static void teardown () throws Exception
{
__testSupport.teardown();
}
@Override
public AbstractTestServer createServer(int port)
{
InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, __testSupport.getCache());
return server;
}
@Test
public void testSessionCreateInForward() throws Exception
{
super.testSessionCreateInForward();
}
}

50
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java Normal file
View File

@ -0,0 +1,50 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.server.session;
import org.junit.Test;
/**
* ForwardedSessionTest
*
*
*/
public class ForwardedSessionTest extends AbstractForwardedSessionTest
{
/**
* @see org.eclipse.jetty.server.session.AbstractForwardedSessionTest#createServer(int)
*/
@Override
public AbstractTestServer createServer(int port)
{
return new JdbcTestServer(port);
}
@Test
public void testSessionCreateInForward() throws Exception
{
super.testSessionCreateInForward();
}
}

48
tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ForwardedSessionTest.java Normal file
View File

@ -0,0 +1,48 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.nosql.mongodb;
import org.eclipse.jetty.server.session.AbstractForwardedSessionTest;
import org.eclipse.jetty.server.session.AbstractTestServer;
import org.junit.Test;
/**
* ForwardedSessionTest
*
*
*/
public class ForwardedSessionTest extends AbstractForwardedSessionTest
{
/**
* @see org.eclipse.jetty.server.session.AbstractForwardedSessionTest#createServer(int)
*/
@Override
public AbstractTestServer createServer(int port)
{
return new MongoTestServer(port);
}
@Test
public void testSessionCreateInForward() throws Exception
{
super.testSessionCreateInForward();
}
}

183
tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractForwardedSessionTest.java Normal file
View File

@ -0,0 +1,183 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
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;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.junit.Test;
/**
* AbstractForwardedSessionTest
*
* Test that creating a session inside a forward on the same context works, and that
* attributes set after the forward returns are preserved.
*
* This test requires that the sessions will be persisted, as the server is stopped and
* then restarted in order to check that all the attributes were saved.
*/
public abstract class AbstractForwardedSessionTest
{
public abstract AbstractTestServer createServer(int port);
@Test
public void testSessionCreateInForward() throws Exception
{
AbstractTestServer testServer = createServer(0);
ServletContextHandler testServletContextHandler = testServer.addContext("/context");
testServletContextHandler.addServlet(Servlet1.class, "/one");
testServletContextHandler.addServlet(Servlet2.class, "/two");
testServletContextHandler.addServlet(Servlet3.class, "/three");
testServletContextHandler.addServlet(Servlet4.class, "/four");
try
{
testServer.start();
int serverPort=testServer.getPort();
HttpClient client = new HttpClient();
client.start();
try
{
//make a request to the first servlet, which will forward it to other servlets
ContentResponse response = client.GET("http://localhost:" + serverPort + "/context/one");
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=");
//test that the session was created, and that it contains the attributes from servlet3 and servlet1
//stop the server, to make sure any session persistence has happened
testServer.stop();
//restart
testServer.start();
serverPort = testServer.getPort();
//Make a fresh request
Request request = client.newRequest("http://localhost:" + serverPort + "/context/four");
request.header("Cookie", sessionCookie);
response = request.send();
assertEquals(HttpServletResponse.SC_OK, response.getStatus());
}
finally
{
client.stop();
}
}
finally
{
testServer.stop();
}
}
public static class Servlet1 extends HttpServlet
{
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
//Don't create a session, just forward to another session in the same context
assertNull(request.getSession(false));
//The session will be created by the other servlet, so will exist as this dispatch returns
RequestDispatcher dispatcher = request.getServletContext().getRequestDispatcher("/two");
dispatcher.forward(request, response);
HttpSession sess = request.getSession(false);
assertNotNull(sess);
sess.setAttribute("servlet1", "servlet1");
}
}
public static class Servlet2 extends HttpServlet
{
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
//forward to yet another servlet to do the creation
assertNull(request.getSession(false));
RequestDispatcher dispatcher = request.getServletContext().getRequestDispatcher("/three");
dispatcher.forward(request, response);
//the session should exist after the forward
HttpSession sess = request.getSession(false);
assertNotNull(sess);
}
}
public static class Servlet3 extends HttpServlet
{
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
//No session yet
assertNull(request.getSession(false));
//Create it
HttpSession session = request.getSession();
assertNotNull(session);
//Set an attribute on it
session.setAttribute("servlet3", "servlet3");
}
}
public static class Servlet4 extends HttpServlet
{
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
//Check that the session contains attributes set during and after the session forward
HttpSession session = request.getSession();
assertNotNull(session);
assertNotNull(session.getAttribute("servlet1"));
assertNotNull(session.getAttribute("servlet3"));
}
}
}