Merge pull request #19081 from owncloud/prevent0bytedownloads
prevent 0 byte downloads when storage returns false
This commit is contained in:
commit
b520a1e520
|
@ -261,10 +261,13 @@ class File extends Node implements IFile {
|
||||||
* @throws ServiceUnavailable
|
* @throws ServiceUnavailable
|
||||||
*/
|
*/
|
||||||
public function get() {
|
public function get() {
|
||||||
|
|
||||||
//throw exception if encryption is disabled but files are still encrypted
|
//throw exception if encryption is disabled but files are still encrypted
|
||||||
try {
|
try {
|
||||||
return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
|
$res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
|
||||||
|
if ($res === false) {
|
||||||
|
throw new ServiceUnavailable("Could not open file");
|
||||||
|
}
|
||||||
|
return $res;
|
||||||
} catch (GenericEncryptionException $e) {
|
} catch (GenericEncryptionException $e) {
|
||||||
// returning 503 will allow retry of the operation at a later point in time
|
// returning 503 will allow retry of the operation at a later point in time
|
||||||
throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
|
throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
|
||||||
|
|
|
@ -809,4 +809,21 @@ class File extends \Test\TestCase {
|
||||||
return $files;
|
return $files;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \Sabre\DAV\Exception\ServiceUnavailable
|
||||||
|
*/
|
||||||
|
public function testGetFopenFails() {
|
||||||
|
$view = $this->getMock('\OC\Files\View', ['fopen'], array());
|
||||||
|
$view->expects($this->atLeastOnce())
|
||||||
|
->method('fopen')
|
||||||
|
->will($this->returnValue(false));
|
||||||
|
|
||||||
|
$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
|
||||||
|
'permissions' => \OCP\Constants::PERMISSION_ALL
|
||||||
|
), null);
|
||||||
|
|
||||||
|
$file = new \OC\Connector\Sabre\File($view, $info);
|
||||||
|
|
||||||
|
$file->get();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue