Skip to content

The code_challenge_methods_supported field is optional #499

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

Open
EvertJanVantLand wants to merge 1 commit into
base: master
Choose a base branch
from
Open

The code_challenge_methods_supported field is optional #499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 23 additions & 11 deletions src/OpenIDConnectClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,18 +775,30 @@ private function requestAuthorization() {

// If the client supports Proof Key for Code Exchange (PKCE)
$codeChallengeMethod = $this->getCodeChallengeMethod();
if (!empty($codeChallengeMethod) && in_array($codeChallengeMethod, $this->getProviderConfigValue('code_challenge_methods_supported', []), true)) {
$codeVerifier = bin2hex(random_bytes(64));
$this->setCodeVerifier($codeVerifier);
if (!empty($this->pkceAlgs[$codeChallengeMethod])) {
$codeChallenge = rtrim(strtr(base64_encode(hash($this->pkceAlgs[$codeChallengeMethod], $codeVerifier, true)), '+/', '-_'), '=');
} else {
$codeChallenge = $codeVerifier;
if (!empty($codeChallengeMethod)) {
//code_challenge_methods_supported can be omitted
try{
$supportedMethods = $this->getProviderConfigValue('code_challenge_methods_supported', null);
} catch ( \OpenIDConnectClientException| \Exception $e) {
$supportedMethods = null;
}


// If the provider does not specify supported methods, assume the one registered is supported.
// Otherwise, check if registered method is in the list of supported methods.
if (is_null($supportedMethods) || in_array($codeChallengeMethod, $supportedMethods, true)) {
$codeVerifier = bin2hex(random_bytes(64));
$this->setCodeVerifier($codeVerifier);
if (!empty($this->pkceAlgs[$codeChallengeMethod])) {
$codeChallenge = rtrim(strtr(base64_encode(hash($this->pkceAlgs[$codeChallengeMethod], $codeVerifier, true)), '+/', '-_'), '=');
} else {
$codeChallenge = $codeVerifier;
}
$auth_params = array_merge($auth_params, [
'code_challenge' => $codeChallenge,
'code_challenge_method' => $codeChallengeMethod
]);
}
$auth_params = array_merge($auth_params, [
'code_challenge' => $codeChallenge,
'code_challenge_method' => $codeChallengeMethod
]);
}

$auth_endpoint .= (strpos($auth_endpoint, '?') === false ? '?' : '&') . http_build_query($auth_params, '', '&', $this->encType);
Expand Down