Merge branch 'master' into add_log_rotation_deploy_examples

2026-03-13 18:00:34 -05:00 · 2021-01-23 10:20:47 +01:00
parent 888bea54ad c2f154f7cd
commit 94c65c6945
16 changed files with 264 additions and 42 deletions
--- a/.drone.env
+++ b/.drone.env
@@ -1,7 +1,7 @@
 # The test runner source for API tests
-CORE_COMMITID=e7189eab94075c4edac75f3e86f96ae1f6826170
+CORE_COMMITID=ec99c594e90b83c8a3778834e31a5714df630ffc
 CORE_BRANCH=master

 # The test runner source for UI tests
-WEB_COMMITID=a5f4dfab62aa036d7933f1286485e122e670b3ef
+WEB_COMMITID=5945833ca594c16d33514da74b3d2eb64d3560fd
 WEB_BRANCH=master
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The following sections list the changes for unreleased.
 * Enhancement - Add OCIS_URL env var: [#1148](https://github.com/owncloud/ocis/pull/1148)
 * Enhancement - Use sync.cache for roles cache: [#1367](https://github.com/owncloud/ocis/pull/1367)
 * Enhancement - Add named locks and refactor cache: [#1212](https://github.com/owncloud/ocis/pull/1212)
+* Enhancement - Update reva to v1.5.1: [#1372](https://github.com/owncloud/ocis/pull/1372)
 * Enhancement - Update reva to v1.4.1-0.20210111080247-f2b63bfd6825: [#1194](https://github.com/owncloud/ocis/pull/1194)

 ## Details
@@ -139,6 +140,81 @@ The following sections list the changes for unreleased.
   https://github.com/owncloud/ocis/issues/966
   https://github.com/owncloud/ocis/pull/1212

+* Enhancement - Update reva to v1.5.1: [#1372](https://github.com/owncloud/ocis/pull/1372)
+
+   Summary -------
+
+  * Fix #1401: Use the user in request for deciding the layout for non-home DAV requests
+  * Fix #1413: Re-include the '.git' dir in the Docker images to pass the version tag
+  * Fix #1399: Fix ocis trash-bin purge
+  * Enh #1397: Bump the Copyright date to 2021
+  * Enh #1398: Support site authorization status in Mentix
+  * Enh #1393: Allow setting favorites, mtime and a temporary etag
+  * Enh #1403: Support remote cloud gathering metrics
+
+   Details -------
+
+  * Bugfix #1401: Use the user in request for deciding the layout for non-home DAV requests
+
+   For the incoming /dav/files/userID requests, we have different namespaces depending on
+   whether the request is for the logged-in user's namespace or not. Since in the storage drivers,
+   we specify the layout depending only on the user whose resources are to be accessed, this fails
+   when a user wants to access another user's namespace when the storage provider depends on the
+   logged in user's namespace. This PR fixes that.
+
+   For example, consider the following case. The owncloud fs uses a layout {{substr 0 1
+   .Id.OpaqueId}}/{{.Id.OpaqueId}}. The user einstein sends a request to access a resource
+   shared with him, say /dav/files/marie/abcd, which should be allowed. However, based on the
+   way we applied the layout, there's no way in which this can be translated to /m/marie/.
+
+   Https://github.com/cs3org/reva/pull/1401
+
+  * Bugfix #1413: Re-include the '.git' dir in the Docker images to pass the version tag
+
+   And git SHA to the release tool.
+
+   Https://github.com/cs3org/reva/pull/1413
+
+  * Bugfix #1399: Fix ocis trash-bin purge
+
+   Fixes the empty trash-bin functionality for ocis-storage
+
+   Https://github.com/owncloud/product/issues/254
+   https://github.com/cs3org/reva/pull/1399
+
+  * Enhancement #1397: Bump the Copyright date to 2021
+
+   Https://github.com/cs3org/reva/pull/1397
+
+  * Enhancement #1398: Support site authorization status in Mentix
+
+   This enhancement adds support for a site authorization status to Mentix. This way, sites
+   registered via a web app can now be excluded until authorized manually by an administrator.
+
+   Furthermore, Mentix now sets the scheme for Prometheus targets. This allows us to also support
+   monitoring of sites that do not support the default HTTPS scheme.
+
+   Https://github.com/cs3org/reva/pull/1398
+
+  * Enhancement #1393: Allow setting favorites, mtime and a temporary etag
+
+   We now let the ocis driver persist favorites, set temporary etags and the mtime as arbitrary
+   metadata.
+
+   Https://github.com/owncloud/ocis/issues/567
+   https://github.com/cs3org/reva/issues/1394
+   https://github.com/cs3org/reva/pull/1393
+
+  * Enhancement #1403: Support remote cloud gathering metrics
+
+   The current metrics package can only gather metrics either from json files. With this feature,
+   the metrics can be gathered polling the http endpoints exposed by the owncloud/nextcloud
+   sciencemesh apps.
+
+   Https://github.com/cs3org/reva/pull/1403
+
+   https://github.com/owncloud/ocis/pull/1372
+
 * Enhancement - Update reva to v1.4.1-0.20210111080247-f2b63bfd6825: [#1194](https://github.com/owncloud/ocis/pull/1194)

  * Enhancement: calculate and expose actual file permission set [cs3org/reva#1368](https://github.com/cs3org/reva/pull/1368)
--- a/accounts/go.mod
+++ b/accounts/go.mod
@@ -7,7 +7,7 @@ require (
 	contrib.go.opencensus.io/exporter/ocagent v0.6.0
 	contrib.go.opencensus.io/exporter/zipkin v0.1.1
 	github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21
-	github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825
+	github.com/cs3org/reva v1.5.1
 	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
--- a/accounts/go.sum
+++ b/accounts/go.sum
@@ -187,6 +187,8 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e h1:khITGSnfDXtByQsLe
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac=
+github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 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=
--- a/changelog/unreleased/update-reva-to-1.5.1.md
+++ b/changelog/unreleased/update-reva-to-1.5.1.md
@@ -0,0 +1,76 @@
+Enhancement: Update reva to v1.5.1
+
+Summary
+-------
+
+* Fix #1401: Use the user in request for deciding the layout for non-home DAV requests
+* Fix #1413: Re-include the '.git' dir in the Docker images to pass the version tag
+* Fix #1399: Fix ocis trash-bin purge
+* Enh #1397: Bump the Copyright date to 2021
+* Enh #1398: Support site authorization status in Mentix
+* Enh #1393: Allow setting favorites, mtime and a temporary etag
+* Enh #1403: Support remote cloud gathering metrics
+
+Details
+-------
+
+* Bugfix #1401: Use the user in request for deciding the layout for non-home DAV requests
+
+  For the incoming /dav/files/userID requests, we have different namespaces depending on
+  whether the request is for the logged-in user's namespace or not. Since in the storage drivers,
+  we specify the layout depending only on the user whose resources are to be accessed, this fails
+  when a user wants to access another user's namespace when the storage provider depends on the
+  logged in user's namespace. This PR fixes that.
+
+  For example, consider the following case. The owncloud fs uses a layout {{substr 0 1
+  .Id.OpaqueId}}/{{.Id.OpaqueId}}. The user einstein sends a request to access a resource
+  shared with him, say /dav/files/marie/abcd, which should be allowed. However, based on the
+  way we applied the layout, there's no way in which this can be translated to /m/marie/.
+
+  https://github.com/cs3org/reva/pull/1401
+
+* Bugfix #1413: Re-include the '.git' dir in the Docker images to pass the version tag
+
+  And git SHA to the release tool.
+
+  https://github.com/cs3org/reva/pull/1413
+
+* Bugfix #1399: Fix ocis trash-bin purge
+
+  Fixes the empty trash-bin functionality for ocis-storage
+
+  https://github.com/owncloud/product/issues/254
+  https://github.com/cs3org/reva/pull/1399
+
+* Enhancement #1397: Bump the Copyright date to 2021
+
+  https://github.com/cs3org/reva/pull/1397
+
+* Enhancement #1398: Support site authorization status in Mentix
+
+  This enhancement adds support for a site authorization status to Mentix. This way, sites
+  registered via a web app can now be excluded until authorized manually by an administrator.
+
+  Furthermore, Mentix now sets the scheme for Prometheus targets. This allows us to also support
+  monitoring of sites that do not support the default HTTPS scheme.
+
+  https://github.com/cs3org/reva/pull/1398
+
+* Enhancement #1393: Allow setting favorites, mtime and a temporary etag
+
+  We now let the ocis driver persist favorites, set temporary etags and the mtime as arbitrary
+  metadata.
+
+  https://github.com/owncloud/ocis/issues/567
+  https://github.com/cs3org/reva/issues/1394
+  https://github.com/cs3org/reva/pull/1393
+
+* Enhancement #1403: Support remote cloud gathering metrics
+
+  The current metrics package can only gather metrics either from json files. With this feature,
+  the metrics can be gathered polling the http endpoints exposed by the owncloud/nextcloud
+  sciencemesh apps.
+
+  https://github.com/cs3org/reva/pull/1403
+
+https://github.com/owncloud/ocis/pull/1372
--- a/ocis/go.sum
+++ b/ocis/go.sum
@@ -265,6 +265,8 @@ github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv
 github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac=
+github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 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/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso=
--- 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.20210111080247-f2b63bfd6825
+	github.com/cs3org/reva v1.5.1
 	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/go-chi/render v1.0.1
 	github.com/golang/protobuf v1.4.3
--- a/ocs/go.sum
+++ b/ocs/go.sum
@@ -198,6 +198,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21/go.mod h1:UXha4T
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac=
+github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 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=
--- 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.20210111080247-f2b63bfd6825
+	github.com/cs3org/reva v1.5.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/golang/mock v1.4.4 // indirect
 	github.com/justinas/alice v1.2.0
--- a/proxy/go.sum
+++ b/proxy/go.sum
@@ -196,6 +196,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21/go.mod h1:UXha4T
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac=
+github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 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=
--- a/storage/go.mod
+++ b/storage/go.mod
@@ -3,7 +3,7 @@ module github.com/owncloud/ocis/storage
 go 1.15

 require (
-	github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825
+	github.com/cs3org/reva v1.5.1
 	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
--- a/storage/go.sum
+++ b/storage/go.sum
@@ -199,6 +199,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.5.1 h1:GebunCjhHfA3lFLXjQT+3jOUjEXUubk9sr3otOIDGac=
+github.com/cs3org/reva v1.5.1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 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=
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -777,10 +777,6 @@

 ### [empty trashbin does not work](https://github.com/owncloud/product/issues/254)

-   [apiTrashbin/trashbinDelete.feature:31](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L31)
-   [apiTrashbin/trashbinDelete.feature:32](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L32)
-   [apiTrashbin/trashbinDelete.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L33)
-   [apiTrashbin/trashbinDelete.feature:34](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L34)
 -   [apiTrashbin/trashbinDelete.feature:37](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L37)

 ### [href in trashbin PROPFIND response is wrong](https://github.com/owncloud/ocis/issues/1120)
@@ -1223,8 +1219,6 @@

 ### [cannot get share-types webdav property](https://github.com/owncloud/ocis/issues/567)

-   [apiWebdavProperties2/getFileProperties.feature:135](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties2/getFileProperties.feature#L135)
-   [apiWebdavProperties2/getFileProperties.feature:136](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties2/getFileProperties.feature#L136)
 -   [apiWebdavProperties2/getFileProperties.feature:174](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties2/getFileProperties.feature#L174)
 -   [apiWebdavProperties2/getFileProperties.feature:175](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties2/getFileProperties.feature#L175)

@@ -2089,6 +2083,54 @@
 -   [apiWebdavLocks2/setTimeoutSharesToShares.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks2/setTimeoutSharesToShares.feature#L74)
 -   [apiWebdavLocks2/setTimeoutSharesToShares.feature:75](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks2/setTimeoutSharesToShares.feature#L75)
 -   [apiWebdavLocks2/setTimeoutSharesToShares.feature:76](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks2/setTimeoutSharesToShares.feature#L76)
+-   [apiWebdavLocks3/independentLocks.feature:24](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L24)
+-   [apiWebdavLocks3/independentLocks.feature:25](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L25)
+-   [apiWebdavLocks3/independentLocks.feature:26](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L26)
+-   [apiWebdavLocks3/independentLocks.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L27)
+-   [apiWebdavLocks3/independentLocks.feature:43](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L43)
+-   [apiWebdavLocks3/independentLocks.feature:44](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L44)
+-   [apiWebdavLocks3/independentLocks.feature:45](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L45)
+-   [apiWebdavLocks3/independentLocks.feature:46](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L46)
+-   [apiWebdavLocks3/independentLocks.feature:62](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L62)
+-   [apiWebdavLocks3/independentLocks.feature:63](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L63)
+-   [apiWebdavLocks3/independentLocks.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L64)
+-   [apiWebdavLocks3/independentLocks.feature:65](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L65)
+-   [apiWebdavLocks3/independentLocks.feature:83](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L83)
+-   [apiWebdavLocks3/independentLocks.feature:84](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L84)
+-   [apiWebdavLocks3/independentLocks.feature:85](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L85)
+-   [apiWebdavLocks3/independentLocks.feature:86](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L86)
+-   [apiWebdavLocks3/independentLocks.feature:87](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L87)
+-   [apiWebdavLocks3/independentLocks.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L88)
+-   [apiWebdavLocks3/independentLocks.feature:89](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L89)
+-   [apiWebdavLocks3/independentLocks.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L90)
+-   [apiWebdavLocks3/independentLocks.feature:109](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L109)
+-   [apiWebdavLocks3/independentLocks.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L110)
+-   [apiWebdavLocks3/independentLocks.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L111)
+-   [apiWebdavLocks3/independentLocks.feature:112](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L112)
+-   [apiWebdavLocks3/independentLocks.feature:134](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L134)
+-   [apiWebdavLocks3/independentLocks.feature:135](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L135)
+-   [apiWebdavLocks3/independentLocks.feature:136](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L136)
+-   [apiWebdavLocks3/independentLocks.feature:137](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L137)
+-   [apiWebdavLocks3/independentLocks.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L157)
+-   [apiWebdavLocks3/independentLocks.feature:158](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L158)
+-   [apiWebdavLocks3/independentLocks.feature:159](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L159)
+-   [apiWebdavLocks3/independentLocks.feature:160](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L160)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L27)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:28](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L28)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L29)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L30)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:49](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L49)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:50](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L50)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:51](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L51)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:52](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L52)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:72](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L72)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:73](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L73)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L74)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:75](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L75)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:94](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L94)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:95](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L95)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:96](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L96)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:97](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L97)
 -   [apiWebdavLocksUnlock/unlock.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L33)
 -   [apiWebdavLocksUnlock/unlock.feature:34](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L34)
 -   [apiWebdavLocksUnlock/unlock.feature:45](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L45)
--- a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md
@@ -876,10 +876,6 @@ User cannot create a folder named Share
 ### [delete from trashbin does not work](https://github.com/owncloud/ocis/issues/551)
 ### [deleting multiple elements concurrently will not delete all the items.](https://github.com/owncloud/product/issues/256)

-   [apiTrashbin/trashbinDelete.feature:31](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L31)
-   [apiTrashbin/trashbinDelete.feature:32](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L32)
-   [apiTrashbin/trashbinDelete.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L33)
-   [apiTrashbin/trashbinDelete.feature:34](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L34)
 -   [apiTrashbin/trashbinDelete.feature:37](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L37)
 -   [apiTrashbin/trashbinDelete.feature:50](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L50)
 -   [apiTrashbin/trashbinDelete.feature:67](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinDelete.feature#L67)
@@ -2228,6 +2224,54 @@ restoring a file doesn't changes the etags of the parents
 -   [apiWebdavLocks2/setTimeoutSharesToShares.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks2/setTimeoutSharesToShares.feature#L74)
 -   [apiWebdavLocks2/setTimeoutSharesToShares.feature:75](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks2/setTimeoutSharesToShares.feature#L75)
 -   [apiWebdavLocks2/setTimeoutSharesToShares.feature:76](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks2/setTimeoutSharesToShares.feature#L76)
+-   [apiWebdavLocks3/independentLocks.feature:24](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L24)
+-   [apiWebdavLocks3/independentLocks.feature:25](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L25)
+-   [apiWebdavLocks3/independentLocks.feature:26](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L26)
+-   [apiWebdavLocks3/independentLocks.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L27)
+-   [apiWebdavLocks3/independentLocks.feature:43](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L43)
+-   [apiWebdavLocks3/independentLocks.feature:44](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L44)
+-   [apiWebdavLocks3/independentLocks.feature:45](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L45)
+-   [apiWebdavLocks3/independentLocks.feature:46](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L46)
+-   [apiWebdavLocks3/independentLocks.feature:62](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L62)
+-   [apiWebdavLocks3/independentLocks.feature:63](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L63)
+-   [apiWebdavLocks3/independentLocks.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L64)
+-   [apiWebdavLocks3/independentLocks.feature:65](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L65)
+-   [apiWebdavLocks3/independentLocks.feature:83](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L83)
+-   [apiWebdavLocks3/independentLocks.feature:84](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L84)
+-   [apiWebdavLocks3/independentLocks.feature:85](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L85)
+-   [apiWebdavLocks3/independentLocks.feature:86](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L86)
+-   [apiWebdavLocks3/independentLocks.feature:87](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L87)
+-   [apiWebdavLocks3/independentLocks.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L88)
+-   [apiWebdavLocks3/independentLocks.feature:89](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L89)
+-   [apiWebdavLocks3/independentLocks.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L90)
+-   [apiWebdavLocks3/independentLocks.feature:109](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L109)
+-   [apiWebdavLocks3/independentLocks.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L110)
+-   [apiWebdavLocks3/independentLocks.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L111)
+-   [apiWebdavLocks3/independentLocks.feature:112](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L112)
+-   [apiWebdavLocks3/independentLocks.feature:134](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L134)
+-   [apiWebdavLocks3/independentLocks.feature:135](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L135)
+-   [apiWebdavLocks3/independentLocks.feature:136](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L136)
+-   [apiWebdavLocks3/independentLocks.feature:137](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L137)
+-   [apiWebdavLocks3/independentLocks.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L157)
+-   [apiWebdavLocks3/independentLocks.feature:158](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L158)
+-   [apiWebdavLocks3/independentLocks.feature:159](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L159)
+-   [apiWebdavLocks3/independentLocks.feature:160](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L160)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L27)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:28](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L28)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L29)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L30)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:49](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L49)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:50](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L50)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:51](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L51)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:52](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L52)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:72](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L72)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:73](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L73)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L74)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:75](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L75)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:94](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L94)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:95](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L95)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:96](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L96)
+-   [apiWebdavLocks3/independentLocksShareToShares.feature:97](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L97)
 -   [apiWebdavLocksUnlock/unlock.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L33)
 -   [apiWebdavLocksUnlock/unlock.feature:34](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L34)
 -   [apiWebdavLocksUnlock/unlock.feature:45](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L45)
--- a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.md
+++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.md
@@ -392,9 +392,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUITrashbinDelete/trashbinDelete.feature:66](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L66)
 -   [webUITrashbinDelete/trashbinDelete.feature:93](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L93)

-### [Trashbin fails with unknown error when restoring](https://github.com/owncloud/product/issues/139)
-   [webUITrashbinDelete/trashbinDelete.feature:114](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L114)
-
 ### [Propfind response to trashbin endpoint is different in ocis](https://github.com/owncloud/product/issues/186)
 ### [restoring a file from "Deleted files" (trashbin) is not possible if the original folder does not exist any-more](https://github.com/owncloud/web/issues/1753)
 -   [webUITrashbinRestore/trashbinRestore.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L123)
--- a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature
+++ b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature
@@ -13,29 +13,6 @@ Feature: files and folders can be deleted from the trashbin
    And user "Alice" has uploaded file with content "to delete" to "/PARENT/parent.txt"
    And user "Alice" has uploaded file with content "to delete" to "/PARENT/CHILD/child.txt"

-  @smokeTest
-  @issue-product-139
-  @issue-product-178
-  @issue-product-179
-  Scenario Outline: Trashbin cannot be emptied
-  # after fixing all issues delete this Scenario and use the one from oC10 core
-    Given user "Alice" has uploaded file with content "file with comma" to "sample,0.txt"
-    And user "Alice" has uploaded file with content "file with comma" to "sample,1.txt"
-    And using <dav-path> DAV path
-    And user "Alice" has deleted file "<filename1>"
-    And user "Alice" has deleted file "<filename2>"
-    And as "Alice" file "<filename1>" should exist in the trashbin
-    And as "Alice" file "<filename2>" should exist in the trashbin
-    When user "Alice" empties the trashbin using the trashbin API
-    Then as "Alice" the file with original path "<filename1>" should exist in the trashbin
-    And as "Alice" the file with original path "<filename2>" should exist in the trashbin
-    Examples:
-      | dav-path | filename1     | filename2     |
-      | old      | textfile0.txt | textfile1.txt |
-      | old      | sample,0.txt  | sample,1.txt  |
-      | new      | textfile0.txt | textfile1.txt |
-      | new      | sample,0.txt  | sample,1.txt  |
-
  @smokeTest
  @issue-ocis-reva-118
  @issue-product-179