fix spaceid handling

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jun 9, 2021 · 931c7f1 · 931c7f1
1 parent 66e4779
commit 931c7f1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
@@ -122,8 +122,15 @@ func (s *svc) ListStorageSpaces(ctx context.Context, req *provider.ListStorageSp
 			id = f.GetId()
 		}
 	}
+	parts := strings.SplitN(id.OpaqueId, "!", 2)
+	if len(parts) != 2 {
+		return &provider.ListStorageSpacesResponse{
+			Status: status.NewInvalidArg(ctx, "space id must be seperated by !"),
+		}, nil
+	}
 	c, err := s.find(ctx, &provider.Reference{
-		StorageId: id.OpaqueId, // FIXME REFERENCE the StorageSpaceId is a storageid + a nodeid
+		StorageId: parts[0], // FIXME REFERENCE the StorageSpaceId is a storageid + a nodeid
+		NodeId:    parts[1],
 	})
 	if err != nil {
 		return &provider.ListStorageSpacesResponse{

diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go
@@ -500,7 +500,10 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 		case provider.ListStorageSpacesRequest_Filter_TYPE_SPACE_TYPE:
 			spaceType = filter[i].GetSpaceType()
 		case provider.ListStorageSpacesRequest_Filter_TYPE_ID:
-			//spaceId = filter[i].GetId().OpaqueId // TODO requests needs to contain the driveid ... currently it is the storage id
+			parts := strings.SplitN(filter[i].GetId().OpaqueId, "!", 2)
+			if len(parts) == 2 {
+				spaceID = parts[1]
+			}
 		}
 	}