fix path construction in webdav propfind (cs3org#2454)

butonic · Feb 14, 2022 · 4f84896 · 4f84896
1 parent 53037a0
commit 4f84896
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
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])