Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Stop adding ?schema=openid to userinfo endpoint URL. #449

### Fixed
- Fix missing `iat` verification when verifying JWT #476
- Check existence of subject when verifying JWT #474

## [1.0.1] - 2024-09-13
Expand Down
1 change: 1 addition & 0 deletions src/OpenIDConnectClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@ protected function verifyJWTClaims($claims, ?string $accessToken = null): bool
&& (!isset($claims->nonce) || $claims->nonce === $this->getNonce())
&& ( !isset($claims->exp) || ((is_int($claims->exp)) && ($claims->exp >= time() - $this->leeway)))
&& ( !isset($claims->nbf) || ((is_int($claims->nbf)) && ($claims->nbf <= time() + $this->leeway)))
&& ( isset($claims->iat) && is_int($claims->iat))
&& ( !isset($claims->at_hash) || !isset($accessToken) || $claims->at_hash === $expected_at_hash )
);
}
Expand Down
21 changes: 21 additions & 0 deletions tests/OpenIDConnectClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function getIdTokenPayload()
'aud' => 'client-id',
'iss' => 'issuer',
'sub' => 'sub',
'iat' => time(),
]);
self::assertTrue($valid);

Expand All @@ -38,6 +39,7 @@ public function getIdTokenPayload()
'aud' => ['client-id'],
'iss' => 'issuer',
'sub' => 'sub',
'iat' => time(),
]);
self::assertTrue($valid);

Expand All @@ -46,6 +48,24 @@ public function getIdTokenPayload()
'aud' => ['ipsum'],
'iss' => 'issuer',
'sub' => 'sub',
'iat' => time(),
]);
self::assertFalse($valid);

# iat missing
$valid = $client->testVerifyJWTClaims((object)[
'aud' => ['client-id'],
'iss' => 'issuer',
'sub' => 'sub',
]);
self::assertFalse($valid);

# iat invalid
$valid = $client->testVerifyJWTClaims((object)[
'aud' => ['client-id'],
'iss' => 'issuer',
'sub' => 'sub',
'iat' => 'invalid'
]);
self::assertFalse($valid);

Expand Down Expand Up @@ -127,6 +147,7 @@ public function testAuthenticateDoesNotThrowExceptionIfClaimsIsMissingNonce()
$fakeClaims->iss = 'fake-issuer';
$fakeClaims->aud = 'fake-client-id';
$fakeClaims->sub = 'fake-sub';
$fakeClaims->iat = time();
$fakeClaims->nonce = null;

$_REQUEST['id_token'] = 'abc.123.xyz';
Expand Down