fix ocm-provider rewrite rules

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

diff --git a/.htaccess b/.htaccess
index 7a8f41886aca9f319a798f7b7dce32a17014e190..2be3c1b9e15a15205cdfdc80ca4930e3916e42b1 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -90,6 +90,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]
 </IfModule>
 

diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 0993fe54f47080ba1cc3427c33311b59190abb24..f167d19adebb091c2cb58b7043605d5d87cc4d02 100644 (file)
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -537,7 +537,7 @@ class Setup {
                        $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]";