fix wrong node to set space name (#2178)

cs3org · Oct 15, 2021 · 2e9bc0c · 2e9bc0c
1 parent 5866f5e
commit 2e9bc0c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/changelog/unreleased/get-quota-storage-space.md b/changelog/unreleased/get-quota-storage-space.md
@@ -4,4 +4,5 @@ Implementation of [cs3org/cs3apis#147](https://github.com/cs3org/cs3apis/pull/14
 
 Make the cs3apis accept a Reference in the getQuota Request to limit the call to a specific storage space.
 
-https://github.com/cs3org/reva/issues/2152
+https://github.com/cs3org/reva/pull/2152
+https://github.com/cs3org/reva/pull/2178
diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go
@@ -221,7 +221,7 @@ func (fs *Decomposedfs) CreateHome(ctx context.Context) (err error) {
 		}
 	}
 
-	if err := n.SetMetadata(xattrs.SpaceNameAttr, u.DisplayName); err != nil {
+	if err := h.SetMetadata(xattrs.SpaceNameAttr, u.DisplayName); err != nil {
 		return err
 	}
 

diff --git a/pkg/storage/utils/decomposedfs/spaces.go b/pkg/storage/utils/decomposedfs/spaces.go
@@ -233,15 +233,13 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 					// do not list shares as spaces for the owner
 					continue
 				}
-			case "project":
+			default:
 				sname, err := xattr.Get(n.InternalPath(), xattrs.SpaceNameAttr)
 				if err != nil {
 					appctx.GetLogger(ctx).Error().Err(err).Interface("node", n).Msg("could not read space name, attribute not found")
 					continue
 				}
 				space.Name = string(sname)
-			default:
-				space.Name = "root"
 			}
 
 			// filter out spaces user cannot access (currently based on stat permission)

diff --git a/pkg/storage/utils/decomposedfs/upload.go b/pkg/storage/utils/decomposedfs/upload.go
@@ -752,15 +752,20 @@ func (upload *fileUpload) ConcatUploads(ctx context.Context, uploads []tusd.Uplo
 
 func checkQuota(ctx context.Context, fs *Decomposedfs, spaceRoot *node.Node, fileSize uint64) (quotaSufficient bool, err error) {
 	used, _ := spaceRoot.GetTreeSize()
-	quotaB, _ := xattr.Get(spaceRoot.InternalPath(), xattrs.QuotaAttr)
-	total, _ := strconv.ParseUint(string(quotaB), 10, 64)
-
 	enoughDiskSpace := enoughDiskSpace(fs, spaceRoot.InternalPath(), fileSize)
 	if !enoughDiskSpace {
 		return false, errtypes.InsufficientStorage("disk full")
 	}
+	quotaB, _ := xattr.Get(spaceRoot.InternalPath(), xattrs.QuotaAttr)
+	var total uint64
+	if quotaB != nil {
+		total, _ = strconv.ParseUint(string(quotaB), 10, 64)
+	} else {
+		// if quota is not set, it means unlimited
+		return true, nil
+	}
 
-	if (fileSize > total-used || total < used) && !enoughDiskSpace {
+	if fileSize > total-used || total < used {
 		return false, errtypes.InsufficientStorage("quota exceeded")
 	}
 	return true, nil
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	if err := n.SetMetadata(xattrs.SpaceNameAttr, u.DisplayName); err != nil {
+    	if err := h.SetMetadata(xattrs.SpaceNameAttr, u.DisplayName); err != nil {
     		return err
     	}
@@ Expand Down @@