From bbcbf692832245455a8e549e0783567178d13aae Mon Sep 17 00:00:00 2001 From: David Christofas Date: Wed, 19 Oct 2022 16:59:26 +0200 Subject: [PATCH 1/3] fix shareroot path in REPORT responses --- changelog/unreleased/received-share-path.md | 6 ++++++ services/search/pkg/search/provider/searchprovider.go | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/received-share-path.md diff --git a/changelog/unreleased/received-share-path.md b/changelog/unreleased/received-share-path.md new file mode 100644 index 0000000000..9958a34cf8 --- /dev/null +++ b/changelog/unreleased/received-share-path.md @@ -0,0 +1,6 @@ +Bugfix: Fix the shareroot path in REPORT responses + +Fixed the shareroot path in REPORT responses. Before this change the attribute leaked part of the folder tree of the sharer. + +https://github.com/owncloud/ocis/pull/4859 +https://github.com/owncloud/ocis/issues/4796 diff --git a/services/search/pkg/search/provider/searchprovider.go b/services/search/pkg/search/provider/searchprovider.go index 1bfe01286b..5201daf98c 100644 --- a/services/search/pkg/search/provider/searchprovider.go +++ b/services/search/pkg/search/provider/searchprovider.go @@ -202,7 +202,8 @@ func (p *Provider) Search(ctx context.Context, req *searchsvc.SearchRequest) (*s SpaceId: spid, OpaqueId: oid, } - rootName = space.GetRootInfo().GetPath() + + rootName = filepath.Join("/", filepath.Base(gpRes.GetPath())) permissions = space.GetRootInfo().GetPermissionSet() p.logger.Debug().Interface("grantSpace", space).Interface("mountpointRootId", mountpointRootID).Msg("searching a grant") case "personal": From a41cc77371a6aa353cc2c8a790e9e9373c11f562 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Thu, 20 Oct 2022 11:10:54 +0200 Subject: [PATCH 2/3] bump web commit id for tests --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index fb7c8b78d2..5b0230fb4a 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=ffc3c40b5b0a7693818dc03b485f12794920fad4 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=c8c69113bc7987d6f14e32e5f1e7bd1b5491b1d9 +WEB_COMMITID=1e20bc5fbaf396930ca5b9c5c584b3ad2a9dc1c6 WEB_BRANCH=master From d82003fe6fa0f5b0d84b68e8aaa3242d1831f4de Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 20 Oct 2022 13:20:30 +0200 Subject: [PATCH 3/3] Update .drone.env brought web commit back --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index 5b0230fb4a..fb7c8b78d2 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=ffc3c40b5b0a7693818dc03b485f12794920fad4 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=1e20bc5fbaf396930ca5b9c5c584b3ad2a9dc1c6 +WEB_COMMITID=c8c69113bc7987d6f14e32e5f1e7bd1b5491b1d9 WEB_BRANCH=master