fix path construction in webdav propfind (#2454)

micbar · web-flow · commit 9c0ebc5a6ba0 · 2022-01-19T11:27:16.000+01:00
diff --git a/changelog/unreleased/webdav-path-fix.md b/changelog/unreleased/webdav-path-fix.md
@@ -0,0 +1,5 @@
+Bugfix: Fix webdav paths in PROPFINDS
+
+The WebDAV Api was handling paths on spaces propfinds in the wrong way. This has been fixed in the WebDAV layer.
+
+https://github.com/cs3org/reva/pull/2454
diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind.go b/internal/http/services/owncloud/ocdav/propfind/propfind.go
@@ -458,7 +458,7 @@ func (p *Handler) getResourceInfos(ctx context.Context, w http.ResponseWriter, r
 					// add path to resource
 					res.Infos[i].Path = filepath.Join(info.Path, res.Infos[i].Path)
 					if spacesPropfind {
-						res.Infos[i].Path = utils.MakeRelativePath(filepath.Join(info.Path, res.Infos[i].Path))
+						res.Infos[i].Path = utils.MakeRelativePath(res.Infos[i].Path)
 					}
 					if res.Infos[i].Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER {
 						stack = append(stack, res.Infos[i])

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ func (p *Handler) getResourceInfos(ctx context.Context, w http.ResponseWriter, r`
`458`	`458`	`// add path to resource`
`459`	`459`	`res.Infos[i].Path = filepath.Join(info.Path, res.Infos[i].Path)`
`460`	`460`	`if spacesPropfind {`
`461`		`- res.Infos[i].Path = utils.MakeRelativePath(filepath.Join(info.Path, res.Infos[i].Path))`
	`461`	`+ res.Infos[i].Path = utils.MakeRelativePath(res.Infos[i].Path)`
`462`	`462`	`}`
`463`	`463`	`if res.Infos[i].Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER {`
`464`	`464`	`stack = append(stack, res.Infos[i])`