standalone shibboleth image

- adds a new image for user_saml integration tests, only providing shib - removes old integration tests images from PHP 5.6 times Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Apr 12, 2023 · 88dc673 · 88dc673
1 parent 4b4da3f
commit 88dc673
Show file tree

Hide file tree

Showing 55 changed files with 26 additions and 3,046 deletions.
diff --git a/user_saml_shibboleth-idp/Dockerfile b/user_saml_shibboleth-idp/Dockerfile
@@ -0,0 +1,10 @@
+FROM cscfi/shibboleth-idp:release-4.1.4
+
+ADD shibboleth-idp/ /opt/shibboleth-idp/
+ADD start.sh /usr/local/bin/
+
+RUN chmod a+x /usr/local/bin/start.sh
+
+RUN init-idp.sh
+
+CMD "start.sh"
diff --git a/...leth/shibboleth/conf/attribute-filter.xml → .../shibboleth-idp/conf/attribute-filter.xml b/...leth/shibboleth/conf/attribute-filter.xml → .../shibboleth-idp/conf/attribute-filter.xml
diff --git a/...th/shibboleth/conf/attribute-resolver.xml → ...hibboleth-idp/conf/attribute-resolver.xml b/...th/shibboleth/conf/attribute-resolver.xml → ...hibboleth-idp/conf/attribute-resolver.xml
diff --git a/...ibboleth/shibboleth/conf/cas-protocol.xml → ...-idp/shibboleth-idp/conf/cas-protocol.xml b/...ibboleth/shibboleth/conf/cas-protocol.xml → ...-idp/shibboleth-idp/conf/cas-protocol.xml
diff --git a/...shibboleth/shibboleth/conf/idp.properties → ...th-idp/shibboleth-idp/conf/idp.properties b/...shibboleth/shibboleth/conf/idp.properties → ...th-idp/shibboleth-idp/conf/idp.properties
diff --git a/...hibboleth/shibboleth/conf/ldap.properties → ...h-idp/shibboleth-idp/conf/ldap.properties b/...hibboleth/shibboleth/conf/ldap.properties → ...h-idp/shibboleth-idp/conf/ldap.properties
@@ -5,7 +5,8 @@
 #idp.authn.LDAP.authenticator                   = anonSearchAuthenticator
 
 ## Connection properties ##
-idp.authn.LDAP.ldapURL                          = ldap://localhost:389
+# the LDAP server is typically a service container, reachable via "directory"
+idp.authn.LDAP.ldapURL                          = ldap://directory:389
 idp.authn.LDAP.useStartTLS                     = false
 idp.authn.LDAP.useSSL                          = false
 #idp.authn.LDAP.connectTimeout                  = 3000
@@ -56,4 +57,4 @@ idp.attribute.resolver.LDAP.searchFilter        = (uid=$requestContext.principal
 #idp.pool.LDAP.prunePeriod                      = 300
 #idp.pool.LDAP.idleTime                         = 600
 #idp.pool.LDAP.blockWaitTime                    = 3000
-#idp.pool.LDAP.failFastInitialize               = false
+#idp.pool.LDAP.failFastInitialize               = false
diff --git a/...th/shibboleth/conf/metadata-providers.xml → ...hibboleth-idp/conf/metadata-providers.xml b/...th/shibboleth/conf/metadata-providers.xml → ...hibboleth-idp/conf/metadata-providers.xml
diff --git a/..._shibboleth/shibboleth/conf/nextcloud.xml → ...eth-idp/shibboleth-idp/conf/nextcloud.xml b/..._shibboleth/shibboleth/conf/nextcloud.xml → ...eth-idp/shibboleth-idp/conf/nextcloud.xml
diff --git a/...bboleth/shibboleth/conf/relying-party.xml → ...idp/shibboleth-idp/conf/relying-party.xml b/...bboleth/shibboleth/conf/relying-party.xml → ...idp/shibboleth-idp/conf/relying-party.xml
diff --git a/...hibboleth/shibboleth/conf/saml-nameid.xml → ...h-idp/shibboleth-idp/conf/saml-nameid.xml b/...hibboleth/shibboleth/conf/saml-nameid.xml → ...h-idp/shibboleth-idp/conf/saml-nameid.xml
diff --git a/...hibboleth/credentials/idp-backchannel.crt → ...oleth-idp/credentials/idp-backchannel.crt b/...hibboleth/credentials/idp-backchannel.crt → ...oleth-idp/credentials/idp-backchannel.crt
diff --git a/...hibboleth/credentials/idp-backchannel.p12 → ...oleth-idp/credentials/idp-backchannel.p12 b/...hibboleth/credentials/idp-backchannel.p12 → ...oleth-idp/credentials/idp-backchannel.p12
diff --git a/...th/shibboleth/credentials/idp-browser.p12 → ...hibboleth-idp/credentials/idp-browser.p12 b/...th/shibboleth/credentials/idp-browser.p12 → ...hibboleth-idp/credentials/idp-browser.p12
diff --git a/...shibboleth/credentials/idp-encryption.crt → ...boleth-idp/credentials/idp-encryption.crt b/...shibboleth/credentials/idp-encryption.crt → ...boleth-idp/credentials/idp-encryption.crt
diff --git a/...shibboleth/credentials/idp-encryption.key → ...boleth-idp/credentials/idp-encryption.key b/...shibboleth/credentials/idp-encryption.key → ...boleth-idp/credentials/idp-encryption.key
diff --git a/...th/shibboleth/credentials/idp-signing.crt → ...hibboleth-idp/credentials/idp-signing.crt b/...th/shibboleth/credentials/idp-signing.crt → ...hibboleth-idp/credentials/idp-signing.crt
diff --git a/...th/shibboleth/credentials/idp-signing.key → ...hibboleth-idp/credentials/idp-signing.key b/...th/shibboleth/credentials/idp-signing.key → ...hibboleth-idp/credentials/idp-signing.key
diff --git a/...shibboleth/shibboleth/credentials/idp.crt → ...th-idp/shibboleth-idp/credentials/idp.crt b/...shibboleth/shibboleth/credentials/idp.crt → ...th-idp/shibboleth-idp/credentials/idp.crt
diff --git a/...shibboleth/shibboleth/credentials/idp.key → ...th-idp/shibboleth-idp/credentials/idp.key b/...shibboleth/shibboleth/credentials/idp.key → ...th-idp/shibboleth-idp/credentials/idp.key
diff --git a/...bboleth/shibboleth/credentials/sealer.jks → ...idp/shibboleth-idp/credentials/sealer.jks b/...bboleth/shibboleth/credentials/sealer.jks → ...idp/shibboleth-idp/credentials/sealer.jks
diff --git a/...boleth/shibboleth/credentials/sealer.kver → ...dp/shibboleth-idp/credentials/sealer.kver b/...boleth/shibboleth/credentials/sealer.kver → ...dp/shibboleth-idp/credentials/sealer.kver
diff --git a/...leth/shibboleth/metadata/idp-metadata.xml → .../shibboleth-idp/metadata/idp-metadata.xml b/...leth/shibboleth/metadata/idp-metadata.xml → .../shibboleth-idp/metadata/idp-metadata.xml
diff --git a/...ews/client-storage/client-storage-read.vm → ...ews/client-storage/client-storage-read.vm b/...ews/client-storage/client-storage-read.vm → ...ews/client-storage/client-storage-read.vm
diff --git a/...ws/client-storage/client-storage-write.vm → ...ws/client-storage/client-storage-write.vm b/...ws/client-storage/client-storage-write.vm → ...ws/client-storage/client-storage-write.vm
diff --git a/user_saml_shibboleth/shibboleth/views/duo.vm → ...hibboleth-idp/shibboleth-idp/views/duo.vm b/user_saml_shibboleth/shibboleth/views/duo.vm → ...hibboleth-idp/shibboleth-idp/views/duo.vm
diff --git a/...saml_shibboleth/shibboleth/views/error.vm → ...bboleth-idp/shibboleth-idp/views/error.vm b/...saml_shibboleth/shibboleth/views/error.vm → ...bboleth-idp/shibboleth-idp/views/error.vm
diff --git a/...leth/views/intercept/attribute-release.vm → ...-idp/views/intercept/attribute-release.vm b/...leth/views/intercept/attribute-release.vm → ...-idp/views/intercept/attribute-release.vm
diff --git a/...leth/views/intercept/expiring-password.vm → ...-idp/views/intercept/expiring-password.vm b/...leth/views/intercept/expiring-password.vm → ...-idp/views/intercept/expiring-password.vm
diff --git a/...hibboleth/views/intercept/terms-of-use.vm → ...oleth-idp/views/intercept/terms-of-use.vm b/...hibboleth/views/intercept/terms-of-use.vm → ...oleth-idp/views/intercept/terms-of-use.vm
diff --git a/...hibboleth/shibboleth/views/login-error.vm → ...h-idp/shibboleth-idp/views/login-error.vm b/...hibboleth/shibboleth/views/login-error.vm → ...h-idp/shibboleth-idp/views/login-error.vm
diff --git a/...saml_shibboleth/shibboleth/views/login.vm → ...bboleth-idp/shibboleth-idp/views/login.vm b/...saml_shibboleth/shibboleth/views/login.vm → ...bboleth-idp/shibboleth-idp/views/login.vm
diff --git a/...oleth/shibboleth/views/logout-complete.vm → ...p/shibboleth-idp/views/logout-complete.vm b/...oleth/shibboleth/views/logout-complete.vm → ...p/shibboleth-idp/views/logout-complete.vm
diff --git a/...leth/shibboleth/views/logout-propagate.vm → .../shibboleth-idp/views/logout-propagate.vm b/...leth/shibboleth/views/logout-propagate.vm → .../shibboleth-idp/views/logout-propagate.vm
diff --git a/...aml_shibboleth/shibboleth/views/logout.vm → ...boleth-idp/shibboleth-idp/views/logout.vm b/...aml_shibboleth/shibboleth/views/logout.vm → ...boleth-idp/shibboleth-idp/views/logout.vm
diff --git a/...th/shibboleth/views/spnego-unavailable.vm → ...hibboleth-idp/views/spnego-unavailable.vm b/...th/shibboleth/views/spnego-unavailable.vm → ...hibboleth-idp/views/spnego-unavailable.vm
diff --git a/...shibboleth/shibboleth/views/user-prefs.js → ...th-idp/shibboleth-idp/views/user-prefs.js b/...shibboleth/shibboleth/views/user-prefs.js → ...th-idp/shibboleth-idp/views/user-prefs.js
diff --git a/...shibboleth/shibboleth/views/user-prefs.vm → ...th-idp/shibboleth-idp/views/user-prefs.vm b/...shibboleth/shibboleth/views/user-prefs.vm → ...th-idp/shibboleth-idp/views/user-prefs.vm
diff --git a/...bboleth/shibboleth/webapp/css/consent.css → ...idp/shibboleth-idp/webapp/css/consent.css b/...bboleth/shibboleth/webapp/css/consent.css → ...idp/shibboleth-idp/webapp/css/consent.css
diff --git a/...ibboleth/shibboleth/webapp/css/logout.css → ...-idp/shibboleth-idp/webapp/css/logout.css b/...ibboleth/shibboleth/webapp/css/logout.css → ...-idp/shibboleth-idp/webapp/css/logout.css
diff --git a/...shibboleth/shibboleth/webapp/css/main.css → ...th-idp/shibboleth-idp/webapp/css/main.css b/...shibboleth/shibboleth/webapp/css/main.css → ...th-idp/shibboleth-idp/webapp/css/main.css
diff --git a/...boleth/webapp/images/dummylogo-mobile.png → ...th-idp/webapp/images/dummylogo-mobile.png b/...boleth/webapp/images/dummylogo-mobile.png → ...th-idp/webapp/images/dummylogo-mobile.png
diff --git a/...th/shibboleth/webapp/images/dummylogo.png → ...hibboleth-idp/webapp/images/dummylogo.png b/...th/shibboleth/webapp/images/dummylogo.png → ...hibboleth-idp/webapp/images/dummylogo.png
diff --git a/...hibboleth/webapp/images/failure-32x32.png → ...oleth-idp/webapp/images/failure-32x32.png b/...hibboleth/webapp/images/failure-32x32.png → ...oleth-idp/webapp/images/failure-32x32.png
diff --git a/...hibboleth/webapp/images/success-32x32.png → ...oleth-idp/webapp/images/success-32x32.png b/...hibboleth/webapp/images/success-32x32.png → ...oleth-idp/webapp/images/success-32x32.png
diff --git a/...th/shibboleth/webapp/js/Duo-Web-v2.min.js → ...hibboleth-idp/webapp/js/Duo-Web-v2.min.js b/...th/shibboleth/webapp/js/Duo-Web-v2.min.js → ...hibboleth-idp/webapp/js/Duo-Web-v2.min.js
diff --git a/.../shibboleth/webapp/js/jquery-2.1.4.min.js → ...bboleth-idp/webapp/js/jquery-2.1.4.min.js b/.../shibboleth/webapp/js/jquery-2.1.4.min.js → ...bboleth-idp/webapp/js/jquery-2.1.4.min.js
diff --git a/user_saml_shibboleth-idp/start.sh b/user_saml_shibboleth-idp/start.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+#set -x
+
+#sed 's/^::1.*localhost/::1\tip6-localhost/g' /etc/hosts > /etc/hosts.tmp
+#cat /etc/hosts.tmp > /etc/hosts
+#rm -f /etc/hosts.tmp
+
+export JETTY_BACKCHANNEL_SSL_KEYSTORE_PASSWORD=nextcloud
+export JETTY_BROWSER_SSL_KEYSTORE_PASSWORD=nextcloud
+
+init-idp.sh
+$JAVA_HOME/bin/java -jar $JETTY_HOME/start.jar jetty.home=$JETTY_HOME jetty.base=$JETTY_BASE -Djetty.sslContext.keyStorePassword=$JETTY_KEYSTORE_PASSWORD -Djetty.sslContext.keyStorePath=$JETTY_KEYSTORE_PATH
diff --git a/user_saml_shibboleth/Dockerfile b/user_saml_shibboleth/Dockerfile