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

fix: handle invalid http responses #508

Merged
merged 5 commits into from
Jun 14, 2023
Merged

fix: handle invalid http responses #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d04102f
fix: handle invalid http responses
bshaffer May 12, 2023
ebe1ed9
Update src/CachedKeySet.php
bshaffer Jun 14, 2023
51198e1
Update CachedKeySetTest.php
bshaffer Jun 14, 2023
41f82ee
fix tests
bshaffer Jun 14, 2023
a7c44a5
Merge branch 'main' into handle-bad-http-response
yash30201 Jun 14, 2023
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
10 changes: 10 additions & 0 deletions src/CachedKeySet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@ private function keyIdExists(string $keyId): bool
}
$request = $this->httpFactory->createRequest('GET', $this->jwksUri);
$jwksResponse = $this->httpClient->sendRequest($request);
if ($jwksResponse->getStatusCode() !== 200) {
throw new UnexpectedValueException(
sprintf('HTTP Error: %d %s for URI "%s"',
$jwksResponse->getStatusCode(),
$jwksResponse->getReasonPhrase(),
$this->jwksUri,
),
$jwksResponse->getStatusCode()
);
}
$this->keySet = $this->formatJwksForCache((string) $jwksResponse->getBody());

if (!isset($this->keySet[$keyId])) {
Expand Down
34 changes: 34 additions & 0 deletions tests/CachedKeySetTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,37 @@ public function testOutOfBoundsThrowsException()
$cachedKeySet['bar'];
}

public function testInvalidHttpResponseThrowsException()
{
$this->expectException(\UnexpectedValueException::class);
$this->expectExceptionMessage('HTTP Error: 404 URL not found');
$this->expectExceptionCode(404);

$body = $this->prophesize('Psr\Http\Message\StreamInterface');
bshaffer marked this conversation as resolved.
Show resolved Hide resolved

$response = $this->prophesize('Psr\Http\Message\ResponseInterface');
$response->getStatusCode()
->shouldBeCalled()
->willReturn(404);
$response->getReasonPhrase()
->shouldBeCalledTimes(1)
->willReturn('URL not found');

$http = $this->prophesize(ClientInterface::class);
$http->sendRequest(Argument::any())
->shouldBeCalledTimes(1)
->willReturn($response->reveal());

$cachedKeySet = new CachedKeySet(
$this->testJwksUri,
$http->reveal(),
$this->getMockHttpFactory(),
$this->getMockEmptyCache()
);

isset($cachedKeySet[0]);
}

public function testWithExistingKeyId()
{
$cachedKeySet = new CachedKeySet(
Expand Down Expand Up @@ -382,6 +413,9 @@ private function getMockHttpClient($testJwks, int $timesCalled = 1)
$response->getBody()
->shouldBeCalledTimes($timesCalled)
->willReturn($body->reveal());
$response->getStatusCode()
->shouldBeCalledTimes($timesCalled)
->willReturn(200);

$http = $this->prophesize(ClientInterface::class);
$http->sendRequest(Argument::any())
Expand Down