Merge pull request #3710 from rhafer/del-space-permission-denied

Fix error handling in DeleteStorage space
cs3org · Mar 8, 2023 · 4ebb727 · 4ebb727
2 parents 861c31c + fc69deb
commit 4ebb727
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-del-space.md b/changelog/unreleased/fix-del-space.md
@@ -0,0 +1,6 @@
+Bugfix: Fix error when try to delete space without permission
+
+When a user without the correct permission tries to delete a storage space,
+return a PermissionDenied error instead of an Internal Error.
+
+https://github.com/cs3org/reva/pull/3710
diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
@@ -597,8 +597,17 @@ func (s *service) DeleteStorageSpace(ctx context.Context, req *provider.DeleteSt
 
 	spaces, err := s.storage.ListStorageSpaces(ctx, []*provider.ListStorageSpacesRequest_Filter{{Type: provider.ListStorageSpacesRequest_Filter_TYPE_ID, Term: &provider.ListStorageSpacesRequest_Filter_Id{Id: id}}}, true)
 	if err != nil || len(spaces) != 1 {
+		var st *rpc.Status
+		switch err.(type) {
+		case errtypes.IsNotFound, errtypes.PermissionDenied:
+			st = status.NewPermissionDenied(ctx, err, "permission denied")
+		case errtypes.BadRequest:
+			st = status.NewInvalid(ctx, err.Error())
+		default:
+			st = status.NewInternal(ctx, "error deleting space: "+req.Id.String())
+		}
 		return &provider.DeleteStorageSpaceResponse{
-			Status: status.NewInternal(ctx, "cannot get space"),
+			Status: st,
 		}, nil
 	}