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

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

This commit is contained in:
Greg Wilkins 2016-06-01 15:31:24 +10:00
parent 6b2f986909 5c33a119da
commit 8138c861c7
6 changed files with 368 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -24,6 +24,7 @@ import java.nio.channels.IllegalSelectorException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
@ -109,12 +110,15 @@ public class Response implements HttpServletResponse
private Locale _locale;
private MimeTypes.Type _mimeType;
private String _characterEncoding;
private boolean _explicitEncoding;
private EncodingFrom _encodingFrom=EncodingFrom.NOT_SET;
private String _contentType;
private OutputType _outputType = OutputType.NONE;
private ResponseWriter _writer;
private long _contentLength = -1;
private enum EncodingFrom { NOT_SET, INFERRED, SET_LOCALE, SET_CONTENT_TYPE, SET_CHARACTER_ENCODING };
private static final EnumSet<EncodingFrom> __localeOverride = EnumSet.of(EncodingFrom.NOT_SET,EncodingFrom.INFERRED);
public Response(HttpChannel channel, HttpOutput out)
{
@ -139,7 +143,7 @@ public class Response implements HttpServletResponse
_contentLength = -1;
_out.recycle();
_fields.clear();
_explicitEncoding=false;
_encodingFrom=EncodingFrom.NOT_SET;
}
public HttpOutput getHttpOutput()
@ -857,7 +861,7 @@ public class Response implements HttpServletResponse
encoding = MimeTypes.inferCharsetFromContentType(_contentType);
if (encoding == null)
encoding = StringUtil.__ISO_8859_1;
setCharacterEncoding(encoding,false);
setCharacterEncoding(encoding,EncodingFrom.INFERRED);
}
}
@ -973,10 +977,10 @@ public class Response implements HttpServletResponse
@Override
public void setCharacterEncoding(String encoding)
{
setCharacterEncoding(encoding,true);
setCharacterEncoding(encoding,EncodingFrom.SET_CHARACTER_ENCODING);
}
private void setCharacterEncoding(String encoding, boolean explicit)
private void setCharacterEncoding(String encoding, EncodingFrom from)
{
if (isIncluding() || isWriting())
return;
@ -985,7 +989,7 @@ public class Response implements HttpServletResponse
{
if (encoding == null)
{
_explicitEncoding=false;
_encodingFrom=EncodingFrom.NOT_SET;
// Clear any encoding.
if (_characterEncoding != null)
@ -1008,7 +1012,7 @@ public class Response implements HttpServletResponse
else
{
// No, so just add this one to the mimetype
_explicitEncoding = explicit;
_encodingFrom = from;
_characterEncoding = HttpGenerator.__STRICT?encoding:StringUtil.normalizeCharset(encoding);
if (_mimeType!=null)
{
@ -1058,10 +1062,29 @@ public class Response implements HttpServletResponse
if (charset == null)
{
if (_characterEncoding != null)
switch (_encodingFrom)
{
_contentType = contentType + ";charset=" + _characterEncoding;
_mimeType = null;
case NOT_SET:
break;
case INFERRED:
case SET_CONTENT_TYPE:
if (isWriting())
{
_mimeType=null;
_contentType = _contentType + ";charset=" + _characterEncoding;
}
else
{
_encodingFrom=EncodingFrom.NOT_SET;
_characterEncoding=null;
}
break;
case SET_LOCALE:
case SET_CHARACTER_ENCODING:
{
_contentType = contentType + ";charset=" + _characterEncoding;
_mimeType = null;
}
}
}
else if (isWriting() && !charset.equalsIgnoreCase(_characterEncoding))
@ -1075,7 +1098,7 @@ public class Response implements HttpServletResponse
else
{
_characterEncoding = charset;
_explicitEncoding = true;
_encodingFrom = EncodingFrom.SET_CONTENT_TYPE;
}
if (HttpGenerator.__STRICT || _mimeType==null)
@ -1226,8 +1249,8 @@ public class Response implements HttpServletResponse
String charset = _channel.getRequest().getContext().getContextHandler().getLocaleEncoding(locale);
if (charset != null && charset.length() > 0 && !_explicitEncoding)
setCharacterEncoding(charset,false);
if (charset != null && charset.length() > 0 && __localeOverride.contains(_encodingFrom))
setCharacterEncoding(charset,EncodingFrom.SET_LOCALE);
}
@Override

8
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java
View File

@ -637,6 +637,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
if (session == null)
return;
if (LOG.isDebugEnabled()) LOG.debug("Checking for idle {}", session.getId());
try (Lock s = session.lock())
{
if (getEvictionPolicy() > 0 && session.isIdleLongerThan(getEvictionPolicy()) && session.isValid() && session.isResident() && session.getRequests() <= 0)
@ -656,9 +657,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
_sessionDataStore.store(session.getId(), session.getSessionData());
}
//evict
// session.stopInactivityTimer();
doDelete(session.getId()); //detach from this cache
session.setResident(false);
@ -666,9 +664,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
catch (Exception e)
{
LOG.warn("Passivation of idle session {} failed", session.getId(), e);
//TODO reset the timer so it can be retried later and leave it in the cache
doDelete(session.getId()); //detach it
session.setResident(false);
session.updateInactivityTimer();
}
}
}

4
jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
View File

@ -259,7 +259,7 @@ public class Session implements SessionHandler.SessionIf
long now = System.currentTimeMillis();
try (Lock lock = _lock.lockIfNotHeld())
{
return ((_sessionData.getAccessed() + (sec*1000)) < now);
return ((_sessionData.getAccessed() + (sec*1000)) <= now);
}
}
@ -485,7 +485,7 @@ public class Session implements SessionHandler.SessionIf
{
//we do not want to evict inactive sessions
setInactivityTimer(-1L);
if (LOG.isDebugEnabled()) LOG.debug("Session is immortal && bo inactivity eviction: timer cancelled");
if (LOG.isDebugEnabled()) LOG.debug("Session is immortal && no inactivity eviction: timer cancelled");
}
else
{

34
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
View File

@ -169,7 +169,7 @@ public class ResponseTest
assertEquals("text/html", response.getContentType());
response.getWriter();
assertEquals("text/html;charset=utf-8", response.getContentType());
response.setContentType("foo2/bar2");
response.setContentType("foo2/bar2;charset=utf-8");
assertEquals("foo2/bar2;charset=utf-8", response.getContentType());
response.recycle();
@ -361,6 +361,38 @@ public class ResponseTest
assertEquals("text/xml;charset=utf-8", response.getContentType());
}
@Test
public void testResetContentTypeWithoutCharacterEncoding() throws Exception
{
Response response = newResponse();
response.setCharacterEncoding("utf-8");
response.setContentType("wrong/answer");
response.setContentType("foo/bar");
assertEquals("foo/bar;charset=utf-8", response.getContentType());
response.getWriter();
response.setContentType("foo2/bar2");
assertEquals("foo2/bar2;charset=utf-8", response.getContentType());
}
@Test
public void testResetContentTypeWithCharacterEncoding() throws Exception
{
Response response = newResponse();
response.setContentType("wrong/answer;charset=utf-8");
response.setContentType("foo/bar");
assertEquals("foo/bar", response.getContentType());
response.setContentType("wrong/answer;charset=utf-8");
response.getWriter();
response.setContentType("foo2/bar2;charset=utf-16");
assertEquals("foo2/bar2;charset=utf-8", response.getContentType());
}
@Test
public void testContentTypeWithOther() throws Exception
{

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

@ -0,0 +1,39 @@
//
// ========================================================================
// Copyright (c) 1995-2016 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;
/**
* EvictionFailureTest
*
*
*/
public class EvictionFailureTest extends AbstractSessionEvictionFailureTest
{
/**
* @see org.eclipse.jetty.server.session.AbstractTestBase#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
{
return new HashTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}
}

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

@ -0,0 +1,256 @@
//
// ========================================================================
// Copyright (c) 1995-2016 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.IOException;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
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.eclipse.jetty.servlet.ServletHolder;
import org.junit.Test;
/**
* AbstractSessionEvictionFailureTest
*
*
*/
public abstract class AbstractSessionEvictionFailureTest extends AbstractTestBase
{
/**
* TestSessionDataStore
*
*
*/
public static class TestSessionDataStore extends AbstractSessionDataStore
{
public boolean _nextResult;
public void setNextResult (boolean goodOrBad)
{
_nextResult = goodOrBad;
}
/**
* @see org.eclipse.jetty.server.session.SessionDataStore#isPassivating()
*/
@Override
public boolean isPassivating()
{
return false;
}
/**
* @see org.eclipse.jetty.server.session.SessionDataStore#exists(java.lang.String)
*/
@Override
public boolean exists(String id) throws Exception
{
return true;
}
/**
* @see org.eclipse.jetty.server.session.SessionDataMap#load(java.lang.String)
*/
@Override
public SessionData load(String id) throws Exception
{
return null;
}
/**
* @see org.eclipse.jetty.server.session.SessionDataMap#delete(java.lang.String)
*/
@Override
public boolean delete(String id) throws Exception
{
return false;
}
/**
* @see org.eclipse.jetty.server.session.AbstractSessionDataStore#doStore(java.lang.String, org.eclipse.jetty.server.session.SessionData, long)
*/
@Override
public void doStore(String id, SessionData data, long lastSaveTime) throws Exception
{
if (!_nextResult)
{
System.err.println("Throwing exception on store!");
throw new IllegalStateException("Testing store");
}
else
System.err.println("Storing");
}
/**
* @see org.eclipse.jetty.server.session.AbstractSessionDataStore#doGetExpired(java.util.Set)
*/
@Override
public Set<String> doGetExpired(Set<String> candidates)
{
return candidates;
}
}
/**
* TestServlet
*
*
*/
public static class TestServlet 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("aaa", new Integer(0));
}
else if ("test".equals(action))
{
HttpSession session = request.getSession(false);
assertNotNull(session);
Integer count = (Integer)session.getAttribute("aaa");
assertNotNull(count);
session.setAttribute("aaa", new Integer(count.intValue()+1));
}
}
}
/**
* @param sec
*/
public static void pause (int sec)
{
try
{
Thread.currentThread().sleep(sec*1000L);
}
catch (InterruptedException e)
{
//just return;
}
}
@Test
public void testEvictFailure () throws Exception
{
String contextPath = "";
String servletMapping = "/server";
int inactivePeriod = 0;
int scavengePeriod = 20;
int evictionPeriod = 5; //evict after inactivity
AbstractTestServer server = createServer(0, inactivePeriod, scavengePeriod, evictionPeriod);
ServletContextHandler context = server.addContext(contextPath);
context.getSessionHandler().getSessionCache().setSaveOnInactiveEviction(true);
TestSessionDataStore ds = new TestSessionDataStore();
context.getSessionHandler().getSessionCache().setSessionDataStore(ds);
TestServlet servlet = new TestServlet();
ServletHolder holder = new ServletHolder(servlet);
context.addServlet(holder, servletMapping);
try
{
server.start();
int port1 = server.getPort();
HttpClient client = new HttpClient();
client.start();
try
{
String url = "http://localhost:" + port1 + contextPath + servletMapping;
// Create the session
ds.setNextResult(true);
ContentResponse response = client.GET(url + "?action=init");
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
String sessionCookie = response.getHeaders().get("Set-Cookie");
assertNotNull(sessionCookie);
// Mangle the cookie, replacing Path with $Path, etc.
sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path=");
ds.setNextResult(false);
//Wait for the eviction period to expire - save on evict should fail but session
//should remain in the cache
pause(evictionPeriod);
ds.setNextResult(true);
// Make another request to see if the session is still in the cache and can be used,
//allow it to be saved this time
Request request = client.newRequest(url + "?action=test");
request.header("Cookie", sessionCookie);
response = request.send();
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
assertNull(response.getHeaders().get("Set-Cookie")); //check that the cookie wasn't reset
ds.setNextResult(false);
System.err.println("Waiting again for session to expire");
//Wait for the eviction period to expire again
pause(evictionPeriod);
ds.setNextResult(true);
request = client.newRequest(url + "?action=test");
request.header("Cookie", sessionCookie);
response = request.send();
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
}
finally
{
client.stop();
}
}
finally
{
server.stop();
}
}
}