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

don't require client secret when using PKCE #337

Merged
merged 1 commit into from
May 31, 2022
Merged

don't require client secret when using PKCE #337

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
35 changes: 25 additions & 10 deletions lib/Controller/OAuthApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public function __construct(
* @param string $redirect_uri The redirect URI.
* @param string $refresh_token The refresh token.
* @param string $code_verifier The PKCE code verifier.
* @param string $client_id The client id in case of a public client.
* @return JSONResponse The Access Token or an empty JSON Object.
*
* @NoAdminRequired
Expand All @@ -113,7 +114,8 @@ public function generateToken(
$code = null,
$redirect_uri = null,
$refresh_token = null,
$code_verifier = null
$code_verifier = null,
$client_id = null
) {
if (!\is_string($grant_type)) {
return new JSONResponse(['error' => 'invalid_request'], Http::STATUS_BAD_REQUEST);
Expand All @@ -123,15 +125,28 @@ public function generateToken(
return new JSONResponse(['error' => 'invalid_request'], Http::STATUS_BAD_REQUEST);
}

try {
/** @var \OCA\OAuth2\Db\Client $client */
$client = $this->clientMapper->findByIdentifier($_SERVER['PHP_AUTH_USER']);
} catch (DoesNotExistException $exception) {
return new JSONResponse(['error' => 'invalid_client'], Http::STATUS_BAD_REQUEST);
}

if (\strcmp($client->getSecret(), $_SERVER['PHP_AUTH_PW']) !== 0) {
return new JSONResponse(['error' => 'invalid_client'], Http::STATUS_BAD_REQUEST);
if (\is_string($client_id) && \is_string($code_verifier)) {
// The authorization code flow doesn't require a client secret in case of a public client.
// Instead, the client needs to use the PKCE extension and send a code challenge / code verifier.
// That is why we don't compare the client secret when the client id and code verifier are set in the
// query parameters.
try {
/** @var \OCA\OAuth2\Db\Client $client */
$client = $this->clientMapper->findByIdentifier($client_id);
} catch (DoesNotExistException $exception) {
return new JSONResponse(['error' => 'invalid_client'], Http::STATUS_BAD_REQUEST);
}
} else {
try {
/** @var \OCA\OAuth2\Db\Client $client */
$client = $this->clientMapper->findByIdentifier($_SERVER['PHP_AUTH_USER']);
} catch (DoesNotExistException $exception) {
return new JSONResponse(['error' => 'invalid_client'], Http::STATUS_BAD_REQUEST);
}

if (\strcmp($client->getSecret(), $_SERVER['PHP_AUTH_PW']) !== 0) {
return new JSONResponse(['error' => 'invalid_client'], Http::STATUS_BAD_REQUEST);
}
}

switch ($grant_type) {
Expand Down