Skip to content

[stable20] avoid fread on directories and unencrypted files #27407

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
blizzz merged 7 commits into from
Sep 23, 2021
Merged

[stable20] avoid fread on directories and unencrypted files #27407

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bca62f
avoid fread on directories and unencrypted files
Jan 5, 2021
0af8a0c
attemtp to fix test
Jan 5, 2021
ca501a6
2nd attempt to fix tests
Jan 5, 2021
76059da
Update EncryptionTest.php
Jan 5, 2021
df3cd0f
consolidation of boolean expression
Jan 16, 2021
ac650a1
fix brakcets
Jan 16, 2021
8466c53
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
attemtp to fix test
  • Loading branch information
@MichaIng
Jasper Knockaert authored and MichaIng committed Sep 3, 2021
commit 0af8a0c8f067000fed42191e96d859740dc15168
8 changes: 7 additions & 1 deletion tests/lib/Files/Storage/Wrapper/EncryptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,12 @@ public function dataTestCopyKeys() {
* @param string $strippedPath
*/
public function testGetHeader($path, $strippedPathExists, $strippedPath) {
$cache = $this->getMockBuilder('\OC\Files\Cache\Cache')
->disableOriginalConstructor()->getMock();
$cache->expects($this->any())
->method('get')
->willReturn(['encrypted' => true]);

$sourceStorage = $this->getMockBuilder('\OC\Files\Storage\Storage')
->disableOriginalConstructor()->getMock();

Expand All @@ -586,7 +592,7 @@ public function testGetHeader($path, $strippedPathExists, $strippedPath) {
$this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache
]
)
->setMethods(['readFirstBlock', 'parseRawHeader'])
->setMethods(['getCache','readFirstBlock', 'parseRawHeader'])
->getMock();

$instance->expects($this->once())->method(('parseRawHeader'))
Expand Down