Merge pull request #8762 from kobergj/RemoveResharing

[full-ci] Remove Resharing

changelog/unreleased/remove-resharing.md

@@ -0,0 +1,5 @@
+Enhancement: Remove resharing
+
+Removed resharing feature from codebase
+
+https://github.com/owncloud/ocis/pull/8762

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.10.0
 	github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
-	github.com/cs3org/reva/v2 v2.19.2-0.20240328104440-9c04f2d8ab7e
+	github.com/cs3org/reva/v2 v2.19.2-0.20240404085416-251ba8d12f6f
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
 	github.com/disintegration/imaging v1.6.2
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

go.sum

@@ -1022,8 +1022,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.19.2-0.20240328104440-9c04f2d8ab7e h1:WkmwnjiTC9FBDQqJhv4IUBBXDEvqKhlgfaJ1sZ3T3N8=
-github.com/cs3org/reva/v2 v2.19.2-0.20240328104440-9c04f2d8ab7e/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
+github.com/cs3org/reva/v2 v2.19.2-0.20240404085416-251ba8d12f6f h1:t4jFaaEmPX8J/jvybuvI7aC1TbU2zSGZabUDQvA5Mr8=
+github.com/cs3org/reva/v2 v2.19.2-0.20240404085416-251ba8d12f6f/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

services/frontend/pkg/config/config.go

@@ -31,7 +31,6 @@ type Config struct {
 	UploadMaxChunkSize             int    `yaml:"upload_max_chunk_size" env:"FRONTEND_UPLOAD_MAX_CHUNK_SIZE" desc:"Sets the max chunk sizes in bytes for uploads via the clients." introductionVersion:"pre5.0"`
 	UploadHTTPMethodOverride       string `yaml:"upload_http_method_override" env:"FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE" desc:"Advise TUS to replace PATCH requests by POST requests." introductionVersion:"pre5.0"`
 	DefaultUploadProtocol          string `yaml:"default_upload_protocol" env:"FRONTEND_DEFAULT_UPLOAD_PROTOCOL" desc:"The default upload protocol to use in clients. Currently only 'tus' is available. See the developer API documentation for more details about TUS." introductionVersion:"pre5.0"`
-	EnableResharing                bool   `yaml:"enable_resharing" env:"OCIS_ENABLE_RESHARING;FRONTEND_ENABLE_RESHARING" desc:"Changing this value is NOT supported. Enables the support for re-sharing in the clients." introductionVersion:"pre5.0" deprecationVersion:"5.0" deprecationInfo:"Re-sharing will be removed in the future."`
 	EnableFederatedSharingIncoming bool   `yaml:"enable_federated_sharing_incoming" env:"FRONTEND_ENABLE_FEDERATED_SHARING_INCOMING" desc:"Changing this value is NOT supported. Enables support for incoming federated sharing for clients. The backend behaviour is not changed." introductionVersion:"pre5.0"`
 	EnableFederatedSharingOutgoing bool   `yaml:"enable_federated_sharing_outgoing" env:"FRONTEND_ENABLE_FEDERATED_SHARING_OUTGOING" desc:"Changing this value is NOT supported. Enables support for outgoing federated sharing for clients. The backend behaviour is not changed." introductionVersion:"pre5.0"`
 	SearchMinLength                int    `yaml:"search_min_length" env:"FRONTEND_SEARCH_MIN_LENGTH" desc:"Minimum number of characters to enter before a client should start a search for Share receivers. This setting can be used to customize the user experience if e.g too many results are displayed." introductionVersion:"pre5.0"`

services/frontend/pkg/config/defaults/defaultconfig.go

@@ -85,7 +85,6 @@ func DefaultConfig() *config.Config {
 		UploadMaxChunkSize:       1e+7,
 		UploadHTTPMethodOverride: "",
 		DefaultUploadProtocol:    "tus",
-		EnableResharing:          false,
 		DefaultLinkPermissions:   1,
 		SearchMinLength:          3,
 		Edition:                  "Community",

services/frontend/pkg/revaconfig/config.go

@@ -229,7 +229,6 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
 							},
 							"files_sharing": map[string]interface{}{
 								"api_enabled":                       true,
-								"resharing":                         cfg.EnableResharing,
 								"group_sharing":                     true,
 								"sharing_roles":                     true,
 								"deny_access":                       cfg.OCS.EnableDenials,

services/graph/pkg/config/config.go

@@ -33,8 +33,6 @@ type Config struct {
 	Keycloak       Keycloak       `yaml:"keycloak"`
 	ServiceAccount ServiceAccount `yaml:"service_account"`
 
-	FilesSharing FilesSharing `yaml:"files_sharing"`
-
 	Context context.Context `yaml:"-"`
 }
 
@@ -151,8 +149,3 @@ type ServiceAccount struct {
 	ServiceAccountID     string `yaml:"service_account_id" env:"OCIS_SERVICE_ACCOUNT_ID;GRAPH_SERVICE_ACCOUNT_ID" desc:"The ID of the service account the service should use. See the 'auth-service' service description for more details." introductionVersion:"5.0"`
 	ServiceAccountSecret string `yaml:"service_account_secret" env:"OCIS_SERVICE_ACCOUNT_SECRET;GRAPH_SERVICE_ACCOUNT_SECRET" desc:"The service account secret." introductionVersion:"5.0"`
 }
-
-// FilesSharing is the configuration for the files sharing
-type FilesSharing struct {
-	EnableResharing bool `yaml:"enable_resharing" env:"OCIS_ENABLE_RESHARING;GRAPH_ENABLE_RESHARING" desc:"Changing this value is NOT supported. Enables the support for re-sharing." introductionVersion:"5.0" deprecationVersion:"5.0" deprecationInfo:"Resharing will be removed in the future."`
-}

services/graph/pkg/config/defaults/defaultconfig.go

@@ -107,9 +107,6 @@ func DefaultConfig() *config.Config {
 			Cluster:   "ocis-cluster",
 			EnableTLS: false,
 		},
-		FilesSharing: config.FilesSharing{
-			EnableResharing: false,
-		},
 	}
 }
 

services/graph/pkg/service/v0/api_driveitem_permissions.go

@@ -96,7 +96,7 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId stor
 
 	unifiedRolePermissions := []*libregraph.UnifiedRolePermission{{AllowedResourceActions: invite.LibreGraphPermissionsActions}}
 	for _, roleID := range invite.GetRoles() {
-		role, err := unifiedrole.NewUnifiedRoleFromID(roleID, s.config.FilesSharing.EnableResharing)
+		role, err := unifiedrole.NewUnifiedRoleFromID(roleID)
 		if err != nil {
 			s.logger.Debug().Err(err).Interface("role", invite.GetRoles()[0]).Msg("unable to convert requested role")
 			return libregraph.Permission{}, err
@@ -125,7 +125,7 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId stor
 	}
 
 	permission := &libregraph.Permission{}
-	if role := unifiedrole.CS3ResourcePermissionsToUnifiedRole(*cs3ResourcePermissions, condition, s.config.FilesSharing.EnableResharing); role != nil {
+	if role := unifiedrole.CS3ResourcePermissionsToUnifiedRole(*cs3ResourcePermissions, condition); role != nil {
 		permission.Roles = []string{role.GetId()}
 	}
 
@@ -246,7 +246,6 @@ func (s DriveItemPermissionsService) ListPermissions(ctx context.Context, itemID
 			unifiedrole.GetApplicableRoleDefinitionsForActions(
 				allowedActions,
 				condition,
-				s.config.FilesSharing.EnableResharing,
 				false,
 			),
 		),

services/graph/pkg/service/v0/api_driveitem_permissions_test.go

@@ -164,13 +164,13 @@ var _ = Describe("DriveItemPermissionsService", func() {
 			driveItemInvite.Recipients = []libregraph.DriveRecipient{
 				{ObjectId: libregraph.PtrString("1"), LibreGraphRecipientType: libregraph.PtrString("user")},
 			}
-			driveItemInvite.Roles = []string{unifiedrole.NewViewerUnifiedRole(true).GetId()}
+			driveItemInvite.Roles = []string{unifiedrole.NewViewerUnifiedRole().GetId()}
 
 			permission, err := driveItemPermissionsService.Invite(context.Background(), driveItemId, driveItemInvite)
 			Expect(err).ToNot(HaveOccurred())
 
 			Expect(permission.GetRoles()).To(HaveLen(1))
-			Expect(permission.GetRoles()[0]).To(Equal(unifiedrole.NewViewerUnifiedRole(true).GetId()))
+			Expect(permission.GetRoles()[0]).To(Equal(unifiedrole.NewViewerUnifiedRole().GetId()))
 		})
 
 		It("fails with wrong role", func() {
@@ -311,7 +311,7 @@ var _ = Describe("DriveItemPermissionsService", func() {
 		It("populates allowedValues for files that are not shared", func() {
 			statResponse.Info = &provider.ResourceInfo{
 				Id:            &itemID,
-				PermissionSet: roleconversions.NewViewerRole(false).CS3ResourcePermissions(),
+				PermissionSet: roleconversions.NewViewerRole().CS3ResourcePermissions(),
 			}
 			gatewayClient.On("Stat", mock.Anything, mock.Anything).Return(statResponse, nil)
 			gatewayClient.On("ListShares", mock.Anything, mock.Anything).Return(listSharesResponse, nil)
@@ -324,13 +324,13 @@ var _ = Describe("DriveItemPermissionsService", func() {
 		It("returns one permission per share", func() {
 			statResponse.Info = &provider.ResourceInfo{
 				Id:            &itemID,
-				PermissionSet: roleconversions.NewEditorRole(false).CS3ResourcePermissions(),
+				PermissionSet: roleconversions.NewEditorRole().CS3ResourcePermissions(),
 			}
 			listSharesResponse.Shares = []*collaboration.Share{
 				{
 					Id: &collaboration.ShareId{OpaqueId: "1"},
 					Permissions: &collaboration.SharePermissions{
-						Permissions: roleconversions.NewViewerRole(false).CS3ResourcePermissions(),
+						Permissions: roleconversions.NewViewerRole().CS3ResourcePermissions(),
 					},
 					ResourceId: &provider.ResourceId{
 						StorageId: "1",
@@ -358,7 +358,7 @@ var _ = Describe("DriveItemPermissionsService", func() {
 						SpaceId:   "spaceid",
 						OpaqueId:  "public-share-opaqueid",
 					},
-					Permissions: &link.PublicSharePermissions{Permissions: roleconversions.NewViewerRole(false).CS3ResourcePermissions()},
+					Permissions: &link.PublicSharePermissions{Permissions: roleconversions.NewViewerRole().CS3ResourcePermissions()},
 				},
 			}
 
@@ -408,7 +408,7 @@ var _ = Describe("DriveItemPermissionsService", func() {
 			gatewayClient.On("ListPublicShares", mock.Anything, mock.Anything).Return(listPublicSharesResponse, nil)
 			statResponse.Info = &provider.ResourceInfo{
 				Id:            listSpacesResponse.StorageSpaces[0].Root,
-				PermissionSet: roleconversions.NewViewerRole(false).CS3ResourcePermissions(),
+				PermissionSet: roleconversions.NewViewerRole().CS3ResourcePermissions(),
 			}
 			gatewayClient.On("Stat", mock.Anything, mock.Anything).Return(statResponse, nil)
 			permissions, err := driveItemPermissionsService.ListSpaceRootPermissions(context.Background(), driveId)
@@ -586,7 +586,7 @@ var _ = Describe("DriveItemPermissionsService", func() {
 					},
 				},
 				Permissions: &collaboration.SharePermissions{
-					Permissions: roleconversions.NewViewerRole(true).CS3ResourcePermissions(),
+					Permissions: roleconversions.NewViewerRole().CS3ResourcePermissions(),
 				},
 			}
 			getShareMockResponse = &collaboration.GetShareResponse{
@@ -798,7 +798,7 @@ var _ = Describe("DriveItemPermissionsService", func() {
 			gatewayClient.On("Stat", mock.Anything, mock.Anything).Return(statResponse, nil)
 			gatewayClient.On("GetUser", mock.Anything, mock.Anything).Return(getUserResponse, nil)
 
-			driveItemPermission.SetRoles([]string{unifiedrole.NewFileEditorUnifiedRole(false).GetId()})
+			driveItemPermission.SetRoles([]string{unifiedrole.NewFileEditorUnifiedRole().GetId()})
 			spaceId := provider.ResourceId{
 				StorageId: "1",
 				SpaceId:   "2",
@@ -980,7 +980,7 @@ var _ = Describe("DriveItemPermissionsApi", func() {
 					ObjectId:                libregraph.PtrString("1"),
 					LibreGraphRecipientType: libregraph.PtrString("user")},
 			},
-			Roles: []string{unifiedrole.NewViewerUnifiedRole(true).GetId()},
+			Roles: []string{unifiedrole.NewViewerUnifiedRole().GetId()},
 		}
 	})
 

services/graph/pkg/service/v0/api_drives_drive_item.go

@@ -34,19 +34,17 @@ type DrivesDriveItemProvider interface {
 
 // DrivesDriveItemService contains the production business logic for everything that relates to drives
 type DrivesDriveItemService struct {
-	logger           log.Logger
-	gatewaySelector  pool.Selectable[gateway.GatewayAPIClient]
-	identityCache    identity.IdentityCache
-	resharingEnabled bool
+	logger          log.Logger
+	gatewaySelector pool.Selectable[gateway.GatewayAPIClient]
+	identityCache   identity.IdentityCache
 }
 
 // NewDrivesDriveItemService creates a new DrivesDriveItemService
-func NewDrivesDriveItemService(logger log.Logger, gatewaySelector pool.Selectable[gateway.GatewayAPIClient], identityCache identity.IdentityCache, resharing bool) (DrivesDriveItemService, error) {
+func NewDrivesDriveItemService(logger log.Logger, gatewaySelector pool.Selectable[gateway.GatewayAPIClient], identityCache identity.IdentityCache) (DrivesDriveItemService, error) {
 	return DrivesDriveItemService{
-		logger:           log.Logger{Logger: logger.With().Str("graph api", "DrivesDriveItemService").Logger()},
-		gatewaySelector:  gatewaySelector,
-		identityCache:    identityCache,
-		resharingEnabled: resharing,
+		logger:          log.Logger{Logger: logger.With().Str("graph api", "DrivesDriveItemService").Logger()},
+		gatewaySelector: gatewaySelector,
+		identityCache:   identityCache,
 	}, nil
 }
 
@@ -211,8 +209,8 @@ func (s DrivesDriveItemService) MountShare(ctx context.Context, resourceID stora
 		return libregraph.DriveItem{}, errors.Join(errs...)
 	}
 
-	// As the accepted shares are all for the same resource they should collapse to a single drive-item
-	items, err := cs3ReceivedSharesToDriveItems(ctx, &s.logger, gatewayClient, s.identityCache, s.resharingEnabled, acceptedShares)
+	// As the accepted shares are all for the same resource they should collapse to a single driveitem
+	items, err := cs3ReceivedSharesToDriveItems(ctx, &s.logger, gatewayClient, s.identityCache, acceptedShares)
 	switch {
 	case err != nil:
 		return libregraph.DriveItem{}, nil

services/graph/pkg/service/v0/api_drives_drive_item_test.go

@@ -47,7 +47,7 @@ var _ = Describe("DrivesDriveItemService", func() {
 
 		cache := identity.NewIdentityCache(identity.IdentityCacheWithGatewaySelector(gatewaySelector))
 
-		service, err := svc.NewDrivesDriveItemService(logger, gatewaySelector, cache, false)
+		service, err := svc.NewDrivesDriveItemService(logger, gatewaySelector, cache)
 		Expect(err).ToNot(HaveOccurred())
 		drivesDriveItemService = service
 	})

services/graph/pkg/service/v0/base.go

@@ -165,7 +165,7 @@ func (g BaseGraphService) cs3SpacePermissionsToLibreGraph(ctx context.Context, s
 			p.SetExpirationDateTime(time.Unix(int64(exp.GetSeconds()), int64(exp.GetNanos())))
 		}
 
-		if role := unifiedrole.CS3ResourcePermissionsToUnifiedRole(*perm, unifiedrole.UnifiedRoleConditionOwner, false); role != nil {
+		if role := unifiedrole.CS3ResourcePermissionsToUnifiedRole(*perm, unifiedrole.UnifiedRoleConditionOwner); role != nil {
 			switch apiVersion {
 			case APIVersion_1:
 				if r := unifiedrole.GetLegacyName(*role); r != "" {
@@ -354,7 +354,6 @@ func (g BaseGraphService) cs3UserShareToPermission(ctx context.Context, share *c
 	role := unifiedrole.CS3ResourcePermissionsToUnifiedRole(
 		*share.GetPermissions().GetPermissions(),
 		condition,
-		g.config.FilesSharing.EnableResharing,
 	)
 	if role != nil {
 		perm.SetRoles([]string{role.GetId()})
@@ -627,7 +626,7 @@ func (g BaseGraphService) updateUserShare(ctx context.Context, permissionID stri
 	var permissionsUpdated, ok bool
 	if roles, ok = newPermission.GetRolesOk(); ok && len(roles) > 0 {
 		for _, roleID := range roles {
-			role, err := unifiedrole.NewUnifiedRoleFromID(roleID, g.config.FilesSharing.EnableResharing)
+			role, err := unifiedrole.NewUnifiedRoleFromID(roleID)
 			if err != nil {
 				g.logger.Debug().Err(err).Interface("role", role).Msg("unable to convert requested role")
 				return nil, err

services/graph/pkg/service/v0/rolemanagement.go

@@ -15,7 +15,7 @@ import (
 // GetRoleDefinitions a list of permission roles than can be used when sharing with users or groups
 func (g Graph) GetRoleDefinitions(w http.ResponseWriter, r *http.Request) {
 	render.Status(r, http.StatusOK)
-	render.JSON(w, r, unifiedrole.GetBuiltinRoleDefinitionList(g.config.FilesSharing.EnableResharing))
+	render.JSON(w, r, unifiedrole.GetBuiltinRoleDefinitionList())
 }
 
 // GetRoleDefinition a permission role than can be used when sharing with users or groups
@@ -27,7 +27,7 @@ func (g Graph) GetRoleDefinition(w http.ResponseWriter, r *http.Request) {
 		errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "unescaping role id failed")
 		return
 	}
-	role, err := getRoleDefinition(roleID, g.config.FilesSharing.EnableResharing)
+	role, err := getRoleDefinition(roleID)
 	if err != nil {
 		logger.Debug().Str("roleID", roleID).Msg("could not get role: not found")
 		errorcode.ItemNotFound.Render(w, r, http.StatusNotFound, err.Error())
@@ -37,8 +37,8 @@ func (g Graph) GetRoleDefinition(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, role)
 }
 
-func getRoleDefinition(roleID string, resharing bool) (*libregraph.UnifiedRoleDefinition, error) {
-	roleList := unifiedrole.GetBuiltinRoleDefinitionList(resharing)
+func getRoleDefinition(roleID string) (*libregraph.UnifiedRoleDefinition, error) {
+	roleList := unifiedrole.GetBuiltinRoleDefinitionList()
 	for _, role := range roleList {
 		if role != nil && role.Id != nil && *role.Id == roleID {
 			return role, nil

services/graph/pkg/service/v0/service.go

@@ -199,7 +199,7 @@ func NewService(opts ...Option) (Graph, error) {
 		requireAdmin = options.RequireAdminMiddleware
 	}
 
-	drivesDriveItemService, err := NewDrivesDriveItemService(options.Logger, options.GatewaySelector, identityCache, options.Config.FilesSharing.EnableResharing)
+	drivesDriveItemService, err := NewDrivesDriveItemService(options.Logger, options.GatewaySelector, identityCache)
 	if err != nil {
 		return svc, err
 	}

services/graph/pkg/service/v0/sharedbyme_test.go

@@ -52,7 +52,7 @@ var _ = Describe("sharedbyme", func() {
 	)
 	expiration := time.Now()
 
-	editorResourcePermissions := conversions.NewEditorRole(true).CS3ResourcePermissions()
+	editorResourcePermissions := conversions.NewEditorRole().CS3ResourcePermissions()
 	userShare := collaboration.Share{
 		Id: &collaboration.ShareId{
 			OpaqueId: "share-id",
@@ -243,7 +243,6 @@ var _ = Describe("sharedbyme", func() {
 		cfg.TokenManager.JWTSecret = "loremipsum"
 		cfg.Commons = &shared.Commons{}
 		cfg.GRPCClientTLS = &shared.GRPCClientTLS{}
-		cfg.FilesSharing.EnableResharing = true
 
 		svc, _ = service.NewService(
 			service.Config(cfg),

services/graph/pkg/service/v0/sharedwithme.go

@@ -39,5 +39,5 @@ func (g Graph) listSharedWithMe(ctx context.Context) ([]libregraph.DriveItem, er
 		return nil, *errCode
 	}
 
-	return cs3ReceivedSharesToDriveItems(ctx, g.logger, gatewayClient, g.identityCache, g.config.FilesSharing.EnableResharing, listReceivedSharesResponse.GetShares())
+	return cs3ReceivedSharesToDriveItems(ctx, g.logger, gatewayClient, g.identityCache, listReceivedSharesResponse.GetShares())
 }