From 2f78b6e58bd3614084940b329071f62e58d6744f Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 2 Oct 2023 14:38:10 -0100 Subject: [PATCH 1/2] fix ocm-provider rewrite rules Signed-off-by: Maxence Lange --- .htaccess | 1 + lib/private/Setup.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 956e29ea7c40f..ca9837ef00cec 100644 --- a/.htaccess +++ b/.htaccess @@ -99,6 +99,7 @@ RewriteRule ^remote/(.*) remote.php [QSA,L] RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L] + RewriteRule ^ocm-provider /index.php [QSA,L] RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L] diff --git a/lib/private/Setup.php b/lib/private/Setup.php index dc59eacbf5717..5428e599a80d0 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -535,7 +535,7 @@ public static function updateHtaccess() { $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(cron|public|remote|status)\\.php"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs/v(1|2)\\.php"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/robots\\.txt"; - $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(ocm-provider|ocs-provider|updater)/"; + $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(ocs-provider|updater)/"; $content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/richdocumentscode(_arm64)?/proxy.php$"; $content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]"; From 20170897bd7a6902e142cbc6687024b942a4a12d Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Tue, 3 Oct 2023 14:19:44 -0100 Subject: [PATCH 2/2] Update .htaccess Co-authored-by: Benjamin Gaussorgues Signed-off-by: Maxence Lange --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index ca9837ef00cec..38c3ec5e7d4e5 100644 --- a/.htaccess +++ b/.htaccess @@ -99,7 +99,7 @@ RewriteRule ^remote/(.*) remote.php [QSA,L] RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L] - RewriteRule ^ocm-provider /index.php [QSA,L] + RewriteRule ^ocm-provider/?$ /index.php [QSA,L] RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]