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

Fixes #3856 - Different behaviour with maxFormContentSize=0 if Content-Length header is present/missing. 

Fixed zero checks and exception messages.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-07-23 15:44:08 +02:00
parent 40fc4ef340
commit d939c9435a
3 changed files with 163 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -540,10 +540,9 @@ public class Request implements HttpServletRequest
}
int contentLength = getContentLength();
if (contentLength > maxFormContentSize && maxFormContentSize > 0)
{
if (maxFormContentSize >= 0 && contentLength > maxFormContentSize)
throw new IllegalStateException("Form too large: " + contentLength + " > " + maxFormContentSize);
}
InputStream in = getInputStream();
if (_input.isAsync())
throw new IllegalStateException("Cannot extract parameters with async IO");

155
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/FormTest.java Normal file
View File

@ -0,0 +1,155 @@
//
// ========================================================================
// Copyright (c) 1995-2019 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.servlet;
import java.io.IOException;
import java.util.function.Function;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.util.FormContentProvider;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.Fields;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class FormTest
{
private Server server;
private ServerConnector connector;
private HttpClient client;
private String contextPath = "/ctx";
private String servletPath = "/test_form";
private void start(Function<ServletContextHandler, HttpServlet> config) throws Exception
{
startServer(config);
startClient();
}
private void startServer(Function<ServletContextHandler, HttpServlet> config) throws Exception
{
server = new Server();
connector = new ServerConnector(server, 1, 1);
server.addConnector(connector);
ServletContextHandler handler = new ServletContextHandler(server, contextPath);
HttpServlet servlet = config.apply(handler);
handler.addServlet(new ServletHolder(servlet), servletPath + "/*");
server.start();
}
private void startClient() throws Exception
{
client = new HttpClient();
client.start();
}
@AfterEach
public void dispose() throws Exception
{
if (client != null)
client.stop();
if (server != null)
server.stop();
}
@Test
public void testMaxFormContentSizeZeroWithoutContentLength() throws Exception
{
testMaxFormContentSizeZero(false);
}
@Test
public void testMaxFormContentSizeZeroWithContentLength() throws Exception
{
testMaxFormContentSizeZero(true);
}
private void testMaxFormContentSizeZero(boolean addContentLength) throws Exception
{
start(handler ->
{
handler.setMaxFormContentSize(0);
return new HttpServlet()
{
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
request.getParameterMap();
}
};
});
Fields formParams = new Fields();
formParams.add("foo", "bar");
ContentResponse response = client.newRequest("localhost", connector.getLocalPort())
.method(HttpMethod.POST)
.path(contextPath + servletPath)
.content(new FormContentProvider(formParams)
{
@Override
public long getLength()
{
return addContentLength ? super.getLength() : -1;
}
})
.send();
assertEquals(HttpStatus.BAD_REQUEST_400, response.getStatus());
}
@Test
public void testMaxFormKeysZero() throws Exception
{
start(handler ->
{
handler.setMaxFormKeys(0);
return new HttpServlet() {
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
request.getParameterMap();
}
};
});
Fields formParams = new Fields();
formParams.add("foo1", "bar1");
formParams.add("foo2", "bar2");
ContentResponse response = client.newRequest("localhost", connector.getLocalPort())
.method(HttpMethod.POST)
.path(contextPath + servletPath)
.content(new FormContentProvider(formParams))
.send();
assertEquals(HttpStatus.BAD_REQUEST_400, response.getStatus());
}
}

12
jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
View File

@ -417,7 +417,7 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
}
key = null;
value = null;
if (maxKeys > 0 && map.size() > maxKeys)
if (maxKeys >= 0 && map.size() > maxKeys)
throw new IllegalStateException(String.format("Form with too many keys [%d > %d]", map.size(), maxKeys));
break;
@ -446,7 +446,7 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
break;
}
if (maxLength >= 0 && (++totalLength > maxLength))
throw new IllegalStateException(String.format("Form with too many keys [%d > %d]", map.size(), maxKeys));
throw new IllegalStateException("Form is larger than max length " + maxLength);
}
if (key != null)
@ -500,7 +500,7 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
}
key = null;
value = null;
if (maxKeys > 0 && map.size() > maxKeys)
if (maxKeys >= 0 && map.size() > maxKeys)
throw new IllegalStateException(String.format("Form with too many keys [%d > %d]", map.size(), maxKeys));
break;
@ -529,7 +529,7 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
break;
}
if (maxLength >= 0 && (++totalLength > maxLength))
throw new IllegalStateException("Form is too large");
throw new IllegalStateException("Form is larger than max length " + maxLength);
}
if (key != null)
@ -651,7 +651,7 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
}
key = null;
value = null;
if (maxKeys > 0 && map.size() > maxKeys)
if (maxKeys >= 0 && map.size() > maxKeys)
throw new IllegalStateException(String.format("Form with too many keys [%d > %d]", map.size(), maxKeys));
break;
case '=':
@ -679,7 +679,7 @@ public class UrlEncoded extends MultiMap<String> implements Cloneable
totalLength++;
if (maxLength >= 0 && totalLength > maxLength)
throw new IllegalStateException("Form is too large");
throw new IllegalStateException("Form is larger than max length " + maxLength);
}
size = output.size();