Merge pull request #3539 from owncloud/single-file-edit

[full-ci] update reva and add capability
owncloud · Apr 15, 2022 · 4eed08b · 4eed08b
2 parents 75804c5 + 9a68be7
commit 4eed08b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.drone.star b/.drone.star
@@ -1693,7 +1693,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             # TODO: redis is not yet supported
             "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379",
             # ownCloudSQL sharing driver
-            "STORAGE_SHARING_USER_DRIVER": "oc10-sql",
+            "STORAGE_SHARING_USER_DRIVER": "owncloudsql",
             "STORAGE_SHARING_USER_SQL_USERNAME": "owncloud",
             "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud",
             "STORAGE_SHARING_USER_SQL_HOST": "oc10-db",

diff --git a/changelog/unreleased/single-file-edit.md b/changelog/unreleased/single-file-edit.md
@@ -0,0 +1,6 @@
+Enhancement: Add capability for public link single file edit
+
+It is now possible to share a single file by link with edit permissions. Therefore we need a public share capability to enable that feature in the clients. At the same time we improved the WebDAV permissions for public links.
+
+https://github.com/owncloud/web/pull/6787
+https://github.com/owncloud/ocis/pull/3538
diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
@@ -97,7 +97,7 @@ services:
       STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME: owncloud
       STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR: redis:6379 # TODO: redis is not yet supported
       # ownCloudSQL sharing driver
-      STORAGE_SHARING_USER_DRIVER: oc10-sql
+      STORAGE_SHARING_USER_DRIVER: owncloudsql
       STORAGE_SHARING_USER_SQL_USERNAME: owncloud
       STORAGE_SHARING_USER_SQL_PASSWORD: owncloud
       STORAGE_SHARING_USER_SQL_HOST: oc10-db

diff --git a/extensions/storage/pkg/command/frontend.go b/extensions/storage/pkg/command/frontend.go
@@ -264,6 +264,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 									"expire_date": map[string]interface{}{
 										"enabled": false,
 									},
+									"can_edit": true,
 								},
 								"user": map[string]interface{}{
 									"send_mail":       true,

diff --git a/extensions/storage/pkg/command/sharing.go b/extensions/storage/pkg/command/sharing.go
@@ -134,7 +134,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
 							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
 							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
 						},
-						"oc10-sql": map[string]interface{}{
+						"owncloudsql": map[string]interface{}{
 							"gateway_addr":     cfg.Reva.Gateway.Endpoint,
 							"storage_mount_id": cfg.Reva.Sharing.UserStorageMountID,
 							"db_username":      cfg.Reva.Sharing.UserSQLUsername,
@@ -169,7 +169,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
 							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
 							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
 						},
-						"oc10-sql": map[string]interface{}{
+						"owncloudsql": map[string]interface{}{
 							"gateway_addr":                  cfg.Reva.Gateway.Endpoint,
 							"storage_mount_id":              cfg.Reva.Sharing.UserStorageMountID,
 							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/blevesearch/bleve/v2 v2.3.2
 	github.com/coreos/go-oidc/v3 v3.1.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde
-	github.com/cs3org/reva/v2 v2.2.0
+	github.com/cs3org/reva/v2 v2.0.0-20220414151507-d46af8cacea0
 	github.com/disintegration/imaging v1.6.2
 	github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
 	github.com/go-chi/chi/v5 v5.0.7

diff --git a/go.sum b/go.sum
@@ -335,11 +335,10 @@ github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3p
 github.com/crewjam/saml v0.4.6 h1:XCUFPkQSJLvzyl4cW9OvpWUbRf0gE7VUpU8ZnilbeM4=
 github.com/crewjam/saml v0.4.6/go.mod h1:ZBOXnNPFzB3CgOkRm7Nd6IVdkG+l/wF+0ZXLqD96t1A=
 github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4=
-github.com/cs3org/go-cs3apis v0.0.0-20220328105952-297bef33e13f/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
 github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde h1:WrD9O8ZaWvsm0eBzpzVBIuczDhqVq50Nmjc7PGHHA9Y=
 github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.2.0 h1:OZRaJyz6/mLkR/B77XwYm9fwERRdk6LcU/7lLVP6tFI=
-github.com/cs3org/reva/v2 v2.2.0/go.mod h1:l1dhodFXCp88/Lc0VhzSeaLSQUTn2AdwwkTFtaLCJhk=
+github.com/cs3org/reva/v2 v2.0.0-20220414151507-d46af8cacea0 h1:1UCLAPld8Za2KClGnHz2GfuJ5L9J/guLbkEj83DCRbM=
+github.com/cs3org/reva/v2 v2.0.0-20220414151507-d46af8cacea0/go.mod h1:ThLaoO0196KODVwlvCoTSe2EaNS8+TJGv8CXviIVA/w=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=