upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #29417 from nextcloud/backport/27440/stable20

Browse source
This commit is contained in:
John Molakvoæ 2021-11-04 09:19:38 +01:00 committed by GitHub
commit 1cb613bbfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Files/Storage/Wrapper/Encryption.php
View file

@ -389,7 +389,7 @@ class Encryption extends Wrapper {
if ($this->util->isExcluded($fullPath) === false) {
$size = $unencryptedSize = 0;
$realFile = $this->util->stripPartialFileExtension($path);
$targetExists = $this->file_exists($realFile) || $this->file_exists($path);
$targetExists = $this->is_file($realFile) || $this->file_exists($path);
$targetIsEncrypted = false;
if ($targetExists) {
// in case the file exists we require the explicit module as
@ -853,7 +853,7 @@ class Encryption extends Wrapper {
*/
protected function readFirstBlock($path) {
$firstBlock = '';
if ($this->storage->file_exists($path)) {
if ($this->storage->is_file($path)) {
$handle = $this->storage->fopen($path, 'r');
$firstBlock = fread($handle, $this->util->getHeaderSize());
fclose($handle);
@ -870,7 +870,7 @@ class Encryption extends Wrapper {
protected function getHeaderSize($path) {
$headerSize = 0;
$realFile = $this->util->stripPartialFileExtension($path);
if ($this->storage->file_exists($realFile)) {
if ($this->storage->is_file($realFile)) {
$path = $realFile;
}
$firstBlock = $this->readFirstBlock($path);
@ -918,7 +918,7 @@ class Encryption extends Wrapper {
*/
protected function getHeader($path) {
$realFile = $this->util->stripPartialFileExtension($path);
$exists = $this->storage->file_exists($realFile);
$exists = $this->storage->is_file($realFile);
if ($exists) {
$path = $realFile;
}

4
tests/lib/Files/Storage/Wrapper/EncryptionTest.php
View file

@ -613,7 +613,7 @@ class EncryptionTest extends Storage {
$util->expects($this->once())->method('stripPartialFileExtension')
->with($path)->willReturn($strippedPath);
$sourceStorage->expects($this->once())
->method('file_exists')
->method('is_file')
->with($strippedPath)
->willReturn($strippedPathExists);
@ -641,7 +641,7 @@ class EncryptionTest extends Storage {
->disableOriginalConstructor()->getMock();
$sourceStorage->expects($this->once())
->method('file_exists')
->method('is_file')
->willReturn($exists);
$util = $this->getMockBuilder('\OC\Encryption\Util')