From bfc891950e29d818c64c11cd46cf5faeb138e396 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 5 Aug 2021 07:23:36 +0200 Subject: [PATCH 1/6] update reva to v1.11.0 --- go.mod | 4 ++-- go.sum | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index a15dfce2bb..57fb1e150b 100644 --- a/go.mod +++ b/go.mod @@ -23,8 +23,8 @@ require ( github.com/asim/go-micro/v3 v3.5.1-0.20210217182006-0f0ace1a44a9 github.com/blevesearch/bleve v1.0.9 github.com/coreos/go-oidc v2.2.1+incompatible - github.com/cs3org/go-cs3apis v0.0.0-20210726064751-4e567a2c8df1 - github.com/cs3org/reva v1.10.1-0.20210730095301-fcb7a30a44a6 + github.com/cs3org/go-cs3apis v0.0.0-20210802070913-970eec344e59 + github.com/cs3org/reva v1.11.0 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/disintegration/imaging v1.6.2 diff --git a/go.sum b/go.sum index 616b61e0e0..9eab8070f6 100644 --- a/go.sum +++ b/go.sum @@ -285,10 +285,10 @@ github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3p github.com/crewjam/saml v0.4.5 h1:H9u+6CZAESUKHxMyxUbVn0IawYvKZn4nt3d4ccV4O/M= github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S68bk= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= -github.com/cs3org/go-cs3apis v0.0.0-20210726064751-4e567a2c8df1 h1:HLVbsiCs1vydncvl6OsiH8iO3D1/p9l/gZ4nMnwcnjQ= -github.com/cs3org/go-cs3apis v0.0.0-20210726064751-4e567a2c8df1/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva v1.10.1-0.20210730095301-fcb7a30a44a6 h1:Bw/vQw4RTiGkVNGTCYKVPEhwmnq0gfvaIIhA73lvta0= -github.com/cs3org/reva v1.10.1-0.20210730095301-fcb7a30a44a6/go.mod h1:NAvw9LS6GPSn3UPbw0VeF2QPmyY50eh5znrzJMaaGoE= +github.com/cs3org/go-cs3apis v0.0.0-20210802070913-970eec344e59 h1:cj9HxIbmbGn+HPpFP8nZ8oaNUsoFa0+cheCO8FUNoMc= +github.com/cs3org/go-cs3apis v0.0.0-20210802070913-970eec344e59/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/reva v1.11.0 h1:LatUclykQgWrWG0MBdKXIav9kGJvrcIgN/zWHLsSDRI= +github.com/cs3org/reva v1.11.0/go.mod h1:AYXC5n5sMeCyGGn9BjzrybkfxxmaBxfjZD/5LhjyVSw= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -450,8 +450,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= -github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= -github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -1081,6 +1081,8 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= +github.com/thanhpk/randstr v1.0.4 h1:IN78qu/bR+My+gHCvMEXhR/i5oriVHcTB/BJJIRTsNo= +github.com/thanhpk/randstr v1.0.4/go.mod h1:M/H2P1eNLZzlDwAzpkkkUvoyNNMbzRGhESZuEQk3r0U= github.com/thejerf/suture/v4 v4.0.1 h1:CLnC1wxLAiHA5zTbbvhSWMupVuGe5ZJ7YddWE3lvb4M= github.com/thejerf/suture/v4 v4.0.1/go.mod h1:g0e8vwskm9tI0jRjxrnA6lSr0q6OfPdWJVX7G5bVWRs= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= From da3d25f0f3fd1a3d303bdf3cbdd6411151e7851f Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 5 Aug 2021 13:44:08 +0200 Subject: [PATCH 2/6] merge reva update changelogs --- .../unreleased/update-reva-57d692feea7b.md | 8 ---- changelog/unreleased/update-reva-v1.10.0.md | 8 ---- changelog/unreleased/update-reva-v1.11.0.md | 45 +++++++++++++++++++ 3 files changed, 45 insertions(+), 16 deletions(-) delete mode 100644 changelog/unreleased/update-reva-57d692feea7b.md delete mode 100644 changelog/unreleased/update-reva-v1.10.0.md create mode 100644 changelog/unreleased/update-reva-v1.11.0.md diff --git a/changelog/unreleased/update-reva-57d692feea7b.md b/changelog/unreleased/update-reva-57d692feea7b.md deleted file mode 100644 index 76ddfd87f7..0000000000 --- a/changelog/unreleased/update-reva-57d692feea7b.md +++ /dev/null @@ -1,8 +0,0 @@ -Enhancement: update REVA to v1.10.1-0.20210721075634-57d692feea7b - -* Fix cs3org/reva#1904: Set Content-Length to 0 when swallowing body in the datagateway -* Fix cs3org/reva#1899: Bugfix: Fix chunked uploads for new versions -* Enh cs3org/reva#1888: Refactoring of the webdav code -* Enh cs3org/reva#1887: Add "a" and "l" filter for grappa queries - -https://github.com/owncloud/ocis/pull/2314 diff --git a/changelog/unreleased/update-reva-v1.10.0.md b/changelog/unreleased/update-reva-v1.10.0.md deleted file mode 100644 index 9e258ce423..0000000000 --- a/changelog/unreleased/update-reva-v1.10.0.md +++ /dev/null @@ -1,8 +0,0 @@ -Enhancement: update REVA to v1.10.0 - -* Fix cs3org/reva#1883: Pass directories with trailing slashes to eosclient.GenerateToken -* Fix cs3org/reva#1878: Improve the webdav error handling in the trashbin -* Fix cs3org/reva#1884: Do not send body on failed range request -* Enh cs3org/reva#1744: Add support for lightweight user types - -https://github.com/owncloud/ocis/pull/2295 diff --git a/changelog/unreleased/update-reva-v1.11.0.md b/changelog/unreleased/update-reva-v1.11.0.md new file mode 100644 index 0000000000..131193f6de --- /dev/null +++ b/changelog/unreleased/update-reva-v1.11.0.md @@ -0,0 +1,45 @@ +Enhancement: update REVA to v1.11.0 + +REVA v1.11.0 +* Fix cs3org/reva#1899: Fix chunked uploads for new versions +* Fix cs3org/reva#1906: Fix copy over existing resource +* Fix cs3org/reva#1891: Delete Shared Resources as Receiver +* Fix cs3org/reva#1907: Error when creating folder with existing name +* Fix cs3org/reva#1937: Do not overwrite more specific matches when finding storage providers +* Fix cs3org/reva#1939: Fix the share jail permissions in the decomposedfs +* Fix cs3org/reva#1932: Numerous fixes to the owncloudsql storage driver +* Fix cs3org/reva#1912: Fix response when listing versions of another user +* Fix cs3org/reva#1910: Get user groups recursively in the cbox rest user driver +* Fix cs3org/reva#1904: Set Content-Length to 0 when swallowing body in the datagateway +* Fix cs3org/reva#1911: Fix version order in propfind responses +* Fix cs3org/reva#1926: Trash Bin in oCIS Storage Operations +* Fix cs3org/reva#1901: Fix response code when folder doesnt exist on upload +* Enh cs3org/reva#1785: Extend app registry with AddProvider method and mimetype filters +* Enh cs3org/reva#1938: Add methods to get and put context values +* Enh cs3org/reva#1798: Add support for a deny-all permission on references +* Enh cs3org/reva#1916: Generate updated protobuf bindings for EOS GRPC +* Enh cs3org/reva#1887: Add "a" and "l" filter for grappa queries +* Enh cs3org/reva#1919: Run gofmt before building +* Enh cs3org/reva#1927: Implement RollbackToVersion for eosgrpc (needs a newer EOS MGM) +* Enh cs3org/reva#1944: Implement listing supported mime types in app registry +* Enh cs3org/reva#1870: Be defensive about wrongly quoted etags +* Enh cs3org/reva#1940: Reduce memory usage when uploading with S3ng storage +* Enh cs3org/reva#1888: Refactoring of the webdav code +* Enh cs3org/reva#1900: Check for illegal names while uploading or moving files +* Enh cs3org/reva#1925: Refactor listing and statting across providers for virtual views + +REVA v1.10.0 +* Fix cs3org/reva#1883: Pass directories with trailing slashes to eosclient.GenerateToken +* Fix cs3org/reva#1878: Improve the webdav error handling in the trashbin +* Fix cs3org/reva#1884: Do not send body on failed range request +* Enh cs3org/reva#1744: Add support for lightweight user types + +REVA v1.10.1-0.20210721075634-57d692feea7b +* Fix cs3org/reva#1904: Set Content-Length to 0 when swallowing body in the datagateway +* Fix cs3org/reva#1899: Bugfix: Fix chunked uploads for new versions +* Enh cs3org/reva#1888: Refactoring of the webdav code +* Enh cs3org/reva#1887: Add "a" and "l" filter for grappa queries + +https://github.com/owncloud/ocis/pull/2355 +https://github.com/owncloud/ocis/pull/2295 +https://github.com/owncloud/ocis/pull/2314 From 57c9c1312976da4b1c1663e33a385572ac8032a2 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 5 Aug 2021 18:13:17 +0545 Subject: [PATCH 3/6] Remove passing tests from expected-failures --- .../expected-failures-API-on-OCIS-storage.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 3d70779039..52ae9604c8 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -3,10 +3,6 @@ ### File Basic file management like up and download, move, copy, properties, trash, versions and chunking. -#### [cannot restore to a different file-name](https://github.com/owncloud/ocis/issues/1122) -- [apiTrashbinRestore/trashbinRestore.feature:309](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbinRestore/trashbinRestore.feature#L309) -- [apiTrashbinRestore/trashbinRestore.feature:310](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbinRestore/trashbinRestore.feature#L310) - #### [Version count is 1 more than on oC10](https://github.com/owncloud/ocis/issues/1633) #### [Implement Versions Feature for ocis storage](https://github.com/owncloud/product/issues/210) @@ -1017,10 +1013,6 @@ _ocs: api compatibility, return correct status code_ - [apiShareReshareToShares2/reShareSubfolder.feature:156](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareReshareToShares2/reShareSubfolder.feature#L156) -#### [No way to set default folder for received shares](https://github.com/owncloud/ocis/issues/1327) -- [apiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature:22](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature#L22) -- [apiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature:23](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature#L23) - #### [various sharing settings cannot be set](https://github.com/owncloud/ocis/issues/1328) - [apiShareUpdateToShares/updateShare.feature:270](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareUpdateToShares/updateShare.feature#L270) - [apiShareUpdateToShares/updateShare.feature:271](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareUpdateToShares/updateShare.feature#L271) @@ -1648,8 +1640,6 @@ Scenario Outline: Do a PROPFIND to a non-existing URL - [apiShareReshareToShares1/reShare.feature:306](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareReshareToShares1/reShare.feature#L306) #### [PROPFIND on trashbin with Depth: infinity only shows the first level](https://github.com/owncloud/ocis/issues/1116) -- [apiTrashbinRestore/trashbinRestore.feature:478](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbinRestore/trashbinRestore.feature#L478) -- [apiTrashbinRestore/trashbinRestore.feature:479](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbinRestore/trashbinRestore.feature#L479) - [apiWebdavOperations/listFiles.feature:182](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/listFiles.feature#L182) #### [Trying to accept a share with invalid ID gives incorrect OCS and HTTP status](https://github.com/owncloud/ocis/issues/2111) From 5c122fb882da720c151134416227a230f60ad07a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 5 Aug 2021 19:45:02 +0545 Subject: [PATCH 4/6] Remove passing web tests from expected-failures --- tests/acceptance/expected-failures-webUI-on-OCIS-storage.md | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index ed3ff8a2ad..23e351deaf 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -406,7 +406,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUITrashbinDelete/trashbinDelete.feature:49](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L49) ### [Trying to create a (public) link share of the Shares folder throws an error](https://github.com/owncloud/web/issues/5152) -- [webUISharingInternalUsers/shareWithUsers.feature:360](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L360) - [webUISharingPublicBasic/publicLinkCreate.feature:190](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L190) ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017) From dbca0a6f0b96d39fb66694c62b1cb6df49990807 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 5 Aug 2021 16:34:50 +0200 Subject: [PATCH 5/6] fix expected failures update changelog --- changelog/unreleased/update-reva-v1.11.0.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/changelog/unreleased/update-reva-v1.11.0.md b/changelog/unreleased/update-reva-v1.11.0.md index 131193f6de..8624020772 100644 --- a/changelog/unreleased/update-reva-v1.11.0.md +++ b/changelog/unreleased/update-reva-v1.11.0.md @@ -1,6 +1,6 @@ -Enhancement: update REVA to v1.11.0 +Enhancement: update REVA -REVA v1.11.0 +Update REVA from v1.10.1-0.20210730095301-fcb7a30a44a6 to v1.11.0 * Fix cs3org/reva#1899: Fix chunked uploads for new versions * Fix cs3org/reva#1906: Fix copy over existing resource * Fix cs3org/reva#1891: Delete Shared Resources as Receiver @@ -27,14 +27,10 @@ REVA v1.11.0 * Enh cs3org/reva#1888: Refactoring of the webdav code * Enh cs3org/reva#1900: Check for illegal names while uploading or moving files * Enh cs3org/reva#1925: Refactor listing and statting across providers for virtual views - -REVA v1.10.0 * Fix cs3org/reva#1883: Pass directories with trailing slashes to eosclient.GenerateToken * Fix cs3org/reva#1878: Improve the webdav error handling in the trashbin * Fix cs3org/reva#1884: Do not send body on failed range request * Enh cs3org/reva#1744: Add support for lightweight user types - -REVA v1.10.1-0.20210721075634-57d692feea7b * Fix cs3org/reva#1904: Set Content-Length to 0 when swallowing body in the datagateway * Fix cs3org/reva#1899: Bugfix: Fix chunked uploads for new versions * Enh cs3org/reva#1888: Refactoring of the webdav code From 8a645f6ac67de87e2cbbcf9441cbeed8583950c1 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 5 Aug 2021 22:12:52 +0545 Subject: [PATCH 6/6] Remove another passing web test from expected-failures --- tests/acceptance/expected-failures-webUI-on-OCIS-storage.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index 23e351deaf..409fffc15f 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -405,9 +405,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUITrashbinDelete/trashbinDelete.feature:85](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L85) - [webUITrashbinDelete/trashbinDelete.feature:49](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L49) -### [Trying to create a (public) link share of the Shares folder throws an error](https://github.com/owncloud/web/issues/5152) -- [webUISharingPublicBasic/publicLinkCreate.feature:190](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L190) - ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017) - [webUIDeleteFilesFolders/deleteFilesFolders.feature:144](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L144) - [webUIFilesSearch/search.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L63)