diff options
| author | Markus Krogh <markus@nordu.net> | 2018-12-20 14:09:14 +0100 |
|---|---|---|
| committer | Markus Krogh <markus@nordu.net> | 2018-12-20 14:09:14 +0100 |
| commit | 153f3ff8ab7f63f32c384d4eb1f8e544d0d4c57f (patch) | |
| tree | dbbdc6ecf4886d7d0c1b2394d76bad2c60de9100 | |
| parent | 5b9343b2e68f4a3af1543baefdd288b7974077f1 (diff) | |
Version 3.4.2 + session timeout
| -rw-r--r-- | compose-prod.yml | 2 | ||||
| -rw-r--r-- | idp/Dockerfile | 2 | ||||
| -rwxr-xr-x | idp/shib-entrypoint.sh | 16 | ||||
| -rw-r--r-- | idp/shibboleth-identity-provider-3.4.2.tar.gz.sha256 | 1 |
4 files changed, 20 insertions, 1 deletions
diff --git a/compose-prod.yml b/compose-prod.yml index 47c7f22..ea2a452 100644 --- a/compose-prod.yml +++ b/compose-prod.yml @@ -9,6 +9,8 @@ services: - IDP_SCOPE=nordu.net - IDP_DEBUG=true - IDP_ENCRYPTION_OPTIONAL=true + - IDP_SESSION_TIMEOUT=PT4H + - IDP_AUTHN_TIMEOUT=PT40M env_file: ./data/production/env volumes: - ./data/production/idp-data:/opt/data diff --git a/idp/Dockerfile b/idp/Dockerfile index 728d7d6..4c9479b 100644 --- a/idp/Dockerfile +++ b/idp/Dockerfile @@ -2,7 +2,7 @@ FROM jetty:9-alpine LABEL authors="Markus Krogh <markus@nordu.net>,Jesper B. Rosenkilde <jbr@nordu.net>" USER root -ENV IDP_VERSION 3.4.0 +ENV IDP_VERSION 3.4.2 COPY install.properties /opt/ COPY nordu-ldap.properties /opt/ COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz.sha256 /opt/ diff --git a/idp/shib-entrypoint.sh b/idp/shib-entrypoint.sh index 5439cc5..b0aa661 100755 --- a/idp/shib-entrypoint.sh +++ b/idp/shib-entrypoint.sh @@ -27,6 +27,22 @@ if [ -e /opt/data ]; then fi fi + +# Set sessiontimeout +if [ -n "$IDP_SESSION_TIMEOUT" ]; then + sed -i -e "/#idp.session.timeout\s*=/ s/^#//" \ + -e "/#idp.authn.defaultLifetime\s*=/ s/^#//" "$IDP_PROPERTIES" + + sed -i -e "/idp.session.timeout\s*=/ s/=.*/= $IDP_SESSION_TIMEOUT/" \ + -e "/idp.authn.defaultLifetime\s*=/ s/=.*/= $IDP_SESSION_TIMEOUT/" "$IDP_PROPERTIES" + +fi +if [ -n "$IDP_AUTHN_TIMEOUT" ]; then + sed -i -e "/#idp.authn.defaultTimeout\s*=/ s/^#//" "$IDP_PROPERTIES" + + sed -i -e "/idp.authn.defaultTimeout\s*=/ s/=.*/= $IDP_AUTHN_TIMEOUT/" "$IDP_PROPERTIES" +fi + # Default property changes # Use secure cookies (https only) sed -i -e "/idp.cookie.secure/ s/^#//" -e "/idp.cookie.secure/ s/false/true/" $IDP_PROPERTIES diff --git a/idp/shibboleth-identity-provider-3.4.2.tar.gz.sha256 b/idp/shibboleth-identity-provider-3.4.2.tar.gz.sha256 new file mode 100644 index 0000000..ee5bdb8 --- /dev/null +++ b/idp/shibboleth-identity-provider-3.4.2.tar.gz.sha256 @@ -0,0 +1 @@ +e946bafedfca21af6bba152605fbbb7fce9c1f6a1b3e1c8c8d2cf26e53bcbc11 shibboleth-identity-provider-3.4.2.tar.gz |