Skip to content

fix: enforce HTTPS scheme check in CheckAllowedOrigins fallback path #820

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

Merged
Spomky merged 3 commits into from
Mar 23, 2026
+22 −27
Merged

fix: enforce HTTPS scheme check in CheckAllowedOrigins fallback path #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d99ac36
fix: enforce HTTPS scheme check before host matching in CheckAllowedO…
Spomky Mar 23, 2026
70ea290
fix: coding standards and regenerate PHPStan baseline
Spomky Mar 23, 2026
d4b3e4c
fix: remove unmatched PHPStan baseline entries for deprecated parameters
Spomky Mar 23, 2026
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
20 changes: 1 addition & 19 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@ parameters:
count: 1
path: src/stimulus/src/WebauthnStimulusBundle.php

-
rawMessage: 'Since web-auth/webauthn-lib 5.2.0: The parameter "$optionStorage" is deprecated since 5.2.0 and will be removed in 6.0.0. Please set "null" and use the global option storage instead..'
identifier: todoBy.sfDeprecation
count: 2
path: src/symfony/src/Controller/AssertionControllerFactory.php

-
rawMessage: 'Since web-auth/webauthn-lib 5.2.0: The parameter "$optionStorage" is deprecated since 5.2.0 and will be removed in 6.0.0. Please set "null" and use the global option storage instead..'
identifier: todoBy.sfDeprecation
count: 2
path: src/symfony/src/Controller/AttestationControllerFactory.php

-
rawMessage: 'Method Webauthn\Bundle\CredentialOptionsBuilder\PublicKeyCredentialCreationOptionsBuilder::getFromRequest() invoked with 3 parameters, 2 required.'
identifier: arguments.count
Expand Down Expand Up @@ -1612,7 +1600,7 @@ parameters:
path: src/webauthn/src/Denormalizer/AuthenticationExtensionNormalizer.php

-
rawMessage: 'Parameter #1 $extensions of static method Webauthn\AuthenticationExtensions\AuthenticationExtensions::create() expects array<Webauthn\AuthenticationExtensions\AuthenticationExtension>, array given.'
rawMessage: 'Parameter #1 $extensions of static method Webauthn\AuthenticationExtensions\AuthenticationExtensions::create() expects array<Webauthn\AuthenticationExtensions\AuthenticationExtension>, array<mixed> given.'
identifier: argument.type
count: 1
path: src/webauthn/src/Denormalizer/AuthenticationExtensionsDenormalizer.php
Expand Down Expand Up @@ -2181,12 +2169,6 @@ parameters:
count: 1
path: src/webauthn/src/MetadataService/Statement/MetadataStatement.php

-
rawMessage: 'Since web-auth/webauthn-lib 5.1.0: The parameter "$icon" is deprecated since 5.1.0 and will be removed in 6.0.0. This value has no effect. Please set "null" instead..'
identifier: todoBy.sfDeprecation
count: 1
path: src/webauthn/src/PublicKeyCredentialEntity.php

-
rawMessage: 'Parameter #1 $extensions of static method Webauthn\AuthenticationExtensions\AuthenticationExtensions::create() expects array<Webauthn\AuthenticationExtensions\AuthenticationExtension>, array<Webauthn\AuthenticationExtensions\AuthenticationExtensions> given.'
identifier: argument.type
Expand Down
12 changes: 10 additions & 2 deletions src/webauthn/src/CeremonyStep/CeremonyStepManagerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@ public function creationCeremony(): CeremonyStepManager
new CheckChallenge(),
$this->allowedOrigins === null ? new CheckOrigin(
$this->securedRelyingPartyId ?? []
) : new CheckAllowedOrigins($this->allowedOrigins, $this->allowSubdomains),
) : new CheckAllowedOrigins(
$this->allowedOrigins,
$this->allowSubdomains,
$this->securedRelyingPartyId ?? []
),
new CheckTopOrigin($this->topOriginValidator),
new CheckRelyingPartyIdIdHash(),
new CheckUserWasPresent(),
Expand All @@ -160,7 +164,11 @@ public function requestCeremony(): CeremonyStepManager
new CheckChallenge(),
$this->allowedOrigins === null ? new CheckOrigin(
$this->securedRelyingPartyId ?? []
) : new CheckAllowedOrigins($this->allowedOrigins, $this->allowSubdomains),
) : new CheckAllowedOrigins(
$this->allowedOrigins,
$this->allowSubdomains,
$this->securedRelyingPartyId ?? []
),
new CheckTopOrigin(),
new CheckRelyingPartyIdIdHash(),
new CheckUserWasPresent(),
Expand Down
17 changes: 11 additions & 6 deletions src/webauthn/src/CeremonyStep/CheckAllowedOrigins.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@

/**
* @param string[] $allowedOrigins
* @param string[] $securedRelyingPartyId RP IDs that are allowed to use HTTP (e.g. localhost for development)
*/
public function __construct(
array $allowedOrigins,
private bool $allowSubdomains = false
private bool $allowSubdomains = false,
private array $securedRelyingPartyId = [],
) {
$fullOrigins = [];
$hostOrigins = [];
Expand Down Expand Up @@ -113,6 +115,13 @@ public function process(

$rpId = $publicKeyCredentialOptions->rpId ?? $publicKeyCredentialOptions->rp->id ?? $host;
$facetId = $this->getFacetId($rpId, $publicKeyCredentialOptions->extensions, $authData->extensions);

if (! in_array($facetId, $this->securedRelyingPartyId, true)) {
$scheme = $parsedOrigin['scheme'] ?? '';
$scheme === 'https' || throw AuthenticatorResponseVerificationException::create(
'Invalid scheme. HTTPS required.'
);
}
$facetId !== '' || throw AuthenticatorResponseVerificationException::create(
'Invalid origin. Unable to determine the facet ID.'
);
Expand All @@ -126,11 +135,7 @@ public function process(
if (! $this->allowSubdomains && $isSubDomains) {
throw AuthenticatorResponseVerificationException::create('Invalid origin. Subdomains are not allowed.');
}

$scheme = $parsedOrigin['scheme'] ?? '';
$scheme === 'https' || throw AuthenticatorResponseVerificationException::create(
'Invalid scheme. HTTPS required.'
);
throw AuthenticatorResponseVerificationException::create('Invalid origin.');
}

/**
Expand Down
Loading