Skip to content

Commit

Permalink
feature/79 Externalized cookie session configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
dkorbel committed Aug 19, 2024
1 parent 5a2ad09 commit 5591b7e
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package edu.harvard.iq.dataverse;

import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener;
import javax.servlet.SessionCookieConfig;

@WebListener
public class DataverseSessionConfigListener implements ServletContextListener {

@Override
public void contextInitialized(ServletContextEvent sce) {
SessionCookieConfig sessionCookieConfig = getDefaultValuesFromWebXml(sce);
overrideDefaultsWithEnvironmentVariables(sessionCookieConfig);
}

private static void overrideDefaultsWithEnvironmentVariables(SessionCookieConfig sessionCookieConfig) {
String cookieName = System.getenv("COOKIE_NAME");
if (cookieName != null) {
sessionCookieConfig.setName(cookieName);
}
String cookieDomain = System.getenv("COOKIE_DOMAIN");
if (cookieDomain != null) {
sessionCookieConfig.setDomain(cookieDomain);
}
String cookieSecure = System.getenv("COOKIE_SECURE");
if (cookieSecure != null) {
sessionCookieConfig.setSecure(Boolean.parseBoolean(cookieSecure));
}
}

private SessionCookieConfig getDefaultValuesFromWebXml(ServletContextEvent sce) {
return sce.getServletContext().getSessionCookieConfig();
}

@Override
public void contextDestroyed(ServletContextEvent servletContextEvent) {
// nothing to do here
}
}
4 changes: 4 additions & 0 deletions dataverse-webapp/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@
<!-- Uncomment the line below to disble `;jsessionid=` in URLs -->
<tracking-mode>COOKIE</tracking-mode>
</session-config>
<!-- Listener to override defaults with environment variables -->
<listener>
<listener-class>edu.harvard.iq.dataverse.DataverseSessionConfigListener</listener-class>
</listener>
<!-- web fonts -->
<mime-mapping>
<extension>eot</extension>
Expand Down

0 comments on commit 5591b7e

Please sign in to comment.