Skip to content

avoid fread on directories and unencrypted files #24966

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

Merged
LukasReschke merged 7 commits into from
Apr 6, 2021
Merged

avoid fread on directories and unencrypted files #24966

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81e3ae4
avoid fread on directories and unencrypted files
Jan 5, 2021
87c6401
attemtp to fix test
Jan 5, 2021
664e74a
2nd attempt to fix tests
Jan 5, 2021
261966a
Update EncryptionTest.php
Jan 5, 2021
f9a0380
consolidation of boolean expression
Jan 16, 2021
252d1ae
fix brakcets
Jan 16, 2021
40fde94
fix even more brackets
Jan 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update EncryptionTest.php
  • Loading branch information
Jasper Knockaert authored Jan 5, 2021
commit 261966ace5f539f0ab676a063506f6e63469dce5
6 changes: 3 additions & 3 deletions tests/lib/Files/Storage/Wrapper/EncryptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ public function testGetHeader($path, $strippedPathExists, $strippedPath) {
->setMethods(['getCache','readFirstBlock', 'parseRawHeader'])
->getMock();

$instance->expects($this->any())->method('getCache')->willReturn($cache);
$instance->expects($this->once())->method('getCache')->willReturn($cache);

$instance->expects($this->once())->method(('parseRawHeader'))
->willReturn([Util::HEADER_ENCRYPTION_MODULE_KEY => 'OC_DEFAULT_MODULE']);
Expand Down Expand Up @@ -671,8 +671,8 @@ public function testGetHeaderAddLegacyModule($header, $isEncrypted, $exists, $ex
->setMethods(['readFirstBlock', 'parseRawHeader', 'getCache'])
->getMock();

$instance->expects($this->once())->method(('parseRawHeader'))->willReturn($header);
$instance->expects($this->any())->method('getCache')->willReturn($cache);
$instance->expects($this->any())->method(('parseRawHeader'))->willReturn($header);
$instance->expects($this->once())->method('getCache')->willReturn($cache);

$result = $this->invokePrivate($instance, 'getHeader', ['test.txt']);
$this->assertSameSize($expected, $result);
Expand Down