Add functionality to create webdav references for OCM shares (#974)

cs3org · Jul 20, 2020 · fd224e4 · fd224e4
1 parent a4e3545
commit fd224e4
Show file tree

Hide file tree

Showing 19 changed files with 377 additions and 31 deletions.
diff --git a/changelog/unreleased/webdav-references.md b/changelog/unreleased/webdav-references.md
@@ -0,0 +1,6 @@
+Enhancement: Add functionality to create webdav references for OCM shares.
+
+Webdav references will now be created in users' shares directory with the target
+set to the original resource's location in their mesh provider.
+
+https://github.com/cs3org/reva/pull/974
diff --git a/cmd/reva/ocm-share-create.go b/cmd/reva/ocm-share-create.go
@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
 	"strconv"
 	"time"
 
@@ -122,17 +123,21 @@ func ocmShareCreateCommand() *command {
 		if err != nil {
 			return err
 		}
-		permOpaque := &types.Opaque{
+		opaqueObj := &types.Opaque{
 			Map: map[string]*types.OpaqueEntry{
 				"permissions": &types.OpaqueEntry{
 					Decoder: "json",
 					Value:   val,
 				},
+				"name": &types.OpaqueEntry{
+					Decoder: "plain",
+					Value:   []byte(path.Base(res.Info.Path)),
+				},
 			},
 		}
 
 		shareRequest := &ocm.CreateOCMShareRequest{
-			Opaque:                permOpaque,
+			Opaque:                opaqueObj,
 			ResourceId:            res.Info.Id,
 			Grant:                 grant,
 			RecipientMeshProvider: providerInfo.ProviderInfo,

diff --git a/examples/oc-phoenix/providers.demo.json b/examples/oc-phoenix/providers.demo.json
@@ -19,6 +19,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:13001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "CERNBox Webdav API"
+					},
+					"name": "CERNBox - Webdav API",
+					"path": "http://127.0.0.1:13001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:13001/"
 			}
 		]
 	},
@@ -42,6 +55,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:13001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "CESNET Webdav API"
+					},
+					"name": "CESNET - Webdav API",
+					"path": "http://127.0.0.1:13001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:13001/"
 			}
 		]
 	},
@@ -65,6 +91,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:13001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Example Webdav API"
+					},
+					"name": "Example - Webdav API",
+					"path": "http://127.0.0.1:13001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:13001/"
 			}
 		]
 	},
@@ -88,6 +127,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:13001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Test Webdav API"
+					},
+					"name": "Test - Webdav API",
+					"path": "http://127.0.0.1:13001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:13001/"
 			}
 		]
 	}

diff --git a/examples/ocm-partners/providers.demo.json b/examples/ocm-partners/providers.demo.json
@@ -19,6 +19,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "https://sciencemesh.cernbox.cern.ch/iop/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "CERNBox Webdav API"
+					},
+					"name": "CERNBox - Webdav API",
+					"path": "https://sciencemesh.cernbox.cern.ch/iop/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://sciencemesh.cernbox.cern.ch/iop/"
 			}
 		]
 	},
@@ -42,6 +55,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "https://sciencemesh.cesnet.cz/iop/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "CESNET Webdav API"
+					},
+					"name": "CESNET - Webdav API",
+					"path": "https://sciencemesh.cesnet.cz/iop/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://sciencemesh.cesnet.cz/iop/"
 			}
 		]
 	},
@@ -65,6 +91,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "https://sciencemesh-test.uni-muenster.de/api/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "WWU Webdav API"
+					},
+					"name": "WWU - Webdav API",
+					"path": "https://sciencemesh-test.uni-muenster.de/api/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://sciencemesh-test.uni-muenster.de/api/"
 			}
 		]
 	},
@@ -88,6 +127,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "https://sciencemesh.cubbit.io/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Cubbit Webdav API"
+					},
+					"name": "Cubbit - Webdav API",
+					"path": "https://sciencemesh.cubbit.io/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://sciencemesh.cubbit.io/"
 			}
 		]
 	},
@@ -111,6 +163,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "https://cs3mesh.softwaremind.com/iop/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Ailleron Webdav API"
+					},
+					"name": "Ailleron - Webdav API",
+					"path": "https://cs3mesh.softwaremind.com/iop/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://cs3mesh.softwaremind.com/iop/"
 			}
 		]
 	},
@@ -134,6 +199,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "https://app.cs3mesh-iop.k8s.surfsara.nl/iop/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Surfsara Webdav API"
+					},
+					"name": "Surfsara - Webdav API",
+					"path": "https://app.cs3mesh-iop.k8s.surfsara.nl/iop/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://app.cs3mesh-iop.k8s.surfsara.nl/iop/"
 			}
 		]
 	}

diff --git a/examples/ocmd/providers.demo.json b/examples/ocmd/providers.demo.json
@@ -19,6 +19,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:19001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "CERNBox Webdav API"
+					},
+					"name": "CERNBox - Webdav API",
+					"path": "http://127.0.0.1:19001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:19001/"
 			}
 		]
 	},
@@ -42,6 +55,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:17001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "CESNET Webdav API"
+					},
+					"name": "CESNET - Webdav API",
+					"path": "http://127.0.0.1:17001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:17001/"
 			}
 		]
 	},
@@ -65,6 +91,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:19001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Example Webdav API"
+					},
+					"name": "Example - Webdav API",
+					"path": "http://127.0.0.1:19001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:19001/"
 			}
 		]
 	},
@@ -88,6 +127,19 @@
 				},
 				"api_version": "0.0.1",
 				"host": "http://127.0.0.1:19001/"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Test Webdav API"
+					},
+					"name": "Test - Webdav API",
+					"path": "http://127.0.0.1:19001/webdav/",
+					"isMonitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "http://127.0.0.1:19001/"
 			}
 		]
 	}

diff --git a/examples/standalone/standalone.toml b/examples/standalone/standalone.toml
@@ -1,7 +1,17 @@
 # services to enable
 [grpc.services.gateway]
+commit_share_to_storage_grant = true
+commit_share_to_storage_ref = true
+
 [grpc.services.storageregistry]
-[grpc.services.storageprovider]
+[grpc.services.storageregistry.drivers.static]
+home_provider = "/home"
+
+[grpc.services.storageregistry.drivers.static.rules]
+"/home" = "localhost:17000"
+"/reva" = "localhost:18000"
+"123e4567-e89b-12d3-a456-426655440000" = "localhost:18000"
+
 [grpc.services.authprovider]
 [grpc.services.authregistry]
 [grpc.services.userprovider]
@@ -13,6 +23,5 @@
 [grpc.services.ocmproviderauthorizer]
 
 [http.services.datagateway]
-[http.services.dataprovider]
 [http.services.prometheus]
 [http.services.ocmd]
diff --git a/examples/standalone/storage-home.toml b/examples/standalone/storage-home.toml
@@ -0,0 +1,14 @@
+[grpc]
+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]
+address = "0.0.0.0:17001"
+
+[http.services.dataprovider]
+driver = "localhome"
diff --git a/examples/standalone/storage-reva.toml b/examples/standalone/storage-reva.toml
@@ -0,0 +1,7 @@
+[grpc]
+address = "0.0.0.0:18000"
+
+[grpc.services.storageprovider]
+driver = "local"
+mount_path = "/reva"
+mount_id = "123e4567-e89b-12d3-a456-426655440000"