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

[stable15] Fix empty file uploads to S3 (and other streaming storages) #14273

Merged
merged 5 commits into from
Feb 20, 2019
Merged

[stable15] Fix empty file uploads to S3 (and other streaming storages) #14273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc8745e
[3rdparty] Bump icewind/streams to 0.7.1
rullzer Feb 18, 2019
58fd016
Fix empty file uploads to S3
rullzer Feb 14, 2019
6bdd9d1
Add a wrapper to determine if a file is EOF
rullzer Feb 14, 2019
141ea50
Make sure that we have a stream
rullzer Feb 18, 2019
7cc3486
Hanlde writestream not closing source
rullzer Feb 20, 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
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 8 files
+1 −1 composer.json
+6 −6 composer.lock
+6 −6 composer/installed.json
+15 −3 icewind/streams/src/CallbackWrapper.php
+3 −1 sabre/dav/lib/CalDAV/ICSExportPlugin.php
+2 −2 sabre/dav/lib/DAV/CorePlugin.php
+1 −1 sabre/vobject/lib/Component/VCard.php
+1 −1 sabre/vobject/lib/FreeBusyGenerator.php
21 changes: 19 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 @@ -36,6 +36,7 @@

namespace OCA\DAV\Connector\Sabre;

use Icewind\Streams\CallbackWrapper;
use OC\AppFramework\Http\Request;
use OC\Files\Filesystem;
use OC\Files\View;
Expand Down Expand Up @@ -166,10 +167,26 @@ public function put($data) {
}

if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
$count = $partStorage->writeStream($internalPartPath, $data);

if (!is_resource($data)) {
$data = fopen('php://temp', 'r+');
fwrite($data, 'foobar');
rewind($data);
}

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

$count = $partStorage->writeStream($internalPartPath, $wrappedData);
$result = $count > 0;

if ($result === false) {
$result = feof($data);
$result = $isEOF;
if (is_resource($wrappedData)) {
$result = feof($wrappedData);
}
}

} else {
Expand Down
25 changes: 23 additions & 2 deletions lib/private/Files/ObjectStore/S3ObjectTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@

namespace OC\Files\ObjectStore;

use Aws\S3\Exception\S3MultipartUploadException;
use Aws\S3\MultipartUploader;
use Aws\S3\ObjectUploader;
use Aws\S3\S3Client;
use Icewind\Streams\CallbackWrapper;

const S3_UPLOAD_PART_SIZE = 524288000; // 500MB

Expand Down Expand Up @@ -73,12 +76,30 @@ function readObject($urn) {
* @since 7.0.0
*/
function writeObject($urn, $stream) {
$uploader = new MultipartUploader($this->getConnection(), $stream, [
$count = 0;
$countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) {
$count += $read;
});

$uploader = new MultipartUploader($this->getConnection(), $countStream, [
'bucket' => $this->bucket,
'key' => $urn,
'part_size' => S3_UPLOAD_PART_SIZE
]);
$uploader->upload();

try {
$uploader->upload();
} catch (S3MultipartUploadException $e) {
// This is an emty file so just touch it then
if ($count === 0 && feof($countStream)) {
$uploader = new ObjectUploader($this->getConnection(), $this->bucket, $urn, '');
$uploader->upload();
} else {
throw $e;
}
}

fclose($countStream);
}

/**
Expand Down