From 0540296b89e9321557326668e6a345ea610e85bb Mon Sep 17 00:00:00 2001
From: Pan Luo <pan.luo@ubc.ca>
Date: Mon, 29 May 2023 11:22:39 -0700
Subject: [PATCH] Add SHIBBOLETH_CACHE_TIMEOUT, SHIBBOLETH_SESSION_TIMEOUT and
 SHIBBOLETH_SESSION_LIFETIME env vars

---
 Dockerfile               | 3 +++
 shibboleth2.xml-template | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 76742bd..22e90c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,9 @@ ENV SHIBD_VERSION=3.2.1-3.1
 ENV SHIBD_REMOTE_USER=somerandomname
 ENV SHIBD_CONSISTENT_ADDRESS=true
 ENV SHIBBOLETH_IDP_METADATA_BACKUPFILE=/var/cache/shibboleth/shibboleth-metadata-idp.xml
+ENV SHIBBOLETH_SESSION_LIFETIME=7200
+ENV SHIBBOLETH_SESSION_TIMEOUT=3600
+ENV SHIBBOLETH_CACHE_TIMEOUT=3600
 
 WORKDIR /etc/shibboleth
 
diff --git a/shibboleth2.xml-template b/shibboleth2.xml-template
index 876f7cf..0caa345 100644
--- a/shibboleth2.xml-template
+++ b/shibboleth2.xml-template
@@ -19,7 +19,7 @@
       </ConnectionString>
    </StorageService>
 
-   <SessionCache type="StorageService" StorageService="db" cacheAllowance="3600" inprocTimeout="900" cleanupInterval="900"/>
+   <SessionCache type="StorageService" StorageService="db" cacheAllowance="3600" cacheTimeout="${SHIBBOLETH_CACHE_TIMEOUT}" inprocTimeout="900" cleanupInterval="900"/>
 
    <ReplayCache StorageService="db"/>
 
@@ -29,7 +29,7 @@
       signing="true" encryption="false"
       REMOTE_USER="${SHIBD_REMOTE_USER}">
 
-      <Sessions lifetime="7200" timeout="3600" relayState="ss:db"
+      <Sessions lifetime="${SHIBBOLETH_SESSION_LIFETIME}" timeout="${SHIBBOLETH_SESSION_TIMEOUT}" relayState="ss:db"
          idpHistory="true" idpHistoryDays="7"
          checkAddress="false" handlerSSL="false" cookieProps="http" consistentAddress="${SHIBD_CONSISTENT_ADDRESS}">