fix(Security): Don't attempt empty secret fallback on >=v3 ciphertext #46176
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Josh <josh.t.richards@gmail.com>
joshtrichards
added
bug
3. to review
joshtrichards
requested review from
nickvergessen,
ChristophWurst,
juliusknorr,
kesselb and
come-nc
|
/backport to stable29 |
|
/backport to stable28 |
Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
come-nc
reviewed
Jun 27, 2024
| $version = $parts[3]; | ||
| } | ||
|
|
||
| if ((!empty($version) && $version <= '2') || empty($version)) { // only <3 versioned or old non-versioned ciphertext ever supported empty secrets |
There was a problem hiding this comment.
Suggested change
| if ((!empty($version) && $version <= '2') || empty($version)) { // only <3 versioned or old non-versioned ciphertext ever supported empty secrets | |
| if (empty($version) || $version <= '2') { // only <3 versioned or old non-versioned ciphertext ever supported empty secrets |
Comment on lines
-113
to
-115
| if ($partCount < 3 || $partCount > 4) { | ||
| throw new Exception('Authenticated ciphertext could not be decoded.'); | ||
| } |
There was a problem hiding this comment.
Why is this removed?
Should be added back.
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The v3 ciphertext format (added in #23496) has never worked with an empty secret/password. However, the v3 implementation was added prior to the existence of the empty secret fallback code added in #31499.
While looking into #34012 I noted that the only reason the
hash_hkdf()PHP ValueError is occurring is because the fallback is being attempted not only anytime the initial decrypt attempt fails, but also against newer ciphertext versions (where the fallback isn't relevant).This PR adjusts the fallback logic to only run against <=2 versioned or non-versioned (which is even older) ciphertext.
Note: This does not fix the underlying cause of #34012 (which is probably in at least most cases a configuration problem), but it does:
References:
TODO
Checklist