fix: fix deprecated calls [skip ci] (#457)

asbiin · web-flow · commit 00dfcc5dfdbe · 2023-10-01T13:55:01.000+02:00
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "illuminate/support": "^9.0 || ^10.0",
         "psr/http-factory-implementation": "1.0",
         "web-auth/cose-lib": "^4.0",
-        "web-auth/webauthn-lib": "^4.0",
+        "web-auth/webauthn-lib": "^4.7.1",
         "web-token/jwt-signature": "^3.0"
     },
     "conflict": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" beStrictAboutTestsThatDoNotTestAnything="true" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="true" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage/>
   <testsuites>
     <testsuite name="LaravelSabre Tests Suite">
       <directory suffix="Test.php">./tests</directory>
@@ -15,4 +11,9 @@
     <env name="APP_KEY" value="base64:uA/XEme0vpegJz/rKSk3ys2uzEfXZA0Ca2P0e1M8vRU="/>
     <env name="DB_CONNECTION" value="testbench"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Models/WebauthnKey.php b/src/Models/WebauthnKey.php
@@ -90,23 +90,23 @@ public function publicKeyCredentialSource(): Attribute
                 $this->counter
             ),
             set: function (PublicKeyCredentialSource $value, array $attributes = null): array {
-                if (((string) Arr::get($attributes, 'user_id')) !== $value->getUserHandle()) {
+                if (((string) Arr::get($attributes, 'user_id')) !== $value->userHandle) {
                     throw new WrongUserHandleException();
                 }
 
                 // Set value to attributes using casts
-                $this->credentialId = $value->getPublicKeyCredentialId();
-                $this->transports = $value->getTransports();
-                $this->trustPath = $value->getTrustPath();
-                $this->aaguid = $value->getAaguid();
-                $this->credentialPublicKey = $value->getCredentialPublicKey();
-                $this->counter = $value->getCounter();
+                $this->credentialId = $value->publicKeyCredentialId;
+                $this->transports = $value->transports;
+                $this->trustPath = $value->trustPath;
+                $this->aaguid = $value->aaguid;
+                $this->credentialPublicKey = $value->credentialPublicKey;
+                $this->counter = $value->counter;
 
                 return [
                     'credentialId' => $this->attributes['credentialId'],
-                    'type' => $value->getType(),
+                    'type' => $value->type,
                     'transports' => $this->attributes['transports'],
-                    'attestationType' => $value->getAttestationType(),
+                    'attestationType' => $value->attestationType,
                     'trustPath' => $this->attributes['trustPath'],
                     'aaguid' => $this->attributes['aaguid'],
                     'credentialPublicKey' => $this->attributes['credentialPublicKey'],
diff --git a/src/Services/Webauthn/CreationOptionsFactory.php b/src/Services/Webauthn/CreationOptionsFactory.php
@@ -40,16 +40,16 @@ public function __construct(
      */
     public function __invoke(User $user): PublicKeyCredentialCreationOptions
     {
-        $publicKey = (new PublicKeyCredentialCreationOptions(
+        $publicKey = new PublicKeyCredentialCreationOptions(
             $this->publicKeyCredentialRpEntity,
             $this->getUserEntity($user),
             $this->getChallenge(),
-            $this->createCredentialParameters()
-        ))
-            ->setTimeout($this->timeout)
-            ->excludeCredentials(...$this->getExcludedCredentials($user))
-            ->setAuthenticatorSelection($this->authenticatorSelectionCriteria)
-            ->setAttestation($this->attestationConveyance);
+            $this->createCredentialParameters(),
+            $this->authenticatorSelectionCriteria,
+            $this->attestationConveyance,
+            $this->getExcludedCredentials($user),
+            $this->timeout
+        );
 
         $this->cache->put($this->cacheKey($user), $publicKey->jsonSerialize(), $this->timeout);
 
diff --git a/src/Services/Webauthn/CredentialAssertionValidator.php b/src/Services/Webauthn/CredentialAssertionValidator.php
@@ -65,22 +65,20 @@ protected function pullPublicKey(User $user): PublicKeyCredentialRequestOptions
      */
     protected function getResponse(PublicKeyCredential $publicKeyCredential): AuthenticatorAssertionResponse
     {
-        $response = $publicKeyCredential->getResponse();
-
         // Check if the response is an Authenticator Assertion Response
-        if (! $response instanceof AuthenticatorAssertionResponse) {
+        if (! $publicKeyCredential->response instanceof AuthenticatorAssertionResponse) {
             throw new ResponseMismatchException('Not an authenticator attestation response');
         }
 
-        return $response;
+        return $publicKeyCredential->response;
     }
 
     /**
      * Get credential source from user and public key.
      */
     protected function getCredentialSource(User $user, PublicKeyCredential $publicKeyCredential)
     {
-        $credentialId = $publicKeyCredential->getRawId();
+        $credentialId = $publicKeyCredential->rawId;
 
         return (Webauthn::model())::where('user_id', $user->getAuthIdentifier())
             ->where(fn ($query) => $query->where('credentialId', Base64UrlSafe::encode($credentialId))
diff --git a/src/Services/Webauthn/CredentialAttestationValidator.php b/src/Services/Webauthn/CredentialAttestationValidator.php
@@ -60,13 +60,11 @@ protected function pullPublicKey(User $user): PublicKeyCredentialCreationOptions
      */
     protected function getResponse(PublicKeyCredential $publicKeyCredential): AuthenticatorAttestationResponse
     {
-        $response = $publicKeyCredential->getResponse();
-
         // Check if the response is an Authenticator Attestation Response
-        if (! $response instanceof AuthenticatorAttestationResponse) {
+        if (! $publicKeyCredential->response instanceof AuthenticatorAttestationResponse) {
             throw new ResponseMismatchException('Not an authenticator attestation response');
         }
 
-        return $response;
+        return $publicKeyCredential->response;
     }
 }
diff --git a/src/Services/Webauthn/CredentialValidator.php b/src/Services/Webauthn/CredentialValidator.php
@@ -29,7 +29,7 @@ protected function cacheKey(User $user): string
             [
                 self::CACHE_PUBLICKEY_REQUEST,
                 get_class($user).':'.$user->getAuthIdentifier(),
-                hash('sha512', $this->request->getHost().'|'.$this->request->ip()),
+                hash('sha512', $this->request->host().'|'.$this->request->ip()),
             ]
         );
     }
diff --git a/src/Services/Webauthn/RequestOptionsFactory.php b/src/Services/Webauthn/RequestOptionsFactory.php
@@ -33,11 +33,13 @@ public function __construct(
      */
     public function __invoke(User $user): PublicKeyCredentialRequestOptions
     {
-        $publicKey = (new PublicKeyCredentialRequestOptions($this->getChallenge()))
-            ->setTimeout($this->timeout)
-            ->allowCredentials(...$this->getAllowedCredentials($user))
-            ->setRpId($this->getRpId())
-            ->setUserVerification($this->userVerification);
+        $publicKey = new PublicKeyCredentialRequestOptions(
+            $this->getChallenge(),
+            $this->getRpId(),
+            $this->getAllowedCredentials($user),
+            $this->userVerification,
+            $this->timeout
+        );
 
         $this->cache->put($this->cacheKey($user), $publicKey->jsonSerialize(), $this->timeout);
 
@@ -69,6 +71,6 @@ private function getAllowedCredentials(User $user): array
      */
     private function getRpId(): ?string
     {
-        return $this->publicKeyCredentialRpEntity->getId();
+        return $this->publicKeyCredentialRpEntity->id;
     }
 }
diff --git a/src/WebauthnServiceProvider.php b/src/WebauthnServiceProvider.php
@@ -169,9 +169,8 @@ protected function bindWebAuthnPackage(): void
             AttestationObjectLoader::class,
             fn ($app) => tap(new AttestationObjectLoader(
                 $app[AttestationStatementSupportManager::class]
-            ), function ($loader) use ($app) {
-                $loader->setLogger($app['webauthn.log']);
-            })
+            ), fn (AttestationObjectLoader $loader) => $loader->setLogger($app['webauthn.log'])
+            )
         );
 
         $this->app->bind(
@@ -186,50 +185,43 @@ protected function bindWebAuthnPackage(): void
                 null,
                 null,
                 $app[ExtensionOutputCheckerHandler::class]
-            ), function ($responseValidator) use ($app) {
-                $responseValidator->setLogger($app['webauthn.log']);
-            })
+            ), fn (AuthenticatorAttestationResponseValidator $responseValidator) => $responseValidator->setLogger($app['webauthn.log'])
+            )
         );
         $this->app->bind(
             AuthenticatorAssertionResponseValidator::class,
-            fn ($app) => tap(new AuthenticatorAssertionResponseValidator(
+            fn ($app) => tap((new AuthenticatorAssertionResponseValidator(
                 null,
                 null,
                 $app[ExtensionOutputCheckerHandler::class],
                 $app[CoseAlgorithmManager::class]
-            ), function ($responseValidator) use ($app) {
-                $responseValidator->setCounterChecker($app[CounterChecker::class])
-                    ->setLogger($app['webauthn.log']);
-            })
+            ))
+                ->setCounterChecker($app[CounterChecker::class]), fn (AuthenticatorAssertionResponseValidator $responseValidator) => $responseValidator->setLogger($app['webauthn.log'])
+            )
         );
         $this->app->bind(
             AuthenticatorSelectionCriteria::class,
-            fn ($app) => tap(new AuthenticatorSelectionCriteria(), function ($authenticatorSelectionCriteria) use ($app) {
-                $authenticatorSelectionCriteria
-                    ->setAuthenticatorAttachment($app['config']->get('webauthn.attachment_mode', 'null'))
-                    ->setUserVerification($app['config']->get('webauthn.user_verification', 'preferred'));
-
-                if (($userless = $app['config']->get('webauthn.userless')) !== null) {
-                    $authenticatorSelectionCriteria->setResidentKey($userless);
-                }
-            })
+            fn ($app) => new AuthenticatorSelectionCriteria(
+                $app['config']->get('webauthn.attachment_mode', 'null'),
+                $app['config']->get('webauthn.user_verification', 'preferred'),
+                $app['config']->get('webauthn.userless')
+            )
         );
 
         $this->app->bind(
             PublicKeyCredentialRpEntity::class,
             fn ($app) => new PublicKeyCredentialRpEntity(
                 $app['config']->get('app.name', 'Laravel'),
-                $app->make('request')->getHost(),
+                $app->make('request')->host(),
                 $app['config']->get('webauthn.icon')
             )
         );
         $this->app->bind(
             PublicKeyCredentialLoader::class,
             fn ($app) => tap(new PublicKeyCredentialLoader(
                 $app[AttestationObjectLoader::class]
-            ), function ($loader) use ($app) {
-                $loader->setLogger($app['webauthn.log']);
-            })
+            ), fn (PublicKeyCredentialLoader $loader) => $loader->setLogger($app['webauthn.log'])
+            )
         );
 
         $this->app->bind(
@@ -348,14 +340,13 @@ protected function bindPsrInterfaces(): void
 
     private function passwordLessWebauthn(): void
     {
-        $this->app['auth']->provider('webauthn', function ($app, array $config) {
-            return new EloquentWebAuthnProvider(
-                $app['config'],
-                $app[CredentialAssertionValidator::class],
-                $app[Hasher::class],
-                $config['model']
-            );
-        });
+        $this->app['auth']->provider('webauthn', fn ($app, array $config) => new EloquentWebAuthnProvider(
+            $app['config'],
+            $app[CredentialAssertionValidator::class],
+            $app[Hasher::class],
+            $config['model']
+        )
+        );
     }
 
     /**
diff --git a/tests/Unit/Models/WebauthnKeyTest.php b/tests/Unit/Models/WebauthnKeyTest.php
@@ -42,14 +42,14 @@ public function test_deserialize_data()
 
         $publicKeyCredentialSource = $webauthnKey->publicKeyCredentialSource;
 
-        $this->assertEquals('a', $publicKeyCredentialSource->getPublicKeyCredentialId());
-        $this->assertEquals('b', $publicKeyCredentialSource->getType());
-        $this->assertEquals([], $publicKeyCredentialSource->getTransports());
-        $this->assertEquals('38195f59-0e5b-4ebf-be46-75664177eeee', $publicKeyCredentialSource->getAaguid());
-        $this->assertEquals('e', $publicKeyCredentialSource->getCredentialPublicKey());
-        $this->assertEquals('0', $publicKeyCredentialSource->getUserHandle());
-        $this->assertEquals(0, $publicKeyCredentialSource->getCounter());
-        $this->assertEquals('c', $publicKeyCredentialSource->getAttestationType());
-        $this->assertInstanceOf(\Webauthn\TrustPath\EmptyTrustPath::class, $publicKeyCredentialSource->getTrustPath());
+        $this->assertEquals('a', $publicKeyCredentialSource->publicKeyCredentialId);
+        $this->assertEquals('b', $publicKeyCredentialSource->type);
+        $this->assertEquals([], $publicKeyCredentialSource->transports);
+        $this->assertEquals('38195f59-0e5b-4ebf-be46-75664177eeee', $publicKeyCredentialSource->aaguid);
+        $this->assertEquals('e', $publicKeyCredentialSource->credentialPublicKey);
+        $this->assertEquals('0', $publicKeyCredentialSource->userHandle);
+        $this->assertEquals(0, $publicKeyCredentialSource->counter);
+        $this->assertEquals('c', $publicKeyCredentialSource->attestationType);
+        $this->assertInstanceOf(\Webauthn\TrustPath\EmptyTrustPath::class, $publicKeyCredentialSource->trustPath);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,22 +65,20 @@ protected function pullPublicKey(User $user): PublicKeyCredentialRequestOptions`
`65`	`65`	`*/`
`66`	`66`	`protected function getResponse(PublicKeyCredential $publicKeyCredential): AuthenticatorAssertionResponse`
`67`	`67`	`{`
`68`		`- $response = $publicKeyCredential->getResponse();`
`69`		`-`
`70`	`68`	`// Check if the response is an Authenticator Assertion Response`
`71`		`- if (! $response instanceof AuthenticatorAssertionResponse) {`
	`69`	`+ if (! $publicKeyCredential->response instanceof AuthenticatorAssertionResponse) {`
`72`	`70`	`throw new ResponseMismatchException('Not an authenticator attestation response');`
`73`	`71`	`}`
`74`	`72`
`75`		`- return $response;`
	`73`	`+ return $publicKeyCredential->response;`
`76`	`74`	`}`
`77`	`75`
`78`	`76`	`/**`
`79`	`77`	`* Get credential source from user and public key.`
`80`	`78`	`*/`
`81`	`79`	`protected function getCredentialSource(User $user, PublicKeyCredential $publicKeyCredential)`
`82`	`80`	`{`
`83`		`- $credentialId = $publicKeyCredential->getRawId();`
	`81`	`+ $credentialId = $publicKeyCredential->rawId;`
`84`	`82`
`85`	`83`	`return (Webauthn::model())::where('user_id', $user->getAuthIdentifier())`
`86`	`84`	`->where(fn ($query) => $query->where('credentialId', Base64UrlSafe::encode($credentialId))`
Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,11 @@ protected function pullPublicKey(User $user): PublicKeyCredentialCreationOptions`
`60`	`60`	`*/`
`61`	`61`	`protected function getResponse(PublicKeyCredential $publicKeyCredential): AuthenticatorAttestationResponse`
`62`	`62`	`{`
`63`		`- $response = $publicKeyCredential->getResponse();`
`64`		`-`
`65`	`63`	`// Check if the response is an Authenticator Attestation Response`
`66`		`- if (! $response instanceof AuthenticatorAttestationResponse) {`
	`64`	`+ if (! $publicKeyCredential->response instanceof AuthenticatorAttestationResponse) {`
`67`	`65`	`throw new ResponseMismatchException('Not an authenticator attestation response');`
`68`	`66`	`}`
`69`	`67`
`70`		`- return $response;`
	`68`	`+ return $publicKeyCredential->response;`
`71`	`69`	`}`
`72`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected function cacheKey(User $user): string`
`29`	`29`	`[`
`30`	`30`	`self::CACHE_PUBLICKEY_REQUEST,`
`31`	`31`	`get_class($user).':'.$user->getAuthIdentifier(),`
`32`		`- hash('sha512', $this->request->getHost().'\|'.$this->request->ip()),`
	`32`	`+ hash('sha512', $this->request->host().'\|'.$this->request->ip()),`
`33`	`33`	`]`
`34`	`34`	`);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,13 @@ public function __construct(`
`33`	`33`	`*/`
`34`	`34`	`public function __invoke(User $user): PublicKeyCredentialRequestOptions`
`35`	`35`	`{`
`36`		`- $publicKey = (new PublicKeyCredentialRequestOptions($this->getChallenge()))`
`37`		`- ->setTimeout($this->timeout)`
`38`		`- ->allowCredentials(...$this->getAllowedCredentials($user))`
`39`		`- ->setRpId($this->getRpId())`
`40`		`- ->setUserVerification($this->userVerification);`
	`36`	`+ $publicKey = new PublicKeyCredentialRequestOptions(`
	`37`	`+ $this->getChallenge(),`
	`38`	`+ $this->getRpId(),`
	`39`	`+ $this->getAllowedCredentials($user),`
	`40`	`+ $this->userVerification,`
	`41`	`+ $this->timeout`
	`42`	`+ );`
`41`	`43`
`42`	`44`	`$this->cache->put($this->cacheKey($user), $publicKey->jsonSerialize(), $this->timeout);`
`43`	`45`
`@@ -69,6 +71,6 @@ private function getAllowedCredentials(User $user): array`
`69`	`71`	`*/`
`70`	`72`	`private function getRpId(): ?string`
`71`	`73`	`{`
`72`		`- return $this->publicKeyCredentialRpEntity->getId();`
	`74`	`+ return $this->publicKeyCredentialRpEntity->id;`
`73`	`75`	`}`
`74`	`76`	`}`