Skip to content

Fix _checkOrigin() to require domain boundary check #123

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
+6 −3
Open

Fix _checkOrigin() to require domain boundary check #123

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
9 changes: 6 additions & 3 deletions src/WebAuthn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,12 @@ private function _checkOrigin($origin) {
$host = \parse_url($origin, PHP_URL_HOST);
$host = \trim($host, '.');

// The RP ID must be equal to the origin's effective domain, or a registrable
// domain suffix of the origin's effective domain.
return \preg_match('/' . \preg_quote($this->_rpId) . '$/i', $host) === 1;
// The RP ID must be equal to the origin's effective domain, or the
// origin's host must be a subdomain of the RP ID (i.e. preceded by a dot).
if (\strcasecmp($host, $this->_rpId) === 0) {
return true;
}
return \str_ends_with(\strtolower($host), '.' . \strtolower($this->_rpId));
}

/**
Expand Down