[HttpFoundation] Generate url-safe hashes for signed urls #59022
Conversation
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
ec97e3a to
93eb218
Compare
|
|
There is 2 errors in fabbot, which need to be treated differently:
|
|
Fixing the deps=low tests is probably a matter of bumping the min requirement |
stof
reviewed
Nov 28, 2024
| @@ -17,6 +17,7 @@ | |||
| ], | |||
| "require": { | |||
| "php": ">=8.2", | |||
| "ext-sodium": "*", | |||
There was a problem hiding this comment.
Making HttpFoundation require ext-sodium is a no-go (especially if only the UriSigner needs it as it is not the main feature of the component)
| @@ -124,7 +125,7 @@ public function checkRequest(Request $request): bool | |||
|
|
|||
| private function computeHash(string $uri): string | |||
| { | |||
| return base64_encode(hash_hmac('sha256', $uri, $this->secret, true)); | |||
| return sodium_bin2base64(hash_hmac('sha256', $uri, $this->secret, true), SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING); | |||
There was a problem hiding this comment.
Introducing a dependency on ext-sodium just to provide URL-safe base64 encoding is clearly not necessary. It is very easy to do it in userland (using the same strtr you use for the comparison)
5782c78 to
4b6515e
Compare
4b6515e to
8258bc4
Compare
8258bc4 to
a533750
Compare
fabpot
approved these changes
Dec 18, 2024
|
Thank you @valtzu. |
xabbuh
added a commit
that referenced
this pull request
Dec 19, 2024
This PR was merged into the 6.4 branch. Discussion ---------- [HttpKernel] relax assertions on generated hashes | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT fixes the high deps tests after #59022 Commits ------- 85a5d13 relax assertions on generated hashes
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.
Generate url-safe signed urls since some clients can't handle parameter encoding correctly and are sending
%2Bas+which PHP reads asBackwards-compatibility is included, and planned to be removed in 8.0 – which will mean all signed urls generated with <7.3 are rendered invalid.