Skip to content

[stable19] avoid fread on directories and unencrypted files #27405

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

Closed
backportbot-nextcloud wants to merge 7 commits into from
Closed

[stable19] avoid fread on directories and unencrypted files #27405

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26d024c
avoid fread on directories and unencrypted files
Jan 5, 2021
50791d1
attemtp to fix test
Jan 5, 2021
bbeb3ce
2nd attempt to fix tests
Jan 5, 2021
cada36a
Update EncryptionTest.php
Jan 5, 2021
f100139
consolidation of boolean expression
Jan 16, 2021
d0a7e2c
fix brakcets
Jan 16, 2021
1c3fe81
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
consolidation of boolean expression
  • Loading branch information
@skjnldsv
Jasper Knockaert authored and skjnldsv committed Jul 1, 2021
commit f10013972185f2823552ebb1678b4c526251a4dc
7 changes: 2 additions & 5 deletions lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,11 +935,8 @@ protected function getHeader($path) {

// if the header doesn't contain a encryption module we check if it is a
// legacy file. If true, we add the default encryption module
if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY])) {
if (!empty($result)) {
$result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
} elseif ($exists) {
$result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY] && (!empty($result) || $exists)) {
$result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
}
}
}
Expand Down