From 60c0233f62d6d12f2a6adbd9083d402003b22964 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 2 Feb 2024 16:38:56 +0100 Subject: [PATCH 1/2] fix successfull authentication detection Signed-off-by: Robin Appelman --- apps/files_external/tests/sso-setup/test-sso-smb.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/files_external/tests/sso-setup/test-sso-smb.sh b/apps/files_external/tests/sso-setup/test-sso-smb.sh index b0f0a2c7af92f..df0692f4319ae 100755 --- 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 "❌" From bfe2cd314e3c84640ec28ed038fdf486cb76cc4e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 5 Feb 2024 09:39:32 +0100 Subject: [PATCH 2/2] fix(CI): Checkout correct app branch Signed-off-by: Joas Schilling --- .github/workflows/smb-kerberos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml index c10d4f59d2940..51e5fe30c104c 100644 --- 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