Merge pull request #4633 from micbar/public-share-tests

Always allow users to create internal links, add public share tests

.mockery.yaml

@@ -7,6 +7,9 @@ packages:
     github.com/cs3org/reva/v2/pkg/publicshare/manager/owncloudsql:
         interfaces:
             UserConverter:
+    github.com/cs3org/reva/v2/pkg/publicshare:
+        interfaces:
+            Manager:
     github.com/cs3org/reva/v2/pkg/share:
         interfaces:
             Manager:

changelog/2.20.0_2024-06-19/fix-public-share-update.md

@@ -2,4 +2,4 @@ Bugfix: Fix public share update
 
 We fixed the permission check for updating public shares. When updating the permissions of a public share while not providing a password, the check must be against the new permissions to take into account that users can opt out only for view permissions.
 
-https://github.com/cs3org/reva/pull/4622
+https://github.com/cs3org/reva/pull/4622

changelog/unreleased/fix-create-internal-links.md

@@ -0,0 +1,6 @@
+Bugfix: Allow all users to create internal links
+
+Due to a bug, not all space members were allowed to create internal links. This has been fixed.
+
+https://github.com/cs3org/reva/pull/4633
+https://github.com/owncloud/ocis/issues/8960

internal/grpc/services/publicshareprovider/expose_test.go

@@ -0,0 +1,6 @@
+package publicshareprovider
+
+var (
+	ParseConfig         = parseConfig
+	ParsePasswordPolicy = parsePasswordPolicy
+)

internal/grpc/services/publicshareprovider/publicshareprovider.go

@@ -53,7 +53,7 @@ import (
 const getUserCtxErrMsg = "error getting user from context"
 
 func init() {
-	rgrpc.Register("publicshareprovider", New)
+	rgrpc.Register("publicshareprovider", NewDefault)
 }
 
 type config struct {
@@ -127,9 +127,8 @@ func parsePasswordPolicy(m map[string]interface{}) (*passwordPolicy, error) {
 	return p, nil
 }
 
-// New creates a new user share provider svc
-func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
-
+// New creates a new public share provider svc initialized from defaults
+func NewDefault(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
 	c, err := parseConfig(m)
 	if err != nil {
 		return nil, err
@@ -146,6 +145,15 @@ func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
 		return nil, err
 	}
 
+	gatewaySelector, err := pool.GatewaySelector(sharedconf.GetGatewaySVC(c.GatewayAddr))
+	if err != nil {
+		return nil, err
+	}
+	return New(gatewaySelector, sm, c, p)
+}
+
+// New creates a new user share provider svc
+func New(gatewaySelector pool.Selectable[gateway.GatewayAPIClient], sm publicshare.Manager, c *config, p *passwordPolicy) (rgrpc.Service, error) {
 	allowedPathsForShares := make([]*regexp.Regexp, 0, len(c.AllowedPathsForShares))
 	for _, s := range c.AllowedPathsForShares {
 		regex, err := regexp.Compile(s)
@@ -155,11 +163,6 @@ func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
 		allowedPathsForShares = append(allowedPathsForShares, regex)
 	}
 
-	gatewaySelector, err := pool.GatewaySelector(sharedconf.GetGatewaySVC(c.GatewayAddr))
-	if err != nil {
-		return nil, err
-	}
-
 	service := &service{
 		conf:                  c,
 		sm:                    sm,
@@ -233,7 +236,7 @@ func (s *service) CreatePublicShare(ctx context.Context, req *link.CreatePublicS
 	}
 
 	// check that user has share permissions
-	if !sRes.GetInfo().GetPermissionSet().AddGrant {
+	if !isInternalLink && !sRes.GetInfo().GetPermissionSet().AddGrant {
 		return &link.CreatePublicShareResponse{
 			Status: status.NewInvalidArg(ctx, "no share permission"),
 		}, nil
@@ -477,14 +480,12 @@ func (s *service) UpdatePublicShare(ctx context.Context, req *link.UpdatePublicS
 
 	isInternalLink := isInternalLink(req, ps)
 
-	// users should always be able to downgrade links to internal links
-	// when they are the creator of the link
-	// all other users should have the WritePublicLink permission
-	if !isInternalLink && !publicshare.IsCreatedByUser(ps, user) {
+	// check if the user has the permission in the user role
+	if !publicshare.IsCreatedByUser(ps, user) {
 		canWriteLink, err := utils.CheckPermission(ctx, permission.WritePublicLink, gatewayClient)
 		if err != nil {
 			return &link.UpdatePublicShareResponse{
-				Status: status.NewInternal(ctx, "error loading public share"),
+				Status: status.NewInternal(ctx, "error checking permission to write public share"),
 			}, err
 		}
 		if !canWriteLink {
@@ -501,8 +502,14 @@ func (s *service) UpdatePublicShare(ctx context.Context, req *link.UpdatePublicS
 			Status: status.NewInternal(ctx, "failed to stat shared resource"),
 		}, err
 	}
+	if sRes.Status.Code != rpc.Code_CODE_OK {
+		return &link.UpdatePublicShareResponse{
+			Status: sRes.GetStatus(),
+		}, nil
 
-	if !publicshare.IsCreatedByUser(ps, user) {
+	}
+
+	if !isInternalLink && !publicshare.IsCreatedByUser(ps, user) {
 		if !sRes.GetInfo().GetPermissionSet().UpdateGrant {
 			return &link.UpdatePublicShareResponse{
 				Status: status.NewPermissionDenied(ctx, nil, "no permission to update public share"),
@@ -547,12 +554,16 @@ func (s *service) UpdatePublicShare(ctx context.Context, req *link.UpdatePublicS
 	}
 
 	// enforce password if needed
-	canOptOut, err := utils.CheckPermission(ctx, permission.DeleteReadOnlyPassword, gatewayClient)
-	if err != nil {
-		return &link.UpdatePublicShareResponse{
-			Status: status.NewInternal(ctx, err.Error()),
-		}, nil
+	var canOptOut bool
+	if !isInternalLink {
+		canOptOut, err = utils.CheckPermission(ctx, permission.DeleteReadOnlyPassword, gatewayClient)
+		if err != nil {
+			return &link.UpdatePublicShareResponse{
+				Status: status.NewInternal(ctx, err.Error()),
+			}, nil
+		}
 	}
+
 	updatePassword := req.GetUpdate().GetType() == link.UpdatePublicShareRequest_Update_TYPE_PASSWORD
 	setPassword := grant.GetPassword()
 

internal/grpc/services/publicshareprovider/publicshareprovider_suite_test.go

@@ -0,0 +1,13 @@
+package publicshareprovider_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestPublicShareProvider(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "PublicShareProvider Suite")
+}