[full-ci] Bump reva version

.drone.env

@@ -1,5 +1,5 @@
 # The test runner source for API tests
-CORE_COMMITID=8f4783aa71a2fd6e863b2a4534fc697d5455bc45
+CORE_COMMITID=1ceba101fb821725d15c3abc6a7c68230c5a155c
 CORE_BRANCH=master
 
 # The test runner source for UI tests

changelog/unreleased/update-reva.md

@@ -9,3 +9,4 @@ https://github.com/owncloud/ocis/pull/3570
 https://github.com/owncloud/ocis/pull/3601
 https://github.com/owncloud/ocis/pull/3605
 https://github.com/owncloud/ocis/pull/3611
+https://github.com/owncloud/ocis/pull/3621

extensions/audit/pkg/service/service_test.go

@@ -297,8 +297,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File created",
 		SystemEvent: events.FileUploaded{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileCreated{}
@@ -312,8 +312,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File read",
 		SystemEvent: events.FileDownloaded{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileRead{}
@@ -327,8 +327,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File trashed",
 		SystemEvent: events.ItemTrashed{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileDeleted{}
@@ -342,7 +342,7 @@ var testCases = []struct {
 	}, {
 		Alias: "File renamed",
 		SystemEvent: events.ItemMoved{
-			FileID:       reference("sto-123", "iid-123", "./item"),
+			Ref:          reference("sto-123", "iid-123", "./item"),
 			OldReference: reference("sto-123", "iid-123", "./anotheritem"),
 			Owner:        userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
@@ -361,8 +361,8 @@ var testCases = []struct {
 	}, {
 		Alias: "File purged",
 		SystemEvent: events.ItemPurged{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFilePurged{}
@@ -376,7 +376,7 @@ var testCases = []struct {
 	}, {
 		Alias: "File restored",
 		SystemEvent: events.ItemRestored{
-			FileID:       reference("sto-123", "iid-123", "./item"),
+			Ref:          reference("sto-123", "iid-123", "./item"),
 			Owner:        userID("uid-123"), // NOTE: owner not yet implemented in reva
 			OldReference: reference("sto-123", "sto-123!iid-123/item", "./oldpath"),
 			Key:          "",
@@ -396,9 +396,9 @@ var testCases = []struct {
 	}, {
 		Alias: "File version restored",
 		SystemEvent: events.FileVersionRestored{
-			FileID: reference("sto-123", "iid-123", "./item"),
-			Owner:  userID("uid-123"), // NOTE: owner not yet implemented in reva
-			Key:    "v1",
+			Ref:   reference("sto-123", "iid-123", "./item"),
+			Owner: userID("uid-123"), // NOTE: owner not yet implemented in reva
+			Key:   "v1",
 		},
 		CheckAuditEvent: func(t *testing.T, b []byte) {
 			ev := types.AuditEventFileVersionRestored{}

extensions/audit/pkg/types/conversion.go

@@ -234,7 +234,7 @@ func FilesAuditEvent(base AuditEvent, itemid, owner, path string) AuditEventFile
 
 // FileUploaded converts a FileUploaded event to an AuditEventFileCreated
 func FileUploaded(ev events.FileUploaded) AuditEventFileCreated {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileCreated(iid), ActionFileCreated)
 	return AuditEventFileCreated{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -243,7 +243,7 @@ func FileUploaded(ev events.FileUploaded) AuditEventFileCreated {
 
 // FileDownloaded converts a FileDownloaded event to an AuditEventFileRead
 func FileDownloaded(ev events.FileDownloaded) AuditEventFileRead {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileRead(iid), ActionFileRead)
 	return AuditEventFileRead{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -252,7 +252,7 @@ func FileDownloaded(ev events.FileDownloaded) AuditEventFileRead {
 
 // ItemMoved converts a ItemMoved event to an AuditEventFileRenamed
 func ItemMoved(ev events.ItemMoved) AuditEventFileRenamed {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 
 	oldpath := ""
 	if ev.OldReference != nil {
@@ -268,7 +268,7 @@ func ItemMoved(ev events.ItemMoved) AuditEventFileRenamed {
 
 // ItemTrashed converts a ItemTrashed event to an AuditEventFileDeleted
 func ItemTrashed(ev events.ItemTrashed) AuditEventFileDeleted {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileTrashed(iid), ActionFileTrashed)
 	return AuditEventFileDeleted{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -277,7 +277,7 @@ func ItemTrashed(ev events.ItemTrashed) AuditEventFileDeleted {
 
 // ItemPurged converts a ItemPurged event to an AuditEventFilePurged
 func ItemPurged(ev events.ItemPurged) AuditEventFilePurged {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFilePurged(iid), ActionFilePurged)
 	return AuditEventFilePurged{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),
@@ -286,7 +286,7 @@ func ItemPurged(ev events.ItemPurged) AuditEventFilePurged {
 
 // ItemRestored converts a ItemRestored event to an AuditEventFileRestored
 func ItemRestored(ev events.ItemRestored) AuditEventFileRestored {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 
 	oldpath := ""
 	if ev.OldReference != nil {
@@ -302,7 +302,7 @@ func ItemRestored(ev events.ItemRestored) AuditEventFileRestored {
 
 // FileVersionRestored converts a FileVersionRestored event to an AuditEventFileVersionRestored
 func FileVersionRestored(ev events.FileVersionRestored) AuditEventFileVersionRestored {
-	iid, path, uid := extractFileDetails(ev.FileID, ev.Owner)
+	iid, path, uid := extractFileDetails(ev.Ref, ev.Owner)
 	base := BasicAuditEvent(uid, "", MessageFileVersionRestored(iid, ev.Key), ActionFileVersionRestored)
 	return AuditEventFileVersionRestored{
 		AuditEventFiles: FilesAuditEvent(base, iid, uid, path),

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/blevesearch/bleve/v2 v2.3.2
 	github.com/coreos/go-oidc/v3 v3.1.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde
-	github.com/cs3org/reva/v2 v2.0.0-20220427203355-0164880ac7d3
+	github.com/cs3org/reva/v2 v2.0.0-20220429143817-1cbc34114b5a
 	github.com/disintegration/imaging v1.6.2
 	github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
 	github.com/go-chi/chi/v5 v5.0.7

go.sum

@@ -318,10 +318,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde h1:WrD9O8ZaWvsm0
 github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
 github.com/cs3org/reva v1.18.0 h1:MbPS5ZAa8RzKcTxAVeSDdISB3XXqLIxqB03BTN5ReBY=
 github.com/cs3org/reva v1.18.0/go.mod h1:e5VDUDu4vVWIeVkZcW//n6UZzhGGMa+Tz/whCiX3N6o=
-github.com/cs3org/reva/v2 v2.0.0-20220427133111-618964eed515 h1:8pPCLxNXVz/q7PMM6Zq1lff3P8SFAu8/CXwB2eA21xc=
-github.com/cs3org/reva/v2 v2.0.0-20220427133111-618964eed515/go.mod h1:2e/4HcIy54Mic3V7Ow0bz4n5dkZU0dHIZSWomFe5vng=
-github.com/cs3org/reva/v2 v2.0.0-20220427203355-0164880ac7d3 h1:6sKjGI0AUW5tBXWBduaBoc+9sNYZWQR894G0oFCbus0=
-github.com/cs3org/reva/v2 v2.0.0-20220427203355-0164880ac7d3/go.mod h1:2e/4HcIy54Mic3V7Ow0bz4n5dkZU0dHIZSWomFe5vng=
+github.com/cs3org/reva/v2 v2.0.0-20220429143817-1cbc34114b5a h1:Uq+iVa+re1qyeva3lEDEHwqkXv9ImeXBP30ke6IYf+U=
+github.com/cs3org/reva/v2 v2.0.0-20220429143817-1cbc34114b5a/go.mod h1:2e/4HcIy54Mic3V7Ow0bz4n5dkZU0dHIZSWomFe5vng=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=

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

@@ -1847,10 +1847,6 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 #### [OCS status code zero](https://github.com/owncloud/ocis/issues/3621)
 - [apiShareManagementToShares/moveReceivedShare.feature:32](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementToShares/moveReceivedShare.feature#L32)
 
-#### [share_with_user_type is not set in response](https://github.com/owncloud/ocis/issues/3622)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:37](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L37)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:38](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L38)
-
 #### [HTTP status code differ while listing the contents of another user's trash bin](https://github.com/owncloud/ocis/issues/3561)
 - [apiTrashbin/trashbinFilesFolders.feature:199](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L199)
 - [apiTrashbin/trashbinFilesFolders.feature:223](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L223)

tests/acceptance/features/bootstrap/SpacesContext.php

@@ -1145,7 +1145,7 @@ public function findEntryFromPropfindResponse(
 		$results = [];
 		if ($multistatusResults !== null) {
 			foreach ($multistatusResults as $multistatusResult) {
-				$entryPath = $multistatusResult['value'][0]['value'];
+				$entryPath = \urldecode($multistatusResult['value'][0]['value']);
 				$entryName = \str_replace($topWebDavPath, "", $entryPath);
 				$entryName = \rawurldecode($entryName);
 				$entryName = \trim($entryName, "/");