Merge pull request #8649 from dragonchaser/ocis-1230-do-not-overwrite…

…-parent

bump reva

changelog/unreleased/check-parent-on-copy.md

@@ -0,0 +1,8 @@
+Bugfix: Prevent copying a file to a parent folder
+
+When copying a file to a parent folder, the file would be copied to the parent folder, but the file would not be removed from the original folder.
+
+https://github.com/owncloud/ocis/pull/8649
+https://github.com/owncloud/ocis/issues/1230
+https://github.com/cs3org/reva/pull/4571
+`

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/cenkalti/backoff 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.19.2-0.20240313154849-352a246529ff
+	github.com/cs3org/reva/v2 v2.19.2-0.20240318131905-fd7b50caacad
 	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,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-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.19.2-0.20240313154849-352a246529ff h1:XW1j4lf3EWfB9/fKN3D8Q1mehNvrlmGuXdVVzWLtFDs=
-github.com/cs3org/reva/v2 v2.19.2-0.20240313154849-352a246529ff/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
+github.com/cs3org/reva/v2 v2.19.2-0.20240318131905-fd7b50caacad h1:qKgPSuJ9T3AElJbZbrNmUSH51MQq1CgN1acKcyty86Y=
+github.com/cs3org/reva/v2 v2.19.2-0.20240318131905-fd7b50caacad/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
 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/features/apiSpacesDavOperation/moveByFileId.feature

@@ -718,8 +718,8 @@ Feature: moving/renaming file using file id
       | textfile.txt |
     Examples:
       | dav-path               | space    | http-status-code |
-      | /remote.php/dav/spaces | Personal | 400              |
-      | /dav/spaces            | Personal | 400              |
+      | /remote.php/dav/spaces | Personal | 409              |
+      | /dav/spaces            | Personal | 409              |
       | /remote.php/dav/spaces | myspace  | 400              |
       | /dav/spaces            | myspace  | 400              |
       | /remote.php/dav/spaces | Shares   | 404              |
@@ -738,8 +738,8 @@ Feature: moving/renaming file using file id
       | dav-path               | space    | http-status-code |
       | /remote.php/dav/spaces | Personal | 400              |
       | /dav/spaces            | Personal | 400              |
-      | /remote.php/dav/spaces | myspace  | 400              |
-      | /dav/spaces            | myspace  | 400              |
+      | /remote.php/dav/spaces | myspace  | 409              |
+      | /dav/spaces            | myspace  | 409              |
       | /remote.php/dav/spaces | Shares   | 404              |
       | /dav/spaces            | Shares   | 404              |
 

vendor/modules.txt

@@ -359,7 +359,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.19.2-0.20240313154849-352a246529ff
+# github.com/cs3org/reva/v2 v2.19.2-0.20240318131905-fd7b50caacad
 ## explicit; go 1.21
 github.com/cs3org/reva/v2/cmd/revad/internal/grace
 github.com/cs3org/reva/v2/cmd/revad/runtime