diff --git a/demo/shibboleth/configs-and-secrets/midpoint/shibboleth/idp-metadata.xml b/demo/shibboleth/configs-and-secrets/midpoint/shibboleth/idp-metadata.xml index 35914b7..65db47e 100644 --- a/demo/shibboleth/configs-and-secrets/midpoint/shibboleth/idp-metadata.xml +++ b/demo/shibboleth/configs-and-secrets/midpoint/shibboleth/idp-metadata.xml @@ -104,10 +104,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= urn:mace:shibboleth:1.0:nameIdentifier urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - + + + + diff --git a/demo/shibboleth/configs-and-secrets/shibboleth/idp-metadata.xml b/demo/shibboleth/configs-and-secrets/shibboleth/idp-metadata.xml index 35914b7..65db47e 100644 --- a/demo/shibboleth/configs-and-secrets/shibboleth/idp-metadata.xml +++ b/demo/shibboleth/configs-and-secrets/shibboleth/idp-metadata.xml @@ -104,10 +104,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= urn:mace:shibboleth:1.0:nameIdentifier urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - + + + + diff --git a/demo/shibboleth/directory/Dockerfile b/demo/shibboleth/directory/Dockerfile index 6e87782..ada659b 100644 --- a/demo/shibboleth/directory/Dockerfile +++ b/demo/shibboleth/directory/Dockerfile @@ -27,4 +27,4 @@ EXPOSE 389 # temporary! -CMD rm -rf /var/lock/dirsrv/slapd-dir/server/* && /usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir && sleep 100000000 +CMD rm -rf /var/lock/dirsrv/slapd-dir/server/* && /usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir && sleep infinity diff --git a/demo/shibboleth/docker-compose.yml b/demo/shibboleth/docker-compose.yml index f1acebd..566d869 100644 --- a/demo/shibboleth/docker-compose.yml +++ b/demo/shibboleth/docker-compose.yml @@ -76,7 +76,7 @@ services: depends_on: - directory ports: - - 4443:4443 + - 443:443 environment: - JETTY_MAX_HEAP=64m - JETTY_BROWSER_SSL_KEYSTORE_PASSWORD=password diff --git a/demo/shibboleth/idp/Dockerfile b/demo/shibboleth/idp/Dockerfile index 7d0b512..ebbcf6f 100644 --- a/demo/shibboleth/idp/Dockerfile +++ b/demo/shibboleth/idp/Dockerfile @@ -1,4 +1,4 @@ -FROM unicon/shibboleth-idp:latest +FROM tier/shib-idp:181001 LABEL author="tier-packaging@internet2.edu " diff --git a/demo/shibboleth/idp/shibboleth-idp/metadata/idp-metadata.xml b/demo/shibboleth/idp/shibboleth-idp/metadata/idp-metadata.xml index 35914b7..65db47e 100644 --- a/demo/shibboleth/idp/shibboleth-idp/metadata/idp-metadata.xml +++ b/demo/shibboleth/idp/shibboleth-idp/metadata/idp-metadata.xml @@ -104,10 +104,10 @@ p+tGUbGS2l873J5PrsbpeKEVR/IIoKo= urn:mace:shibboleth:1.0:nameIdentifier urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - + + + + diff --git a/demo/shibboleth/tests/main.bats b/demo/shibboleth/tests/main.bats index a14db90..0b5896a 100755 --- a/demo/shibboleth/tests/main.bats +++ b/demo/shibboleth/tests/main.bats @@ -20,24 +20,28 @@ load ../../../library wait_for_midpoint_start shibboleth_midpoint_server_1 } -@test "030 Check health" { +@test "030 Check health (midPoint)" { check_health } +@test "035 Check health (Shibboleth IdP)" { + check_health_shibboleth_idp +} + @test "040 Check Shibboleth redirection (/midpoint)" { - curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint | grep 'https:\/\/localhost:4443\/idp\/profile\/SAML2\/Redirect' + curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint | grep 'https:\/\/localhost\/idp\/profile\/SAML2\/Redirect' } @test "041 Check Shibboleth redirection (/midpoint/)" { - curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/ | grep 'https:\/\/localhost:4443\/idp\/profile\/SAML2\/Redirect' + curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/ | grep 'https:\/\/localhost\/idp\/profile\/SAML2\/Redirect' } @test "042 Check Shibboleth redirection (/midpoint/login)" { - curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/login | grep 'https:\/\/localhost:4443\/idp\/profile\/SAML2\/Redirect' + curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/login | grep 'https:\/\/localhost\/idp\/profile\/SAML2\/Redirect' } @test "043 Check Shibboleth redirection (/midpoint/something)" { - curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/something | grep 'https:\/\/localhost:4443\/idp\/profile\/SAML2\/Redirect' + curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/something | grep 'https:\/\/localhost\/idp\/profile\/SAML2\/Redirect' } @test "044 Check SOAP without Shibboleth redirection (/midpoint/ws/)" { diff --git a/library.bash b/library.bash index 258f2c6..39f8176 100644 --- a/library.bash +++ b/library.bash @@ -20,14 +20,14 @@ function generic_wait_for_log () { echo "Waiting $DELAY seconds for $WAITING_FOR (attempt $ATTEMPT) ..." sleep $DELAY docker ps - ( docker logs $CONTAINER_NAME 2>&1 | grep "$MESSAGE" ) && return 0 + ( docker logs $CONTAINER_NAME 2>&1 | grep -F "$MESSAGE" ) && return 0 done echo "$FAILURE" in $(( $MAX_ATTEMPTS * $DELAY )) seconds in $CONTAINER_NAME echo "========== Container log ==========" docker logs $CONTAINER_NAME 2>&1 echo "========== End of the container log ==========" - if [ -n "ADDITIONAL_CONTAINER_NAME" ]; then + if [ -n "$ADDITIONAL_CONTAINER_NAME" ]; then echo "========== Container log ($ADDITIONAL_CONTAINER_NAME) ==========" docker logs $ADDITIONAL_CONTAINER_NAME 2>&1 echo "========== End of the container log ($DATABASE_CONTAINER_NAME) ==========" @@ -46,10 +46,15 @@ function wait_for_midpoint_start () { } # Waits until Shibboleth IDP starts -function wait_for_shibboleth_idp_start () { +function wait_for_shibboleth_idp_start_old () { generic_wait_for_log $1 "INFO:oejs.Server:main: Started" "shibboleth idp to start" "shibboleth idp did not start" $2 } +# Waits until Shibboleth IDP starts +function wait_for_shibboleth_idp_start () { + generic_wait_for_log $1 "[main] INFO org.apache.catalina.startup.Catalina- Server startup in" "shibboleth idp to start" "shibboleth idp did not start" $2 +} + # Waits until Grouper UI starts function wait_for_grouper_ui_start () { generic_wait_for_log $1 "INFO org.apache.catalina.startup.Catalina- Server startup in" "grouper ui to start" "grouper ui did not start" $2 @@ -71,7 +76,7 @@ function check_health () { } # Checks the health of Shibboleth IDP server -function check_health_shibboleth_idp () { +function check_health_shibboleth_idp_old () { echo Checking health of shibboleth idp... status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:4443/idp/)" if [ $status -ne 200 ]; then @@ -84,6 +89,19 @@ function check_health_shibboleth_idp () { fi } +function check_health_shibboleth_idp () { + echo Checking health of shibboleth idp... + status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost/idp/)" + if [ $status -ne 200 ]; then + echo Error: Http code of response is $status + docker ps + return 1 + else + echo OK + return 0 + fi +} + # Result is in OUTFILE function get_object () { local TYPE=$1