Skip to content

Commit

Permalink
Merge pull request #3017 from eclipse/jetty-10.x-issue-3011-move-http…
Browse files Browse the repository at this point in the history 
…compliance-to-config

Issue #3011 - Moving HttpCompliance to HttpConfiguration
  • Loading branch information
@joakime
joakime committed Oct 22, 2018
2 parents 6b56314 + fbd9fc1 commit 405a6b6
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 36 deletions.
2 changes: 1 addition & 1 deletion jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java
View file
Expand Up @@ -128,7 +128,7 @@ public void init() throws Exception
@Override
public Connection newConnection(Connector connector, EndPoint endPoint)
{
return configure(new HttpConnection(getHttpConfiguration(), connector, endPoint,getHttpCompliance(),isRecordHttpComplianceViolations())
return configure(new HttpConnection(getHttpConfiguration(), connector, endPoint, isRecordHttpComplianceViolations())
{
@Override
protected HttpParser newHttpParser(HttpCompliance compliance)
Expand Down
2 changes: 1 addition & 1 deletion jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/HTTP2CServerTest.java
View file
Expand Up @@ -300,7 +300,7 @@ public void testHTTP_2_0_DirectWithoutH2C() throws Exception
@Override
public Connection newConnection(Connector connector, EndPoint endPoint)
{
HttpConnection connection = new HttpConnection(getHttpConfiguration(), connector, endPoint,getHttpCompliance(),isRecordHttpComplianceViolations())
HttpConnection connection = new HttpConnection(getHttpConfiguration(), connector, endPoint, isRecordHttpComplianceViolations())
{
@Override
public void onFillable()
Expand Down
12 changes: 12 additions & 0 deletions jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
View file
Expand Up @@ -24,6 +24,7 @@
import java.util.concurrent.CopyOnWriteArrayList;

import org.eclipse.jetty.http.CookieCompliance;
import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.http.MultiPartFormDataCompliance;
Expand Down Expand Up @@ -72,6 +73,7 @@ public class HttpConfiguration
private boolean _useDirectByteBuffers = false;
private long _minRequestDataRate;
private long _minResponseDataRate;
private HttpCompliance _httpCompliance = HttpCompliance.RFC7230;
private CookieCompliance _cookieCompliance = CookieCompliance.RFC6265;
private MultiPartFormDataCompliance _multiPartCompliance = MultiPartFormDataCompliance.RFC7578;
private boolean _notifyRemoteAsyncErrors = true;
Expand Down Expand Up @@ -548,6 +550,16 @@ public void setMinResponseDataRate(long bytesPerSecond)
_minResponseDataRate = bytesPerSecond;
}

public HttpCompliance getHttpCompliance()
{
return _httpCompliance;
}

public void setHttpCompliance(HttpCompliance _httpCompliance)
{
this._httpCompliance = _httpCompliance;
}

public CookieCompliance getCookieCompliance()
{
return _cookieCompliance;
Expand Down
4 changes: 2 additions & 2 deletions jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View file
Expand Up @@ -93,7 +93,7 @@ protected static HttpConnection setCurrentConnection(HttpConnection connection)
return last;
}

public HttpConnection(HttpConfiguration config, Connector connector, EndPoint endPoint, HttpCompliance compliance, boolean recordComplianceViolations)
public HttpConnection(HttpConfiguration config, Connector connector, EndPoint endPoint, boolean recordComplianceViolations)
{
super(endPoint, connector.getExecutor());
_config = config;
Expand All @@ -102,7 +102,7 @@ public HttpConnection(HttpConfiguration config, Connector connector, EndPoint en
_generator = newHttpGenerator();
_channel = newHttpChannel();
_input = _channel.getRequest().getHttpInput();
_parser = newHttpParser(compliance);
_parser = newHttpParser(config.getHttpCompliance());
_recordHttpComplianceViolations = recordComplianceViolations;
if (LOG.isDebugEnabled())
LOG.debug("New HTTP Connection {}", this);
Expand Down
23 changes: 1 addition & 22 deletions jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
View file
Expand Up @@ -18,7 +18,6 @@

package org.eclipse.jetty.server;

import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
Expand All @@ -32,7 +31,6 @@
public class HttpConnectionFactory extends AbstractConnectionFactory implements HttpConfiguration.ConnectionFactory
{
private final HttpConfiguration _config;
private HttpCompliance _httpCompliance;
private boolean _recordHttpComplianceViolations = false;

public HttpConnectionFactory()
Expand All @@ -41,15 +39,9 @@ public HttpConnectionFactory()
}

public HttpConnectionFactory(@Name("config") HttpConfiguration config)
{
this(config,null);
}

public HttpConnectionFactory(@Name("config") HttpConfiguration config, @Name("compliance") HttpCompliance compliance)
{
super(HttpVersion.HTTP_1_1.asString());
_config=config;
_httpCompliance=compliance==null?HttpCompliance.RFC7230:compliance;
if (config==null)
throw new IllegalArgumentException("Null HttpConfiguration");
addBean(_config);
Expand All @@ -61,28 +53,15 @@ public HttpConfiguration getHttpConfiguration()
return _config;
}

public HttpCompliance getHttpCompliance()
{
return _httpCompliance;
}

public boolean isRecordHttpComplianceViolations()
{
return _recordHttpComplianceViolations;
}

/**
* @param httpCompliance String value of {@link HttpCompliance}
*/
public void setHttpCompliance(HttpCompliance httpCompliance)
{
_httpCompliance = httpCompliance;
}

@Override
public Connection newConnection(Connector connector, EndPoint endPoint)
{
HttpConnection conn = new HttpConnection(_config, connector, endPoint, _httpCompliance,isRecordHttpComplianceViolations());
HttpConnection conn = new HttpConnection(_config, connector, endPoint, isRecordHttpComplianceViolations());
return configure(conn, connector, endPoint);
}

Expand Down
3 changes: 1 addition & 2 deletions jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java
View file
Expand Up @@ -33,7 +33,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.ChannelEndPoint;
import org.eclipse.jetty.io.Connection;
Expand Down Expand Up @@ -104,7 +103,7 @@ private static class ExtendedHttpConnection extends HttpConnection
{
public ExtendedHttpConnection(HttpConfiguration config, Connector connector, EndPoint endPoint)
{
super(config,connector,endPoint,HttpCompliance.RFC7230_LEGACY,false);
super(config,connector,endPoint, false);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java
View file
Expand Up @@ -281,7 +281,7 @@ public void testSlowClose(long stopTimeout, long closeWait, Matcher<Long> stopTi
public Connection newConnection(Connector con, EndPoint endPoint)
{
// Slow closing connection
HttpConnection conn = new HttpConnection(getHttpConfiguration(), con, endPoint, getHttpCompliance(), isRecordHttpComplianceViolations())
HttpConnection conn = new HttpConnection(getHttpConfiguration(), con, endPoint, isRecordHttpComplianceViolations())
{
@Override
public void close()
Expand Down
10 changes: 5 additions & 5 deletions jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
View file
Expand Up @@ -148,12 +148,12 @@ public void testFragmentedChunk() throws Exception
@Test
public void testHttp09_NoVersion() throws Exception
{
connector.getConnectionFactory(HttpConnectionFactory.class).setHttpCompliance(HttpCompliance.RFC2616);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setHttpCompliance(HttpCompliance.RFC2616);
String request = "GET / HTTP/0.9\r\n\r\n";
String response = connector.getResponse(request);
assertThat(response, containsString("400 Bad Version"));

connector.getConnectionFactory(HttpConnectionFactory.class).setHttpCompliance(HttpCompliance.RFC7230);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setHttpCompliance(HttpCompliance.RFC7230);
request = "GET / HTTP/0.9\r\n\r\n";
response = connector.getResponse(request);
assertThat(response, containsString("400 Bad Version"));
Expand All @@ -165,7 +165,7 @@ public void testHttp09_NoVersion() throws Exception
@Test
public void testHttp09_NoHeaders() throws Exception
{
connector.getConnectionFactory(HttpConnectionFactory.class).setHttpCompliance(HttpCompliance.RFC2616);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setHttpCompliance(HttpCompliance.RFC2616);
// header looking like another request is ignored
String request = "GET /one\r\nGET :/two\r\n\r\n";
String response = BufferUtil.toString(connector.executeRequest(request).waitForOutput(10,TimeUnit.SECONDS));
Expand All @@ -179,7 +179,7 @@ public void testHttp09_NoHeaders() throws Exception
@Test
public void testHttp09_MultipleRequests() throws Exception
{
connector.getConnectionFactory(HttpConnectionFactory.class).setHttpCompliance(HttpCompliance.RFC2616);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setHttpCompliance(HttpCompliance.RFC2616);

// Verify that pipelining does not work with HTTP/0.9.
String requests = "GET /?id=123\r\n\r\nGET /?id=456\r\n\r\n";
Expand Down Expand Up @@ -407,7 +407,7 @@ public void testEncodedBadDotDotPath() throws Exception
@Test
public void test_0_9() throws Exception
{
connector.getConnectionFactory(HttpConnectionFactory.class).setHttpCompliance(HttpCompliance.RFC2616_LEGACY);
connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setHttpCompliance(HttpCompliance.RFC2616_LEGACY);
LocalEndPoint endp = connector.executeRequest("GET /R1\n");
endp.waitUntilClosed();
String response=BufferUtil.toString(endp.takeOutput());
Expand Down
2 changes: 1 addition & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/SlowClientWithPipelinedRequestTest.java
View file
Expand Up @@ -57,7 +57,7 @@ public void startServer(Handler handler) throws Exception
@Override
public Connection newConnection(Connector connector, EndPoint endPoint)
{
return configure(new HttpConnection(getHttpConfiguration(),connector,endPoint,getHttpCompliance(),isRecordHttpComplianceViolations())
return configure(new HttpConnection(getHttpConfiguration(),connector,endPoint, isRecordHttpComplianceViolations())
{
@Override
public void onFillable()
Expand Down
3 changes: 2 additions & 1 deletion jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ComplianceViolations2616Test.java
View file
Expand Up @@ -109,8 +109,9 @@ public static void startServer() throws Exception

HttpConfiguration config = new HttpConfiguration();
config.setSendServerVersion(false);
config.setHttpCompliance(HttpCompliance.RFC2616_LEGACY);

HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(config, HttpCompliance.RFC2616_LEGACY);
HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(config);
httpConnectionFactory.setRecordHttpComplianceViolations(true);
connector = new LocalConnector(server, null, null, null, -1, httpConnectionFactory);

Expand Down

0 comments on commit 405a6b6

Please sign in to comment.