Skip to content
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

Jump to bottom

Copy over nonce from parsed POST vars to parsed GET vars as a temp fix #36

Merged
merged 6 commits into from
Sep 23, 2022
Merged

Copy over nonce from parsed POST vars to parsed GET vars as a temp fix #36

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebd4033
switch to GET method when taking user consent
ashfame Sep 21, 2022
5ec0967
suppress phpcs warning since its irrelevant in this case
ashfame Sep 21, 2022
1ca02bc
separate explanation for phpcs:disable by --
ashfame Sep 21, 2022
f0b158a
Revert changes in this PR for different approach
ashfame Sep 21, 2022
7d090a2
copy over the nonce from parsed POST parameters to parsed GET paramet…
ashfame Sep 21, 2022
d061d40
reformat comment to satisfy linter
ashfame Sep 21, 2022
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
7 changes: 7 additions & 0 deletions src/Http/Handlers/AuthorizeHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ public function __construct( OAuth2Server $server, ConsentStorage $consent_stora
}

public function handle( Request $request, Response $response ): Response {
// Our dependency bshaffer's OAuth library currently has a bug where it doesn't pick up nonce correctly if it's a POST request to the Authorize endpoint.
// Fix has been contributed upstream (https://github.com/bshaffer/oauth2-server-php/pull/1032) but it doesn't look it would be merged anytime soon based on recent activity.
// Hence, as a temporary fix, we are copying over the nonce from parsed $_POST values to parsed $_GET values in $request object here.
if ( isset( $request->request['nonce'] ) && ! isset( $request->query['nonce'] ) ) {
$request->query['nonce'] = $request->request['nonce'];
}

if ( ! $this->server->validateAuthorizeRequest( $request, $response ) ) {
return $response;
}
Expand Down