fix ci test apache setup

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Oct 20, 2023 · 102aa2b · 102aa2b
1 parent 6f1f928
commit 102aa2b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/apps/files_external/tests/sso-setup/apache-session.conf b/apps/files_external/tests/sso-setup/apache-session.conf
@@ -14,6 +14,18 @@
                 require valid-user
         </Location>
 
+        <Location /index.php>
+                AuthType Kerberos
+                AuthName "Kerberos authenticated intranet"
+                KrbAuthRealms DOMAIN.TEST
+                KrbServiceName HTTP/httpd.domain.test
+                Krb5Keytab /shared/httpd.keytab
+                KrbMethodNegotiate On
+                KrbMethodK5Passwd On
+                KrbSaveCredentials On
+                require valid-user
+        </Location>
+
         ErrorLog /shared/apache-error.log
         CustomLog /shared/apache-access.log combined
 </VirtualHost>
diff --git a/apps/files_external/tests/sso-setup/run.sh b/apps/files_external/tests/sso-setup/run.sh
@@ -3,8 +3,8 @@ set -e
 
 SCRIPT_DIR="${0%/*}"
 
-DC_IP=$(apps/files_external/tests/sso-setup/start-dc.sh)
-apps/files_external/tests/sso-setup/start-apache.sh "$DC_IP" "$PWD" -v "$PWD/$SCRIPT_DIR"/apache-session.conf:/etc/apache2/sites-enabled/000-default.conf
-apps/files_external/tests/sso-setup/setup-sso-nc.sh smb::kerberos_sso_session
+DC_IP=$("$SCRIPT_DIR"/start-dc.sh)
+"$SCRIPT_DIR"/start-apache.sh "$DC_IP" "$PWD" -v "$PWD/$SCRIPT_DIR"/apache-session.conf:/etc/apache2/sites-enabled/000-default.conf
+"$SCRIPT_DIR"/setup-sso-nc.sh smb::kerberos_sso_session
 
-apps/files_external/tests/sso-setup/test-sso-smb-session.sh "$DC_IP"
+"$SCRIPT_DIR"/test-sso-smb-session.sh "$DC_IP"
diff --git a/apps/files_external/tests/sso-setup/test-sso-smb-session.sh b/apps/files_external/tests/sso-setup/test-sso-smb-session.sh
@@ -13,6 +13,8 @@ else
   exit 1
 fi
 
+"$SCRIPT_DIR/client-cmd.sh" "$DC_IP" curl -s -b /shared/cookie -c /shared/cookie --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php
+
 echo -n "Getting test with session file: "
 CONTENT=$("$SCRIPT_DIR/client-cmd.sh" "$DC_IP" curl -s -b /shared/cookie 'http://httpd.domain.test/remote.php/webdav/smb/test.txt?XDEBUG_SESSION_START=1')
 CONTENT=$(echo "$CONTENT" | head -n 1 | tr -d '[:space:]')