Skip to content

fix(oauth2): harden client update endpoint against mass assignment of credentials #180

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
romanetar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(oauth2): harden client update endpoint against mass assignment of credentials #180

Show file tree
Hide file tree
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
17 changes: 17 additions & 0 deletions app/Http/Controllers/Api/ClientApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,23 @@ protected function getCreatePayloadValidationRules(): array
];
}

/**
* Credentials and ownership must never be set through the update endpoint:
* credentials change only via ClientCredentialGenerator (create / regenerate).
* @param array $payload
* @return array
*/
protected function curateUpdatePayload(array $payload): array
{
unset(
$payload['client_id'],
$payload['client_secret'],
$payload['client_secret_expires_at'],
$payload['owner']
);
return $payload;
}

protected function getResourceServerContext(): IResourceServerContext
{
// TODO: Implement getResourceServerContext() method.
Expand Down
52 changes: 51 additions & 1 deletion tests/ClientApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,4 +560,54 @@ public function testUpdateNativeClientRejectsSchemeAlreadyRegisteredInAuthorityL
$this->assertResponseStatus(412);
}

}
public function testUpdateIgnoresCredentialsAndOwner(){

$client = EntityManager::getRepository(Client::class)->findOneBy(['app_name' => 'oauth2_test_app']);
$id = $client->id;
$client_id = $client->getClientId();
$secret = $client->getClientSecret();
$expires_at = $client->getClientSecretExpiration();
$owner_id = $client->getOwner()->getId();

$this->action("PUT", "Api\\ClientApiController@update",
[
'id' => $id,
'app_name' => 'oauth2_test_app',
'application_type' => $client->getApplicationType(),
'client_id' => 'hijacked.client.id',
'client_secret' => 'short',
'client_secret_expires_at' => time() + 31536000,
'owner' => '123',
],
[], [], []);

$this->assertResponseStatus(201);

EntityManager::clear();
$client = EntityManager::getRepository(Client::class)->find($id);
$this->assertEquals($client_id, $client->getClientId());
$this->assertEquals($secret, $client->getClientSecret());
$this->assertEquals($expires_at, $client->getClientSecretExpiration());
$this->assertEquals($owner_id, $client->getOwner()->getId());
}

public function testRegenerateClientSecretStillRotatesAndDispatchesEvent(){

$client = EntityManager::getRepository(Client::class)->findOneBy(['app_name' => 'oauth2_test_app']);
$id = $client->id;
$client_id = $client->getClientId();
$old = $client->getClientSecret();

$dispatched = [];
\Illuminate\Support\Facades\Event::listen('oauth2.client.regenerate.secret', function ($cid) use (&$dispatched) {
$dispatched[] = $cid;
});

$new_client = App::make(ClientService::class)->regenerateClientSecret($id);

$this->assertNotEquals($old, $new_client->getClientSecret());
$this->assertEquals(64, strlen($new_client->getClientSecret()));
$this->assertEquals([$client_id], $dispatched);
}

}
Loading