Skip to content

[stable16] dont use part files for dav writes when the target folder doesn't have create permissions #16223

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
skjnldsv merged 2 commits into from
Jul 6, 2019
Merged

[stable16] dont use part files for dav writes when the target folder doesn't have create permissions #16223

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
135cfd2
dont use part files for dav writes when the target folder doesn't hav…
icewind1991 May 28, 2019
edb6df2
add test for overwriting in non creatable directory
icewind1991 Jun 13, 2019
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
Next Next commit
dont use part files for dav writes when the target folder doesn't hav… 
…e create permissions

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 authored and Backportbot committed Jul 3, 2019
commit 135cfd2c5573596545332787c2a77e112e98d4a3
9 changes: 7 additions & 2 deletions apps/dav/lib/Connector/Sabre/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,12 @@ public function put($data) {
if ($needsPartFile) {
// mark file as partial while uploading (ignored by the scanner)
$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
} else {

if (!$view->isCreatable($partFilePath) && $view->isUpdatable($this->path)) {
$needsPartFile = false;
}
}
if (!$needsPartFile) {
// upload file directly as the final path
$partFilePath = $this->path;

Expand Down Expand Up @@ -178,7 +183,7 @@ public function put($data) {
}

$isEOF = false;
$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function($stream) use (&$isEOF) {
$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
$isEOF = feof($stream);
});

Expand Down