Repository: knox Updated Branches: refs/heads/master e27c6ea93 -> 7968d476e
KNOX-1516 - Upgrade Jetty to 9.4.12 Signed-off-by: Kevin Risden <kris...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/7968d476 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/7968d476 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/7968d476 Branch: refs/heads/master Commit: 7968d476ea5095cc9daf2b559f24a8d4d535c60d Parents: e27c6ea Author: Kevin Risden <kris...@apache.org> Authored: Fri Oct 5 10:26:39 2018 -0400 Committer: Kevin Risden <kris...@apache.org> Committed: Wed Nov 7 20:15:55 2018 -0500 ---------------------------------------------------------------------- gateway-provider-identity-assertion-common/pom.xml | 13 +++++++++++++ .../function/UsernameFunctionProcessorTest.java | 7 ++++--- .../pom.xml | 13 +++++++++++++ .../impl/ServiceRegistryFunctionsTest.java | 9 +++++---- gateway-provider-rewrite/pom.xml | 12 ++++++++++++ .../api/UrlRewriteServletContextListenerTest.java | 7 ++++--- .../rewrite/api/UrlRewriteServletFilterTest.java | 7 ++++--- .../rewrite/impl/FrontendFunctionProcessorTest.java | 9 +++++---- .../knox/gateway/filter/RequestUpdateHandler.java | 4 ++-- .../org/apache/knox/gateway/trace/AccessHandler.java | 2 +- gateway-test-utils/pom.xml | 12 +++++++++++- .../apache/knox/gateway/GatewayMultiFuncTest.java | 6 +++--- .../gateway/SimpleDescriptorHandlerFuncTest.java | 1 + pom.xml | 15 ++++++++++++++- 14 files changed, 92 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-identity-assertion-common/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/pom.xml b/gateway-provider-identity-assertion-common/pom.xml index 946c550..65c6de5 100644 --- a/gateway-provider-identity-assertion-common/pom.xml +++ b/gateway-provider-identity-assertion-common/pom.xml @@ -89,6 +89,19 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java index 75a00e5..8f81515 100644 --- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java +++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java @@ -33,7 +33,6 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.log.Log; import org.hamcrest.core.Is; import org.junit.After; @@ -54,11 +53,13 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.util.ArrayDeque; import java.util.Arrays; import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Queue; import java.util.ServiceLoader; import static org.hamcrest.MatcherAssert.assertThat; @@ -71,7 +72,7 @@ public class UsernameFunctionProcessorTest { private ServletTester server; private HttpTester.Request request; private HttpTester.Response response; - private ArrayQueue<MockInteraction> interactions; + private Queue<MockInteraction> interactions; private MockInteraction interaction; private static URL getTestResource( String name ) { @@ -101,7 +102,7 @@ public class UsernameFunctionProcessorTest { } rewriteFilter.setFilter( new UrlRewriteServletFilter() ); - interactions = new ArrayQueue<>(); + interactions = new ArrayDeque<>(); ServletHolder servlet = server.addServlet( MockServlet.class, "/" ); servlet.setServlet( new MockServlet( "mock-servlet", interactions ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-rewrite-func-service-registry/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml index 0216a82..c88f7f5 100644 --- a/gateway-provider-rewrite-func-service-registry/pom.xml +++ b/gateway-provider-rewrite-func-service-registry/pom.xml @@ -79,6 +79,19 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java index f8e7560..ee1b9eb 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java @@ -33,7 +33,6 @@ import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.log.Log; import org.hamcrest.core.Is; import org.junit.Test; @@ -53,9 +52,11 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.util.ArrayDeque; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; +import java.util.Queue; import static org.hamcrest.MatcherAssert.assertThat; @@ -65,7 +66,7 @@ public class ServiceRegistryFunctionsTest { private ServletTester server; private HttpTester.Request request; private HttpTester.Response response; - private ArrayQueue<MockInteraction> interactions; + private Queue<MockInteraction> interactions; private MockInteraction interaction; private static URL getTestResource( String name ) { @@ -105,8 +106,8 @@ public class ServiceRegistryFunctionsTest { } } rewriteFilter.setFilter( new UrlRewriteServletFilter() ); - - interactions = new ArrayQueue<>(); + + interactions = new ArrayDeque<>(); ServletHolder servlet = server.addServlet( MockServlet.class, "/" ); servlet.setServlet( new MockServlet( "mock-servlet", interactions ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-rewrite/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml index 20aa382..f17a1f1 100644 --- a/gateway-provider-rewrite/pom.xml +++ b/gateway-provider-rewrite/pom.xml @@ -130,6 +130,18 @@ <artifactId>gateway-test-utils</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java index 4223a46..0552b00 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java @@ -23,20 +23,21 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.ArrayQueue; import org.junit.After; import org.junit.Before; import javax.servlet.DispatcherType; import java.net.URL; +import java.util.ArrayDeque; import java.util.EnumSet; +import java.util.Queue; public class UrlRewriteServletContextListenerTest { private ServletTester server; private HttpTester.Request request; private HttpTester.Response response; - private ArrayQueue<MockInteraction> interactions; + private Queue<MockInteraction> interactions; private MockInteraction interaction; private static URL getTestResource( String name ) { @@ -58,7 +59,7 @@ public class UrlRewriteServletContextListenerTest { FilterHolder filter = server.addFilter( UrlRewriteServletFilter.class, "/*", EnumSet.of( DispatcherType.REQUEST ) ); filter.setFilter( new UrlRewriteServletFilter() ); - interactions = new ArrayQueue<>(); + interactions = new ArrayDeque<>(); ServletHolder servlet = server.addServlet( MockServlet.class, "/" ); servlet.setServlet( new MockServlet( "mock-servlet", interactions ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java index f857dcf..ab2a9fc 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java @@ -30,7 +30,6 @@ import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.ArrayQueue; import org.junit.After; import org.junit.Test; @@ -46,10 +45,12 @@ import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.ArrayDeque; import java.util.EnumSet; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; +import java.util.Queue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; @@ -63,7 +64,7 @@ public class UrlRewriteServletFilterTest { private ServletTester server; private HttpTester.Request request; private HttpTester.Response response; - private ArrayQueue<MockInteraction> interactions; + private Queue<MockInteraction> interactions; private MockInteraction interaction; private static URL getTestResource( String name ) { @@ -90,7 +91,7 @@ public class UrlRewriteServletFilterTest { } rewriteFilter.setFilter( new UrlRewriteServletFilter() ); - interactions = new ArrayQueue<>(); + interactions = new ArrayDeque<>(); ServletHolder servlet = server.addServlet( MockServlet.class, "/" ); servlet.setServlet( new MockServlet( "mock-servlet", interactions ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java index de87d75..a0791fb 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java @@ -37,7 +37,6 @@ import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.AttributesMap; import org.eclipse.jetty.util.log.Log; @@ -59,10 +58,12 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.util.ArrayDeque; import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Queue; import java.util.ServiceLoader; import static org.hamcrest.CoreMatchers.containsString; @@ -76,7 +77,7 @@ public class FrontendFunctionProcessorTest { private ServletTester server; private HttpTester.Request request; private HttpTester.Response response; - private ArrayQueue<MockInteraction> interactions; + private Queue<MockInteraction> interactions; private MockInteraction interaction; @SuppressWarnings("rawtypes") @@ -157,8 +158,8 @@ public class FrontendFunctionProcessorTest { } } rewriteFilter.setFilter( new UrlRewriteServletFilter() ); - - interactions = new ArrayQueue<>(); + + interactions = new ArrayDeque<>(); ServletHolder servlet = server.addServlet( MockServlet.class, "/" ); servlet.setServlet( new MockServlet( "mock-servlet", interactions ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java index 61bd09d..d9ea302 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java @@ -87,8 +87,8 @@ public class RequestUpdateHandler extends ScopedHandler { // if the request already has the /{gatewaypath}/{topology} part then skip if (!StringUtils.startsWithIgnoreCase(target, redirectContext)) { baseRequest.setPathInfo(redirectContext + baseRequest.getPathInfo()); - baseRequest.setUri( - new HttpURI(redirectContext + baseRequest.getUri().toString())); + baseRequest.setHttpURI( + new HttpURI(redirectContext + baseRequest.getRequestURI())); LOG.topologyPortMappingUpdateRequest(target, newTarget); nextHandle(newTarget, baseRequest, newRequest, response); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java index 366e1b0..4722558 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java @@ -37,7 +37,7 @@ public class AccessHandler extends AbstractLifeCycle implements RequestLog { sb.append( "|" ); sb.append( request.getMethod() ); sb.append( "|" ); - sb.append( request.getUri().toString() ); + sb.append( request.getRequestURI() ); sb.append( "|" ); sb.append( request.getContentLength() ); sb.append( "|" ); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml index f90edb0..eddfb21 100644 --- a/gateway-test-utils/pom.xml +++ b/gateway-test-utils/pom.xml @@ -123,6 +123,16 @@ <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> - + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <classifier>tests</classifier> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-test/src/test/java/org/apache/knox/gateway/GatewayMultiFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayMultiFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayMultiFuncTest.java index 5fb94b3..1deb738 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayMultiFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayMultiFuncTest.java @@ -185,7 +185,7 @@ public class GatewayMultiFuncTest { .then() //.log().all() .statusCode( HttpStatus.SC_OK ) - .contentType( "application/json; charset=UTF-8" ) + .contentType( "application/json;charset=UTF-8" ) .when().get( gatewayUrl + "/knox678/repeat" ).andReturn().asString(); assertThat( json, is("{\"msg\":\"H\u00eallo\"}") ); assertThat( mock.isEmpty(), is(true) ); @@ -232,7 +232,7 @@ public class GatewayMultiFuncTest { .status( HttpStatus.SC_CREATED ) .content( "{\"name\":\"value\"}".getBytes(StandardCharsets.UTF_8) ) .contentLength( -1 ) - .contentType( "application/json; charset=UTF-8" ) + .contentType( "application/json;charset=UTF-8" ) .header( "Location", gatewayUrl + "/knox681/repeat" ); String uname = "guest"; @@ -259,7 +259,7 @@ public class GatewayMultiFuncTest { CloseableHttpResponse response = client.execute( request, context ); assertThat( response.getStatusLine().getStatusCode(), is( HttpStatus.SC_CREATED ) ); assertThat( response.getFirstHeader( "Location" ).getValue(), endsWith("/gateway/knox681/repeat" ) ); - assertThat( response.getFirstHeader( "Content-Type" ).getValue(), is("application/json; charset=UTF-8") ); + assertThat( response.getFirstHeader( "Content-Type" ).getValue(), is("application/json;charset=utf-8") ); String body = new String( IOUtils.toByteArray( response.getEntity().getContent() ), StandardCharsets.UTF_8 ); assertThat( body, is( "{\"name\":\"value\"}" ) ); response.close(); http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/gateway-test/src/test/java/org/apache/knox/gateway/SimpleDescriptorHandlerFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/SimpleDescriptorHandlerFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/SimpleDescriptorHandlerFuncTest.java index f7c2103..e01dcbb 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/SimpleDescriptorHandlerFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/SimpleDescriptorHandlerFuncTest.java @@ -165,6 +165,7 @@ public class SimpleDescriptorHandlerFuncTest { EasyMock.expect(config.getGatewayDeploymentDir()).andReturn(testDeployDir.getAbsolutePath()).anyTimes(); EasyMock.expect(config.getGatewayAddress()).andReturn(gatewayAddress).anyTimes(); EasyMock.expect(config.getGatewayPortMappings()).andReturn(Collections.emptyMap()).anyTimes(); + EasyMock.expect(config.getThreadPoolMax()).andReturn(200).anyTimes(); EasyMock.replay(config); // Setup the Gateway Services http://git-wip-us.apache.org/repos/asf/knox/blob/7968d476/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 80df8ce..9879414 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ <javax.websocket-api.version>1.1</javax.websocket-api.version> <jericho-html.version>3.4</jericho-html.version> <jersey.version>2.6</jersey.version> - <jetty.version>9.2.26.v20180806</jetty.version> + <jetty.version>9.4.12.v20180830</jetty.version> <jline.version>2.14.6</jline.version> <jna.version>4.5.2</jna.version> <joda-time.version>2.10</joda-time.version> @@ -956,6 +956,19 @@ </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty.version}</version> + <classifier>tests</classifier> + </dependency> + + <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>${javax.annotation-api.version}</version>
