Skip to content

[stable25] Add fallback routines for empty secret cases #35605

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
PVince81 merged 5 commits into from
Dec 5, 2022
Merged

[stable25] Add fallback routines for empty secret cases #35605

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4735ea
Add fallback routines for empty secret cases
juliusknorr Mar 9, 2022
3ebf7b8
Rotate token after fallback
juliusknorr Mar 10, 2022
0f7260d
Fix decryption fallback after adding a secret
juliusknorr Mar 10, 2022
1d33d37
Fix unit tests
CarlSchwan Mar 10, 2022
7416f44
Mark method as deprecated
CarlSchwan Sep 13, 2022
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
Fix decryption fallback after adding a secret 
Signed-off-by: Julius Härtl <[email protected]>
(cherry picked from commit a6796b4)
  • Loading branch information
@juliusknorr @PVince81
juliusknorr authored and PVince81 committed Dec 5, 2022
commit 0f7260de03b3fd5b1cf70cd79a1d6c77faeb56f5
15 changes: 10 additions & 5 deletions lib/private/Security/Crypto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,19 @@ public function encrypt(string $plaintext, string $password = ''): string {
* @throws Exception If the decryption failed
*/
public function decrypt(string $authenticatedCiphertext, string $password = ''): string {
if ($password === '') {
$password = $this->config->getSystemValue('secret');
}
$secret = $this->config->getSystemValue('secret');
try {
if ($password === '') {
return $this->decryptWithoutSecret($authenticatedCiphertext, $secret);
}
return $this->decryptWithoutSecret($authenticatedCiphertext, $password);
} catch (Exception $e) {
// Retry with empty secret as a fallback for instances where the secret might not have been set by accident
return $this->decryptWithoutSecret($authenticatedCiphertext, '');
if ($password === '') {
// Retry with empty secret as a fallback for instances where the secret might not have been set by accident
return $this->decryptWithoutSecret($authenticatedCiphertext, '');
}

throw $e;
}
}

Expand Down