Change condition for setting sharing permissions from EOS ACLs

cs3org · Oct 12, 2021 · 850a787 · 850a787
1 parent 5551534
commit 850a787
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/cbox/storage/eoswrapper/eoswrapper.go b/pkg/cbox/storage/eoswrapper/eoswrapper.go
@@ -149,14 +149,15 @@ func (w *wrapper) setProjectSharingPermissions(ctx context.Context, r *provider.
 	if strings.HasPrefix(w.config.Namespace, eosProjectsNamespace) && (perm.AddGrant || perm.RemoveGrant || perm.UpdateGrant) {
 		var userHasSharingAccess bool
 		user := ctxpkg.ContextMustGetUser(ctx)
-		for _, g := range user.Groups {
 
+		for _, g := range user.Groups {
 			// Check if user is present in the admins or writers groups
 			if strings.HasPrefix(g, projectSpaceGroupsPrefix) && (strings.HasSuffix(g, projectSpaceAdminGroups) || strings.HasSuffix(g, projectSpaceWriterGroups)) {
 				userHasSharingAccess = true
 				break
 			}
 		}
+
 		if !userHasSharingAccess {
 			r.PermissionSet.AddGrant = false
 			r.PermissionSet.RemoveGrant = false

diff --git a/pkg/storage/utils/grants/grants.go b/pkg/storage/utils/grants/grants.go
@@ -96,7 +96,7 @@ func GetGrantPermissionSet(perm string, isDir bool) *provider.ResourcePermission
 		rp.Delete = false
 	}
 
-	if strings.Contains(perm, "m") && !strings.Contains(perm, "!m") {
+	if strings.Contains(perm, "w") && strings.Contains(perm, "x") && !strings.Contains(perm, "!m") {
 		rp.AddGrant = true
 		rp.ListGrants = true
 		rp.RemoveGrant = true