Skip to content

Reject cross-origin requests in processCreate and processGet #125

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
ScottHelme wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −0
Open

Reject cross-origin requests in processCreate and processGet #125

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
10 changes: 10 additions & 0 deletions src/WebAuthn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ public function processCreate($clientDataJSON, $attestationObject, $challenge, $
throw new WebAuthnException('invalid origin', WebAuthnException::INVALID_ORIGIN);
}

// Reject cross-origin requests (proposed Level 3 spec §7.1 Step 10).
if (\property_exists($clientData, 'crossOrigin') && $clientData->crossOrigin === true) {
throw new WebAuthnException('cross-origin request not allowed', WebAuthnException::INVALID_ORIGIN);
}

// Attestation
$attestationObject = new Attestation\AttestationObject($attestationObject, $this->_formats);

Expand Down Expand Up @@ -475,6 +480,11 @@ public function processGet($clientDataJSON, $authenticatorData, $signature, $cre
throw new WebAuthnException('invalid origin', WebAuthnException::INVALID_ORIGIN);
}

// Reject cross-origin requests (proposed Level 3 spec §7.2 Step 13).
if (\property_exists($clientData, 'crossOrigin') && $clientData->crossOrigin === true) {
throw new WebAuthnException('cross-origin request not allowed', WebAuthnException::INVALID_ORIGIN);
}

// 11. Verify that the rpIdHash in authData is the SHA-256 hash of the RP ID expected by the Relying Party.
if ($authenticatorObj->getRpIdHash() !== $this->_rpIdHash) {
throw new WebAuthnException('invalid rpId hash', WebAuthnException::INVALID_RELYING_PARTY);
Expand Down