[13.x] Validate MAC across all decryption keys#59742
Merged
taylorotwell merged 2 commits intolaravel:13.xfrom Apr 18, 2026
Merged
[13.x] Validate MAC across all decryption keys#59742taylorotwell merged 2 commits intolaravel:13.xfrom
taylorotwell merged 2 commits intolaravel:13.xfrom
Conversation
Contributor
Author
|
NOT AI!!! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR addresses #59363.
When multiple decryption keys are configured,
Encrypter::decrypt()currently stops MAC validation as soon as a matching key is found. That means the amount of work depends on where the matching key appears in the rotation list.This change makes MAC validation run across all configured keys, remembers the first matching key, and then decrypts only once with that key.
The behavior stays the same, but the implementation no longer short-circuits based on key position.
This is also intentionally narrower than #59366. It only changes
Encrypter, keeps the fix focused on #59363, and avoids the extra array-building logic from that earlier attempt.A regression test was added to cover decryption when multiple previous keys are configured.