Add Webauthn authentication support

Introduce WebauthnBadge, WebauthnPassport, and WebauthnAuthenticator implementations to support Webauthn-based authentication. Update services and configuration to handle Webauthn-specific dependencies and options, and add support for customizable storage and routing configurations. This implementation enhances security options by enabling passwordless authentication.

src/stimulus/assets/dist/controller.d.ts

@@ -9,6 +9,10 @@ export default class extends Controller {
             type: StringConstructor;
             default: string;
         };
+        requestResultField: {
+            type: StringConstructor;
+            default: null;
+        };
         requestSuccessRedirectUri: StringConstructor;
         creationResultUrl: {
             type: StringConstructor;
@@ -59,6 +63,7 @@ export default class extends Controller {
     };
     readonly requestResultUrlValue: string;
     readonly requestOptionsUrlValue: string;
+    readonly requestResultFieldValue?: string;
     readonly requestSuccessRedirectUriValue?: string;
     readonly creationResultUrlValue: string;
     readonly creationOptionsUrlValue: string;

src/stimulus/assets/dist/controller.js

@@ -5,14 +5,15 @@ class default_1 extends Controller {
     constructor() {
         super(...arguments);
         this.connect = async () => {
-            var _a, _b;
+            var _a, _b, _c;
             const options = {
                 requestResultUrl: this.requestResultUrlValue,
                 requestOptionsUrl: this.requestOptionsUrlValue,
-                requestSuccessRedirectUri: (_a = this.requestSuccessRedirectUriValue) !== null && _a !== void 0 ? _a : null,
+                requestResultField: (_a = this.requestResultFieldValue) !== null && _a !== undefined ? _a : null,
+                requestSuccessRedirectUri: (_b = this.requestSuccessRedirectUriValue) !== null && _b !== undefined ? _b : null,
                 creationResultUrl: this.creationResultUrlValue,
                 creationOptionsUrl: this.creationOptionsUrlValue,
-                creationSuccessRedirectUri: (_b = this.creationSuccessRedirectUriValue) !== null && _b !== void 0 ? _b : null,
+                creationSuccessRedirectUri: (_c = this.creationSuccessRedirectUriValue) !== null && _c !== undefined ? _c : null,
             };
             this._dispatchEvent('webauthn:connect', { options });
             const supportAutofill = await browserSupportsWebAuthnAutofill();
@@ -38,9 +39,16 @@ class default_1 extends Controller {
         this._processSignin(optionsResponseJson, false);
     }
     async _processSignin(optionsResponseJson, useBrowserAutofill) {
+        var _a;
         try {
             const authenticatorResponse = await startAuthentication(optionsResponseJson, useBrowserAutofill);
             this._dispatchEvent('webauthn:authenticator:response', { response: authenticatorResponse });
+            console.log(authenticatorResponse, this.requestResultFieldValue, this.element instanceof HTMLFormElement);
+            if (this.requestResultFieldValue && this.element instanceof HTMLFormElement) {
+                (_a = this.element.querySelector(this.requestResultFieldValue)) === null || _a === void 0 ? void 0 : _a.setAttribute('value', JSON.stringify(authenticatorResponse));
+                this.element.submit();
+                return;
+            }
             const assertionResponse = await this._getAssertionResponse(authenticatorResponse);
             if (assertionResponse !== false && this.requestSuccessRedirectUriValue) {
                 window.location.replace(this.requestSuccessRedirectUriValue);
@@ -151,6 +159,7 @@ class default_1 extends Controller {
 default_1.values = {
     requestResultUrl: { type: String, default: '/request' },
     requestOptionsUrl: { type: String, default: '/request/options' },
+    requestResultField: { type: String, default: null },
     requestSuccessRedirectUri: String,
     creationResultUrl: { type: String, default: '/creation' },
     creationOptionsUrl: { type: String, default: '/creation/options' },

src/stimulus/assets/src/controller.ts

@@ -11,6 +11,7 @@ export default class extends Controller {
     static values = {
         requestResultUrl: { type: String, default: '/request' },
         requestOptionsUrl: { type: String, default: '/request/options' },
+        requestResultField: { type: String, default: null },
         requestSuccessRedirectUri: String,
         creationResultUrl: { type: String, default: '/creation' },
         creationOptionsUrl: { type: String, default: '/creation/options' },
@@ -32,6 +33,7 @@ export default class extends Controller {
 
     declare readonly requestResultUrlValue: string;
     declare readonly requestOptionsUrlValue: string;
+    declare readonly requestResultFieldValue?: string;
     declare readonly requestSuccessRedirectUriValue?: string;
     declare readonly creationResultUrlValue: string;
     declare readonly creationOptionsUrlValue: string;
@@ -49,6 +51,7 @@ export default class extends Controller {
         const options = {
             requestResultUrl: this.requestResultUrlValue,
             requestOptionsUrl: this.requestOptionsUrlValue,
+            requestResultField: this.requestResultFieldValue ?? null,
             requestSuccessRedirectUri: this.requestSuccessRedirectUriValue ?? null,
             creationResultUrl: this.creationResultUrlValue,
             creationOptionsUrl: this.creationOptionsUrlValue,
@@ -85,6 +88,16 @@ export default class extends Controller {
             // @ts-ignore
             const authenticatorResponse = await startAuthentication(optionsResponseJson, useBrowserAutofill);
             this._dispatchEvent('webauthn:authenticator:response', { response: authenticatorResponse });
+            console.log(
+                authenticatorResponse,
+                this.requestResultFieldValue,
+                this.element instanceof HTMLFormElement,
+            );
+            if (this.requestResultFieldValue && this.element instanceof HTMLFormElement) {
+                this.element.querySelector(this.requestResultFieldValue)?.setAttribute('value', JSON.stringify(authenticatorResponse));
+                this.element.submit();
+                return;
+            }
 
             const assertionResponse = await this._getAssertionResponse(authenticatorResponse);
             if (assertionResponse !== false && this.requestSuccessRedirectUriValue) {

src/symfony/src/Controller/AssertionControllerFactory.php

@@ -23,6 +23,7 @@ final class AssertionControllerFactory implements CanLogData
 
     public function __construct(
         private readonly SerializerInterface $serializer,
+        private readonly OptionsStorage $optionStorage,
         private readonly AuthenticatorAssertionResponseValidator $authenticatorAssertionResponseValidator,
         private readonly PublicKeyCredentialSourceRepositoryInterface $publicKeyCredentialSourceRepository,
     ) {
@@ -36,21 +37,19 @@ public function setLogger(LoggerInterface $logger): void
 
     public function createRequestController(
         PublicKeyCredentialRequestOptionsBuilder $optionsBuilder,
-        OptionsStorage $optionStorage,
         RequestOptionsHandler $optionsHandler,
         FailureHandler|AuthenticationFailureHandlerInterface $failureHandler
     ): AssertionRequestController {
         return new AssertionRequestController(
             $optionsBuilder,
-            $optionStorage,
+            $this->optionStorage,
             $optionsHandler,
             $failureHandler,
             $this->logger,
         );
     }
 
     public function createResponseController(
-        OptionsStorage $optionStorage,
         SuccessHandler $successHandler,
         FailureHandler|AuthenticationFailureHandlerInterface $failureHandler,
         null|AuthenticatorAssertionResponseValidator $authenticatorAssertionResponseValidator = null,
@@ -59,7 +58,7 @@ public function createResponseController(
             $this->serializer,
             $authenticatorAssertionResponseValidator ?? $this->authenticatorAssertionResponseValidator,
             $this->logger,
-            $optionStorage,
+            $this->optionStorage,
             $successHandler,
             $failureHandler,
             $this->publicKeyCredentialSourceRepository

src/symfony/src/Controller/AttestationControllerFactory.php

@@ -18,6 +18,7 @@
 final readonly class AttestationControllerFactory
 {
     public function __construct(
+        private OptionsStorage $optionStorage,
         private SerializerInterface $serializer,
         private AuthenticatorAttestationResponseValidator $attestationResponseValidator,
         private PublicKeyCredentialSourceRepositoryInterface $publicKeyCredentialSourceRepository
@@ -27,23 +28,21 @@ public function __construct(
     public function createRequestController(
         PublicKeyCredentialCreationOptionsBuilder $optionsBuilder,
         UserEntityGuesser $userEntityGuesser,
-        OptionsStorage $optionStorage,
         CreationOptionsHandler $creationOptionsHandler,
         FailureHandler|AuthenticationFailureHandlerInterface $failureHandler,
         bool $hideExistingExcludedCredentials = false
     ): AttestationRequestController {
         return new AttestationRequestController(
             $optionsBuilder,
             $userEntityGuesser,
-            $optionStorage,
+            $this->optionStorage,
             $creationOptionsHandler,
             $failureHandler,
             $hideExistingExcludedCredentials
         );
     }
 
     public function createResponseController(
-        OptionsStorage $optionStorage,
         SuccessHandler $successHandler,
         FailureHandler|AuthenticationFailureHandlerInterface $failureHandler,
         null|AuthenticatorAttestationResponseValidator $attestationResponseValidator = null,
@@ -52,7 +51,7 @@ public function createResponseController(
             $this->serializer,
             $attestationResponseValidator ?? $this->attestationResponseValidator,
             $this->publicKeyCredentialSourceRepository,
-            $optionStorage,
+            $this->optionStorage,
             $successHandler,
             $failureHandler,
         );

src/symfony/src/DependencyInjection/Configuration.php

@@ -64,6 +64,10 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->defaultValue('webauthn.clock.default')
                 ->info('PSR-20 Clock service.')
             ->end()
+            ->scalarNode('options_storage')
+                ->defaultValue(SessionStorage::class)
+                ->info('Service responsible of the options/user entity storage during the ceremony')
+            ->end()
             ->scalarNode('event_dispatcher')
                 ->defaultValue(EventDispatcherInterface::class)
                 ->info('PSR-14 Event Dispatcher service.')
@@ -314,7 +318,7 @@ private function addControllersConfig(ArrayNodeDefinition $rootNode): void
             ->defaultValue(Request::METHOD_POST)
             ->end()
             ->scalarNode('result_path')
-            ->isRequired()
+            ->defaultNull()
             ->end()
             ->scalarNode('host')
             ->defaultValue(null)
@@ -338,6 +342,7 @@ private function addControllersConfig(ArrayNodeDefinition $rootNode): void
                 ->defaultFalse()
             ->end()
             ->scalarNode('options_storage')
+            ->setDeprecated('web-auth/webauthn-symfony-bundle', '5.2.0', 'The child node "%node%" at path "%path%" is deprecated. Please use the root option "options_storage" instead.')
             ->defaultValue(SessionStorage::class)
             ->info('Service responsible of the options/user entity storage during the ceremony')
             ->end()
@@ -379,7 +384,7 @@ private function addControllersConfig(ArrayNodeDefinition $rootNode): void
             ->defaultValue(Request::METHOD_POST)
             ->end()
             ->scalarNode('result_path')
-            ->isRequired()
+            ->defaultNull()
             ->end()
             ->scalarNode('host')
             ->defaultValue(null)
@@ -394,6 +399,7 @@ private function addControllersConfig(ArrayNodeDefinition $rootNode): void
             ->defaultNull()
             ->end()
             ->scalarNode('options_storage')
+            ->setDeprecated('web-auth/webauthn-symfony-bundle', '5.2.0', 'The child node "%node%" at path "%path%" is deprecated. Please use the root option "options_storage" instead.')
             ->defaultValue(SessionStorage::class)
             ->info('Service responsible of the options/user entity storage during the ceremony')
             ->end()

src/symfony/src/DependencyInjection/Factory/Security/WebauthnFactory.php

@@ -88,7 +88,7 @@
     private const PRIORITY = 0;
 
     public function __construct(
-        private WebauthnServicesFactory $servicesFactory
+        private WebauthnServicesFactory $servicesFactory,
     ) {
     }
 
@@ -112,6 +112,7 @@ public function addConfiguration(NodeDefinition $builder): void
             ->defaultNull()
             ->end()
             ->scalarNode('options_storage')
+            ->setDeprecated('web-auth/webauthn-symfony-bundle', '5.2.0', 'The child node "%node%" at path "%path%" is deprecated. Please use the root option "options_storage" instead.')
             ->defaultValue(self::DEFAULT_SESSION_STORAGE_SERVICE)
             ->end()
             ->scalarNode('success_handler')
@@ -232,7 +233,6 @@ public function createAuthenticator(
             $config['success_handler'],
             $config['failure_handler'],
             $firewallConfigId,
-            $config['options_storage'],
             $authenticatorAssertionResponseValidatorId,
             $authenticatorAttestationResponseValidatorId
         );
@@ -256,7 +256,6 @@ private function createAuthenticatorService(
         string $successHandlerId,
         string $failureHandlerId,
         string $firewallConfigId,
-        string $optionsStorageId,
         string $authenticatorAssertionResponseValidatorId,
         string $authenticatorAttestationResponseValidatorId
     ): string {
@@ -267,7 +266,6 @@ private function createAuthenticatorService(
             ->replaceArgument(1, new Reference($userProviderId))
             ->replaceArgument(2, new Reference($successHandlerId))
             ->replaceArgument(3, new Reference($failureHandlerId))
-            ->replaceArgument(4, new Reference($optionsStorageId))
             ->replaceArgument(8, new Reference($authenticatorAssertionResponseValidatorId))
             ->replaceArgument(9, new Reference($authenticatorAttestationResponseValidatorId))
             ->addMethodCall('setLogger', [new Reference('webauthn.logger')]);
@@ -295,10 +293,10 @@ private function createAssertionControllersAndRoutes(
             $config['authentication']['routes']['options_path'],
             $config['authentication']['routes']['host'],
             $optionsBuilderId,
-            $config['options_storage'],
             $config['authentication']['options_handler'],
             $config['failure_handler'],
         );
+        if ($config['authentication']['routes']['result_path'] !== null) {
         $this->createResponseControllerAndRoute(
             $container,
             $firewallName,
@@ -307,6 +305,7 @@ private function createAssertionControllersAndRoutes(
             $config['authentication']['routes']['result_path'],
             $config['authentication']['routes']['host']
         );
+        }
     }
 
     /**
@@ -329,10 +328,10 @@ private function createAttestationControllersAndRoutes(
             $config['registration']['routes']['options_path'],
             $config['registration']['routes']['host'],
             $optionsBuilderId,
-            $config['options_storage'],
             $config['registration']['options_handler'],
             $config['failure_handler'],
         );
+        if ($config['registration']['routes']['result_path'] !== null) {
         $this->createResponseControllerAndRoute(
             $container,
             $firewallName,
@@ -341,6 +340,7 @@ private function createAttestationControllersAndRoutes(
             $config['registration']['routes']['result_path'],
             $config['registration']['routes']['host']
         );
+        }
     }
 
     private function createAssertionRequestControllerAndRoute(
@@ -350,15 +350,13 @@ private function createAssertionRequestControllerAndRoute(
         string $path,
         ?string $host,
         string $optionsBuilderId,
-        string $optionsStorageId,
         string $optionsHandlerId,
         string $failureHandlerId,
     ): void {
         $controller = (new Definition(AssertionRequestController::class))
             ->setFactory([new Reference(AssertionControllerFactory::class), 'createRequestController'])
             ->setArguments([
                 new Reference($optionsBuilderId),
-                new Reference($optionsStorageId),
                 new Reference($optionsHandlerId),
                 new Reference($failureHandlerId),
             ]);
@@ -381,7 +379,6 @@ private function createAttestationRequestControllerAndRoute(
         string $path,
         ?string $host,
         string $optionsBuilderId,
-        string $optionsStorageId,
         string $optionsHandlerId,
         string $failureHandlerId,
     ): void {
@@ -390,7 +387,6 @@ private function createAttestationRequestControllerAndRoute(
             ->setArguments([
                 new Reference($optionsBuilderId),
                 new Reference(RequestBodyUserEntityGuesser::class),
-                new Reference($optionsStorageId),
                 new Reference($optionsHandlerId),
                 new Reference($failureHandlerId),
                 true,