Fix list space permissions (#3084)

* revert logic change Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * fix typo Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * fix v2.7.1 changelog Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * add changelog Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * fill in storage provider id if it is missing Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * update changelog reflect all commits Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jul 18, 2022 · 6b31c62 · 6b31c62
1 parent 0517511
commit 6b31c62
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -153,11 +153,11 @@ Details
 
  https://github.com/owncloud/reva/issues/3080
 
- * Enhancement #4072: Add user filter
+ * Enhancement #3046: Add user filter
 
  This PR adds the ability to filter spaces by user-id
 
- https://github.com/owncloud/ocis/pull/4072
+ https://github.com/cs3org/reva/pull/3046
 
 
 Changelog for reva 2.6.1 (2022-06-27)

diff --git a/changelog/2.7.1_2022-07-15/add-user-filter.md b/changelog/2.7.1_2022-07-15/add-user-filter.md
@@ -2,4 +2,4 @@ Enhancement: Add user filter
 
 This PR adds the ability to filter spaces by user-id
 
-https://github.com/owncloud/ocis/pull/4072
+https://github.com/cs3org/reva/pull/3046
diff --git a/changelog/NOTE.md b/changelog/NOTE.md
@@ -20,10 +20,10 @@ Details
 
  https://github.com/owncloud/reva/issues/3080
 
- * Enhancement #4072: Add user filter
+ * Enhancement #3046: Add user filter
 
  This PR adds the ability to filter spaces by user-id
 
- https://github.com/owncloud/ocis/pull/4072
+ https://github.com/cs3org/reva/pull/3046
 
 
diff --git a/changelog/unreleased/fix-can-list-all-spaces-permission.md b/changelog/unreleased/fix-can-list-all-spaces-permission.md
@@ -0,0 +1,5 @@
+Bugfix: spaces relatated permissions and providerid cleanup
+
+Following the CS3 resource id refactoring we reverted a logic check when checking the list all spaces permission, fixed some typos and made the storageprovider fill in a missing storage provider id.
+
+https://github.com/cs3org/reva/pull/3084
diff --git a/docs/content/en/docs/changelog/2.7.1/_index.md b/docs/content/en/docs/changelog/2.7.1/_index.md
@@ -29,10 +29,10 @@ Details
 
  https://github.com/owncloud/reva/issues/3080
 
- * Enhancement #4072: Add user filter
+ * Enhancement #3046: Add user filter
 
  This PR adds the ability to filter spaces by user-id
 
- https://github.com/owncloud/ocis/pull/4072
+ https://github.com/cs3org/reva/pull/3046
 
 
diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
@@ -265,6 +265,10 @@ func (s *service) InitiateFileDownload(ctx context.Context, req *provider.Initia
  protocol := &provider.FileDownloadProtocol{Expose: s.conf.ExposeDataServer}
 
  if utils.IsRelativeReference(req.Ref) {
+ // fill in storage provider id if it is missing
+ if req.GetRef().GetResourceId().GetStorageId() == "" {
+ req.GetRef().GetResourceId().StorageId = s.conf.MountID
+ }
  protocol.Protocol = "spaces"
  u.Path = path.Join(u.Path, "spaces", storagespace.FormatResourceID(*req.Ref.ResourceId), req.Ref.Path)
  } else {

diff --git a/pkg/rhttp/datatx/utils/download/download.go b/pkg/rhttp/datatx/utils/download/download.go
@@ -80,6 +80,11 @@ func GetOrHeadFile(w http.ResponseWriter, r *http.Request, fs storage.FS, spaceI
  return
  }
 
+ // fill in storage provider id if it is missing
+ if spaceID != "" && md.GetId().GetStorageId() == "" {
+ md.Id.StorageId = ref.ResourceId.StorageId
+ }
+
  var ranges []HTTPRange
 
  if r.Header.Get("Range") != "" {

diff --git a/pkg/storage/utils/decomposedfs/spaces.go b/pkg/storage/utils/decomposedfs/spaces.go
@@ -282,7 +282,7 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
  return nil, errtypes.PermissionDenied(fmt.Sprintf("user %s is not allowed to list spaces of other users", ctxpkg.ContextMustGetUser(ctx).GetId().GetOpaqueId()))
  }
 
- checkNodePermissions := !canListAllSpaces && !unrestricted
+ checkNodePermissions := !canListAllSpaces || !unrestricted
 
  spaces := []*provider.StorageSpace{}
  // build the glob path, eg.

diff --git a/pkg/storage/utils/decomposedfs/tree/tree.go b/pkg/storage/utils/decomposedfs/tree/tree.go
@@ -154,7 +154,7 @@ func (t *Tree) moveSpaceType(spaceType string) error {
  Str("space", spaceType).
  Str("nodes", child.Name()).
  Str("oldLink", old).
- Msg("could not read old symplink")
+ Msg("could not read old symlink")
  continue
  }
  newDir := filepath.Join(t.root, "indexes", "by-type", spaceType)
@@ -163,7 +163,7 @@ func (t *Tree) moveSpaceType(spaceType string) error {
  Str("space", spaceType).
  Str("nodes", child.Name()).
  Str("targetDir", newDir).
- Msg("could not read old symplink")
+ Msg("could not read old symlink")
  }
  newLink := filepath.Join(newDir, child.Name())
  if err := os.Symlink(filepath.Join("..", target), newLink); err != nil {