fix: normalize SodiumHandler params and padding failures#10321
Open
gr8man wants to merge 12 commits into
Open
Conversation
michalsn
reviewed
Jun 18, 2026
michalsn
reviewed
Jun 18, 2026
michalsn
reviewed
Jun 18, 2026
michalsn
reviewed
Jun 18, 2026
michalsn
reviewed
Jun 18, 2026
michalsn
reviewed
Jun 18, 2026
michalsn
requested changes
Jun 18, 2026
michalsn
left a comment
Member
There was a problem hiding this comment.
Please rename the new testBug* methods to behavior-focused names. For example, testBug2InvalidKeyLengthThrowsSodiumException() expects EncryptionException, so the current name is misleading.
I also think testBug1MemzeroZeroesInternalKey() and testBug4OriginalDataIsNotZeroed() are questionable as regression tests. Can we either remove them or rewrite them around the actual behavior we want to protect?
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
michalsn
reviewed
Jun 19, 2026
michalsn
left a comment
Member
There was a problem hiding this comment.
Looks good, thank you. Please add a changelog entry.
For future PRs, please use the PR template when writing the description.
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
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 fixes bugs and improves the validation and error handling logic of the encrypt and decrypt methods in the
SodiumHandler.Key changes:
blockSizecan now be passed without also passingkey, while['key' => null]falls back to the configured instance key.SODIUM_CRYPTO_SECRETBOX_KEYBYTES) to ensure invalid Sodium keys throwEncryptionExceptioninstead of native Sodium errors.sodium_unpad()failures so mismatchedblockSizeduring decrypt throwsEncryptionException.$keyand$blockSizefrom the$paramsarray.