mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22753 from nextcloud/backport/22651/stable19 

[stable19] Fix reading empty files from objectstorage
This commit is contained in:
Roeland Jago Douma 2020-09-10 08:45:01 +02:00 committed by GitHub
parent 7dc51204d3 24b69b2402
commit b5cb33ed36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_external/lib/Lib/Storage/AmazonS3.php
View File

@ -404,12 +404,12 @@ class AmazonS3 extends \OC\Files\Storage\Common {
*/ */
private function getContentLength($path) { private function getContentLength($path) {
if (isset($this->filesCache[$path])) { if (isset($this->filesCache[$path])) {
return $this->filesCache[$path]['ContentLength']; return (int)$this->filesCache[$path]['ContentLength'];
} }
$result = $this->headObject($path); $result = $this->headObject($path);
if (isset($result['ContentLength'])) { if (isset($result['ContentLength'])) {
return $result['ContentLength']; return (int)$result['ContentLength'];
} }
return 0; return 0;
@ -506,6 +506,12 @@ class AmazonS3 extends \OC\Files\Storage\Common {
switch ($mode) { switch ($mode) {
case 'r': case 'r':
case 'rb': case 'rb':
// Don't try to fetch empty files
$stat = $this->stat($path);
if (is_array($stat) && isset($stat['size']) && $stat['size'] === 0) {
return fopen('php://memory', $mode);
}
try { try {
return $this->readObject($path); return $this->readObject($path);
} catch (S3Exception $e) { } catch (S3Exception $e) {

5
lib/private/Files/ObjectStore/ObjectStoreStorage.php
View File

@ -286,6 +286,11 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
case 'rb': case 'rb':
$stat = $this->stat($path); $stat = $this->stat($path);
if (is_array($stat)) { if (is_array($stat)) {
// Reading 0 sized files is a waste of time
if (isset($stat['size']) && $stat['size'] === 0) {
return fopen('php://memory', $mode);
}
try { try {
return $this->objectStore->readObject($this->getURN($stat['fileid'])); return $this->objectStore->readObject($this->getURN($stat['fileid']));
} catch (NotFoundException $e) { } catch (NotFoundException $e) {