All required features and fixes for the OC/NC ScienceMesh apps

changelog/unreleased/sciencemesh-apps.md

@@ -0,0 +1,6 @@
+Enhancement: All required features and fixes for the OC/NC ScienceMesh apps
+
+This PR includes all necessary code in Reva
+to interface with the ScienceMesh apps in OC and NC 
+
+https://github.com/cs3org/reva/pull/4115

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

@@ -9,7 +9,7 @@ description: >
 # _struct: config_
 
 {{% dir name="provider_domain" type="string" default="The same domain registered in the provider authorizer" %}}
- [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/ocminvitemanager/ocminvitemanager.go#L61)
+ [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/ocminvitemanager/ocminvitemanager.go#L62)
 {{< highlight toml >}}
 [grpc.services.ocminvitemanager]
 provider_domain = "The same domain registered in the provider authorizer"

docs/content/en/docs/config/http/services/ocmprovider/_index.md

@@ -9,55 +9,55 @@ description: >
 # _struct: config_
 
 {{% dir name="ocm_prefix" type="string" default="ocm" %}}
-The prefix URL where the OCM API is served. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L37)
+The prefix URL where the OCM API is served. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L39)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 ocm_prefix = "ocm"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="endpoint" type="string" default="This host's URL. If it's not configured, it is assumed OCM is not available." %}}
- [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L38)
+ [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L40)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 endpoint = "This host's URL. If it's not configured, it is assumed OCM is not available."
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="provider" type="string" default="reva" %}}
-A friendly name that defines this service. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L39)
+A friendly name that defines this service. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L41)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 provider = "reva"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="webdav_root" type="string" default="/remote.php/dav/ocm" %}}
-The root URL of the WebDAV endpoint to serve OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L40)
+The root URL of the WebDAV endpoint to serve OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L42)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 webdav_root = "/remote.php/dav/ocm"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="webapp_root" type="string" default="/external/sciencemesh" %}}
-The root URL to serve Web apps via OCM. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L41)
+The root URL to serve Web apps via OCM. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L43)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 webapp_root = "/external/sciencemesh"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="enable_webapp" type="bool" default=false %}}
-Whether web apps are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L42)
+Whether web apps are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L44)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 enable_webapp = false
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="enable_datatx" type="bool" default=false %}}
-Whether data transfers are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L43)
+Whether data transfers are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L45)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 enable_datatx = false

docs/content/en/docs/config/packages/ocm/share/repository/nextcloud/_index.md

@@ -9,7 +9,7 @@ description: >
 # _struct: ShareManagerConfig_
 
 {{% dir name="endpoint" type="string" default="" %}}
-The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/repository/nextcloud/nextcloud.go#L60)
+The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/repository/nextcloud/nextcloud.go#L61)
 {{< highlight toml >}}
 [ocm.share.repository.nextcloud]
 endpoint = ""

examples/nextcloud-integration/revad.toml

@@ -70,6 +70,10 @@ driver = "json"
 [grpc.services.ocmcore.drivers.json]
 file = "/var/tmp/reva/shares_server_1.json"
 
+[grpc.services.ocminvitemanager.drivers.api]
+base_url = "http://localhost/"
+api_key = "put_api_key_here"
+
 [grpc.services.ocminvitemanager]
 driver = "json"
 
@@ -94,7 +98,7 @@ 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
+enable_home_creation = false
 disable_tus = true
 custom_mime_types_json = "custom-mime-types-demo.json"
 

examples/oc-phoenix/storage-home.toml

@@ -27,7 +27,7 @@ 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
+enable_home_creation = false
 
 [grpc.services.storageprovider.drivers.owncloud]
 datadirectory = "/var/tmp/reva/data"

examples/ocmd/server-1.toml

@@ -90,7 +90,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:{{ http.services.dataprovider[0].address.port }}/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.storageprovider.drivers.localhome]
 user_layout = "{{.Username}}"

examples/ocmd/server-2.toml

@@ -90,7 +90,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:{{ http.services.dataprovider[0].address.port }}/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.storageprovider.drivers.localhome]
 user_layout = "{{.Username}}"

examples/oidc-mapping-tpc/server-1.toml

@@ -35,7 +35,7 @@ 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
+enable_home_creation = false
 
 [grpc.services.usershareprovider]
 [grpc.services.groupprovider]

examples/oidc-mapping-tpc/server-2.toml

@@ -35,7 +35,7 @@ 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
+enable_home_creation = false
 
 [grpc.services.usershareprovider]
 [grpc.services.groupprovider]

examples/sciencemesh/README.md

@@ -0,0 +1,62 @@
+## ScienceMesh Development Setup
+
+These scripts will create a Docker testnet which simulates the [ScienceMesh](https://sciencemesh.io).
+It is useful for all kinds of ScienceMesh-related development and (manual) testing scenarios.
+
+Prerequisites: bash, git, Docker.
+
+```
+git clone --branch=sciencemesh-testing https://github.com/cs3org/reva
+cd reva
+cd examples/sciencemesh
+./init-sciencemesh.sh # This will prepare the Nextcloud and ownCloud 10 images
+./init-reva.sh # This will build reva and revad in the current repo and handle a few other prerequisites
+./nrro.sh
+./einstein.sh nextcloud1
+./maria2.sh
+./clean.sh # Careful! This will kill and remove all your Docker containers on the current host system! Also unrelated ones if present.
+./orro.sh
+```
+
+## Reva-to-reva
+
+To initialize your development environment and build reva on the host, do:
+```
+./init-reva.sh # This will build reva and revad in the current repo and handle a few other prerequisites
+# passing sleep as the main container command will allow us
+# to run revad interactively later:
+REVA_CMD="sleep 30000" ./scripts/testing-reva.sh
+```
+
+### Running the ocmd tutorial
+After you've started the Docker testnet with container as above, you do:
+* `docker exec -it revad1.docker bash` and then:
+```
+cd /etc/revad/ocmd
+/reva/cmd/revad/revad -dev-dir server-1
+```
+* `docker exec -it revad2.docker bash` and then:
+```
+cd /etc/revad/ocmd
+/reva/cmd/revad/revad -dev-dir server-2
+```
+* `docker exec -it revad1.docker bash` again for `/reva/cmd/reva/reva -insecure -host localhost:19000` etc.
+* `docker exec -it revad2.docker bash` again for `/reva/cmd/reva/reva -insecure -host localhost:17000` etc. (notice the port number!)
+* follow the rest of https://reva.link/docs/tutorials/share-tutorial/
+
+### Running the datatx tutorial
+After you've started the Docker testnet with container as above, you do:
+* `docker exec -it revad1.docker bash` and then:
+```
+cd /etc/revad/datatx
+/reva/cmd/revad/revad -dev-dir server-1
+```
+* `docker exec -it revad2.docker bash` and then:
+```
+cd /etc/revad/datatx
+/reva/cmd/revad/revad -dev-dir server-2
+```
+* `docker exec -it revad1.docker bash` again for `/reva/cmd/reva/reva -insecure -host localhost:19000` etc.
+* `docker exec -it revad2.docker bash` again for `/reva/cmd/reva/reva -insecure -host localhost:17000` etc. (notice the port number!)
+* get einstein to generate an invite, and marie to accept it, following the usual way as described in https://reva.link/docs/tutorials/share-tutorial/#4-invitation-workflow
+* follow the rest of https://reva.link/docs/tutorials/datatx-tutorial/#3-create-a-datatx-protocol-type-ocm-share

examples/sciencemesh/build-reva.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+echo hi
+git config --global --add safe.directory /reva
+# go mod tidy
+go mod vendor
+make revad
+make reva

examples/sciencemesh/clean.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+running=$(docker ps -q)
+([ -z "$running" ] && echo "no running containers!") || docker kill $running
+existing=$(docker ps -qa)
+([ -z "$existing" ] && echo "no existing containers!") || docker rm $existing
+docker network remove testnet || true
+docker network create testnet

examples/sciencemesh/einstein.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker exec -it "reva${1}.docker" /reva/cmd/reva/reva -insecure -host localhost:19000

examples/sciencemesh/init-reva.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+ENV_ROOT=$(pwd)
+export ENV_ROOT=${ENV_ROOT}
+[ ! -d "./scripts" ] && echo "Directory ./scripts DOES NOT exist inside $ENV_ROOT, are you running this from the repo root?" && exit 1
+
+docker run --rm               -it    \
+  -v "${ENV_ROOT}/../..:/reva"    \
+  -v "${ENV_ROOT}/build-reva.sh:/build-reva.sh" \
+  --workdir /reva                 \
+  --entrypoint /bin/bash          \
+  pondersource/dev-stock-revad    \
+  /build-reva.sh
+
+docker network inspect testnet >/dev/null 2>&1 || docker network create testnet
+
+[ ! -d "temp" ] && mkdir --parents temp

examples/sciencemesh/init-sciencemesh.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -e
+
+# repositories and branches.
+REPO_NEXTCLOUD_APP=https://github.com/sciencemesh/nc-sciencemesh
+BRANCH_NEXTCLOUD_APP=nextcloud
+
+REPO_OWNCLOUD_APP=https://github.com/sciencemesh/nc-sciencemesh
+BRANCH_OWNCLOUD_APP=owncloud
+
+# Nextcloud Sciencemesh source code.
+[ ! -d "nextcloud-sciencemesh" ] &&                                             \
+    git clone                                                                   \
+    --branch ${BRANCH_NEXTCLOUD_APP}                                            \
+    ${REPO_NEXTCLOUD_APP}                                                       \
+    nextcloud-sciencemesh                                                       \
+    &&                                                                          \
+    docker run -it                                                              \
+    -v "$(pwd)/nextcloud-sciencemesh:/var/www/html/apps/sciencemesh"            \
+    --workdir /var/www/html/apps/sciencemesh                                    \
+    pondersource/dev-stock-nextcloud-sciencemesh                                \
+    make composer
+
+# ownCloud Sciencemesh source code.
+[ ! -d "owncloud-sciencemesh" ] &&                                              \
+    git clone                                                                   \
+    --branch ${BRANCH_OWNCLOUD_APP}                                             \
+    ${REPO_OWNCLOUD_APP}                                                        \
+    owncloud-sciencemesh                                                        \
+    &&                                                                          \
+    docker run -it                                                              \
+    -v "$(pwd)/owncloud-sciencemesh:/var/www/html/apps/sciencemesh"             \
+    --workdir /var/www/html/apps/sciencemesh                                    \
+    pondersource/dev-stock-owncloud-sciencemesh                                 \
+    composer install

examples/sciencemesh/maria1.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+docker exec -it                                     \
+    maria1.docker                                   \
+    mariadb                                         \
+    -u root                                         \
+    -peilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek      \
+    efss

examples/sciencemesh/maria2.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+docker exec -it                                     \
+    maria2.docker                                   \
+    mariadb                                         \
+    -u root                                         \
+    -peilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek      \
+    efss 

examples/sciencemesh/nrrn.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+export EFSS1=nextcloud
+export EFSS2=nextcloud
+"./scripts/testing-sciencemesh.sh"

examples/sciencemesh/nrro.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+export EFSS1=nextcloud
+export EFSS2=owncloud
+"./scripts/testing-sciencemesh.sh"

examples/sciencemesh/orrn.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+export EFSS1=owncloud
+export EFSS2=nextcloud
+"./scripts/testing-sciencemesh.sh"

examples/sciencemesh/orro.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+export EFSS1=owncloud
+export EFSS2=owncloud
+"./scripts/testing-sciencemesh.sh"

examples/sciencemesh/revad/custom-mime-types-demo.json

@@ -0,0 +1,3 @@
+{
+  ".zmd": "application/compressed-markdown"
+}