[full-ci] Continuation of Dragonchaser/bump reva

changelog/unreleased/bump-reva.md

@@ -2,4 +2,5 @@ Enhancement: Update reva to latest edge version
 
 We update reva to the latest edge version to get the latest fixes and features.
 
+https://github.com/owncloud/ocis/pull/8264
 https://github.com/owncloud/ocis/pull/8100

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.9.0
 	github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
-	github.com/cs3org/reva/v2 v2.18.1-0.20240115094008-bde86a38bd77
+	github.com/cs3org/reva/v2 v2.18.1-0.20240122171534-e8fc07f2395a
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
 	github.com/disintegration/imaging v1.6.2
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

go.sum

@@ -1018,8 +1018,10 @@ 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-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.18.1-0.20240115094008-bde86a38bd77 h1:wDi6MOBGdd9zyqDSwhm2FBYqkiEVgDUevpMBKQ6zSf4=
-github.com/cs3org/reva/v2 v2.18.1-0.20240115094008-bde86a38bd77/go.mod h1:plMbmaHczZbP+1rtV56YCYs5lkmpdRNpj0KZb9BWLus=
+github.com/cs3org/reva/v2 v2.18.1-0.20240122154113-d79f163775db h1:0nc89DfeCGRr98Z/NZor9fRyQ0pGxq0iQnnUsWFhnek=
+github.com/cs3org/reva/v2 v2.18.1-0.20240122154113-d79f163775db/go.mod h1:plMbmaHczZbP+1rtV56YCYs5lkmpdRNpj0KZb9BWLus=
+github.com/cs3org/reva/v2 v2.18.1-0.20240122171534-e8fc07f2395a h1:2FLa9HFgDlvXTAdDjqcHsb8Ky2eTBXIIR/ukZeemMKI=
+github.com/cs3org/reva/v2 v2.18.1-0.20240122171534-e8fc07f2395a/go.mod h1:GCN3g6uYE0Nvd31dGlhaGGyUviUfbG2NkecPRv5oSc4=
 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=

tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md

@@ -270,10 +270,10 @@ The expected failures in this file are from features in the owncloud/ocis repo.
 - [apiSharingNg/linkShare.feature:453](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/linkShare.feature#L453)
 - [apiSharingNg/linkShare.feature:455](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/linkShare.feature#L455)
 - [apiSharingNg/linkShare.feature:456](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/linkShare.feature#L456)
-- [apiSharingNg/deletePermissions.feature:146](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L146)
-- [apiSharingNg/deletePermissions.feature:163](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L163)
-- [apiSharingNg/deletePermissions.feature:184](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L184)
-- [apiSharingNg/deletePermissions.feature:203](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L203)
+- [apiSharingNg/deletePermissions.feature:138](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L138)
+- [apiSharingNg/deletePermissions.feature:155](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L155)
+- [apiSharingNg/deletePermissions.feature:176](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L176)
+- [apiSharingNg/deletePermissions.feature:195](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg/deletePermissions.feature#L195)
 
 ### [sharee (editor role) MOVE a file by file-id into same shared folder returns 403](https://github.com/owncloud/ocis/issues/7617)
 

tests/acceptance/features/apiContract/copy.feature

@@ -16,7 +16,9 @@ Feature: Copy test
   Scenario: check the COPY response headers
     Given user "Alice" has uploaded a file inside space "new-space" with content "some content" to "testfile.txt"
     And user "Alice" has created a folder "new" in space "new-space"
-    When user "Alice" copies file "testfile.txt" from space "new-space" to "/new/testfile.txt" inside space "new-space" using the WebDAV API
+    When user "Alice" copies file "testfile.txt" from space "new-space" to "/new/testfile.txt" inside space "new-space" with following headers using the WebDAV API
+      | header | value      |
+      | Origin | %base_url% |
     Then the HTTP status code should be "201"
     And the following headers should match these regular expressions
       | Oc-Fileid                   | /^[a-f0-9!\$\-]{110}$/                       |

tests/acceptance/features/apiSharingNg/deletePermissions.feature

@@ -27,8 +27,6 @@ Feature: Remove access to a drive item
       | permissionsRole | resource-type | path          |
       | Viewer          | file          | textfile.txt  |
       | File Editor     | file          | textfile.txt  |
-      | Co Owner        | file          | textfile.txt  |
-      | Manager         | file          | textfile.txt  |
       | Viewer          | folder        | FolderToShare |
       | Editor          | folder        | FolderToShare |
       | Co Owner        | folder        | FolderToShare |
@@ -56,8 +54,6 @@ Feature: Remove access to a drive item
       | permissionsRole | resource-type | path          |
       | Viewer          | file          | textfile.txt  |
       | File Editor     | file          | textfile.txt  |
-      | Co Owner        | file          | textfile.txt  |
-      | Manager         | file          | textfile.txt  |
       | Viewer          | folder        | FolderToShare |
       | Editor          | folder        | FolderToShare |
       | Co Owner        | folder        | FolderToShare |
@@ -86,8 +82,6 @@ Feature: Remove access to a drive item
       | permissionsRole | resource-type | path          |
       | Viewer          | file          | textfile.txt  |
       | File Editor     | file          | textfile.txt  |
-      | Co Owner        | file          | textfile.txt  |
-      | Manager         | file          | textfile.txt  |
       | Viewer          | folder        | FolderToShare |
       | Editor          | folder        | FolderToShare |
       | Co Owner        | folder        | FolderToShare |
@@ -118,8 +112,6 @@ Feature: Remove access to a drive item
       | permissionsRole | resource-type | path          |
       | Viewer          | file          | textfile.txt  |
       | File Editor     | file          | textfile.txt  |
-      | Co Owner        | file          | textfile.txt  |
-      | Manager         | file          | textfile.txt  |
       | Viewer          | folder        | FolderToShare |
       | Editor          | folder        | FolderToShare |
       | Co Owner        | folder        | FolderToShare |

tests/acceptance/features/apiSharingNg/shareInvitations.feature

@@ -89,8 +89,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -181,8 +179,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -265,7 +261,6 @@ Feature: Send a sharing invitations
     Examples:
       | permissionsAction  |
       | permissions/create |
-      | children/create    |
       | upload/create      |
       | path/read          |
       | quota/read         |
@@ -275,11 +270,9 @@ Feature: Send a sharing invitations
       | versions/read      |
       | deleted/read       |
       | basic/read         |
-      | path/update        |
       | versions/update    |
       | deleted/update     |
       | permissions/update |
-      | standard/delete    |
       | permissions/delete |
       | deleted/delete     |
       | permissions/deny   |
@@ -461,7 +454,6 @@ Feature: Send a sharing invitations
     Examples:
       | permissionsAction  |
       | permissions/create |
-      | children/create    |
       | upload/create      |
       | path/read          |
       | quota/read         |
@@ -471,11 +463,9 @@ Feature: Send a sharing invitations
       | versions/read      |
       | deleted/read       |
       | basic/read         |
-      | path/update        |
       | versions/update    |
       | deleted/update     |
       | permissions/update |
-      | standard/delete    |
       | permissions/delete |
       | deleted/delete     |
       | permissions/deny   |
@@ -667,8 +657,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -767,8 +755,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -854,8 +840,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -917,8 +901,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -972,8 +954,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -1039,8 +1019,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |
@@ -1104,8 +1082,6 @@ Feature: Send a sharing invitations
       | permissions-role | resource-type | path           |
       | Viewer           | file          | /textfile1.txt |
       | File Editor      | file          | /textfile1.txt |
-      | Co Owner         | file          | /textfile1.txt |
-      | Manager          | file          | /textfile1.txt |
       | Viewer           | folder        | FolderToShare  |
       | Editor           | folder        | FolderToShare  |
       | Co Owner         | folder        | FolderToShare  |

tests/acceptance/features/bootstrap/SpacesContext.php

@@ -1807,12 +1807,14 @@ public function moveFilesAndFoldersRequest(string $user, string $fullUrl, array
 
 	/**
 	 * @When /^user "([^"]*)" copies (?:file|folder) "([^"]*)" from space "([^"]*)" to "([^"]*)" inside space "([^"]*)" using the WebDAV API$/
+	 * @When /^user "([^"]*)" copies (?:file|folder) "([^"]*)" from space "([^"]*)" to "([^"]*)" inside space "([^"]*)"(?: with following headers) using the WebDAV API$/
 	 *
 	 * @param string $user
 	 * @param string $fileSource
 	 * @param string $fromSpaceName
 	 * @param string $fileDestination
 	 * @param string $toSpaceName
+	 * @param TableNode|null $table
 	 *
 	 * @return void
 	 * @throws GuzzleException
@@ -1822,10 +1824,22 @@ public function userCopiesFileFromAndToSpaceBetweenSpaces(
 		string $fileSource,
 		string $fromSpaceName,
 		string $fileDestination,
-		string $toSpaceName
+		string $toSpaceName,
+		TableNode $table = null
 	):void {
 		$space = $this->getSpaceByName($user, $fromSpaceName);
 		$headers['Destination'] = $this->destinationHeaderValueWithSpaceName($user, $fileDestination, $toSpaceName);
+
+		if ($table !== null) {
+			$this->featureContext->verifyTableNodeColumns(
+				$table,
+				['header', 'value']
+			);
+			foreach ($table as $row) {
+				$headers[$row['header']] = $this->featureContext->substituteInLineCodes($row['value']);
+			}
+		}
+
 		$fullUrl = $space["root"]["webDavUrl"] . '/' . ltrim($fileSource, "/");
 		$this->featureContext->setResponse($this->copyFilesAndFoldersRequest($user, $fullUrl, $headers));
 	}