Sharestorageprovider oc10 sm

.drone.star

@@ -746,7 +746,9 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
               "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
               "/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
               "/drone/src/cmd/revad/revad -c storage-publiclink-ocis.toml &",
-              "/drone/src/cmd/revad/revad -c ldap-users.toml",
+              "/drone/src/cmd/revad/revad -c storage-shares.toml &",
+              "/drone/src/cmd/revad/revad -c ldap-users.toml &",
+              "/drone/src/cmd/revad/revad -c machine-auth.toml",
             ],
           },
           cloneOc10TestReposStep(),
@@ -821,7 +823,9 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
               "/drone/src/cmd/revad/revad -c storage-home-s3ng.toml &",
               "/drone/src/cmd/revad/revad -c storage-oc-s3ng.toml &",
               "/drone/src/cmd/revad/revad -c storage-publiclink-s3ng.toml &",
-              "/drone/src/cmd/revad/revad -c ldap-users.toml",
+              "/drone/src/cmd/revad/revad -c storage-shares.toml &",
+              "/drone/src/cmd/revad/revad -c ldap-users.toml &",
+              "/drone/src/cmd/revad/revad -c machine-auth.toml",
             ],
           },
           cloneOc10TestReposStep(),

changelog/unreleased/sharestorageprovider.md

@@ -0,0 +1,5 @@
+Change: Add a sharestorageprovider
+
+This PR adds a ShareStorageProvider which enables us to get rid of a lot of special casing in other parts of the code. It also fixes several issues regarding shares and group shares.
+
+https://github.com/cs3org/reva/pull/2023

go.mod

@@ -26,6 +26,7 @@ require (
 	github.com/go-openapi/errors v0.20.1 // indirect
 	github.com/go-openapi/strfmt v0.20.2 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
+	github.com/gogo/protobuf v1.3.2
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/golang/protobuf v1.5.2
 	github.com/gomodule/redigo v1.8.5

go.sum

@@ -276,6 +276,7 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=

internal/grpc/services/gateway/appprovider.go

@@ -56,17 +56,7 @@ func (s *svc) OpenInApp(ctx context.Context, req *gateway.OpenInAppRequest) (*pr
 		}, nil
 	}
 
-	if s.isSharedFolder(ctx, p) {
-		return &providerpb.OpenInAppResponse{
-			Status: status.NewInvalid(ctx, "gateway: can't open shares folder"),
-		}, nil
-	}
-
 	resName, resChild := p, ""
-	if s.isShareChild(ctx, p) {
-		resName, resChild = s.splitShare(ctx, p)
-	}
-
 	statRes, err := s.stat(ctx, &storageprovider.StatRequest{
 		Ref: &storageprovider.Reference{Path: resName},
 	})

internal/grpc/services/gateway/gateway.go

@@ -42,27 +42,28 @@ func init() {
 }
 
 type config struct {
-	AuthRegistryEndpoint          string `mapstructure:"authregistrysvc"`
-	ApplicationAuthEndpoint       string `mapstructure:"applicationauthsvc"`
-	StorageRegistryEndpoint       string `mapstructure:"storageregistrysvc"`
-	AppRegistryEndpoint           string `mapstructure:"appregistrysvc"`
-	PreferencesEndpoint           string `mapstructure:"preferencessvc"`
-	UserShareProviderEndpoint     string `mapstructure:"usershareprovidersvc"`
-	PublicShareProviderEndpoint   string `mapstructure:"publicshareprovidersvc"`
-	OCMShareProviderEndpoint      string `mapstructure:"ocmshareprovidersvc"`
-	OCMInviteManagerEndpoint      string `mapstructure:"ocminvitemanagersvc"`
-	OCMProviderAuthorizerEndpoint string `mapstructure:"ocmproviderauthorizersvc"`
-	OCMCoreEndpoint               string `mapstructure:"ocmcoresvc"`
-	UserProviderEndpoint          string `mapstructure:"userprovidersvc"`
-	GroupProviderEndpoint         string `mapstructure:"groupprovidersvc"`
-	DataTxEndpoint                string `mapstructure:"datatx"`
-	DataGatewayEndpoint           string `mapstructure:"datagateway"`
-	CommitShareToStorageGrant     bool   `mapstructure:"commit_share_to_storage_grant"`
-	CommitShareToStorageRef       bool   `mapstructure:"commit_share_to_storage_ref"`
-	DisableHomeCreationOnLogin    bool   `mapstructure:"disable_home_creation_on_login"`
-	TransferSharedSecret          string `mapstructure:"transfer_shared_secret"`
-	TransferExpires               int64  `mapstructure:"transfer_expires"`
-	TokenManager                  string `mapstructure:"token_manager"`
+	StorageRules                  map[string]map[string]interface{} `mapstructure:"storage_rules"`
+	AuthRegistryEndpoint          string                            `mapstructure:"authregistrysvc"`
+	ApplicationAuthEndpoint       string                            `mapstructure:"applicationauthsvc"`
+	StorageRegistryEndpoint       string                            `mapstructure:"storageregistrysvc"`
+	AppRegistryEndpoint           string                            `mapstructure:"appregistrysvc"`
+	PreferencesEndpoint           string                            `mapstructure:"preferencessvc"`
+	UserShareProviderEndpoint     string                            `mapstructure:"usershareprovidersvc"`
+	PublicShareProviderEndpoint   string                            `mapstructure:"publicshareprovidersvc"`
+	OCMShareProviderEndpoint      string                            `mapstructure:"ocmshareprovidersvc"`
+	OCMInviteManagerEndpoint      string                            `mapstructure:"ocminvitemanagersvc"`
+	OCMProviderAuthorizerEndpoint string                            `mapstructure:"ocmproviderauthorizersvc"`
+	OCMCoreEndpoint               string                            `mapstructure:"ocmcoresvc"`
+	UserProviderEndpoint          string                            `mapstructure:"userprovidersvc"`
+	GroupProviderEndpoint         string                            `mapstructure:"groupprovidersvc"`
+	DataTxEndpoint                string                            `mapstructure:"datatx"`
+	DataGatewayEndpoint           string                            `mapstructure:"datagateway"`
+	CommitShareToStorageGrant     bool                              `mapstructure:"commit_share_to_storage_grant"`
+	CommitShareToStorageRef       bool                              `mapstructure:"commit_share_to_storage_ref"`
+	DisableHomeCreationOnLogin    bool                              `mapstructure:"disable_home_creation_on_login"`
+	TransferSharedSecret          string                            `mapstructure:"transfer_shared_secret"`
+	TransferExpires               int64                             `mapstructure:"transfer_expires"`
+	TokenManager                  string                            `mapstructure:"token_manager"`
 	// ShareFolder is the location where to create shares in the recipient's storage provider.
 	ShareFolder         string                            `mapstructure:"share_folder"`
 	DataTransfersFolder string                            `mapstructure:"data_transfers_folder"`

internal/grpc/services/gateway/publicshareprovider.go

@@ -24,16 +24,11 @@ import (
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1"
 	"github.com/cs3org/reva/pkg/appctx"
-	"github.com/cs3org/reva/pkg/errtypes"
 	"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
 	"github.com/pkg/errors"
 )
 
 func (s *svc) CreatePublicShare(ctx context.Context, req *link.CreatePublicShareRequest) (*link.CreatePublicShareResponse, error) {
-	if s.isSharedFolder(ctx, req.ResourceInfo.GetPath()) {
-		return nil, errtypes.AlreadyExists("gateway: can't create a public share of the share folder itself")
-	}
-
 	log := appctx.GetLogger(ctx)
 	log.Info().Msg("create public share")