diff --git a/accounts/go.mod b/accounts/go.mod index 2c38b357b72..397bd1be44b 100644 --- a/accounts/go.mod +++ b/accounts/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 + github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/render v1.0.1 github.com/gofrs/uuid v3.3.0+incompatible diff --git a/accounts/go.sum b/accounts/go.sum index 419764ed431..d7fc9552a23 100644 --- a/accounts/go.sum +++ b/accounts/go.sum @@ -198,6 +198,8 @@ github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b h1:Bypxdf3vXwyEeL86M github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 h1:4CKU+R4UNvILzsPrcAFwEbk/8Hc6vJqwO7SxK0gAm4I= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 h1:H3QnP+eApE2LDJrYjJrIBmJ04KGVdpR2QP+ipdPp3jE= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/changelog/unreleased/fix-ocs-share-api.md b/changelog/unreleased/fix-ocs-share-api.md new file mode 100644 index 00000000000..761ab991d72 --- /dev/null +++ b/changelog/unreleased/fix-ocs-share-api.md @@ -0,0 +1,6 @@ +Bugfix: Fix path of files shared with me in ocs api + +The path of files shared with me using the ocs api we pointing to an incorrect location. + +https://github.com/owncloud/product/issues/204 +https://github.com/owncloud/ocis/pull/994 diff --git a/ocis-pkg/go.mod b/ocis-pkg/go.mod index 4ed3d68c124..3f1f9d9f1d7 100644 --- a/ocis-pkg/go.mod +++ b/ocis-pkg/go.mod @@ -7,7 +7,7 @@ require ( github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 + github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 github.com/go-chi/chi v4.1.2+incompatible github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 github.com/iancoleman/strcase v0.1.2 diff --git a/ocis-pkg/go.sum b/ocis-pkg/go.sum index b3e6cb68966..c913420bf5f 100644 --- a/ocis-pkg/go.sum +++ b/ocis-pkg/go.sum @@ -226,6 +226,8 @@ github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b h1:Bypxdf3vXwyEeL86M github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 h1:4CKU+R4UNvILzsPrcAFwEbk/8Hc6vJqwO7SxK0gAm4I= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 h1:H3QnP+eApE2LDJrYjJrIBmJ04KGVdpR2QP+ipdPp3jE= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/ocs/go.mod b/ocs/go.mod index cfa7755d639..e3e18d928d6 100644 --- a/ocs/go.mod +++ b/ocs/go.mod @@ -8,7 +8,7 @@ require ( contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 + github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/render v1.0.1 github.com/golang/protobuf v1.4.3 diff --git a/ocs/go.sum b/ocs/go.sum index 8e2ccd8f354..b271fff5776 100644 --- a/ocs/go.sum +++ b/ocs/go.sum @@ -210,6 +210,8 @@ github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b h1:Bypxdf3vXwyEeL86M github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 h1:4CKU+R4UNvILzsPrcAFwEbk/8Hc6vJqwO7SxK0gAm4I= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 h1:H3QnP+eApE2LDJrYjJrIBmJ04KGVdpR2QP+ipdPp3jE= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= diff --git a/proxy/go.mod b/proxy/go.mod index fde9d037006..0e21053b64e 100644 --- a/proxy/go.mod +++ b/proxy/go.mod @@ -8,7 +8,7 @@ require ( contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 + github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/google/uuid v1.1.2 github.com/justinas/alice v1.2.0 diff --git a/proxy/go.sum b/proxy/go.sum index 0061092f2b4..f693374cf40 100644 --- a/proxy/go.sum +++ b/proxy/go.sum @@ -205,6 +205,8 @@ github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b h1:Bypxdf3vXwyEeL86M github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 h1:4CKU+R4UNvILzsPrcAFwEbk/8Hc6vJqwO7SxK0gAm4I= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 h1:H3QnP+eApE2LDJrYjJrIBmJ04KGVdpR2QP+ipdPp3jE= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= diff --git a/storage/go.mod b/storage/go.mod index aee111b6e59..a63be4fbe00 100644 --- a/storage/go.mod +++ b/storage/go.mod @@ -3,7 +3,7 @@ module github.com/owncloud/ocis/storage go 1.13 require ( - github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 + github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 github.com/gofrs/uuid v3.3.0+incompatible github.com/micro/cli/v2 v2.1.2 github.com/micro/go-micro/v2 v2.9.1 diff --git a/storage/go.sum b/storage/go.sum index adc9014cfd1..ee2a41f95d4 100644 --- a/storage/go.sum +++ b/storage/go.sum @@ -218,6 +218,8 @@ github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b h1:Bypxdf3vXwyEeL86M github.com/cs3org/reva v1.4.1-0.20201127111856-e6a6212c1b7b/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 h1:4CKU+R4UNvILzsPrcAFwEbk/8Hc6vJqwO7SxK0gAm4I= github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3 h1:H3QnP+eApE2LDJrYjJrIBmJ04KGVdpR2QP+ipdPp3jE= +github.com/cs3org/reva v1.4.1-0.20201130150257-7e3efcbd0fc3/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go index 7bb726597d9..9a1bed16412 100644 --- a/storage/pkg/command/frontend.go +++ b/storage/pkg/command/frontend.go @@ -134,6 +134,7 @@ func Frontend(cfg *config.Config) *cli.Command { "disable_tus": cfg.Reva.UploadDisableTus, }, "ocs": map[string]interface{}{ + "share_prefix": cfg.Reva.Frontend.OCSSharePrefix, "prefix": cfg.Reva.Frontend.OCSPrefix, "config": map[string]interface{}{ "version": "1.8", diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 69c48d83262..ebf46302de5 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -82,6 +82,7 @@ type FrontendPort struct { DatagatewayPrefix string OCDavPrefix string OCSPrefix string + OCSSharePrefix string PublicURL string } diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go index dcada4d8bf1..7b132a94f72 100644 --- a/storage/pkg/flagset/frontend.go +++ b/storage/pkg/flagset/frontend.go @@ -100,7 +100,13 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"STORAGE_FRONTEND_OCS_PREFIX"}, Destination: &cfg.Reva.Frontend.OCSPrefix, }, - + &cli.StringFlag{ + Name: "ocs-share-prefix", + Value: "/Shares", + Usage: "the prefix prepended to the path of shared files", + EnvVars: []string{"STORAGE_FRONTEND_OCS_Share_PREFIX"}, + Destination: &cfg.Reva.Frontend.OCSSharePrefix, + }, // Gateway &cli.StringFlag{