Merge pull request #496 from web-auth/bug/pkc-source-repository-nullable

Bug/pkc source repository nullable
web-auth · Oct 15, 2023 · 50b6418 · 50b6418
2 parents 474cc11 + 1aa6855
commit 50b6418
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/webauthn/src/AuthenticatorAssertionResponseValidator.php b/src/webauthn/src/AuthenticatorAssertionResponseValidator.php
@@ -139,9 +139,17 @@ public function check(
  ->getHost(),
  'userHandle' => $userHandle,
  ]);
- $publicKeyCredentialSource = is_string(
- $credentialId
- ) ? $this->publicKeyCredentialSourceRepository?->findOneByCredentialId($credentialId) : $credentialId;
+ $publicKeyCredentialSource = null;
+ if ($credentialId instanceof PublicKeyCredentialSource) {
+ $publicKeyCredentialSource = $credentialId;
+ } else {
+ $this->publicKeyCredentialSourceRepository instanceof PublicKeyCredentialSourceRepository || throw AuthenticatorResponseVerificationException::create(
+ 'The parameter "$publicKeyCredentialSourceRepository" is required.'
+ );
+ $publicKeyCredentialSource = $this->publicKeyCredentialSourceRepository->findOneByCredentialId(
+ $credentialId
+ );
+ }
  $publicKeyCredentialSource !== null || throw AuthenticatorResponseVerificationException::create(
  'The credential ID is invalid.'
  );