Merge remote-tracking branch 'origin/jetty-7' into jetty-8
This commit is contained in:
Jan Bartel
commit
a8a015d8c2
|
|
@ -216,7 +216,7 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
|
||||||
BasicDBObject invalidQuery = new BasicDBObject();
|
BasicDBObject invalidQuery = new BasicDBObject();
|
||||||
|
|
||||||
invalidQuery.put(MongoSessionManager.__ACCESSED, new BasicDBObject("$lt",System.currentTimeMillis() - _purgeInvalidAge));
|
invalidQuery.put(MongoSessionManager.__ACCESSED, new BasicDBObject("$lt",System.currentTimeMillis() - _purgeInvalidAge));
|
||||||
invalidQuery.put(MongoSessionManager.__VALID, __valid_false);
|
invalidQuery.put(MongoSessionManager.__VALID, false);
|
||||||
|
|
||||||
DBCursor oldSessions = _sessions.find(invalidQuery, new BasicDBObject(MongoSessionManager.__ID, 1));
|
DBCursor oldSessions = _sessions.find(invalidQuery, new BasicDBObject(MongoSessionManager.__ID, 1));
|
||||||
|
|
||||||
|
|
@ -234,9 +234,9 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
|
||||||
BasicDBObject validQuery = new BasicDBObject();
|
BasicDBObject validQuery = new BasicDBObject();
|
||||||
|
|
||||||
validQuery.put(MongoSessionManager.__ACCESSED,new BasicDBObject("$lt",System.currentTimeMillis() - _purgeValidAge));
|
validQuery.put(MongoSessionManager.__ACCESSED,new BasicDBObject("$lt",System.currentTimeMillis() - _purgeValidAge));
|
||||||
validQuery.put(MongoSessionManager.__VALID, __valid_false);
|
validQuery.put(MongoSessionManager.__VALID, true);
|
||||||
|
|
||||||
oldSessions = _sessions.find(invalidQuery,new BasicDBObject(MongoSessionManager.__ID,1));
|
oldSessions = _sessions.find(validQuery,new BasicDBObject(MongoSessionManager.__ID,1));
|
||||||
|
|
||||||
for (DBObject session : oldSessions)
|
for (DBObject session : oldSessions)
|
||||||
{
|
{
|
||||||
|
|
@ -410,7 +410,8 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
|
||||||
purge();
|
purge();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
_purgeTimer.schedule(_purgeTask,_purgeDelay);
|
|
||||||
|
_purgeTimer.schedule(_purgeTask,0,_purgeDelay);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,190 @@
|
||||||
|
//
|
||||||
|
// ========================================================================
|
||||||
|
// Copyright (c) 1995-2012 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 static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.UnknownHostException;
|
||||||
|
|
||||||
|
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.ContentExchange;
|
||||||
|
import org.eclipse.jetty.client.HttpClient;
|
||||||
|
import org.eclipse.jetty.http.HttpMethods;
|
||||||
|
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.mongodb.BasicDBObject;
|
||||||
|
import com.mongodb.DBCollection;
|
||||||
|
import com.mongodb.DBObject;
|
||||||
|
import com.mongodb.Mongo;
|
||||||
|
import com.mongodb.MongoException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PurgeInvalidSessionTest
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class PurgeInvalidSessionTest
|
||||||
|
{
|
||||||
|
public MongoTestServer createServer(int port, int max, int scavenge)
|
||||||
|
{
|
||||||
|
MongoTestServer server = new MongoTestServer(port,max,scavenge);
|
||||||
|
|
||||||
|
return server;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testPurgeInvalidSession() throws Exception
|
||||||
|
{
|
||||||
|
String contextPath = "";
|
||||||
|
String servletMapping = "/server";
|
||||||
|
long purgeDelay = 1000; //1 sec
|
||||||
|
long purgeInvalidAge = 1000; //1 sec
|
||||||
|
long purgeValidAge = 1000;
|
||||||
|
|
||||||
|
//ensure scavenging is turned off so the purger gets a chance to find the session
|
||||||
|
MongoTestServer server = createServer(0, 1, 0);
|
||||||
|
ServletContextHandler context = server.addContext(contextPath);
|
||||||
|
context.addServlet(TestServlet.class, servletMapping);
|
||||||
|
|
||||||
|
MongoSessionManager sessionManager = (MongoSessionManager)context.getSessionHandler().getSessionManager();
|
||||||
|
MongoSessionIdManager idManager = (MongoSessionIdManager)server.getServer().getSessionIdManager();
|
||||||
|
idManager.setPurge(true);
|
||||||
|
idManager.setPurgeDelay(purgeDelay);
|
||||||
|
idManager.setPurgeInvalidAge(purgeInvalidAge); //purge invalid sessions older than
|
||||||
|
idManager.setPurgeValidAge(purgeValidAge); //purge valid sessions older than
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
server.start();
|
||||||
|
int port=server.getPort();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HttpClient client = new HttpClient();
|
||||||
|
client.setConnectorType(HttpClient.CONNECTOR_SOCKET);
|
||||||
|
client.start();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//Create a session
|
||||||
|
ContentExchange exchange = new ContentExchange(true);
|
||||||
|
exchange.setMethod(HttpMethods.GET);
|
||||||
|
exchange.setURL("http://localhost:" + port + contextPath + servletMapping + "?action=create");
|
||||||
|
client.send(exchange);
|
||||||
|
exchange.waitForDone();
|
||||||
|
assertEquals(HttpServletResponse.SC_OK,exchange.getResponseStatus());
|
||||||
|
String sessionCookie = exchange.getResponseFields().getStringField("Set-Cookie");
|
||||||
|
assertTrue(sessionCookie != null);
|
||||||
|
// Mangle the cookie, replacing Path with $Path, etc.
|
||||||
|
sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path=");
|
||||||
|
|
||||||
|
//make a request to invalidate the session
|
||||||
|
exchange = new ContentExchange(true);
|
||||||
|
exchange.setMethod(HttpMethods.GET);
|
||||||
|
exchange.setURL("http://localhost:" + port + contextPath + servletMapping + "?action=invalidate");
|
||||||
|
exchange.getRequestFields().add("Cookie", sessionCookie);
|
||||||
|
client.send(exchange);
|
||||||
|
exchange.waitForDone();
|
||||||
|
assertEquals(HttpServletResponse.SC_OK,exchange.getResponseStatus());
|
||||||
|
|
||||||
|
Thread.currentThread().sleep(3*purgeDelay); //sleep long enough for purger to have run
|
||||||
|
|
||||||
|
//make a request using previous session to test if its still there
|
||||||
|
exchange = new ContentExchange(true);
|
||||||
|
exchange.setMethod(HttpMethods.GET);
|
||||||
|
exchange.setURL("http://localhost:" + port + contextPath + servletMapping + "?action=test");
|
||||||
|
exchange.getRequestFields().add("Cookie", sessionCookie);
|
||||||
|
client.send(exchange);
|
||||||
|
exchange.waitForDone();
|
||||||
|
assertEquals(HttpServletResponse.SC_OK,exchange.getResponseStatus());
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
client.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
server.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static class TestServlet extends HttpServlet
|
||||||
|
{
|
||||||
|
DBCollection _sessions;
|
||||||
|
|
||||||
|
|
||||||
|
public TestServlet() throws UnknownHostException, MongoException
|
||||||
|
{
|
||||||
|
super();
|
||||||
|
_sessions = new Mongo().getDB("HttpSessions").getCollection("sessions");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
|
||||||
|
{
|
||||||
|
String action = request.getParameter("action");
|
||||||
|
if ("create".equals(action))
|
||||||
|
{
|
||||||
|
HttpSession session = request.getSession(true);
|
||||||
|
assertTrue(session.isNew());
|
||||||
|
}
|
||||||
|
else if ("invalidate".equals(action))
|
||||||
|
{
|
||||||
|
HttpSession existingSession = request.getSession(false);
|
||||||
|
assertNotNull(existingSession);
|
||||||
|
existingSession.invalidate();
|
||||||
|
String id = request.getRequestedSessionId();
|
||||||
|
assertNotNull(id);
|
||||||
|
id = id.substring(0, id.indexOf("."));
|
||||||
|
|
||||||
|
//still in db, just marked as invalid
|
||||||
|
DBObject dbSession = _sessions.findOne(new BasicDBObject("id", id));
|
||||||
|
assertTrue(dbSession != null);
|
||||||
|
}
|
||||||
|
else if ("test".equals(action))
|
||||||
|
{
|
||||||
|
String id = request.getRequestedSessionId();
|
||||||
|
assertNotNull(id);
|
||||||
|
id = id.substring(0, id.indexOf("."));
|
||||||
|
|
||||||
|
HttpSession existingSession = request.getSession(false);
|
||||||
|
assertTrue(existingSession == null);
|
||||||
|
|
||||||
|
//not in db any more
|
||||||
|
DBObject dbSession = _sessions.findOne(new BasicDBObject("id", id));
|
||||||
|
assertTrue(dbSession == null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,171 @@
|
||||||
|
//
|
||||||
|
// ========================================================================
|
||||||
|
// Copyright (c) 1995-2012 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 static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.UnknownHostException;
|
||||||
|
|
||||||
|
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.ContentExchange;
|
||||||
|
import org.eclipse.jetty.client.HttpClient;
|
||||||
|
import org.eclipse.jetty.http.HttpMethods;
|
||||||
|
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.mongodb.BasicDBObject;
|
||||||
|
import com.mongodb.DBCollection;
|
||||||
|
import com.mongodb.DBObject;
|
||||||
|
import com.mongodb.Mongo;
|
||||||
|
import com.mongodb.MongoException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PurgeValidSessionTest
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class PurgeValidSessionTest
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public MongoTestServer createServer(int port, int max, int scavenge)
|
||||||
|
{
|
||||||
|
MongoTestServer server = new MongoTestServer(port,max,scavenge);
|
||||||
|
|
||||||
|
return server;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testPurgeValidSession() throws Exception
|
||||||
|
{
|
||||||
|
String contextPath = "";
|
||||||
|
String servletMapping = "/server";
|
||||||
|
long purgeDelay = 1000; //1 sec
|
||||||
|
long purgeValidAge = 1000;
|
||||||
|
|
||||||
|
//ensure scavenging is turned off so the purger gets a chance to find the session
|
||||||
|
MongoTestServer server = createServer(0, 1, 0);
|
||||||
|
ServletContextHandler context = server.addContext(contextPath);
|
||||||
|
context.addServlet(TestServlet.class, servletMapping);
|
||||||
|
|
||||||
|
MongoSessionManager sessionManager = (MongoSessionManager)context.getSessionHandler().getSessionManager();
|
||||||
|
MongoSessionIdManager idManager = (MongoSessionIdManager)server.getServer().getSessionIdManager();
|
||||||
|
idManager.setPurge(true);
|
||||||
|
idManager.setPurgeDelay(purgeDelay);
|
||||||
|
|
||||||
|
idManager.setPurgeValidAge(purgeValidAge); //purge valid sessions older than
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
server.start();
|
||||||
|
int port=server.getPort();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HttpClient client = new HttpClient();
|
||||||
|
client.setConnectorType(HttpClient.CONNECTOR_SOCKET);
|
||||||
|
client.start();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//Create a session
|
||||||
|
ContentExchange exchange = new ContentExchange(true);
|
||||||
|
exchange.setMethod(HttpMethods.GET);
|
||||||
|
exchange.setURL("http://localhost:" + port + contextPath + servletMapping + "?action=create");
|
||||||
|
client.send(exchange);
|
||||||
|
exchange.waitForDone();
|
||||||
|
assertEquals(HttpServletResponse.SC_OK,exchange.getResponseStatus());
|
||||||
|
String sessionCookie = exchange.getResponseFields().getStringField("Set-Cookie");
|
||||||
|
assertTrue(sessionCookie != null);
|
||||||
|
// Mangle the cookie, replacing Path with $Path, etc.
|
||||||
|
sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path=");
|
||||||
|
|
||||||
|
|
||||||
|
Thread.currentThread().sleep(3*purgeDelay); //sleep long enough for purger to have run
|
||||||
|
|
||||||
|
//make a request using previous session to test if its still there
|
||||||
|
exchange = new ContentExchange(true);
|
||||||
|
exchange.setMethod(HttpMethods.GET);
|
||||||
|
exchange.setURL("http://localhost:" + port + contextPath + servletMapping + "?action=test");
|
||||||
|
exchange.getRequestFields().add("Cookie", sessionCookie);
|
||||||
|
client.send(exchange);
|
||||||
|
exchange.waitForDone();
|
||||||
|
assertEquals(HttpServletResponse.SC_OK,exchange.getResponseStatus());
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
client.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
server.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static class TestServlet extends HttpServlet
|
||||||
|
{
|
||||||
|
DBCollection _sessions;
|
||||||
|
|
||||||
|
|
||||||
|
public TestServlet() throws UnknownHostException, MongoException
|
||||||
|
{
|
||||||
|
super();
|
||||||
|
_sessions = new Mongo().getDB("HttpSessions").getCollection("sessions");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
|
||||||
|
{
|
||||||
|
String action = request.getParameter("action");
|
||||||
|
if ("create".equals(action))
|
||||||
|
{
|
||||||
|
HttpSession session = request.getSession(true);
|
||||||
|
assertTrue(session.isNew());
|
||||||
|
}
|
||||||
|
else if ("test".equals(action))
|
||||||
|
{
|
||||||
|
String id = request.getRequestedSessionId();
|
||||||
|
assertNotNull(id);
|
||||||
|
id = id.substring(0, id.indexOf("."));
|
||||||
|
|
||||||
|
HttpSession existingSession = request.getSession(false);
|
||||||
|
assertTrue(existingSession == null);
|
||||||
|
|
||||||
|
//not in db any more
|
||||||
|
DBObject dbSession = _sessions.findOne(new BasicDBObject("id", id));
|
||||||
|
assertTrue(dbSession == null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue