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

Jump to bottom

Update Encryption.php #15946

Merged
merged 4 commits into from
Aug 15, 2019
Merged

Update Encryption.php #15946

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b9675d
Update Encryption.php
martink-p Jun 13, 2019
39a4fe4
Apply suggestions from code review
martink-p Jun 13, 2019
8b22ede
Update Encryption.php
martink-p Jun 13, 2019
9cff71f
Update Encryption.php
martink-p Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 27 additions & 2 deletions lib/private/Files/Stream/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,31 @@ public function stream_read($count) {
return $result;

}

/**
* stream_read_block
*
* This function is a wrapper for function stream_read.
* 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 int $blockSize Length of requested data block in bytes
* @return string Data fetched from stream.
*/
private function stream_read_block(int $blockSize): string {
$remaining = $blockSize;
$data = '';

do {
$chunk = parent::stream_read($remaining);
$chunk_len = strlen($chunk);
$data .= $chunk;
$remaining -= $chunk_len;
} while (($remaining > 0) && ($chunk_len > 0));

return $data;
}

public function stream_write($data) {
$length = 0;
Expand Down Expand Up @@ -470,7 +495,7 @@ protected function readCache() {
// don't try to fill the cache when trying to write at the end of the unencrypted file when it coincides with new block
if ($this->cache === '' && !($this->position === $this->unencryptedSize && ($this->position % $this->unencryptedBlockSize) === 0)) {
// Get the data from the file handle
$data = parent::stream_read($this->util->getBlockSize());
$data = $this->stream_read_block($this->util->getBlockSize());
$position = (int)floor($this->position/$this->unencryptedBlockSize);
$numberOfChunks = (int)($this->unencryptedSize / $this->unencryptedBlockSize);
if($numberOfChunks === $position) {
Expand All @@ -495,7 +520,7 @@ protected function writeHeader() {
* read first block to skip the header
*/
protected function skipHeader() {
parent::stream_read($this->headerSize);
$this->stream_read_block($this->headerSize);
}

/**
Expand Down