feat: remove deprecated AndroidSafetynet (#489)

asbiin · web-flow · commit bb5070b5fda8 · 2024-07-21T21:31:42.000+02:00
diff --git a/config/webauthn.php b/config/webauthn.php
@@ -216,18 +216,6 @@
 
     'attestation_conveyance' => 'none',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Google Safetynet ApiKey
-    |--------------------------------------------------------------------------
-    |
-    | Api key to use Google Safetynet.
-    | See https://developer.android.com/training/safetynet/attestation
-    |
-    */
-
-    'google_safetynet_api_key' => env('GOOGLE_SAFETYNET_API_KEY'),
-
     /*
     |--------------------------------------------------------------------------
     | Webauthn Public Key Credential Parameters
diff --git a/src/Actions/AttemptToAuthenticate.php b/src/Actions/AttemptToAuthenticate.php
@@ -20,8 +20,7 @@ class AttemptToAuthenticate
     public function __construct(
         protected StatefulGuard $guard,
         protected LoginRateLimiter $limiter
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the incoming request.
diff --git a/src/Actions/EnsureLoginIsNotThrottled.php b/src/Actions/EnsureLoginIsNotThrottled.php
@@ -15,8 +15,7 @@ class EnsureLoginIsNotThrottled
      */
     public function __construct(
         protected LoginRateLimiter $limiter
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the incoming request.
diff --git a/src/Actions/LoginUserRetrieval.php b/src/Actions/LoginUserRetrieval.php
@@ -18,8 +18,7 @@ class LoginUserRetrieval
      */
     public function __construct(
         protected LoginRateLimiter $limiter
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the incoming request.
diff --git a/src/Actions/PrepareAuthenticatedSession.php b/src/Actions/PrepareAuthenticatedSession.php
@@ -13,8 +13,7 @@ class PrepareAuthenticatedSession
      */
     public function __construct(
         protected LoginRateLimiter $limiter
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the incoming request.
diff --git a/src/Events/WebauthnLogin.php b/src/Events/WebauthnLogin.php
@@ -19,6 +19,5 @@ class WebauthnLogin
     public function __construct(
         public User $user,
         public bool $eloquent = false
-    ) {
-    }
+    ) {}
 }
diff --git a/src/Events/WebauthnLoginData.php b/src/Events/WebauthnLoginData.php
@@ -20,6 +20,5 @@ class WebauthnLoginData
     public function __construct(
         public User $user,
         public PublicKeyCredentialRequestOptions $publicKey
-    ) {
-    }
+    ) {}
 }
diff --git a/src/Events/WebauthnRegister.php b/src/Events/WebauthnRegister.php
@@ -17,6 +17,5 @@ class WebauthnRegister
      */
     public function __construct(
         public Model $webauthnKey
-    ) {
-    }
+    ) {}
 }
diff --git a/src/Events/WebauthnRegisterData.php b/src/Events/WebauthnRegisterData.php
@@ -20,6 +20,5 @@ class WebauthnRegisterData
     public function __construct(
         public User $user,
         public PublicKeyCredentialCreationOptions $publicKey
-    ) {
-    }
+    ) {}
 }
diff --git a/src/Events/WebauthnRegisterFailed.php b/src/Events/WebauthnRegisterFailed.php
@@ -20,6 +20,5 @@ class WebauthnRegisterFailed
     public function __construct(
         public User $user,
         public ?Exception $exception = null
-    ) {
-    }
+    ) {}
 }
diff --git a/src/Exceptions/ResponseMismatchException.php b/src/Exceptions/ResponseMismatchException.php
@@ -7,6 +7,4 @@
 /**
  * Exception thrown if the response type is wrong.
  */
-class ResponseMismatchException extends RuntimeException
-{
-}
+class ResponseMismatchException extends RuntimeException {}
diff --git a/src/Exceptions/WrongUserHandleException.php b/src/Exceptions/WrongUserHandleException.php
@@ -7,6 +7,4 @@
 /**
  * Exception thrown if the user handle is wrong.
  */
-class WrongUserHandleException extends RuntimeException
-{
-}
+class WrongUserHandleException extends RuntimeException {}
diff --git a/src/Http/Middleware/WebauthnMiddleware.php b/src/Http/Middleware/WebauthnMiddleware.php
@@ -15,8 +15,7 @@ class WebauthnMiddleware
      */
     public function __construct(
         protected AuthFactory $auth
-    ) {
-    }
+    ) {}
 
     /**
      * Handle an incoming request.
diff --git a/src/Http/Responses/LockoutResponse.php b/src/Http/Responses/LockoutResponse.php
@@ -15,8 +15,7 @@ class LockoutResponse implements LockoutResponseContract
      */
     public function __construct(
         protected LoginRateLimiter $limiter
-    ) {
-    }
+    ) {}
 
     /**
      * Create an HTTP response that represents the object.
diff --git a/src/Models/Casts/TrustPath.php b/src/Models/Casts/TrustPath.php
@@ -3,8 +3,8 @@
 namespace LaravelWebauthn\Models\Casts;
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\TrustPath\TrustPath as TrustPathLib;
-use Webauthn\TrustPath\TrustPathLoader;
 
 /**
  * @implements CastsAttributes<TrustPathLib,string>
@@ -19,7 +19,7 @@ class TrustPath implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes): ?TrustPathLib
     {
-        return $value !== null ? TrustPathLoader::loadTrustPath(json_decode($value, true, flags: JSON_THROW_ON_ERROR)) : null;
+        return $value !== null ? app(SerializerInterface::class)->deserialize($value, TrustPathLib::class, 'json') : null;
     }
 
     /**
diff --git a/src/Services/LoginRateLimiter.php b/src/Services/LoginRateLimiter.php
@@ -13,8 +13,7 @@ class LoginRateLimiter
      */
     public function __construct(
         protected RateLimiter $limiter
-    ) {
-    }
+    ) {}
 
     /**
      * Get the number of attempts for the given key.
diff --git a/src/Services/Webauthn/CredentialValidator.php b/src/Services/Webauthn/CredentialValidator.php
@@ -16,8 +16,7 @@ abstract class CredentialValidator
     public function __construct(
         protected Request $request,
         protected Cache $cache
-    ) {
-    }
+    ) {}
 
     /**
      * Returns the cache key to remember the challenge for the user.
diff --git a/src/WebauthnServiceProvider.php b/src/WebauthnServiceProvider.php
@@ -41,7 +41,6 @@
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\AttestationStatement\AndroidKeyAttestationStatementSupport;
-use Webauthn\AttestationStatement\AndroidSafetyNetAttestationStatementSupport;
 use Webauthn\AttestationStatement\AppleAttestationStatementSupport;
 use Webauthn\AttestationStatement\AttestationObjectLoader;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
@@ -130,15 +129,6 @@ protected function bindWebAuthnPackage(): void
                 $app[CoseAlgorithmManager::class]
             )
         );
-        $this->app->bind(
-            AndroidSafetyNetAttestationStatementSupport::class,
-            fn ($app) => (new AndroidSafetyNetAttestationStatementSupport())
-                ->enableApiVerification(
-                    $app[ClientInterface::class],
-                    $app['config']->get('webauthn.google_safetynet_api_key'),
-                    $app[RequestFactoryInterface::class]
-                )
-        );
         $this->app->bind(
             AttestationStatementSupportManager::class,
             fn ($app) => tap(new AttestationStatementSupportManager(), function ($manager) use ($app) {
@@ -157,11 +147,6 @@ protected function bindWebAuthnPackage(): void
                 // https://www.w3.org/TR/webauthn/#sctn-packed-attestation
                 $manager->add($app[PackedAttestationStatementSupport::class]);
 
-                // https://www.w3.org/TR/webauthn/#sctn-android-safetynet-attestation
-                if ($app['config']->get('webauthn.google_safetynet_api_key') !== null) {
-                    $manager->add($app[AndroidSafetyNetAttestationStatementSupport::class]);
-                }
-
                 // https://www.w3.org/TR/webauthn/#sctn-apple-anonymous-attestation
                 $manager->add($app[AppleAttestationStatementSupport::class]);
             })
@@ -182,10 +167,8 @@ protected function bindWebAuthnPackage(): void
         $this->app->bind(
             AuthenticatorAttestationResponseValidator::class,
             fn ($app) => tap(new AuthenticatorAttestationResponseValidator(
-                $app[AttestationStatementSupportManager::class],
-                null,
-                null,
-                $app[ExtensionOutputCheckerHandler::class]
+                attestationStatementSupportManager: $app[AttestationStatementSupportManager::class],
+                extensionOutputCheckerHandler: $app[ExtensionOutputCheckerHandler::class]
             ), fn (AuthenticatorAttestationResponseValidator $responseValidator) => $responseValidator->setLogger($app['webauthn.log'])
             )
         );
diff --git a/tests/Unit/Services/WebauthnTest.php b/tests/Unit/Services/WebauthnTest.php
@@ -289,6 +289,4 @@ public function it_creates_model_anyway()
     }
 }
 
-class WebauthnKeyTest extends WebauthnKey
-{
-}
+class WebauthnKeyTest extends WebauthnKey {}

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,5 @@ class WebauthnLogin`
`19`	`19`	`public function __construct(`
`20`	`20`	`public User $user,`
`21`	`21`	`public bool $eloquent = false`
`22`		`- ) {`
`23`		`- }`
	`22`	`+ ) {}`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,5 @@ class WebauthnLoginData`
`20`	`20`	`public function __construct(`
`21`	`21`	`public User $user,`
`22`	`22`	`public PublicKeyCredentialRequestOptions $publicKey`
`23`		`- ) {`
`24`		`- }`
	`23`	`+ ) {}`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,5 @@ class WebauthnRegister`
`17`	`17`	`*/`
`18`	`18`	`public function __construct(`
`19`	`19`	`public Model $webauthnKey`
`20`		`- ) {`
`21`		`- }`
	`20`	`+ ) {}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,5 @@ class WebauthnRegisterData`
`20`	`20`	`public function __construct(`
`21`	`21`	`public User $user,`
`22`	`22`	`public PublicKeyCredentialCreationOptions $publicKey`
`23`		`- ) {`
`24`		`- }`
	`23`	`+ ) {}`
`25`	`24`	`}`