From e5270d7b0e7aac35202fad90148ff6f951a8464a Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 10 Oct 2018 18:23:20 -0400 Subject: [PATCH] mods/cleanup for 3.4 --- test-compose/compose.sh | 6 - test-compose/docker-compose.yml | 18 +- test-compose/idp/Dockerfile | 2 +- .../config/shib-idp/conf/access-control.xml | 0 .../shib-idp/conf/admin/general-admin.xml | 0 .../config/shib-idp/conf/admin/metrics.xml | 0 .../config/shib-idp/conf/attribute-filter.xml | 2 +- .../conf/attribute-resolver-default.xml | 0 .../shib-idp/conf/attribute-resolver-full.xml | 202 ++++++++++-------- .../shib-idp/conf/attribute-resolver-ldap.xml | 0 .../shib-idp/conf/attribute-resolver.xml | 142 ++++++------ .../config/shib-idp/conf/audit.xml | 0 .../shib-idp/conf/authn/authn-comparison.xml | 0 .../shib-idp/conf/authn/authn-events-flow.xml | 0 .../shib-idp/conf/authn/duo-authn-config.xml | 0 .../config/shib-idp/conf/authn/duo.properties | 0 .../conf/authn/external-authn-config.xml | 0 .../shib-idp/conf/authn/general-authn.xml | 0 .../conf/authn/ipaddress-authn-config.xml | 0 .../shib-idp/conf/authn/jaas-authn-config.xml | 0 .../config/shib-idp/conf/authn/jaas.config | 0 .../shib-idp/conf/authn/krb5-authn-config.xml | 0 .../shib-idp/conf/authn/ldap-authn-config.xml | 0 .../shib-idp/conf/authn/mfa-authn-config.xml | 0 .../conf/authn/password-authn-config.xml | 0 .../conf/authn/remoteuser-authn-config.xml | 0 .../remoteuser-internal-authn-config.xml | 0 .../conf/authn/spnego-authn-config.xml | 0 .../shib-idp/conf/authn/x509-authn-config.xml | 0 .../conf/authn/x509-internal-authn-config.xml | 0 .../attribute-sourced-subject-c14n-config.xml | 0 .../conf/c14n/simple-subject-c14n-config.xml | 0 .../conf/c14n/subject-c14n-events-flow.xml | 0 .../shib-idp/conf/c14n/subject-c14n.xml | 0 .../conf/c14n/x500-subject-c14n-config.xml | 0 .../config/shib-idp/conf/cas-protocol.xml | 0 .../config/shib-idp/conf/credentials.xml | 0 .../config/shib-idp/conf/errors.xml | 0 .../config/shib-idp/conf/global.xml | 0 .../config/shib-idp/conf/idp.properties | 6 +- .../config/shib-idp/conf/idp.properties.dist | 2 +- .../intercept/consent-intercept-config.xml | 0 .../context-check-intercept-config.xml | 0 .../expiring-password-intercept-config.xml | 0 .../conf/intercept/intercept-events-flow.xml | 0 .../conf/intercept/profile-intercept.xml | 0 .../config/shib-idp/conf/ldap.properties | 0 .../config/shib-idp/conf/ldap.properties.dist | 0 .../config/shib-idp/conf/logback.xml | 0 .../shib-idp/conf/metadata-providers.xml | 17 +- .../config/shib-idp/conf/mvc-beans.xml | 0 .../config/shib-idp/conf/relying-party.xml | 0 .../shib-idp/conf/saml-nameid.properties | 0 .../config/shib-idp/conf/saml-nameid.xml | 0 .../config/shib-idp/conf/services.properties | 0 .../config/shib-idp/conf/services.xml | 0 .../config/shib-idp/conf/session-manager.xml | 0 .../shib-idp/edit-webapp/css/consent.css | 0 .../shib-idp/edit-webapp/css/logout.css | 0 .../config/shib-idp/edit-webapp/css/main.css | 0 .../edit-webapp/images/dummylogo-mobile.png | Bin .../shib-idp/edit-webapp/images/dummylogo.png | Bin .../edit-webapp/images/failure-32x32.png | Bin .../edit-webapp/images/success-32x32.png | Bin .../shib-idp/messages/messages.properties | 0 .../config/shib-idp/metadata/idp-metadata.xml | 32 +-- .../metadata/localCopyFromInCommon.xml | 0 .../client-storage/client-storage-read.vm | 0 .../client-storage/client-storage-write.vm | 0 .../config/shib-idp/views/duo.vm | 0 .../config/shib-idp/views/error.vm | 0 .../views/intercept/attribute-release.vm | 0 .../views/intercept/expiring-password.vm | 0 .../shib-idp/views/intercept/terms-of-use.vm | 0 .../config/shib-idp/views/login-error.vm | 0 .../config/shib-idp/views/login.vm | 0 .../config/shib-idp/views/logout-complete.vm | 0 .../config/shib-idp/views/logout-propagate.vm | 0 .../config/shib-idp/views/logout.vm | 0 .../shib-idp/views/spnego-unavailable.vm | 0 .../config/shib-idp/views/user-prefs.js | 0 .../config/shib-idp/views/user-prefs.vm | 0 .../config/tomcat/catalina.policy | 0 .../config/tomcat/catalina.properties | 0 .../{shib-idp => }/config/tomcat/context.xml | 0 .../config/tomcat/logging.properties | 0 .../{shib-idp => }/config/tomcat/server.xml | 2 +- .../config/tomcat/server.xml.dist | 0 .../config/tomcat/tomcat-users.xml | 0 .../config/tomcat/tomcat-users.xsd | 0 .../{shib-idp => }/config/tomcat/web.xml | 0 .../credentials/shib-idp/idp-encryption.crt | 19 ++ .../credentials/shib-idp/idp-encryption.key | 28 +++ .../credentials/shib-idp/idp-signing.crt | 19 ++ .../credentials/shib-idp/idp-signing.key | 28 +++ .../credentials/shib-idp/inc-md-cert.pem | 0 .../credentials/shib-idp/sealer.jks | Bin 0 -> 518 bytes .../credentials/shib-idp/sealer.kver | 0 .../credentials/tomcat/keystore.jks | Bin 0 -> 2281 bytes .../credentials/shib-idp/idp-encryption.crt | 19 -- .../credentials/shib-idp/idp-encryption.key | 28 --- .../credentials/shib-idp/idp-signing.crt | 19 -- .../credentials/shib-idp/idp-signing.key | 28 --- .../shib-idp/credentials/shib-idp/sealer.jks | Bin 518 -> 0 bytes .../shib-idp/credentials/tomcat/keystore.jks | Bin 2282 -> 0 bytes .../{shib-idp => }/wwwroot/robots.txt | 0 106 files changed, 320 insertions(+), 299 deletions(-) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/access-control.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/admin/general-admin.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/admin/metrics.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/attribute-filter.xml (99%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/attribute-resolver-default.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/attribute-resolver-full.xml (69%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/attribute-resolver-ldap.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/attribute-resolver.xml (78%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/audit.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/authn-comparison.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/authn-events-flow.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/duo-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/duo.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/external-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/general-authn.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/ipaddress-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/jaas-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/jaas.config (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/krb5-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/ldap-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/mfa-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/password-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/remoteuser-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/spnego-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/x509-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/authn/x509-internal-authn-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/c14n/subject-c14n.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/cas-protocol.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/credentials.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/errors.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/global.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/idp.properties (98%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/idp.properties.dist (99%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/intercept/consent-intercept-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/intercept/context-check-intercept-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/intercept/intercept-events-flow.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/intercept/profile-intercept.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/ldap.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/ldap.properties.dist (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/logback.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/metadata-providers.xml (99%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/mvc-beans.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/relying-party.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/saml-nameid.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/saml-nameid.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/services.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/services.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/conf/session-manager.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/css/consent.css (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/css/logout.css (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/css/main.css (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/images/dummylogo-mobile.png (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/images/dummylogo.png (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/images/failure-32x32.png (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/edit-webapp/images/success-32x32.png (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/messages/messages.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/metadata/idp-metadata.xml (56%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/metadata/localCopyFromInCommon.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/client-storage/client-storage-read.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/client-storage/client-storage-write.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/duo.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/error.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/intercept/attribute-release.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/intercept/expiring-password.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/intercept/terms-of-use.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/login-error.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/login.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/logout-complete.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/logout-propagate.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/logout.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/spnego-unavailable.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/user-prefs.js (100%) rename test-compose/idp/container_files/{shib-idp => }/config/shib-idp/views/user-prefs.vm (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/catalina.policy (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/catalina.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/context.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/logging.properties (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/server.xml (90%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/server.xml.dist (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/tomcat-users.xml (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/tomcat-users.xsd (100%) rename test-compose/idp/container_files/{shib-idp => }/config/tomcat/web.xml (100%) create mode 100644 test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt create mode 100644 test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key create mode 100644 test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt create mode 100644 test-compose/idp/container_files/credentials/shib-idp/idp-signing.key rename test-compose/idp/container_files/{shib-idp => }/credentials/shib-idp/inc-md-cert.pem (100%) create mode 100644 test-compose/idp/container_files/credentials/shib-idp/sealer.jks rename test-compose/idp/container_files/{shib-idp => }/credentials/shib-idp/sealer.kver (100%) create mode 100644 test-compose/idp/container_files/credentials/tomcat/keystore.jks delete mode 100644 test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.crt delete mode 100644 test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.key delete mode 100644 test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.crt delete mode 100644 test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.key delete mode 100644 test-compose/idp/container_files/shib-idp/credentials/shib-idp/sealer.jks delete mode 100644 test-compose/idp/container_files/shib-idp/credentials/tomcat/keystore.jks rename test-compose/idp/container_files/{shib-idp => }/wwwroot/robots.txt (100%) diff --git a/test-compose/compose.sh b/test-compose/compose.sh index 435144b..28d6353 100755 --- a/test-compose/compose.sh +++ b/test-compose/compose.sh @@ -5,10 +5,4 @@ echo "" echo "If everything above was successful, your IdP metadata can be retreived with this command (after a minute or two):" echo " curl -k https://127.0.0.1/idp/shibboleth" echo "" -echo "By default, this test IdP is pre-integrated with the samltest.id testing service." -echo "" -echo "If you are testing the default test config and have port 443 open," -echo " map your IP to idp.example.edu in your hosts file," -echo " then proceed to https://samltest.id/start-idp-test to test this IdP test instance." -echo "" diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index ef12cd2..ddc465b 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -6,15 +6,15 @@ services: build: context: ./idp/ args: - TOMCFG: ./container_files/shib-idp/config/tomcat - TOMCERT: ./container_files/shib-idp/credentials/tomcat - TOMWWWROOT: ./container_files/shib-idp/wwwroot - SHBCFG: ./container_files/shib-idp/config/shib-idp/conf - SHBCREDS: ./container_files/shib-idp/credentials/shib-idp - SHBVIEWS: ./container_files/shib-idp/config/shib-idp/views - SHBEDWAPP: ./container_files/shib-idp/config/shib-idp/edit-webapp - SHBMSGS: ./container_files/shib-idp/config/shib-idp/messages - SHBMD: ./container_files/shib-idp/config/shib-idp/metadata + TOMCFG: ./container_files/config/tomcat + TOMCERT: ./container_files/credentials/tomcat + TOMWWWROOT: ./container_files/wwwroot + SHBCFG: ./container_files/config/shib-idp/conf + SHBCREDS: ./container_files/credentials/shib-idp + SHBVIEWS: ./container_files/config/shib-idp/views + SHBEDWAPP: ./container_files/config/shib-idp/edit-webapp + SHBMSGS: ./container_files/config/shib-idp/messages + SHBMD: ./container_files/config/shib-idp/metadata depends_on: - data networks: diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile index d851db6..617c62d 100644 --- a/test-compose/idp/Dockerfile +++ b/test-compose/idp/Dockerfile @@ -1,4 +1,4 @@ -FROM tier/shib-idp:latest +FROM tier/shib-idp:3.4.0_181002 # The build args below can be used at build-time to tell the build process where to find your config files. This is for a completely burned-in config. ARG TOMCFG=config/tomcat diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/access-control.xml b/test-compose/idp/container_files/config/shib-idp/conf/access-control.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/access-control.xml rename to test-compose/idp/container_files/config/shib-idp/conf/access-control.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/general-admin.xml b/test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/general-admin.xml rename to test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/metrics.xml b/test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/metrics.xml rename to test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-filter.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml similarity index 99% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-filter.xml rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml index 678e14d..326dfe9 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-filter.xml +++ b/test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml @@ -115,5 +115,5 @@ - + diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-default.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-default.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-default.xml rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-default.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-full.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml similarity index 69% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-full.xml rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml index 4681b64..32647a3 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-full.xml +++ b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml @@ -15,10 +15,8 @@ --> + xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"> @@ -26,116 +24,117 @@ - - + + + + + + - + + + + + diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-ldap.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-ldap.xml rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml similarity index 78% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver.xml rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml index e1396dc..fb963b2 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver.xml +++ b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml @@ -25,217 +25,217 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/audit.xml b/test-compose/idp/container_files/config/shib-idp/conf/audit.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/audit.xml rename to test-compose/idp/container_files/config/shib-idp/conf/audit.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-comparison.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-comparison.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-events-flow.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo.properties b/test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo.properties rename to test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/external-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/external-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/general-authn.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/general-authn.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ipaddress-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ipaddress-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas.config b/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas.config rename to test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/krb5-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/krb5-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ldap-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ldap-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/mfa-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/mfa-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/password-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/password-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/spnego-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/spnego-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-internal-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-internal-authn-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n.xml rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/cas-protocol.xml b/test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/cas-protocol.xml rename to test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/credentials.xml b/test-compose/idp/container_files/config/shib-idp/conf/credentials.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/credentials.xml rename to test-compose/idp/container_files/config/shib-idp/conf/credentials.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/errors.xml b/test-compose/idp/container_files/config/shib-idp/conf/errors.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/errors.xml rename to test-compose/idp/container_files/config/shib-idp/conf/errors.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/global.xml b/test-compose/idp/container_files/config/shib-idp/conf/global.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/global.xml rename to test-compose/idp/container_files/config/shib-idp/conf/global.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties similarity index 98% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties rename to test-compose/idp/container_files/config/shib-idp/conf/idp.properties index 490d00f..ba38100 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties +++ b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties @@ -8,7 +8,7 @@ idp.entityID= https://idp.example.edu/idp/shibboleth idp.scope= example.edu # General cookie properties (maxAge only applies to persistent cookies) -#idp.cookie.secure = false +idp.cookie.secure = true #idp.cookie.httpOnly = true #idp.cookie.domain = #idp.cookie.path = @@ -26,8 +26,8 @@ idp.scope= example.edu #idp.sealer.aliasBase = secret idp.sealer.storeResource= %{idp.home}/credentials/sealer.jks idp.sealer.versionResource= %{idp.home}/credentials/sealer.kver -idp.sealer.storePassword= ce472e68-f433-4a77-aad2-b8697670158a -idp.sealer.keyPassword= ce472e68-f433-4a77-aad2-b8697670158a +idp.sealer.storePassword= 90fa668e-ce0f-45e7-82f1-fa4bd0273b51 +idp.sealer.keyPassword= 90fa668e-ce0f-45e7-82f1-fa4bd0273b51 # Settings for public/private signing and encryption key(s) # During decryption key rollover, point the ".2" properties at a second diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties.dist b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist similarity index 99% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties.dist rename to test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist index d7cfea7..2c5dcc0 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties.dist +++ b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist @@ -8,7 +8,7 @@ idp.entityID= https://example.org/idp/shibboleth idp.scope= example.org # General cookie properties (maxAge only applies to persistent cookies) -#idp.cookie.secure = false +idp.cookie.secure = true #idp.cookie.httpOnly = true #idp.cookie.domain = #idp.cookie.path = diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/consent-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/consent-intercept-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/context-check-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/context-check-intercept-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/intercept-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/intercept-events-flow.xml rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/profile-intercept.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/profile-intercept.xml rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties b/test-compose/idp/container_files/config/shib-idp/conf/ldap.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties rename to test-compose/idp/container_files/config/shib-idp/conf/ldap.properties diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties.dist b/test-compose/idp/container_files/config/shib-idp/conf/ldap.properties.dist similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties.dist rename to test-compose/idp/container_files/config/shib-idp/conf/ldap.properties.dist diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/logback.xml b/test-compose/idp/container_files/config/shib-idp/conf/logback.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/logback.xml rename to test-compose/idp/container_files/config/shib-idp/conf/logback.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/metadata-providers.xml b/test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml similarity index 99% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/metadata-providers.xml rename to test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml index 80178c4..48f06ca 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/metadata-providers.xml +++ b/test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml @@ -62,15 +62,6 @@ --> - - - - - - + + + + + diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/mvc-beans.xml b/test-compose/idp/container_files/config/shib-idp/conf/mvc-beans.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/mvc-beans.xml rename to test-compose/idp/container_files/config/shib-idp/conf/mvc-beans.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/relying-party.xml b/test-compose/idp/container_files/config/shib-idp/conf/relying-party.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/relying-party.xml rename to test-compose/idp/container_files/config/shib-idp/conf/relying-party.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.properties b/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.properties rename to test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.xml b/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.xml rename to test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.properties b/test-compose/idp/container_files/config/shib-idp/conf/services.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.properties rename to test-compose/idp/container_files/config/shib-idp/conf/services.properties diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.xml b/test-compose/idp/container_files/config/shib-idp/conf/services.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.xml rename to test-compose/idp/container_files/config/shib-idp/conf/services.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/session-manager.xml b/test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/session-manager.xml rename to test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/consent.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/consent.css rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/logout.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/logout.css rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/main.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/main.css rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo-mobile.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo-mobile.png rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo.png rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/failure-32x32.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/failure-32x32.png rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/success-32x32.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/success-32x32.png rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/messages/messages.properties b/test-compose/idp/container_files/config/shib-idp/messages/messages.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/messages/messages.properties rename to test-compose/idp/container_files/config/shib-idp/messages/messages.properties diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/idp-metadata.xml b/test-compose/idp/container_files/config/shib-idp/metadata/idp-metadata.xml similarity index 56% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/idp-metadata.xml rename to test-compose/idp/container_files/config/shib-idp/metadata/idp-metadata.xml index 2211379..af11f89 100644 --- a/test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/idp-metadata.xml +++ b/test-compose/idp/container_files/config/shib-idp/metadata/idp-metadata.xml @@ -7,23 +7,23 @@ -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 diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/localCopyFromInCommon.xml b/test-compose/idp/container_files/config/shib-idp/metadata/localCopyFromInCommon.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/localCopyFromInCommon.xml rename to test-compose/idp/container_files/config/shib-idp/metadata/localCopyFromInCommon.xml diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-read.vm b/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-read.vm rename to test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-write.vm b/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-write.vm rename to test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/duo.vm b/test-compose/idp/container_files/config/shib-idp/views/duo.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/duo.vm rename to test-compose/idp/container_files/config/shib-idp/views/duo.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/error.vm b/test-compose/idp/container_files/config/shib-idp/views/error.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/error.vm rename to test-compose/idp/container_files/config/shib-idp/views/error.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/attribute-release.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/attribute-release.vm rename to test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/expiring-password.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/expiring-password.vm rename to test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/terms-of-use.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/terms-of-use.vm rename to test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/login-error.vm b/test-compose/idp/container_files/config/shib-idp/views/login-error.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/login-error.vm rename to test-compose/idp/container_files/config/shib-idp/views/login-error.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/login.vm b/test-compose/idp/container_files/config/shib-idp/views/login.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/login.vm rename to test-compose/idp/container_files/config/shib-idp/views/login.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-complete.vm b/test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-complete.vm rename to test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-propagate.vm b/test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-propagate.vm rename to test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout.vm b/test-compose/idp/container_files/config/shib-idp/views/logout.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout.vm rename to test-compose/idp/container_files/config/shib-idp/views/logout.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/spnego-unavailable.vm b/test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/spnego-unavailable.vm rename to test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.js b/test-compose/idp/container_files/config/shib-idp/views/user-prefs.js similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.js rename to test-compose/idp/container_files/config/shib-idp/views/user-prefs.js diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.vm b/test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.vm rename to test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/catalina.policy b/test-compose/idp/container_files/config/tomcat/catalina.policy similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/catalina.policy rename to test-compose/idp/container_files/config/tomcat/catalina.policy diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/catalina.properties b/test-compose/idp/container_files/config/tomcat/catalina.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/catalina.properties rename to test-compose/idp/container_files/config/tomcat/catalina.properties diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/context.xml b/test-compose/idp/container_files/config/tomcat/context.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/context.xml rename to test-compose/idp/container_files/config/tomcat/context.xml diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/logging.properties b/test-compose/idp/container_files/config/tomcat/logging.properties similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/logging.properties rename to test-compose/idp/container_files/config/tomcat/logging.properties diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/server.xml b/test-compose/idp/container_files/config/tomcat/server.xml similarity index 90% rename from test-compose/idp/container_files/shib-idp/config/tomcat/server.xml rename to test-compose/idp/container_files/config/tomcat/server.xml index 9991643..d0df37e 100644 --- a/test-compose/idp/container_files/shib-idp/config/tomcat/server.xml +++ b/test-compose/idp/container_files/config/tomcat/server.xml @@ -8,7 +8,7 @@ protocol="org.apache.coyote.http11.Http11NioProtocol" port="443" maxThreads="200" scheme="https" secure="true" SSLEnabled="true" - keystoreFile="/opt/certs/keystore.jks" keystorePass="34f9a51f-2a3a-42f8-b109-fce47dedeb24" + keystoreFile="/opt/certs/keystore.jks" keystorePass="e68cb9bc-bb21-4319-a664-1f755ad8b47c" clientAuth="false" sslProtocol="TLS"/> diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/server.xml.dist b/test-compose/idp/container_files/config/tomcat/server.xml.dist similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/server.xml.dist rename to test-compose/idp/container_files/config/tomcat/server.xml.dist diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xml b/test-compose/idp/container_files/config/tomcat/tomcat-users.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xml rename to test-compose/idp/container_files/config/tomcat/tomcat-users.xml diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xsd b/test-compose/idp/container_files/config/tomcat/tomcat-users.xsd similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xsd rename to test-compose/idp/container_files/config/tomcat/tomcat-users.xsd diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/web.xml b/test-compose/idp/container_files/config/tomcat/web.xml similarity index 100% rename from test-compose/idp/container_files/shib-idp/config/tomcat/web.xml rename to test-compose/idp/container_files/config/tomcat/web.xml diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt new file mode 100644 index 0000000..52a7085 --- /dev/null +++ b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDHDCCAgSgAwIBAgIJAIg/g2B0+JTzMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV +BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMTAyMDM1NDBaFw0yMzEwMDkyMDM1 +NDBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAOXvrrP5G0yLd6OfWPO1NzKjTFqY6l9kyGid98uOOut3 +oFAwrjUgQ1gwVRNSVQNL7pfmiai1prNzzxo6oHXpctwJi+HK6l1JfKsmyOCo974d +S9HYnRL0HT59lIoT1oaIOr+5SGcSr0iFYLKkNwQz5FJrMIp0jkeFatoJ/FjZG8qy +z8NAaMTYMoR7pxWn6CuSTFPx0cKkSrxRwcUO+qsqBdrrweNSFUzo/KTmsl9wxga3 +bLdUJ4TzypQKRY5vFTO1yxk8ZM7JTUHYLEFXUyThjfUQLT2uMMGNpBO3dYWttGyY +yXOzFvuJiMp64JTcoDb698ca7e3oeLNa3SGOiPwHRnkCAwEAAaNlMGMwQgYDVR0R +BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p +ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQURsDhZRUa47gaSCOLN4Uq1Jsgv0UwDQYJ +KoZIhvcNAQELBQADggEBAJ8PShxPRmdUeJJC/6lAGqGXlw3H+eVyC16hkU+Pozva +bjzDvJapj5r5MyUBkPvm6zPZKk2sDKGm640KVSxEjK+PHfCIIf/d3DQ6DgsvvBUu +/QLqG4dTOPwN6PJEVceo7jBAmMZk8nCMSMTfEl/nGwn0YxFbFVE6OamkYR9UuOD7 +qBfqXxNQspQvA74kP5iCW+5VNwmcmya2Zhe5yJtD0DS5EOLfu/elrrU6DuR9e8xv +SQnmhIXnMKQKMYmUcEuksved5NRkzHiojtMHKewlXpnB7rqJi7BUYkKqY3/vgOqD +iSIkxhgaixWy//7nNHLGeNsZgG9xmnQ41qYsRtw5RdY= +-----END CERTIFICATE----- diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key new file mode 100644 index 0000000..1f570b4 --- /dev/null +++ b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDl766z+RtMi3ej +n1jztTcyo0xamOpfZMhonffLjjrrd6BQMK41IENYMFUTUlUDS+6X5omotaazc88a +OqB16XLcCYvhyupdSXyrJsjgqPe+HUvR2J0S9B0+fZSKE9aGiDq/uUhnEq9IhWCy +pDcEM+RSazCKdI5HhWraCfxY2RvKss/DQGjE2DKEe6cVp+grkkxT8dHCpEq8UcHF +DvqrKgXa68HjUhVM6Pyk5rJfcMYGt2y3VCeE88qUCkWObxUztcsZPGTOyU1B2CxB +V1Mk4Y31EC09rjDBjaQTt3WFrbRsmMlzsxb7iYjKeuCU3KA2+vfHGu3t6HizWt0h +joj8B0Z5AgMBAAECggEBANZTs+TOLkQLPFmoDqIcKHdq/6DzKIQCzUu282MqEIGr +4CLfPYMHr75kTujTtap8/MlaerZnnBtpt4IbY7aFBCtWOq0dF5gdB7gBTv0agtMT +O7k+0Cr6oMe/BtYt56k/EoPjkTmCkSBoMtpRd3bTZ9/rSjPEsVq5YgAbjrzCosUs +YyGoTQC+sjPCOQDglr4tujgveBvGatEonfTxurJrUqHr3QBd3Biop3UXuc3g3wx4 +yqXwHwACyPL9BY0r1e7WzfC1jSjWaxZkNg30XSJPuhvMoLaOunJUTqYMwlSlpuOJ +AdVPOBUXx5cmn7j8KZaTqdqKXM2G7JKH0BcW6KlMQAECgYEA+6vP9QY2Jw+v6xj1 +qK3QFSQIdvZq2zeJjmEgKkIFDsmdg4dxxu8awUOZFp/JQETsibmvuDlNHfSmmTMg +0PCMQE924e1fHU7GZfxK2gtM4sKWK/0PxQsLzWD/J8Q8fpMAMS5X4wvVLhyqrIPk +WrmGZb5RN7kbSvRbRJfCVwNd2rkCgYEA6eQqHxawUHD0lPNWBW4vI1C50H3qSbzB +TFfunUz1NCmVlxU55pyLlTzUuGxD9wRXVAs1YL6z6a6EjzbB2WfaTTQ7zD2pZldQ +NrRxigkqm/7RuNL+O26RH0VP8ANAryxnfbnRsU2kraATSt199cFSgb+eKjz3T7OD +rMrOvoJL6cECgYAGB22p7wYpFWUfeq+X5OIRP5W8U9bnfYMcGBOPL5mzav0NA5ek +LmIzswzdz+IgWgZYnkwpW6YPS6caEHF+z+RsPfsZGnim2RZDpzGb251x6TtzvlI8 +ZDFaMDKsnzTby2W7x+JvG/91ZVZpX5d+3ObtVQvZC+QtfYEaOZB8SSZccQKBgQDV +feQI3p/vvTsznu4dJNc4KB6ENfsedYIHmpf+01la1L5r2v8wBiLPBWiyMnjTSA4i +c9y0Qz5cBmWPiA7n0IkOQah3pK008mwQkyK0Oeu/2pg6WbWgMCudXJo73ew0OZb5 +xxyl99ZieaRCiOzJ3z3dmzfXHDEuehCuL60Jbku2wQKBgQCMN7ETD7apRliJosKb +UQDEA/hV3Nw3TqCEpCz01pR3HHLedHYwQhUsUNkMycVlV52/STqe/6c8rcZmt7hD +csAkWpoKHU9v5s6pdu3SMURzHi8q1p8hO49n3eqx2IhJOzpMFygmJgBy6jNiXkAD +/6HfDYCuMSxoqgofz0jtyZAMow== +-----END PRIVATE KEY----- diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt new file mode 100644 index 0000000..5890db7 --- /dev/null +++ b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDHDCCAgSgAwIBAgIJAPEnL5jgbeVoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV +BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMTAyMDM1NDBaFw0yMzEwMDkyMDM1 +NDBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAKwTrvQhmFX3SUNgJAhQ/YV0UX56Rt53mwbiKuH+Ez83 +7z6XRynBVsfzHfbWe0IpNKx5mIr84dfbGhQKQBEKzQuek7ihW3J6PIVZN1A3icZZ +B9i7gow902bT0ZfRG8QW49gl7pk3ASutPcO9Dq5Xc/AqWr3OSO/Pei0yBtTdzG3b +rm0u0gbj3P2tjt7BN77wIB+yjJsND3ITtP0MFXIJxLTlty8thwqQOAOAYcF+rhC5 +znnBLsRNo0E57PtzZs8i/BpEX2uPTxpEyvlU1vtyxcKUiHtK5ZjOsDEkS2rEualr ++FILYg/Oxw1gi0+mNO1a94Ft+UoLiREztq6MQt8OK98CAwEAAaNlMGMwQgYDVR0R +BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p +ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3ZJ8oHkmlgPtZuZAxnzONccPsb8wDQYJ +KoZIhvcNAQELBQADggEBAIJ4oZKSMGpF8J3qdfjLZGkc3iVbu/eiE1MD77no0oCz +nelY0CNUBuFJk1Xv+Bv0fW0cVugtMPz4xi7zv0zkpS2IVxpPZWBosuVabUD9k+V4 +iN5woJdO7e2KRGvhlWmbkmoZUvhygDe0u0vblNfLzDwFQvxHXiWG//P7SanoQrjP +dE8U21tYz+EFm6s5TvHxVhr9id8c+UacAFCpAtzUB+J8K1abx05XlKsySflkOQV9 +JbM4zOy5gXSI5dY9dGUF77g0muyC+jAhIhLSt/7v3vJgvBurrxPoeBFXOU3D+siT +VZlKtYzYjJhVqXx1vKrWEE1hkpqm+iYgZe4MvgcdswY= +-----END CERTIFICATE----- diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-signing.key b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.key new file mode 100644 index 0000000..46de653 --- /dev/null +++ b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsE670IZhV90lD +YCQIUP2FdFF+ekbed5sG4irh/hM/N+8+l0cpwVbH8x321ntCKTSseZiK/OHX2xoU +CkARCs0LnpO4oVtyejyFWTdQN4nGWQfYu4KMPdNm09GX0RvEFuPYJe6ZNwErrT3D +vQ6uV3PwKlq9zkjvz3otMgbU3cxt265tLtIG49z9rY7ewTe+8CAfsoybDQ9yE7T9 +DBVyCcS05bcvLYcKkDgDgGHBfq4Quc55wS7ETaNBOez7c2bPIvwaRF9rj08aRMr5 +VNb7csXClIh7SuWYzrAxJEtqxLmpa/hSC2IPzscNYItPpjTtWveBbflKC4kRM7au +jELfDivfAgMBAAECggEAXcm8qcNFzFUj0V0tRnseMwbbBByRU9/M10ueI97fjq1l +8K9zUgbWzdRsmIT+WWksFHWR9u8uCQCajiGoGaHRcGvWB+OqfBKzudqOk2Ix7bHI +3RAWb2mjN4Br1FtcztvLA5xpF4krUiryZyU8QznXLydmnd05U7u507hYkNzy90zI +ERp3p1PXL6XagW8SlraBbQW6HMCzwaILFT6v9Lxen8cw8VTSFEPfNthfGC2kmWRq +/ub/bbjx7HaV2p+U7FuXI2tk/pXbZxkHAMJ0OPcSx6lfcKU9m79peIgzA3vqALDj +QsvHioZ4O0ocOqj4ul1dojYrGYyjwXTNhGmytnXKwQKBgQDcAzg+FGMBDRuPLq7f +l9WoC4Pz/kN3nY0BGg6Ow5TW9SnDeUSZ5Mt3utuPyMtsHHwdTjR+iHMZv1uFOXCL +lI0SpkvRHCXCnsZqRPmnoGA0Tf+b1VfwjvZEiYJBnS5eKcy7nB81tBO/nty43eCo +241VeEX7USkrOqjVyYnK+YUwfQKBgQDIOTXewaEI3X/AOSXd35lZm9egGwTCTG3X +yIvZ6DghNLaAAVI52o9Y8mpLzdZP81+pATjgedR2UZbVt6blAT9BAqi+K6wZqZ3P +k8eRxm/h57zV/Ixlzxk6k5xzjzb4ZBSha+kAy8bvVqWYgIbbHEB5gMlorKF7m8Uy +A78p3N+4iwKBgHKM0pmv76Q6eODhw3bzDPEDnd5JwkLjKukp8e5u8m3BE8+MsiUW +NMHP7kU8nH1bj1uKvlYrIRKEyVfiAjEKVTEimFL1vstH87Kc2wdlvvE8sxslxzWe +maYxmjojZmLsjIYZ0T4a1jVstyshirkgJsQbbQRey3qQfhthZXbi12/ZAoGBAIg8 +rVQJ6nnuxUtVV1e2GlEnwjtVxxIyERefhNFbuj2V8Yv92iY1eg5qvDsiLu4tymxj +wYC0RQXRFFINaYkvJQwmNA1aB/taN2ATzNp67IwJM6ti8WEg3qjF4dGbpCq1ZnhD +xcJd5dna2kh/Q8N5YMGMCP+pXyONZUtX00431R5rAoGBAMIqlJSFfXtiAs+ox5Wo +RJTP1jXBMwLxIpAiA2831OG1I2MmuRFfcl7bw0Ei2XWGfanenLd6pCHo5wVWvZ/k +7f3zg2NItabMZLIpc3ES8Sr1N0IeSOuAlLwWQ4wTeaF673dwLaGJ+doQERc3psoY +PSJOpnyo7wRfuXWQaKpzcF+w +-----END PRIVATE KEY----- diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/inc-md-cert.pem b/test-compose/idp/container_files/credentials/shib-idp/inc-md-cert.pem similarity index 100% rename from test-compose/idp/container_files/shib-idp/credentials/shib-idp/inc-md-cert.pem rename to test-compose/idp/container_files/credentials/shib-idp/inc-md-cert.pem diff --git a/test-compose/idp/container_files/credentials/shib-idp/sealer.jks b/test-compose/idp/container_files/credentials/shib-idp/sealer.jks new file mode 100644 index 0000000000000000000000000000000000000000..69d21ac92bb4c7602eddbe1812ced3867b32567a GIT binary patch literal 518 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 F2LOf^%TfRU diff --git a/test-compose/idp/container_files/shib-idp/credentials/tomcat/keystore.jks b/test-compose/idp/container_files/shib-idp/credentials/tomcat/keystore.jks deleted file mode 100644 index 4c2adaa7cd449d5fbbc19930a1633558fa99658c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2282 zcmc(g={ppP7sqF_&S30JxW+}RrmMe{s+Go=f(H)oaa2}`JVHfbFg@@2mk;;M*;j5+`$AtuVA7# ziQsvJyzEP^Yy$vnAQTO9fZ}E6R$>Q2fQle~Adn3Jp+V-zpr!5iODqqK&G^Lo=1ylR z)$-ArW8@l+m*IT;lR_L{s3EBVEIh~vjShwdyZWePb)Ez+GCeGrhSG4b0riM(m0Z#Df4>cSPd7fc5^+Im1qb%6;OU7dhHKh0(?r)+SQS6-jydjIfU7r(&G_B`lmAGBy3%U;cwI-p5pLE(q?*oVxaz74AGnjzCMfZ1w% zRjx##8y~W%nVcQnwFFGw7*W-53264PcA;)$zn?ij+r8uxc*A;_C&I1p50dC|%2y~{ zr9}r*787O43c7nTderm)ab|4qVKuX3G&5m#@iisN_JX%@>yLXL^_aI>bC>NX!QMPh zqwZwXIW@oA9wQC0H_;UUC(${r;h^YQo*wRN#-mZ-TVAVIG0$zn(;v+vvr0@vJ12gd zldP$C9yuxuo@DtCPQ>2a{gjh($e1va z24`;b2{HEFw1F__!$gakq~U4d2;+G>L{5RPN|{tu>NWmWJ}$umdaHkxF}9-#A;`k! z4sKGF+_d=^=k6xrXotMEHUAFyXjlFA3_j zb)v6$!%<)B>0mUSP*eZI+*f3cgLvy+n31yxyGQo9nxpGw%^o1itdc(Yi4a&R@}+G+9x>T}IaSf;v^0IXVVsx5s;zf=C3P@pkQ2l}=tJec zi8-2_i#Xg}7b|72;59vn9H0t%G7o_=_sdfl@^_T!(1C!H%9q8#d~o$meti$#r1R8U zU1zTg>Ah7Tm|Hqp%OW+rrp~ZdF?UOKkzSjN%Ycfq(6U>l+9MpiYkhX!jOp@BFq{uQ2U!4Nf7k|M+5Gt^=(vNGnNJ?_WD z?VhHjZS%8roMex`WHsY%0m5V=-7YGO^ESoTaXKQR`I@_pKRY{X>;Z4a`ai;6OvOe* zck9KK^_nb}RsxC5Ees)FWS7*}l{NOczg6_(@SHVB2J`HX`VhszQ4hGiq$Qr zy(bF+Gn+1f6BrNH`&mV|!}$$qk-Q*IycsB;6y(ph??f|jOj5H@+xm4K+3>2TP}%?h zI2%O+(@`|g^*k^L2m(Ru+;R6%JnUSGv1YMbJU}3n4S3~@?gEPHs)SHC|0{k3Rf1;-N=lRmt%XLRv`(T=p-yQ#9!c#Zss2Ct z|89>4l=-h=NB;y&1M&e-G$1#K1_T0P;3A=t`@;Y#JsQ-bYw@na3T;%|ka>SeL?(B) z-4q6}CJzhFzyo304XJAc6j8i|A-wPopW$p2x8adhn)WBXuTHeg_Ddr?G(NGdE;Bw` zWNhV=)OvVpV-m+e*@@cA$9_QX#8Zu+?hYnrX71T`M@A020JC|qWn^oyE zoh-M1=}^gqYPixbJ6SKLP>~~4obBybbnm;)hW%-E+q{U+&`-{dEzzye(JfXdB%8l? zNXv6iaNE=!w05-*-EZWHCyf{R%p0ZFOP14sEg-`9Zm{j8?P+zcME18z(}-kM-Gy6L zL|?}YmXG0sm)D|p!rBsQ6$C+GAOKi^ME!=6JQ}bhFGK_)lyX)4u{00qspW)mHYv`b z9GRf7{$CT1w(iJ8AOKb(U!(Kv7?ma}robROzDjoUo5wYZoX``P8y0P=PYhzT)Gn&* zRQeO_ESR$yRT)#-WE)q#!GI#^bQ19omlzk0qQbvM1*M|KK5Kq>Q6m-zXE~84&&Lm_ zNR?K>?qcpB$F2I^KArHzMZB$mT&wC!S50n%F$k7M!X+IMdff9W7FFr#-s2tk$$iB_ z{s;m~YKuN}{~*QFGO{ZLH8ql?yepGtlOgWrt5CUV-bUQD%kl4mrs&>?!+aEW?C9B@ z&8=#G(Pg*z`NqYCIN_R8AM!ik=~(POT&4S^Z|co_y~+g5K3DSsnKt!To_!21ozjp- iqqR1x*PR|boBG)Au2!!VqQdPm<(W^ls*fY8#r^@Z2;;l} diff --git a/test-compose/idp/container_files/shib-idp/wwwroot/robots.txt b/test-compose/idp/container_files/wwwroot/robots.txt similarity index 100% rename from test-compose/idp/container_files/shib-idp/wwwroot/robots.txt rename to test-compose/idp/container_files/wwwroot/robots.txt