KNOX-1645 - Improve JSESSIONID handling

Signed-off-by: Kevin Risden <[email protected]>
apache · Nov 30, 2018 · d49cb66 · d49cb66
1 parent 191b914
commit d49cb66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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
@@ -77,6 +77,7 @@
 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;
@@ -118,6 +119,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;
 
@@ -678,6 +681,8 @@ private WebAppContext createWebAppContext( Topology topology, File warFile, Stri
     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 ) );

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
@@ -318,7 +318,8 @@ public void testBasicJsonUseCase() throws IOException {
         .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" ) );