diff --git a/changelog/unreleased/bump-reva.md b/changelog/unreleased/bump-reva.md index 9a1d91e15b5..08247c1653f 100644 --- a/changelog/unreleased/bump-reva.md +++ b/changelog/unreleased/bump-reva.md @@ -1,4 +1,5 @@ -Enhancement: Bump reva +Enhancement: Bump reva https://github.com/owncloud/ocis/pull/9662 https://github.com/owncloud/ocis/pull/9621 +https://github.com/owncloud/ocis/pull/9677 diff --git a/changelog/unreleased/fix-copy-responce.md b/changelog/unreleased/fix-copy-responce.md new file mode 100644 index 00000000000..352ce8e6aaa --- /dev/null +++ b/changelog/unreleased/fix-copy-responce.md @@ -0,0 +1,6 @@ +Bugfix: Fixed the response code when copying the shared from to personal + +We fixed the response code when copying the file from shares to personal space with a secure view role. + +https://github.com/owncloud/ocis/pull/9677 +https://github.com/owncloud/ocis/issues/9482 diff --git a/go.mod b/go.mod index 5cc41cc4a60..d68a42963d1 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.10.0 github.com/cs3org/go-cs3apis v0.0.0-20240425114016-d2cb31692b4e - github.com/cs3org/reva/v2 v2.21.1-0.20240722093715-1a6e7f6d0e4f + github.com/cs3org/reva/v2 v2.21.1-0.20240724074721-53e5aafbfb86 github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e github.com/egirna/icap-client v0.1.1 diff --git a/go.sum b/go.sum index 6fc2e08da58..5aa88a9d72e 100644 --- a/go.sum +++ b/go.sum @@ -1025,8 +1025,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c= github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME= github.com/cs3org/go-cs3apis v0.0.0-20240425114016-d2cb31692b4e h1:Cm2l8m2riLa79eh7V2wHd1Ra7wR3TbngmeLZBJ9MxTU= github.com/cs3org/go-cs3apis v0.0.0-20240425114016-d2cb31692b4e/go.mod h1:yyP8PRo0EZou3nSH7H4qjlzQwaydPeIRNgX50npQHpE= -github.com/cs3org/reva/v2 v2.21.1-0.20240722093715-1a6e7f6d0e4f h1:U0RoCVpBKU+xRYdgxBgZY3ZxtArnYVERobjhtXUv7qo= -github.com/cs3org/reva/v2 v2.21.1-0.20240722093715-1a6e7f6d0e4f/go.mod h1:+5pteFc4ymQnhYG2cOtg/jzaIZKgxrgIeH0D4fuC6gA= +github.com/cs3org/reva/v2 v2.21.1-0.20240724074721-53e5aafbfb86 h1:gJkzSPurbNq7x+N5IjnwtKh+moUtHVQ7IRIncc4rmQ8= +github.com/cs3org/reva/v2 v2.21.1-0.20240724074721-53e5aafbfb86/go.mod h1:+5pteFc4ymQnhYG2cOtg/jzaIZKgxrgIeH0D4fuC6gA= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go index 97b4686420a..e575bdda766 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go @@ -511,6 +511,12 @@ func (s *svc) executeSpacesCopy(ctx context.Context, w http.ResponseWriter, sele return err } defer httpDownloadRes.Body.Close() + if httpDownloadRes.StatusCode == http.StatusForbidden { + w.WriteHeader(http.StatusForbidden) + b, err := errors.Marshal(http.StatusForbidden, http.StatusText(http.StatusForbidden), "", strconv.Itoa(http.StatusForbidden)) + errors.HandleWebdavError(log, w, b, err) + return nil + } if httpDownloadRes.StatusCode != http.StatusOK { return fmt.Errorf("status code %d", httpDownloadRes.StatusCode) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4b51469baf0..d49aef90e76 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -366,7 +366,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.21.1-0.20240722093715-1a6e7f6d0e4f +# github.com/cs3org/reva/v2 v2.21.1-0.20240724074721-53e5aafbfb86 ## explicit; go 1.21 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime