Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: block moving files to it's own parent with dav #49966

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Open

fix: block moving files to it's own parent with dav #49966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/dav/lib/Connector/Sabre/FilesPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ public function checkMove(string $source, string $target): void {
if (!$sourceNodeFileInfo->isDeletable()) {
throw new Forbidden($source . ' cannot be deleted');
}

// The source is not allowed to be the parent of the target
if (str_starts_with($source, $target . '/')) {
throw new Forbidden($source . ' cannot be moved to it\'s parent');
}
}

/**
Expand Down
10 changes: 10 additions & 0 deletions build/integration/dav_features/dav-v2.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ Feature: dav-v2
When User "user0" moves file "/textfile0.txt" to "/FOLDER/textfile0.txt"
Then the HTTP status code should be "201"

Scenario: Moving and overwriting it's parent
Given using new dav path
And As an "admin"
And user "user0" exists
And As an "user0"
And user "user0" created a folder "/test"
And user "user0" created a folder "/test/test"
When User "user0" moves file "/test/test" to "/test"
Then the HTTP status code should be "403"

Scenario: download a file with range using new endpoint
Given using new dav path
And As an "admin"
Expand Down
10 changes: 10 additions & 0 deletions build/integration/dav_features/webdav-related.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ Feature: webdav-related
Then the HTTP status code should be "204"
And Downloaded content when downloading file "/textfile0.txt" with range "bytes=0-6" should be "Welcome"

Scenario: Moving and overwriting it's parent
Given using old dav path
And As an "admin"
And user "user0" exists
And As an "user0"
And user "user0" created a folder "/test"
And user "user0" created a folder "/test/test"
When User "user0" moves file "/test/test" to "/test"
Then the HTTP status code should be "403"

Scenario: Moving a file to a folder with no permissions
Given using old dav path
And As an "admin"
Expand Down
Loading