Skip to content

[stable10] Fix required permissions for webdav move and copy #1320

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

Merged
MorrisJobke merged 3 commits into from
Sep 8, 2016
Merged

[stable10] Fix required permissions for webdav move and copy #1320

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14299e4
Only require CREATE permissions when the file does not exist yet
nickvergessen Sep 7, 2016
42b9eed
UPDATE permissions qualify for renaming a node
nickvergessen Sep 7, 2016
2e40773
Fix tests
nickvergessen Sep 7, 2016
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
Prev Previous commit
Next Next commit
UPDATE permissions qualify for renaming a node
  • Loading branch information
@nickvergessen
nickvergessen committed Sep 8, 2016
commit 42b9eed5dcde89e1f2323efcdca0cbe859725631
15 changes: 10 additions & 5 deletions apps/dav/lib/Connector/Sabre/ObjectTree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,18 @@ public function move($sourcePath, $destinationPath) {
}

$infoDestination = $this->fileView->getFileInfo(dirname($destinationPath));
$infoSource = $this->fileView->getFileInfo($sourcePath);
if ($this->fileView->file_exists($destinationPath)) {
$destinationPermission = $infoDestination && $infoDestination->isUpdateable();
if (dirname($destinationPath) === dirname($sourcePath)) {
$sourcePermission = $infoDestination && $infoDestination->isUpdateable();
$destinationPermission = $sourcePermission;
} else {
$destinationPermission = $infoDestination && $infoDestination->isCreatable();
$infoSource = $this->fileView->getFileInfo($sourcePath);
if ($this->fileView->file_exists($destinationPath)) {
$destinationPermission = $infoDestination && $infoDestination->isUpdateable();
} else {
$destinationPermission = $infoDestination && $infoDestination->isCreatable();
}
$sourcePermission = $infoSource && $infoSource->isDeletable();
}
$sourcePermission = $infoSource && $infoSource->isDeletable();

if (!$destinationPermission || !$sourcePermission) {
throw new Forbidden('No permissions to move object.');
Expand Down