From 22bf9bbfea68a3e71d80c31ecff64e6c9d460554 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:51:32 +0000 Subject: [PATCH] Update to Keycloak 26.0.6 --- integrationTest/suite.sh | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/integrationTest/suite.sh b/integrationTest/suite.sh index 2f98512..3f6f56a 100755 --- a/integrationTest/suite.sh +++ b/integrationTest/suite.sh @@ -3,6 +3,7 @@ keycloak_cas_url='http://localhost:8080/realms/master/protocol/cas' action_pattern='action="([^"]+)"' +CURL="curl --fail --silent --verbose" get_ticket() { local cookie_options="-b /tmp/cookies" @@ -16,7 +17,7 @@ client_url_param=TARGET fi - local login_response=$(curl --fail --silent -c /tmp/cookies "${keycloak_cas_url}/login?${client_url_param}=http://localhost") + local login_response=$($CURL -c /tmp/cookies "${keycloak_cas_url}/login?${client_url_param}=http://localhost") if [[ ! ($login_response =~ $action_pattern) ]] ; then echo "Could not parse login form in response" echo "${login_response}" @@ -24,7 +25,7 @@ fi local login_url=${BASH_REMATCH[1]//&/&} - local redirect_response=$(curl --fail --silent -D - $cookie_options --data 'username=admin&password=admin' "$login_url") + local redirect_response=$($CURL -D - $cookie_options --data 'username=admin&password=admin' "$login_url") if [[ ! ($redirect_response =~ $ticket_pattern) ]] ; then echo "No service ticket found in response" echo "${redirect_response}" @@ -37,24 +38,24 @@ # CAS 1.0 echo "Testing CAS 1.0..." ticket=$(get_ticket) -curl --fail --silent "${keycloak_cas_url}/validate?service=http://localhost&ticket=$ticket" +$CURL "${keycloak_cas_url}/validate?service=http://localhost&ticket=$ticket" echo # CAS 2.0 echo "Testing CAS 2.0 - XML..." ticket=$(get_ticket) -curl --fail --silent "${keycloak_cas_url}/serviceValidate?service=http://localhost&format=XML&ticket=$ticket" +$CURL "${keycloak_cas_url}/serviceValidate?service=http://localhost&format=XML&ticket=$ticket" echo echo "Testing CAS 2.0 - JSON..." ticket=$(get_ticket) -curl --fail --silent "${keycloak_cas_url}/serviceValidate?service=http://localhost&format=JSON&ticket=$ticket" +$CURL "${keycloak_cas_url}/serviceValidate?service=http://localhost&format=JSON&ticket=$ticket" echo # CAS 3.0 echo "Testing CAS 3.0..." ticket=$(get_ticket save_cookies) -curl --fail --silent "${keycloak_cas_url}/p3/serviceValidate?service=http://localhost&format=JSON&ticket=$ticket" +$CURL "${keycloak_cas_url}/p3/serviceValidate?service=http://localhost&format=JSON&ticket=$ticket" echo # SAML 1.1 @@ -63,7 +64,7 @@ timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ") saml_template=$(dirname "$0")/samlValidateTemplate.xml sed -e "s/CAS_TICKET/$ticket/g" -e "s/TIMESTAMP/$timestamp/g" "$saml_template" \ - | curl --fail --silent -X POST -H "Content-Type: text/xml" \ + | $CURL -X POST -H "Content-Type: text/xml" \ -H "SOAPAction: http://www.oasis-open.org/committees/security" \ --data-binary @- "${keycloak_cas_url}/samlValidate?TARGET=http://localhost" echo @@ -71,7 +72,7 @@ # CAS - gateway option echo "Testing CAS - gateway option, stage 1..." get_ticket save_cookies -login_response=$(curl --fail --silent -D - -b /tmp/cookies "${keycloak_cas_url}/login?service=http://localhost&gateway=true") +login_response=$($CURL -D - -b /tmp/cookies "${keycloak_cas_url}/login?service=http://localhost&gateway=true") if echo "${login_response}" | grep '^Location: http://localhost\?ticket='; then echo "Gateway option did not redirect back to service with ticket" echo "${login_response}" @@ -79,7 +80,7 @@ fi echo "Testing CAS - gateway option, stage 2..." -login_response=$(curl --fail --silent -D - "${keycloak_cas_url}/login?service=http://localhost&gateway=true") +login_response=$($CURL -D - "${keycloak_cas_url}/login?service=http://localhost&gateway=true") if echo "${login_response}" | grep '^Location: http://localhost$'; then echo "Gateway option did not redirect back to service without ticket" echo "${login_response}" -- Gitblit v1.9.1