Skip to content

fix query params sorting to build correct canonical query string #1938

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
jderusse merged 6 commits into from
Sep 4, 2025
Merged

fix query params sorting to build correct canonical query string #1938

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0154ba
fix sorting
Sep 2, 2025
92c0a67
cs fix + change log
Sep 2, 2025
80b0225
fix change log
Sep 2, 2025
e085e8f
fix for psalm
Sep 2, 2025
9330500
add tests
Sep 4, 2025
715f61b
fix deprecations
Sep 4, 2025
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
4 changes: 4 additions & 0 deletions src/Core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## NOT RELEASED

### Fixed

- SignerV4: fix sort of query parameters to build correct canoncal query string

## 1.27.0

### Added
Expand Down
4 changes: 3 additions & 1 deletion src/Core/src/Signer/SignerV4.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,9 @@ private function buildCanonicalQuery(Request $request): string
return '';
}

ksort($query);
uksort($query, static function (string $a, string $b): int {
return strcmp(rawurlencode($a), rawurlencode($b));
});
$encodedQuery = [];
foreach ($query as $key => $values) {
if (!\is_array($values)) {
Expand Down