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

[9.x] Fix personal access token secrets #1256

Closed
wants to merge 2 commits into from
Closed

[9.x] Fix personal access token secrets #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7adc117
Fix personal access token secret matching
driesvints May 8, 2020
7707300
Fix test
driesvints May 8, 2020
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: 4 additions & 3 deletions src/Bridge/ClientRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function validateClient($clientIdentifier, $clientSecret, $grantType)
return false;
}

return ! $record->confidential() || $this->verifySecret((string) $clientSecret, $record->secret);
return ! $record->confidential() || $this->verifySecret((string) $clientSecret, $record->secret, $grantType);
}

/**
Expand Down Expand Up @@ -95,11 +95,12 @@ protected function handlesGrant($record, $grantType)
*
* @param string $clientSecret
* @param string $storedHash
* @param string $grantType
* @return bool
*/
protected function verifySecret($clientSecret, $storedHash)
protected function verifySecret($clientSecret, $storedHash, $grantType)
{
return Passport::$hashesClientSecrets
return Passport::$hashesClientSecrets && $grantType !== 'personal_access'
? password_verify($clientSecret, $storedHash)
: hash_equals($storedHash, $clientSecret);
}
Expand Down
8 changes: 8 additions & 0 deletions tests/BridgeClientRepositoryHashedSecretsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ protected function setUp(): void
$this->clientModelRepository = $clientModelRepository;
$this->repository = new BridgeClientRepository($clientModelRepository);
}

public function test_personal_access_grant_is_permitted()
{
$client = $this->clientModelRepository->findActive(1);
$client->personal_access_client = true;

$this->assertTrue($this->repository->validateClient(1, $client->secret, 'personal_access'));
}
}

class BridgeClientRepositoryHashedTestClientStub extends BridgeClientRepositoryTestClientStub
Expand Down