diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-02-09 15:14:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 15:14:53 +0100 |
| commit | 75329bdf7080ff5b8e63ac37dedcda0f6ce964f8 (patch) | |
| tree | fab3d386d9dbcf424b8c7317059789a2021cdaeb | |
| parent | d3252caeede60ade24c0706c25112730f44d1864 (diff) | |
| parent | bfe2cd314e3c84640ec28ed038fdf486cb76cc4e (diff) | |
| download | nextcloud-server-75329bdf7080ff5b8e63ac37dedcda0f6ce964f8.tar.gz nextcloud-server-75329bdf7080ff5b8e63ac37dedcda0f6ce964f8.zip | |
Merge pull request #43303 from nextcloud/backport/43296/stable27
[stable27] fix kerberos test successfull authentication detection
| -rw-r--r-- | .github/workflows/smb-kerberos.yml | 2 | ||||
| -rwxr-xr-x | apps/files_external/tests/sso-setup/test-sso-smb.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml index c10d4f59d29..51e5fe30c10 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 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 b0f0a2c7af9..df0692f4319 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 "❌" |