Repository: knox Updated Branches: refs/heads/v1.2.0 a746fbf4c -> 19b1d75bc
KNOX-1645 - Improve JSESSIONID handling 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/19b1d75b Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/19b1d75b Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/19b1d75b Branch: refs/heads/v1.2.0 Commit: 19b1d75bcb50f92a1768f8c92dd3ac35a30200dc Parents: a746fbf Author: Kevin Risden <kris...@apache.org> Authored: Thu Nov 29 15:33:49 2018 -0500 Committer: Kevin Risden <kris...@apache.org> Committed: Fri Nov 30 10:06:31 2018 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/knox/gateway/GatewayServer.java | 5 +++++ .../test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/19b1d75b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java index 802ff27..315f796 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java @@ -78,6 +78,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import javax.servlet.SessionCookieConfig; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import java.io.File; @@ -119,6 +120,8 @@ public class GatewayServer { private static final Auditor auditor = AuditServiceFactory.getAuditService().getAuditor(AuditConstants.DEFAULT_AUDITOR_NAME, AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME); + static final String KNOXSESSIONCOOKIENAME = "KNOXSESSIONID"; + private static GatewayServer server; private static GatewayServices services; @@ -687,6 +690,8 @@ public class GatewayServer { String contextPath; contextPath = "/" + Urls.trimLeadingAndTrailingSlashJoin( config.getGatewayPath(), topoName, warPath ); context.setContextPath( contextPath ); + SessionCookieConfig sessionCookieConfig = context.getServletContext().getSessionCookieConfig(); + sessionCookieConfig.setName(KNOXSESSIONCOOKIENAME); context.setWar( warFile.getAbsolutePath() ); context.setAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE, topoName ); context.setAttribute( "org.apache.knox.gateway.frontend.uri", getFrontendUri( context, config ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/19b1d75b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java index 997cbee..2c6d6f8 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java @@ -317,7 +317,8 @@ public class GatewayBasicFuncTest { .statusCode( HttpStatus.SC_OK ) .contentType( "application/json" ) .body( "boolean", is( true ) ) - .when().put( driver.getUrl( "WEBHDFS" ) + "/v1" + root + "/dir" ).getDetailedCookie( "JSESSIONID" ); + .when().put( driver.getUrl( "WEBHDFS" ) + "/v1" + root + "/dir" ) + .getDetailedCookie( GatewayServer.KNOXSESSIONCOOKIENAME); assertThat( cookie.isSecured(), is( true ) ); assertThat( cookie.isHttpOnly(), is( true ) ); assertThat( cookie.getPath(), is( "/gateway/cluster" ) );
