Add missing tests

Author: nguereza-tony

src/Attestation/AttestationData.php

@@ -85,23 +85,13 @@ public function __construct(string $binary, array $allowedFormats)
             throw new WebauthnException('Invalid attestation format provided (attStmt not available)');
         }
 
-        if (! array_key_exists('authData', $enc) || ! $enc['authData'] instanceof ByteBuffer) {
-            throw new WebauthnException('Invalid attestation format provided (authData not available)');
-        }
-
         $this->formatName = $enc['fmt'];
-        $this->authenticatorData = new AuthenticatorData($enc['authData']->getBinaryString());
 
-        if (! in_array($this->formatName, $allowedFormats)) {
-            throw new WebauthnException(sprintf(
-                'Invalid attestation format [%s], allowed [%s]',
-                $this->formatName,
-                implode(', ', $allowedFormats)
-            ));
-        }
+        // Set attestation data
+        $this->setAuthenticatorData($enc);
 
         // Create attestation format based on the provided format name
-        $this->createAttestationFormat($enc);
+        $this->createAttestationFormat($enc, $allowedFormats);
     }
 
     /**
@@ -238,13 +228,36 @@ protected function getCertificateInfo(string $type): string
         return $result;
     }
 
+    /**
+     * Set the authenticator data
+     * @param array<string|int, mixed> $enc
+     * @return void
+     */
+    protected function setAuthenticatorData(array $enc): void
+    {
+        if (! array_key_exists('authData', $enc) || ! $enc['authData'] instanceof ByteBuffer) {
+            throw new WebauthnException('Invalid attestation format provided (authData not available)');
+        }
+
+        $this->authenticatorData = new AuthenticatorData($enc['authData']->getBinaryString());
+    }
+
     /**
      * Create the attestation format
-     * @param array<string, mixed> $enc the encoded data
+     * @param array<string|int, mixed> $enc the encoded data
+     * @param array<string> $allowedFormats the allowed format
      * @return void
      */
-    protected function createAttestationFormat(array $enc): void
+    protected function createAttestationFormat(array $enc, array $allowedFormats): void
     {
+        if (! in_array($this->formatName, $allowedFormats)) {
+            throw new WebauthnException(sprintf(
+                'Invalid attestation format [%s], allowed [%s]',
+                $this->formatName,
+                implode(', ', $allowedFormats)
+            ));
+        }
+
         switch ($this->formatName) {
             case KeyFormat::FIDO_U2FA:
                 $this->format = new FidoU2F($enc, $this->authenticatorData);

src/Attestation/Format/FidoU2F.php

@@ -100,7 +100,7 @@ public function __construct(
         }
 
         if (! $attestationStatement['x5c'][0] instanceof ByteBuffer) {
-            throw new WebauthnException('Invalid X5C certificate');
+            throw new WebauthnException('Invalid X5C certificate must be Byte Buffer)');
         }
 
         $this->signature = $attestationStatement['sig']->getBinaryString();
@@ -114,7 +114,7 @@ public function getCertificatePem(): string
     {
         $pem = '-----BEGIN CERTIFICATE-----' . "\n";
         $pem .= chunk_split(base64_encode($this->x5c), 64, "\n");
-        $pem = '-----END CERTIFICATE-----' . "\n";
+        $pem .= '-----END CERTIFICATE-----' . "\n";
 
         return $pem;
     }

src/Attestation/Format/Packed.php

@@ -78,10 +78,7 @@ public function __construct(
             ! array_key_exists('alg', $attestationStatement) ||
             $this->getCoseAlgorithm($attestationStatement['alg']) === null
         ) {
-            throw new WebauthnException(sprintf(
-                'Unsupported algorithm [%d]',
-                $attestationStatement['alg']
-            ));
+            throw new WebauthnException('Unsupported algorithm or not provided');
         }
 
         if (

src/Entity/CredentialPublicKey.php

@@ -125,14 +125,8 @@ public function __construct(string $binaryData, int $offset, int &$endOffset)
         $this->kty = $enc[self::COSE_KTY];
         $this->alg = $enc[self::COSE_ALG];
 
-        switch ($this->alg) {
-            case self::EC2_ES256:
-                $this->createES256($enc);
-                break;
-            case self::RSA_RS256:
-                $this->createRSA256($enc);
-                break;
-        }
+        // Update properties
+        $this->create($enc);
     }
 
     /**
@@ -207,6 +201,23 @@ public function jsonSerialize()
         return get_object_vars($this);
     }
 
+    /**
+     * Update properties based on the given data received
+     * @param array<string, mixed> $enc
+     * @return void
+     */
+    protected function create(array $enc): void
+    {
+        switch ($this->alg) {
+            case self::EC2_ES256:
+                $this->createES256($enc);
+                break;
+            case self::RSA_RS256:
+                $this->createRSA256($enc);
+                break;
+        }
+    }
+
     /**
      * Create for ES256
      * @param array<string|int, mixed> $enc

src/Webauthn.php

@@ -329,21 +329,21 @@ public function processRegistration(
             $this->signatureCounter = $signCount;
         }
 
-        // prepare data to store for future logins
+        // Prepare data to store for future logins
         $data = [
             'rp_id' => $this->relyingParty->getId(),
             'attestation_format' => $attestation->getFormatName(),
             'credential_id' => bin2hex($attestation->getAuthenticatorData()->getCredentialId()),
             'credential_public_key' => $attestation->getAuthenticatorData()->getPublicKeyPEM(),
-            'certificate_chain' => $attestation->getCertificateChain(),
-            'certificate' => $attestation->getCertificatePem(),
-            'certificate_issuer' => $attestation->getCertificateIssuer(),
-            'certificate_subject' => $attestation->getCertificateSubject(),
-            'root_certificate_valid' => $isRootValid,
+            'cert_chain' => $attestation->getCertificateChain(),
+            'cert' => $attestation->getCertificatePem(),
+            'cert_issuer' => $attestation->getCertificateIssuer(),
+            'cert_subject' => $attestation->getCertificateSubject(),
+            'is_root_cert_valid' => $isRootValid,
             'signature_counter' => $this->signatureCounter,
             'aaguid' => bin2hex($attestation->getAuthenticatorData()->getAaguid()),
-            'user_present' => $userPresent,
-            'user_verified' => $userVerified,
+            'is_user_present' => $userPresent,
+            'is_user_verified' => $userVerified,
         ];