From 6c13fadd0d1db53f76388499fc13032205373209 Mon Sep 17 00:00:00 2001
From: Slavek Licehammer <slavek@evolveum.com>
Date: Thu, 10 Dec 2020 00:32:49 +0100
Subject: [PATCH] Fix demo/shibboleth tests

Remove SOAP interface tests because SOAP is no longer supported in
midpoint 4.2.

Fix typo in curl --silent option.

Update docker-compose-tests.yml with recent changes from
docker-compose.yml file. docker-compose-tests.yml should contain the
same configuration as docker-compose.yml, only it minimizes the ports
exported to localhost, because it's not necessary for tests.
---
 demo/shibboleth/docker-compose-tests.yml | 15 +++++++++++++++
 demo/shibboleth/tests/main.bats          | 16 +++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/demo/shibboleth/docker-compose-tests.yml b/demo/shibboleth/docker-compose-tests.yml
index d611fd1..25a28a4 100644
--- a/demo/shibboleth/docker-compose-tests.yml
+++ b/demo/shibboleth/docker-compose-tests.yml
@@ -51,12 +51,27 @@ services:
      - type: bind
        source: ./configs-and-secrets/midpoint/shibboleth/idp-metadata.xml
        target: /etc/shibboleth/idp-metadata.xml
+     - type: bind
+       source: ./configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
+       target: /etc/shibboleth/shibboleth2.xml
+     - type: bind
+       source: ./configs-and-secrets/midpoint/shibboleth/attribute-map.xml
+       target: /etc/shibboleth/attribute-map.xml
      - type: bind
        source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
        target: /etc/pki/tls/certs/host-cert.pem
      - type: bind
        source: ./configs-and-secrets/midpoint/httpd/host-cert.pem
        target: /etc/pki/tls/certs/cachain.pem
+     - type: bind
+       source: ./configs-and-secrets/midpoint/httpd/00-shib.conf
+       target: /etc/httpd/conf.modules.d/00-shib.conf
+     - type: bind
+       source: ./configs-and-secrets/midpoint/httpd/midpoint-shib.conf
+       target: /etc/httpd/conf.d/midpoint-shib.conf
+     - type: bind
+       source: ./configs-and-secrets/midpoint/httpd/vhosts.conf
+       target: /etc/httpd/conf.d/vhosts/vhosts.conf
 
   directory:
     build: ./directory/
diff --git a/demo/shibboleth/tests/main.bats b/demo/shibboleth/tests/main.bats
index aca5160..dd17314 100755
--- a/demo/shibboleth/tests/main.bats
+++ b/demo/shibboleth/tests/main.bats
@@ -33,7 +33,7 @@ load ../../../library
 }
 
 @test "040 Check internal SAML redirection (/midpoint/auth/saml-internal)" {
-    curl -k --write-out %{redirect_url} --silen --output /dev/null https://localhost:8443/midpoint/auth/saml-internal/ | grep 'https:\/\/localhost:8443\/midpoint\/auth\/saml-internal\/mySamlSso\/discovery?idp=https%3A%2F%2Fidptestbed%2Fidp%2Fshibboleth'
+    curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/auth/saml-internal/ | grep 'https:\/\/localhost:8443\/midpoint\/auth\/saml-internal\/mySamlSso\/discovery?idp=https%3A%2F%2Fidptestbed%2Fidp%2Fshibboleth'
 }
 
 @test "041 Check internal SAML redirection action (midpoint/..../discovery?...)" {
@@ -51,22 +51,12 @@ load ../../../library
     fi
 }
 
-@test "042 Check SOAP without Shibboleth redirection (/midpoint/ws/)" {
-    status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/ws/)"
-    [ "$status" -eq 200 ]
-}
-
-@test "043 Check SOAP without Shibboleth redirection (/midpoint/model/)" {
-    status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/model/)"
-    [ "$status" -eq 200 ]
-}
-
 @test "044 Check Shibboleth redirection (/midpoint/)" {
-    curl -k --write-out %{redirect_url} --silen --output /dev/null https://localhost:8443/midpoint/ | grep 'https:\/\/localhost:8443\/midpoint\/auth\/shib'
+    curl -k --write-out %{redirect_url} --silent  https://localhost:8443/midpoint/ | grep 'https:\/\/localhost:8443\/midpoint\/auth\/shib'
 }
 
 @test "045 Check Shibboleth redirection (/midpoint/auth/shib/)" {
-    curl -k --write-out %{redirect_url} --silen --output /dev/null https://localhost:8443/midpoint/auth/shib/ | grep 'https:\/\/localhost\/idp\/profile\/SAML2\/Redirect\/SSO?SAMLRequest='
+    curl -k --write-out %{redirect_url} --silent --output /dev/null https://localhost:8443/midpoint/auth/shib/ | grep 'https:\/\/localhost\/idp\/profile\/SAML2\/Redirect\/SSO?SAMLRequest='
 }
 
 @test "100 Check internally-authenticated REST call: get 'administrator'" {