Merge pull request #5108 from 2403905/issue-11054-2

Fix the OCM role file editor

Author: 2403905

changelog/unreleased/fix-ocm-role-file-editor.md

@@ -0,0 +1,6 @@
+Bugfix: Fix the OCM role file editor
+
+Fix the OCM role file editor permission set. The redundant permissions have been removed.
+
+https://github.com/cs3org/reva/pull/5108    
+https://github.com/owncloud/ocis/issues/11054

internal/http/services/ocmd/notifications.go

@@ -174,10 +174,11 @@ func (h *notifHandler) handleShareChangePermission(ctx context.Context, req *not
 
 	o := &typesv1beta1.Opaque{}
 	utils.AppendPlainToOpaque(o, "grantee", req.Notification.Grantee)
+	utils.AppendPlainToOpaque(o, "resourceType", req.ResourceType)
 
 	res, err := gatewayClient.UpdateOCMCoreShare(ctx, &ocmcore.UpdateOCMCoreShareRequest{
 		OcmShareId: req.ProviderId,
-		Protocols:  getProtocols(req.Notification.Protocols),
+		Protocols:  getProtocols(req.Notification.Protocols, o),
 		Opaque:     o,
 	})
 	if err != nil {

internal/http/services/ocmd/protocols.go

@@ -27,6 +27,7 @@ import (
 
 	ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1"
 	providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
+	typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
 	ocmshare "github.com/cs3org/reva/v2/pkg/ocm/share"
 	utils "github.com/cs3org/reva/v2/pkg/utils"
 )
@@ -38,7 +39,7 @@ type Protocols []Protocol
 // in the OCM share.
 type Protocol interface {
 	// ToOCMProtocol convert the protocol to a ocm Protocol struct
-	ToOCMProtocol() *ocm.Protocol
+	ToOCMProtocol(*typesv1beta1.Opaque) *ocm.Protocol
 }
 
 // protocols supported by the OCM API
@@ -51,7 +52,8 @@ type WebDAV struct {
 }
 
 // ToOCMProtocol convert the protocol to a ocm Protocol struct.
-func (w *WebDAV) ToOCMProtocol() *ocm.Protocol {
+func (w *WebDAV) ToOCMProtocol(o *typesv1beta1.Opaque) *ocm.Protocol {
+	resourceType := utils.ReadPlainFromOpaque(o, "resourceType")
 	perms := &ocm.SharePermissions{
 		Permissions: &providerv1beta1.ResourcePermissions{},
 	}
@@ -67,9 +69,11 @@ func (w *WebDAV) ToOCMProtocol() *ocm.Protocol {
 		case "write":
 			perms.Permissions.InitiateFileUpload = true
 			perms.Permissions.RestoreRecycleItem = true
-			perms.Permissions.CreateContainer = true
-			perms.Permissions.Delete = true
-			perms.Permissions.Move = true
+			if resourceType == "folder" {
+				perms.Permissions.Move = true
+				perms.Permissions.CreateContainer = true
+				perms.Permissions.Delete = true
+			}
 		}
 	}
 
@@ -83,7 +87,7 @@ type Webapp struct {
 }
 
 // ToOCMProtocol convert the protocol to a ocm Protocol struct.
-func (w *Webapp) ToOCMProtocol() *ocm.Protocol {
+func (w *Webapp) ToOCMProtocol(_ *typesv1beta1.Opaque) *ocm.Protocol {
 	return ocmshare.NewWebappProtocol(w.URITemplate, utils.GetAppViewMode(w.ViewMode))
 }
 
@@ -95,7 +99,7 @@ type Datatx struct {
 }
 
 // ToOCMProtocol convert the protocol to a ocm Protocol struct.
-func (w *Datatx) ToOCMProtocol() *ocm.Protocol {
+func (w *Datatx) ToOCMProtocol(_ *typesv1beta1.Opaque) *ocm.Protocol {
 	return ocmshare.NewTransferProtocol(w.SourceURI, w.SharedSecret, w.Size)
 }
 

internal/http/services/ocmd/shares.go

@@ -154,6 +154,9 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	o := &types.Opaque{}
+	utils.AppendPlainToOpaque(o, "resourceType", req.ResourceType)
+
 	createShareReq := &ocmcore.CreateOCMCoreShareRequest{
 		Description:  req.Description,
 		Name:         req.Name,
@@ -163,7 +166,7 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
 		ShareWith:    userRes.User.Id,
 		ResourceType: getResourceTypeFromOCMRequest(req.ResourceType),
 		ShareType:    getOCMShareType(req.ShareType),
-		Protocols:    getProtocols(req.Protocols),
+		Protocols:    getProtocols(req.Protocols, o),
 	}
 
 	if req.Expiration != 0 {
@@ -251,10 +254,10 @@ func getOCMShareType(t string) ocm.ShareType {
 	return ocm.ShareType_SHARE_TYPE_GROUP
 }
 
-func getProtocols(p Protocols) []*ocm.Protocol {
+func getProtocols(p Protocols, o *types.Opaque) []*ocm.Protocol {
 	prot := make([]*ocm.Protocol, 0, len(p))
 	for _, data := range p {
-		prot = append(prot, data.ToOCMProtocol())
+		prot = append(prot, data.ToOCMProtocol(o))
 	}
 	return prot
 }