Merge pull request #43303 from nextcloud/backport/43296/stable27

[stable27] fix kerberos test successfull authentication detection
nextcloud · Feb 9, 2024 · 75329bd · 75329bd
2 parents d3252ca + bfe2cd3
commit 75329bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           repository: nextcloud/user_saml
           path: apps/user_saml
-          ref: stable27
+          ref: stable-5.2
       - name: Pull images
         run: |
           docker pull ghcr.io/icewind1991/samba-krb-test-dc

diff --git a/apps/files_external/tests/sso-setup/test-sso-smb.sh b/apps/files_external/tests/sso-setup/test-sso-smb.sh
@@ -5,8 +5,9 @@ DC_IP="$1"
 SCRIPT_DIR="${0%/*}"
 
 echo -n "Checking that we can authenticate using kerberos: "
-LOGIN_CONTENT=$("$SCRIPT_DIR/client-cmd.sh" $DC_IP curl -i -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login?originalUrl=success)
-if [[ "$LOGIN_CONTENT" =~ "Location: success" ]]; then
+LOGIN_CONTENT=$("$SCRIPT_DIR/client-cmd.sh" $DC_IP curl -i -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login?originalUrl=http://localhost/success)
+
+if [[ "$LOGIN_CONTENT" =~ "Location: http://localhost/success" ]]; then
   echo "✔️"
 else
   echo "❌"