Skip to content

Commit 1a4a672

Browse files
committed
DRILL-8522: Change session cookie name. Use STRICT sameSite
1 parent 83f6075 commit 1a4a672

File tree

1 file changed

+9
-1
lines changed
  • exec/java-exec/src/main/java/org/apache/drill/exec/server/rest

1 file changed

+9
-1
lines changed

exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.apache.drill.exec.server.rest.header.ResponseHeadersSettingFilter;
4343
import org.apache.drill.exec.server.rest.ssl.SslContextFactoryConfigurator;
4444
import org.apache.drill.exec.work.WorkManager;
45+
import org.eclipse.jetty.http.HttpCookie;
4546
import org.eclipse.jetty.http.HttpVersion;
4647
import org.eclipse.jetty.security.SecurityHandler;
4748
import org.eclipse.jetty.security.authentication.SessionAuthentication;
@@ -276,7 +277,14 @@ private SessionHandler createSessionHandler(final SecurityHandler securityHandle
276277
//SessionManager sessionManager = new HashSessionManager();
277278
sessionHandler.setMaxInactiveInterval(config.getInt(ExecConstants.HTTP_SESSION_MAX_IDLE_SECS));
278279
// response cookie will be returned with HttpOnly flag
279-
sessionHandler.getSessionCookieConfig().setHttpOnly(true);
280+
sessionHandler.setHttpOnly(true);
281+
sessionHandler.setSameSite(HttpCookie.SameSite.STRICT);
282+
283+
if(config.getBoolean(ExecConstants.HTTP_ENABLE_SSL)) {
284+
sessionHandler.setSessionCookie("__Secure-Drill-Session-Id");
285+
} else {
286+
sessionHandler.setSessionCookie("Drill-Session-Id");
287+
}
280288
sessionHandler.addEventListener(new HttpSessionListener() {
281289
@Override
282290
public void sessionCreated(HttpSessionEvent se) { }

0 commit comments

Comments
 (0)