Spaces registry

.drone.star

@@ -511,10 +511,9 @@ def virtualViews():
         "commands": [
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend-global.toml &",
-          "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
-          "/drone/src/cmd/revad/revad -c storage-local-1.toml &",
-          "/drone/src/cmd/revad/revad -c storage-local-2.toml &",
+          "/drone/src/cmd/revad/revad -c gateway-virtual.toml &",
+          "/drone/src/cmd/revad/revad -c storage-users-0-9.toml &",
+          "/drone/src/cmd/revad/revad -c storage-users-a-f.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ],
       },
@@ -530,7 +529,7 @@ def virtualViews():
           "PATH_TO_CORE": "/drone/src/tmp/testrunner",
           "TEST_SERVER_URL": "http://revad-services:20180",
           "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
-          "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
+          "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/* /drone/src/tmp/reva/data/spaces/*/*",
           "STORAGE_DRIVER": "OCIS",
           "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
           "TEST_REVA": "true",
@@ -570,7 +569,6 @@ def litmusOcisOldWebdav():
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend.toml &",
           "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
           "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ],
@@ -623,7 +621,6 @@ def litmusOcisNewWebdav():
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend.toml &",
           "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
           "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ]
@@ -677,7 +674,6 @@ def litmusOcisSpacesDav():
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend.toml &",
           "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
           "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ]
@@ -700,7 +696,7 @@ def litmusOcisSpacesDav():
         "commands": [
           # The spaceid is randomly generated during the first login so we need this hack to construct the correct url.
           "curl -s -k -u einstein:relativity -I http://revad-services:20080/remote.php/dav/files/einstein",
-          "export LITMUS_URL=http://revad-services:20080/remote.php/dav/spaces/123e4567-e89b-12d3-a456-426655440000!$(ls /drone/src/tmp/reva/data/spaces/personal/)",
+          "export LITMUS_URL=http://revad-services:20080/remote.php/dav/spaces/$(ls /drone/src/tmp/reva/data/spaces/personal/)",
           "/usr/local/bin/litmus-wrapper",
         ]
       },
@@ -743,7 +739,8 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
               "/drone/src/cmd/revad/revad -c frontend.toml &",
               "/drone/src/cmd/revad/revad -c gateway.toml &",
               "/drone/src/cmd/revad/revad -c shares.toml &",
-              "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
+              "/drone/src/cmd/revad/revad -c storage-shares.toml &",
+              "/drone/src/cmd/revad/revad -c machine-auth.toml &",
               "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
               "/drone/src/cmd/revad/revad -c storage-publiclink.toml &",
               "/drone/src/cmd/revad/revad -c ldap-users.toml",
@@ -760,7 +757,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
             "environment": {
               "TEST_SERVER_URL": "http://revad-services:20080",
               "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
-              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
+              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/* /drone/src/tmp/reva/data/spaces/*/*",
               "STORAGE_DRIVER": "OCIS",
               "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
               "TEST_WITH_LDAP": "true",
@@ -818,10 +815,11 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
               "/drone/src/cmd/revad/revad -c frontend.toml &",
               "/drone/src/cmd/revad/revad -c gateway.toml &",
               "/drone/src/cmd/revad/revad -c shares.toml &",
-              "/drone/src/cmd/revad/revad -c storage-home-s3ng.toml &",
               "/drone/src/cmd/revad/revad -c storage-users-s3ng.toml &",
               "/drone/src/cmd/revad/revad -c storage-publiclink.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(),
@@ -835,7 +833,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
             "environment": {
               "TEST_SERVER_URL": "http://revad-services:20080",
               "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
-              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
+              "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/* /drone/src/tmp/reva/data/spaces/*/*",
               "STORAGE_DRIVER": "S3NG",
               "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
               "TEST_WITH_LDAP": "true",

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

changelog/unreleased/spaces-registry.md

@@ -0,0 +1,5 @@
+Change: Add a spaces registry
+
+Spaces registry is supposed to manage spaces. Read `pkg/storage/registry/spaces/Readme.md` for full details
+
+https://github.com/cs3org/reva/pull/2234

changelog/unreleased/wrap-unwrap-in-gateway.md

@@ -0,0 +1,5 @@
+Change: move wrapping and unwrapping of paths to the storage gateway
+
+We've moved the wrapping and unwrapping of reference paths to the storage gateway so that the storageprovider doesn't have to know its mount path.
+
+https://github.com/cs3org/reva/pull/2016

docs/content/en/docs/config/grpc/services/storageprovider/_index.md

@@ -8,32 +8,16 @@ description: >
 
 # _struct: config_
 
-{{% dir name="mount_path" type="string" default="/" %}}
-The path where the file system would be mounted. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L57)
-{{< highlight toml >}}
-[grpc.services.storageprovider]
-mount_path = "/"
-{{< /highlight >}}
-{{% /dir %}}
-
-{{% dir name="mount_id" type="string" default="-" %}}
-The ID of the mounted file system. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L58)
-{{< highlight toml >}}
-[grpc.services.storageprovider]
-mount_id = "-"
-{{< /highlight >}}
-{{% /dir %}}
-
 {{% dir name="driver" type="string" default="localhome" %}}
-The storage driver to be used. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L59)
+The storage driver to be used. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L54)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 driver = "localhome"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="drivers" type="map[string]map[string]interface{}" default="localhome" %}}
- [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L60)
+ [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L55)
 {{< highlight toml >}}
 [grpc.services.storageprovider.drivers.localhome]
 root = "/var/tmp/reva/"
@@ -44,39 +28,39 @@ user_layout = "{{.Username}}"
 {{% /dir %}}
 
 {{% dir name="tmp_folder" type="string" default="/var/tmp" %}}
-Path to temporary folder. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L61)
+Path to temporary folder. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L56)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 tmp_folder = "/var/tmp"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="data_server_url" type="string" default="http://localhost/data" %}}
-The URL for the data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L62)
+The URL for the data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L57)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 data_server_url = "http://localhost/data"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="expose_data_server" type="bool" default=false %}}
-Whether to expose data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L63)
+Whether to expose data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L58)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 expose_data_server = false
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="available_checksums" type="map[string]uint32" default=nil %}}
-List of available checksums. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L64)
+List of available checksums. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L59)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 available_checksums = nil
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="mimetypes" type="map[string]string" default=nil %}}
-List of supported mime types and corresponding file extensions. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L65)
+List of supported mime types and corresponding file extensions. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L60)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 mimetypes = nil

examples/nextcloud-integration/revad.toml

@@ -84,8 +84,6 @@ driver = "static"
 
 [grpc.services.storageprovider]
 driver = "nextcloud"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://127.0.0.1:19001/data"
 enable_home_creation = true
@@ -110,8 +108,6 @@ driver = "nextcloud"
 end_point = "http://localhost/apps/sciencemesh/"
 
 [http]
-enabled_services = ["ocmd"]
-enabled_middlewares = ["providerauthorizer", "cors"]
 address = "0.0.0.0:19001"
 
 [http.services.dataprovider]

examples/oc-phoenix/ocmd.toml

@@ -28,8 +28,6 @@ driver = "json"
 providers = "providers.demo.json"
 
 [http]
-enabled_services = ["ocmd"]
-enabled_middlewares = ["providerauthorizer", "cors"]
 address = "0.0.0.0:13001"
 
 [http.services.ocmd]

examples/oc-phoenix/storage-home.toml

@@ -23,8 +23,6 @@ address = "0.0.0.0:12000"
 # the context path wrapper reads tho username from the context and prefixes the relative storage path with it
 [grpc.services.storageprovider]
 driver = "owncloud"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:12001/data"
 enable_home_creation = true

examples/oc-phoenix/storage-oc.toml

@@ -15,8 +15,6 @@ address = "0.0.0.0:11000"
 # we have a locally running dataprovider
 [grpc.services.storageprovider]
 driver = "owncloud"
-mount_path = "/oc"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:11001/data"
 

examples/ocmd/ocmd-server-1.toml

@@ -91,8 +91,6 @@ app_url = "https://your-collabora-server.org:9980"
 
 [grpc.services.storageprovider]
 driver = "localhome"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:19001/data"
 enable_home_creation = true

examples/ocmd/ocmd-server-2.toml

@@ -65,8 +65,6 @@ driver = "memory"
 
 [grpc.services.storageprovider]
 driver = "localhome"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:17001/data"
 enable_home_creation = true

examples/storage-references/storage-home.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:17000"
 
 [grpc.services.storageprovider]
 driver = "localhome"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:17001/data"
 
 [http]

examples/storage-references/storage-public.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:16000"
 
 [grpc.services.publicstorageprovider]
 driver = "localhome"
-mount_path = "/public"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:16001/data"
 gateway_addr = "localhost:19000"
 

examples/storage-references/storage-reva.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:18000"
 
 [grpc.services.storageprovider]
 driver = "local"
-mount_path = "/reva"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:18001/data"
 
 [http]

examples/two-server-setup/storage-home-1.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:17000"
 
 [grpc.services.storageprovider]
 driver = "localhome"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:17001/data"
 
 [http]

examples/two-server-setup/storage-home-2.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:27000"
 
 [grpc.services.storageprovider]
 driver = "localhome"
-mount_path = "/home"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:27001/data"
 
 [http]

examples/two-server-setup/storage-reva-1.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:18000"
 
 [grpc.services.storageprovider]
 driver = "local"
-mount_path = "/reva"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:18001/data"
 
 [http]

examples/two-server-setup/storage-reva-2.toml

@@ -3,8 +3,6 @@ address = "0.0.0.0:28000"
 
 [grpc.services.storageprovider]
 driver = "local"
-mount_path = "/reva"
-mount_id = "123e4567-e89b-12d3-a456-426655440000"
 data_server_url = "http://localhost:28001/data"
 
 [http]

internal/grpc/interceptors/auth/scope.go

@@ -210,6 +210,26 @@ func checkIfNestedResource(ctx context.Context, ref *provider.Reference, parent
 
 	return strings.HasPrefix(childPath, parentPath), nil
 
+	// resourcePath := statResponse.Info.Path
+
+	// if strings.HasPrefix(ref.GetPath(), resourcePath) {
+	// 	// The path corresponds to the resource to which the token has access.
+	// 	// We allow access to it.
+	// 	return true, nil
+	// }
+
+	// // If we arrived here that could mean that ref.GetPath is not prefixed with the storage mount path but resourcePath is
+	// // because it was returned by the gateway which will prefix it. To fix that we remove the mount path from the resourcePath.
+	// // resourcePath = "/users/<name>/some/path"
+	// // After the split we have [" ", "users", "<name>/some/path"].
+	// trimmedPath := "/" + strings.SplitN(resourcePath, "/", 3)[2]
+	// if strings.HasPrefix(ref.GetPath(), trimmedPath) {
+	// 	// The path corresponds to the resource to which the token has access.
+	// 	// We allow access to it.
+	// 	return true, nil
+	// }
+
+	// return false, nil
 }
 
 func extractRef(req interface{}, hasEditorRole bool) (*provider.Reference, bool) {

internal/grpc/services/gateway/appprovider.go

@@ -44,41 +44,19 @@ import (
 )
 
 func (s *svc) OpenInApp(ctx context.Context, req *gateway.OpenInAppRequest) (*providerpb.OpenInAppResponse, error) {
-	p, st := s.getPath(ctx, req.Ref)
-	if st.Code != rpc.Code_CODE_OK {
-		if st.Code == rpc.Code_CODE_NOT_FOUND {
-			return &providerpb.OpenInAppResponse{
-				Status: status.NewNotFound(ctx, "gateway: resource not found:"+req.Ref.String()),
-			}, nil
-		}
-		return &providerpb.OpenInAppResponse{
-			Status: st,
-		}, nil
-	}
-
-	if s.isSharedFolder(ctx, p) {
-		return &providerpb.OpenInAppResponse{
-			Status: status.NewInvalid(ctx, "gateway: can't open shared 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},
+	resChild := ""
+	statRes, err := s.Stat(ctx, &storageprovider.StatRequest{
+		Ref: req.Ref,
 	})
 	if err != nil {
 		return &providerpb.OpenInAppResponse{
 			Status: status.NewInternal(ctx, err, "gateway: error calling Stat on the resource path for the app provider: "+req.Ref.GetPath()),
 		}, nil
 	}
 	if statRes.Status.Code != rpc.Code_CODE_OK {
-		err := status.NewErrorFromCode(statRes.Status.GetCode(), "gateway")
 		return &providerpb.OpenInAppResponse{
-			Status: status.NewInternal(ctx, err, "Stat failed on the resource path for the app provider: "+req.Ref.GetPath()),
+			Status: statRes.Status,
 		}, nil
 	}