Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

makes session cookie secure, httponly and set same site attribute #209

Merged
merged 4 commits into from
Oct 16, 2024
Merged

makes session cookie secure, httponly and set same site attribute #209

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56ea014
makes session cookie secure, httponly and set same site attribute
gs-saurabh Oct 3, 2024
32633fb
Merge pull request #1 from goldmansachs/review-session-cookie-change
gs-saurabh Oct 4, 2024
c6c2a89
adds null check for session cookie config
gs-saurabh Oct 9, 2024
9c6b46b
check style fix
gs-saurabh Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions legend-shared-server/src/main/java/org/finos/legend/server/shared/staticserver/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@
import io.dropwizard.configuration.SubstitutingSourceProvider;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import org.eclipse.jetty.http.HttpCookie;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.session.SessionHandler;

import javax.servlet.SessionCookieConfig;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -113,5 +116,17 @@ public void run(org.finos.legend.server.shared.staticserver.StaticServerConfigur
sessionHandler.setSessionCookie(staticServerConfiguration.getSessionCookie());
}
environment.servlets().setSessionHandler(sessionHandler);
makeSessionCookieSecure(environment.getApplicationContext().getServletContext());
}

private void makeSessionCookieSecure(ContextHandler.Context servletContext)
{
SessionCookieConfig sessionCookieConfig = servletContext.getSessionCookieConfig();
Copy link
Contributor

@rafaelbey rafaelbey Oct 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this ever be null?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have seen "JSESSIONID" getting always created with Dropwizard and Jetty so ideally SessionCookieConfig should not be null.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, added null check to avoid potential NPE.

if (sessionCookieConfig != null)
{
sessionCookieConfig.setSecure(true);
sessionCookieConfig.setHttpOnly(true);
}
servletContext.setAttribute(HttpCookie.SAME_SITE_DEFAULT_ATTRIBUTE, "STRICT");
}
}
Loading