Remove favs attribute if no favourites are set

cs3org · Dec 18, 2024 · 6184dc9 · 6184dc9
1 parent 2578d59
commit 6184dc9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/pkg/eosclient/eosbinary/eosbinary.go b/pkg/eosclient/eosbinary/eosbinary.go
@@ -527,6 +527,9 @@ func (c *Client) handleFavAttr(ctx context.Context, auth eosclient.Authorization
 		favs.DeleteEntry(acl.TypeUser, u.Id.OpaqueId)
 	}
 	attr.Val = favs.Serialize()
+	if attr.Val == "" {
+		return c.UnsetAttr(ctx, auth, attr, false, path, "")
+	}
 	return c.setEOSAttr(ctx, auth, attr, false, recursive, path, "")
 }
 

diff --git a/pkg/eosclient/eosgrpc/eosgrpc.go b/pkg/eosclient/eosgrpc/eosgrpc.go
@@ -597,6 +597,9 @@ func (c *Client) handleFavAttr(ctx context.Context, auth eosclient.Authorization
 		favs.DeleteEntry(acl.TypeUser, u.Id.OpaqueId)
 	}
 	attr.Val = favs.Serialize()
+	if attr.Val == "" {
+		return c.UnsetAttr(ctx, auth, attr, false, path, "")
+	}
 	return c.setEOSAttr(ctx, auth, attr, false, recursive, path, "")
 }
 

diff --git a/pkg/storage/utils/acl/acl.go b/pkg/storage/utils/acl/acl.go
@@ -79,6 +79,10 @@ func isComment(line string) bool {
 
 // Serialize always serializes to short text form.
 func (m *ACLs) Serialize() string {
+	if len(m.Entries) == 0 {
+		return ""
+	}
+
 	sysACL := []string{}
 	for _, e := range m.Entries {
 		sysACL = append(sysACL, e.CitrineSerialize())