Merge pull request #628 from web-auth/temp-ac12ed

Merge up 4.9.x to 5.0.x

.gitsplit.yml

@@ -9,5 +9,5 @@ splits:
     target: "https://${GH_TOKEN}@github.com/web-auth/webauthn-metadata-service.git"
 
 origins:
-  - ^\d+\.\d+\.x$
-  - ^\d+\.\d+\.\d+$
+  - ^(1|2|3|4)\.\d+\.x$
+  - ^(1|2|3|4)\.\d+\.\d+$

src/metadata-service/composer.json

@@ -2,7 +2,7 @@
     "name": "web-auth/metadata-service",
     "type": "library",
     "license": "MIT",
-    "description": "Metadata Service for FIDO2/Webauthn",
+    "description": "[DEPRECATED] Please use 'web-auth/webauthn-lib' instead",
     "keywords": [
         "FIDO",
         "FIDO2",
@@ -20,36 +20,12 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "ext-json": "*",
-        "lcobucci/clock": "^2.2|^3.0",
-        "paragonie/constant_time_encoding": "^2.6|^3.0",
-        "psr/clock": "^1.0",
-        "psr/event-dispatcher": "^1.0",
-        "psr/http-client": "^1.0",
-        "psr/http-factory": "^1.0",
-        "psr/log": "^1.0|^2.0|^3.0",
-        "spomky-labs/pki-framework": "^1.0",
-        "symfony/deprecation-contracts": "^3.2"
-    },
-    "autoload": {
-        "psr-4": {
-            "Webauthn\\MetadataService\\": "src/"
-        }
+        "web-auth/webauthn-lib": "^4.9"
     },
     "extra": {
         "thanks": {
             "name": "web-auth/webauthn-framework",
             "url": "https://github.com/web-auth/webauthn-framework"
         }
-    },
-    "suggest": {
-        "symfony/serializer": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-        "symfony/property-access": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-        "symfony/property-info": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-        "phpdocumentor/reflection-docblock": "As of 4.5.x, the phpdocumentor/reflection-docblock component will become mandatory for converting objects such as the Metadata Statement",
-        "psr/clock-implementation": "As of 4.5.x, the PSR Clock implementation will replace lcobucci/clock",
-        "psr/log-implementation": "Recommended to receive logs from the library",
-        "web-token/jwt-library": "Mandatory for fetching Metadata Statement from distant sources"
     }
 }

src/symfony/src/DependencyInjection/WebauthnExtension.php

@@ -46,10 +46,10 @@
 use Webauthn\CeremonyStep\CeremonyStepManagerFactory;
 use Webauthn\CeremonyStep\TopOriginValidator;
 use Webauthn\Counter\CounterChecker;
+use Webauthn\Event\CanDispatchEvents;
 use Webauthn\FakeCredentialGenerator;
 use Webauthn\MetadataService\CanLogData;
 use Webauthn\MetadataService\CertificateChain\CertificateChainValidator;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
 use Webauthn\MetadataService\MetadataStatementRepository;
 use Webauthn\MetadataService\StatusReportRepository;
 use Webauthn\PublicKeyCredentialSourceRepository;

src/symfony/src/Resources/config/services.php

@@ -40,16 +40,16 @@
 use Webauthn\Denormalizer\AuthenticatorDataDenormalizer;
 use Webauthn\Denormalizer\AuthenticatorResponseDenormalizer;
 use Webauthn\Denormalizer\CollectedClientDataDenormalizer;
+use Webauthn\Denormalizer\ExtensionDescriptorDenormalizer;
 use Webauthn\Denormalizer\PublicKeyCredentialDenormalizer;
 use Webauthn\Denormalizer\PublicKeyCredentialDescriptorNormalizer;
 use Webauthn\Denormalizer\PublicKeyCredentialOptionsDenormalizer;
 use Webauthn\Denormalizer\PublicKeyCredentialSourceDenormalizer;
 use Webauthn\Denormalizer\PublicKeyCredentialUserEntityDenormalizer;
+use Webauthn\Denormalizer\VerificationMethodANDCombinationsDenormalizer;
 use Webauthn\Denormalizer\WebauthnSerializerFactory;
 use Webauthn\FakeCredentialGenerator;
-use Webauthn\MetadataService\Denormalizer\ExtensionDescriptorDenormalizer;
 use Webauthn\MetadataService\Denormalizer\MetadataStatementSerializerFactory;
-use Webauthn\MetadataService\Denormalizer\VerificationMethodANDCombinationsDenormalizer;
 use Webauthn\PublicKeyCredentialLoader;
 use Webauthn\PublicKeyCredentialSourceRepository;
 use Webauthn\SimpleFakeCredentialGenerator;
@@ -286,7 +286,13 @@
     $container->set(WebauthnSerializerFactory::class)
         ->args([service(AttestationStatementSupportManager::class)])
     ;
-    $container->set(MetadataStatementSerializerFactory::class);
+    $container->set(MetadataStatementSerializerFactory::class)
+        ->deprecate(
+            'web-auth/webauthn-symfony-bundle',
+            '4.9.0',
+            '%service_id% is deprecated since 4.9.0 and will be removed in 5.0.0'
+        )
+    ;
     $container->set(DefaultFailureHandler::class);
     $container->set(DefaultSuccessHandler::class);
 };

src/symfony/src/Service/PublicKeyCredentialCreationOptionsFactory.php

@@ -11,8 +11,8 @@
 use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\AuthenticatorSelectionCriteria;
 use Webauthn\Bundle\Event\PublicKeyCredentialCreationOptionsCreatedEvent;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\PublicKeyCredentialCreationOptions;
 use Webauthn\PublicKeyCredentialDescriptor;
 use Webauthn\PublicKeyCredentialParameters;

src/symfony/src/Service/PublicKeyCredentialRequestOptionsFactory.php

@@ -10,8 +10,8 @@
 use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\Bundle\Event\PublicKeyCredentialRequestOptionsCreatedEvent;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\PublicKeyCredentialDescriptor;
 use Webauthn\PublicKeyCredentialRequestOptions;
 use function array_key_exists;

src/webauthn/composer.json

@@ -24,15 +24,18 @@
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-mbstring": "*",
+        "lcobucci/clock": "^2.2|^3.0",
         "paragonie/constant_time_encoding": "^2.6|^3.0",
+        "psr/clock": "^1.0",
         "psr/event-dispatcher": "^1.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
         "spomky-labs/cbor-php": "^3.0",
+        "spomky-labs/pki-framework": "^1.0",
         "symfony/uid": "^6.1|^7.0",
-        "web-auth/cose-lib": "^4.2.3",
-        "web-auth/metadata-service": "self.version"
+        "symfony/deprecation-contracts": "^3.2",
+        "web-auth/cose-lib": "^4.2.3"
     },
     "autoload": {
         "psr-4": {
@@ -51,6 +54,8 @@
         "symfony/property-info": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
         "phpdocumentor/reflection-docblock": "As of 4.5.x, the phpdocumentor/reflection-docblock component will become mandatory for converting objects such as the Metadata Statement",
         "psr/log-implementation": "Recommended to receive logs from the library",
-        "symfony/event-dispatcher": "Recommended to use dispatched events"
+        "symfony/event-dispatcher": "Recommended to use dispatched events",
+        "psr/clock-implementation": "As of 4.5.x, the PSR Clock implementation will replace lcobucci/clock",
+        "web-token/jwt-library": "Mandatory for fetching Metadata Statement from distant sources"
     }
 }

src/webauthn/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php

@@ -16,12 +16,12 @@
 use SpomkyLabs\Pki\ASN1\Type\Tagged\ExplicitTagging;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
 use function array_key_exists;

src/webauthn/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php

@@ -28,13 +28,13 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\Exception\UnsupportedFeatureException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\TrustPath\CertificateTrustPath;
 use function array_key_exists;
 use function count;

src/webauthn/src/AttestationStatement/AppleAttestationStatementSupport.php

@@ -12,12 +12,12 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
 use function array_key_exists;

src/webauthn/src/AttestationStatement/AttestationObjectLoader.php

@@ -12,10 +12,10 @@
 use Throwable;
 use Webauthn\AuthenticatorDataLoader;
 use Webauthn\Event\AttestationObjectLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\InvalidDataException;
 use Webauthn\MetadataService\CanLogData;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\StringStream;
 use Webauthn\Util\Base64;
 use function array_key_exists;

src/webauthn/src/AttestationStatement/FidoU2FAttestationStatementSupport.php

@@ -11,12 +11,12 @@
 use Throwable;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
 use function array_key_exists;

src/webauthn/src/AttestationStatement/NoneAttestationStatementSupport.php

@@ -7,9 +7,9 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\TrustPath\EmptyTrustPath;
 use function count;
 use function is_array;

src/webauthn/src/AttestationStatement/PackedAttestationStatementSupport.php

@@ -13,14 +13,14 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\Exception\InvalidDataException;
 use Webauthn\Exception\UnsupportedFeatureException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
 use Webauthn\TrustPath\EcdaaKeyIdTrustPath;

src/webauthn/src/AttestationStatement/TPMAttestationStatementSupport.php

@@ -20,13 +20,13 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\Exception\UnsupportedFeatureException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
 use Webauthn\TrustPath\EcdaaKeyIdTrustPath;

src/webauthn/src/AuthenticatorAssertionResponseValidator.php

@@ -16,10 +16,10 @@
 use Webauthn\Counter\CounterChecker;
 use Webauthn\Event\AuthenticatorAssertionResponseValidationFailedEvent;
 use Webauthn\Event\AuthenticatorAssertionResponseValidationSucceededEvent;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 use Webauthn\MetadataService\CanLogData;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\TokenBinding\TokenBindingHandler;
 use function is_string;
 

src/webauthn/src/AuthenticatorAttestationResponseValidator.php

@@ -15,11 +15,11 @@
 use Webauthn\CeremonyStep\CeremonyStepManagerFactory;
 use Webauthn\Event\AuthenticatorAttestationResponseValidationFailedEvent;
 use Webauthn\Event\AuthenticatorAttestationResponseValidationSucceededEvent;
+use Webauthn\Event\CanDispatchEvents;
+use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 use Webauthn\MetadataService\CanLogData;
 use Webauthn\MetadataService\CertificateChain\CertificateChainValidator;
-use Webauthn\MetadataService\Event\CanDispatchEvents;
-use Webauthn\MetadataService\Event\NullEventDispatcher;
 use Webauthn\MetadataService\MetadataStatementRepository;
 use Webauthn\MetadataService\StatusReportRepository;
 use Webauthn\TokenBinding\TokenBindingHandler;

src/webauthn/src/Denormalizer/AttestedCredentialDataNormalizer.php

@@ -14,6 +14,9 @@ final class AttestedCredentialDataNormalizer implements NormalizerInterface, Nor
 {
     use NormalizerAwareTrait;
 
+    /**
+     * @return array<string, mixed>
+     */
     public function normalize(mixed $data, ?string $format = null, array $context = []): array
     {
         assert($data instanceof AttestedCredentialData);

src/webauthn/src/Denormalizer/AuthenticationExtensionNormalizer.php

@@ -20,6 +20,9 @@ public function getSupportedTypes(?string $format): array
         ];
     }
 
+    /**
+     * @return array<mixed>
+     */
     public function normalize(mixed $data, ?string $format = null, array $context = []): array
     {
         assert($data instanceof AuthenticationExtension);