Merge pull request #11687 from owncloud/feat/drop-remote-php

[full-ci] feat: [OCISDEV-330] drop remote.php prefix

Author: LukasHirt

changelog/unreleased/enhancement-drop-remote-php.md

@@ -0,0 +1,5 @@
+Enhancement: Drop remote.php prefix
+
+The `remote.php` prefix is now fully optional in WebDAV endpoints and is never returned in responses.
+
+https://github.com/owncloud/ocis/pull/11687

services/frontend/pkg/revaconfig/config.go

@@ -201,7 +201,7 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
 						"capabilities": map[string]interface{}{
 							"core": map[string]interface{}{
 								"poll_interval": 60,
-								"webdav_root":   "remote.php/webdav",
+								"webdav_root":   "webdav",
 								"status": map[string]interface{}{
 									"installed":      true,
 									"maintenance":    false,

services/proxy/pkg/config/defaults/defaultconfig.go

@@ -188,6 +188,11 @@ func DefaultPolicies() []config.Policy {
 					Endpoint: "/remote.php/?preview=1",
 					Service:  "com.owncloud.web.webdav",
 				},
+				{
+					Type:     config.QueryRoute,
+					Endpoint: "/?preview=1",
+					Service:  "com.owncloud.web.webdav",
+				},
 				// TODO the actual REPORT goes to /dav/files/{username}, which is user specific ... how would this work in a spaces world?
 				// TODO what paths are returned? the href contains the full path so it should be possible to return urls from other spaces?
 				// TODO or we allow a REPORT on /dav/spaces to search all spaces and /dav/space/{spaceid} to search a specific space

services/proxy/pkg/middleware/policies.go

@@ -79,15 +79,16 @@ func Policies(qs string, opts ...Option) func(next http.Handler) http.Handler {
 			// this should only be used as last bastion, every request goes through the proxy and doing stats is expensive!
 			// needed for:
 			// - if a single resource is shared -> the url only contains the resourceID (spaceRef)
-			if resource.Name == "" && filepath.Ext(r.URL.Path) == "" && r.Method == http.MethodPut && strings.HasPrefix(r.URL.Path, "/remote.php/dav/spaces") {
+			if resource.Name == "" && filepath.Ext(r.URL.Path) == "" && r.Method == http.MethodPut && (strings.HasPrefix(r.URL.Path, "/remote.php/dav/spaces") || strings.HasPrefix(r.URL.Path, "/dav/spaces")) {
 				client, err := gatewaySelector.Next()
 				if err != nil {
 					logger.Err(err).Msg("error selecting next gateway client")
 					RenderError(w, r, req, http.StatusForbidden, DeniedMessage)
 					return
 				}
 
-				resourceID, err := storagespace.ParseID(strings.TrimPrefix(r.URL.Path, "/remote.php/dav/spaces/"))
+				path := strings.TrimPrefix(r.URL.Path, "/remote.php")
+				resourceID, err := storagespace.ParseID(strings.TrimPrefix(path, "/dav/spaces/"))
 				if err != nil {
 					logger.Debug().Err(err).Msg("error parsing the resourceId")
 					RenderError(w, r, req, http.StatusForbidden, DeniedMessage)

tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature

@@ -40,7 +40,7 @@ Feature: default capabilities for normal user
                     "const": 60
                   },
                   "webdav-root": {
-                    "const": "remote.php/webdav"
+                    "const": "webdav"
                   },
                   "status": {
                     "type": "object",