feat: Support Laravel 10.0, and remove TokenBindingHandler (#419)

Author: asbiin

.github/workflows/static.yml

@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
 
     steps:
       - name: Checkout sources

.github/workflows/tests.yml

@@ -28,8 +28,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1']
-        laravel-version: [9.*]
+        php-version: ['8.1','8.2']
+        laravel-version: [9.*,10.*]
         psr7: ['guzzle']
         include:
           - php-version: '8.1'
@@ -38,6 +38,12 @@ jobs:
           - php-version: '8.1'
             laravel-version: '9.*'
             psr7: 'discovery'
+          - php-version: '8.2'
+            laravel-version: '10.*'
+            psr7: 'nyholm'
+          - php-version: '8.2'
+            laravel-version: '10.*'
+            psr7: 'discovery'
 
     steps:
       - name: Checkout sources
@@ -47,7 +53,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          coverage: none
+          coverage: pcov
           extensions: sqlite3, gmp
       - name: Check PHP Version
         run: php -v
@@ -97,7 +103,7 @@ jobs:
           composer update --no-interaction --no-progress --prefer-dist
 
       - name: Run test suite
-        run: phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --log-junit ./results/results_${{ matrix.psr7 }}.xml --coverage-clover ./results/coverage_${{ matrix.psr7 }}.xml
+        run: vendor/bin/phpunit -c phpunit.xml --log-junit ./results/results_${{ matrix.psr7 }}.xml --coverage-clover ./results/coverage_${{ matrix.psr7 }}.xml
 
       - name: Fix results files
         run: sed -i -e "s%$GITHUB_WORKSPACE/%%g" *.xml
@@ -119,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
 
     steps:
       - name: Checkout repository

.gitignore

@@ -1,4 +1,5 @@
 /vendor/
 /results/
 .phpunit.result.cache
+.phpunit.cache
 composer.lock

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "illuminate/support": "^9.0",
+        "illuminate/support": "^9.0 || ^10.0",
         "psr/http-factory-implementation": "1.0",
         "thecodingmachine/safe": "^2.0",
         "web-auth/cose-lib": "^4.0",
@@ -34,11 +34,11 @@
         "laravel/legacy-factories": "^1.0",
         "nunomaduro/larastan": "^2.0",
         "ocramius/package-versions": "^2.0",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0 || ^8.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^9.5",
         "thecodingmachine/phpstan-safe-rule": "^1.0"
     },
     "suggest": {

src/WebauthnServiceProvider.php

@@ -59,8 +59,6 @@
 use Webauthn\PublicKeyCredentialLoader;
 use Webauthn\PublicKeyCredentialRpEntity;
 use Webauthn\PublicKeyCredentialSourceRepository;
-use Webauthn\TokenBinding\IgnoreTokenBindingHandler;
-use Webauthn\TokenBinding\TokenBindingHandler;
 
 class WebauthnServiceProvider extends ServiceProvider
 {
@@ -138,7 +136,6 @@ public function registerResponseBindings()
     protected function bindWebAuthnPackage(): void
     {
         $this->app->bind(PublicKeyCredentialSourceRepository::class, CredentialRepository::class);
-        $this->app->bind(TokenBindingHandler::class, IgnoreTokenBindingHandler::class);
 
         $this->app->bind(
             PackedAttestationStatementSupport::class,
@@ -184,10 +181,11 @@ protected function bindWebAuthnPackage(): void
         );
         $this->app->bind(
             AttestationObjectLoader::class,
-            fn ($app) => (new AttestationObjectLoader(
+            fn ($app) => tap(new AttestationObjectLoader(
                     $app[AttestationStatementSupportManager::class]
-                ))
-                    ->setLogger($app['log'])
+            ), function ($loader) use ($app) {
+                $loader->setLogger($app['log']);
+            })
         );
 
         $this->app->bind(
@@ -197,24 +195,26 @@ protected function bindWebAuthnPackage(): void
 
         $this->app->bind(
             AuthenticatorAttestationResponseValidator::class,
-            fn ($app) => (new AuthenticatorAttestationResponseValidator(
+            fn ($app) => tap(new AuthenticatorAttestationResponseValidator(
                     $app[AttestationStatementSupportManager::class],
                     $app[PublicKeyCredentialSourceRepository::class],
-                    $app[TokenBindingHandler::class],
+                    null,
                     $app[ExtensionOutputCheckerHandler::class]
-                ))
-                ->setLogger($app['log'])
+            ), function ($responseValidator) use ($app) {
+                $responseValidator->setLogger($app['log']);
+            })
         );
         $this->app->bind(
             AuthenticatorAssertionResponseValidator::class,
-            fn ($app) => (new AuthenticatorAssertionResponseValidator(
+            fn ($app) => tap(new AuthenticatorAssertionResponseValidator(
                     $app[PublicKeyCredentialSourceRepository::class],
-                    $app[TokenBindingHandler::class],
+                    null,
                     $app[ExtensionOutputCheckerHandler::class],
                     $app[CoseAlgorithmManager::class]
-                ))
-                ->setCounterChecker($app[CounterChecker::class])
-                ->setLogger($app['log'])
+            ), function ($responseValidator) use ($app) {
+                $responseValidator->setCounterChecker($app[CounterChecker::class])
+                    ->setLogger($app['log']);
+            })
         );
         $this->app->bind(
             AuthenticatorSelectionCriteria::class,
@@ -239,10 +239,11 @@ protected function bindWebAuthnPackage(): void
         );
         $this->app->bind(
             PublicKeyCredentialLoader::class,
-            fn ($app) => (new PublicKeyCredentialLoader(
+            fn ($app) => tap(new PublicKeyCredentialLoader(
                     $app[AttestationObjectLoader::class]
-                ))
-                    ->setLogger($app['log'])
+            ), function ($loader) use ($app) {
+                $loader->setLogger($app['log']);
+            })
         );
 
         $this->app->bind(

tests/Unit/Models/Casts/Base64Test.php

@@ -21,7 +21,7 @@ public function it_deserialize_credentialId($credentialId, $expected)
         $this->assertEquals($expected, (new Base64)->set($webauthnKey, 'credentialId', $bin, []));
     }
 
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             [

tests/Unit/Services/WebauthnTest.php

@@ -127,7 +127,7 @@ public function test_do_authenticate()
                     'origin' => 'https://localhost',
                     'tokenBinding' => [
                         'status' => 'supported',
-                        'id' => 'id',
+                        'id' => Base64UrlSafe::encodeUnpadded(1),
                     ],
                 ])),
                 'authenticatorData' => Base64UrlSafe::encodeUnpadded(
@@ -148,7 +148,7 @@ public function test_do_authenticate()
             ],
         ];
 
-        $this->expectException(\Assert\InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $result = Webauthn::validateAssertion($user, $data);
 
         $this->assertTrue($result); // Not yet ...
@@ -186,7 +186,7 @@ private function getAttestationData($publicKey)
                     'origin' => 'https://localhost',
                     'tokenBinding' => [
                         'status' => 'supported',
-                        'id' => 'id',
+                        'id' => Base64UrlSafe::encodeUnpadded(1),
                     ],
                 ])),
                 'attestationObject' => Base64UrlSafe::encodeUnpadded((string) (new MapObject([