upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge pull request #28389 from alanmeeson/bugfix/22077/default-encryption-module

Browse source
This commit is contained in:
John Molakvoæ 2021-10-23 19:10:34 +02:00 committed by GitHub
commit 623ac8c706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,6 +471,7 @@ class Encryption extends Wrapper {
$handle = \OC\Files\Stream\Encryption::wrap($source, $path, $fullPath, $header,
$this->uid, $encryptionModule, $this->storage, $this, $this->util, $this->fileHelper, $mode,
$size, $unencryptedSize, $headerSize, $signed);
return $handle;
}
}
@ -540,7 +541,7 @@ class Encryption extends Wrapper {
// if a header exists we skip it
if ($headerSize > 0) {
fread($stream, $headerSize);
$this->fread_block($stream, $headerSize);
}
// fast path, else the calculation for $lastChunkNr is bogus
@ -567,7 +568,7 @@ class Encryption extends Wrapper {
$count = $blockSize;
while ($count > 0) {
$data = fread($stream, $blockSize);
$data = $this->fread_block($stream, $blockSize);
$count = strlen($data);
$lastChunkContentEncrypted .= $data;
if (strlen($lastChunkContentEncrypted) > $blockSize) {
@ -598,6 +599,33 @@ class Encryption extends Wrapper {
return $newUnencryptedSize;
}
/**
* fread_block
*
* This function is a wrapper around the fread function. It is based on the
* stream_read_block function from lib/private/Files/Streams/Encryption.php
* It calls stream read until the requested $blockSize was received or no remaining data is present.
* This is required as stream_read only returns smaller chunks of data when the stream fetches from a
* remote storage over the internet and it does not care about the given $blockSize.
*
* @param handle the stream to read from
* @param int $blockSize Length of requested data block in bytes
* @return string Data fetched from stream.
*/
private function fread_block($handle, int $blockSize): string {
$remaining = $blockSize;
$data = '';
do {
$chunk = fread($handle, $remaining);
$chunk_len = strlen($chunk);
$data .= $chunk;
$remaining -= $chunk_len;
} while (($remaining > 0) && ($chunk_len > 0));
return $data;
}
/**
* @param Storage\IStorage $sourceStorage
* @param string $sourceInternalPath