Bugs (#197)

web-auth · Nov 21, 2021 · 8761be6 · 8761be6
1 parent c72ad01
commit 8761be6
Show file tree

Hide file tree

Showing 61 changed files with 81 additions and 84 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "psr/log": "^1.1",
         "ramsey/uuid": "^3.8|^4.0",
         "spomky-labs/base64url": "^2.0",
-        "spomky-labs/cbor-php": "^1.1|^2.0",
+        "spomky-labs/cbor-php": "^1.0|^2.0",
         "symfony/process": "^3.0|^4.0|^5.0",
         "thecodingmachine/safe": "^1.1",
         "web-auth/cose-lib": "self.version",

diff --git a/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php b/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php b/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -231,13 +231,13 @@ private function getResponseBody(ResponseInterface $response): string
     {
         $responseBody = '';
         $response->getBody()->rewind();
-        do {
+        while (true) {
             $tmp = $response->getBody()->read(1024);
             if ('' === $tmp) {
                 break;
             }
             $responseBody .= $tmp;
-        } while (true);
+        }
 
         return $responseBody;
     }

diff --git a/src/AttestationStatement/AppleAttestationStatementSupport.php b/src/AttestationStatement/AppleAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/AttestationObject.php b/src/AttestationStatement/AttestationObject.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/AttestationObjectLoader.php b/src/AttestationStatement/AttestationObjectLoader.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/AttestationStatement.php b/src/AttestationStatement/AttestationStatement.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/AttestationStatementSupport.php b/src/AttestationStatement/AttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/AttestationStatementSupportManager.php b/src/AttestationStatement/AttestationStatementSupportManager.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/FidoU2FAttestationStatementSupport.php b/src/AttestationStatement/FidoU2FAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/NoneAttestationStatementSupport.php b/src/AttestationStatement/NoneAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/PackedAttestationStatementSupport.php b/src/AttestationStatement/PackedAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestationStatement/TPMAttestationStatementSupport.php b/src/AttestationStatement/TPMAttestationStatementSupport.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AttestedCredentialData.php b/src/AttestedCredentialData.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/AuthenticationExtension.php b/src/AuthenticationExtensions/AuthenticationExtension.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php b/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php b/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php b/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/ExtensionOutputChecker.php b/src/AuthenticationExtensions/ExtensionOutputChecker.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/ExtensionOutputCheckerHandler.php b/src/AuthenticationExtensions/ExtensionOutputCheckerHandler.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticationExtensions/ExtensionOutputError.php b/src/AuthenticationExtensions/ExtensionOutputError.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorAssertionResponse.php b/src/AuthenticatorAssertionResponse.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorAssertionResponseValidator.php b/src/AuthenticatorAssertionResponseValidator.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorAttestationResponse.php b/src/AuthenticatorAttestationResponse.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorAttestationResponseValidator.php b/src/AuthenticatorAttestationResponseValidator.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorData.php b/src/AuthenticatorData.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorResponse.php b/src/AuthenticatorResponse.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/AuthenticatorSelectionCriteria.php b/src/AuthenticatorSelectionCriteria.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/CertificateChainChecker/CertificateChainChecker.php b/src/CertificateChainChecker/CertificateChainChecker.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/CertificateChainChecker/OpenSSLCertificateChainChecker.php b/src/CertificateChainChecker/OpenSSLCertificateChainChecker.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/CertificateToolbox.php b/src/CertificateToolbox.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/CollectedClientData.php b/src/CollectedClientData.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Counter/CounterChecker.php b/src/Counter/CounterChecker.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Counter/ThrowExceptionIfInvalid.php b/src/Counter/ThrowExceptionIfInvalid.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Credential.php b/src/Credential.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/PublicKeyCredential.php b/src/PublicKeyCredential.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/PublicKeyCredentialCreationOptions.php b/src/PublicKeyCredentialCreationOptions.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -212,18 +212,17 @@ public static function createFromArray(array $json): PublicKeyCredentialOptions
             }
         }
 
-        return self
-            ::create(
+        return self::create(
                 PublicKeyCredentialRpEntity::createFromArray($json['rp']),
                 PublicKeyCredentialUserEntity::createFromArray($json['user']),
                 Base64Url::decode($json['challenge']),
                 $pubKeyCredParams
             )
-                ->excludeCredentials($excludeCredentials)
-                ->setAuthenticatorSelection(AuthenticatorSelectionCriteria::createFromArray($json['authenticatorSelection']))
-                ->setAttestation($json['attestation'])
-                ->setTimeout($json['timeout'] ?? null)
-                ->setExtensions(isset($json['extensions']) ? AuthenticationExtensionsClientInputs::createFromArray($json['extensions']) : new AuthenticationExtensionsClientInputs())
+            ->excludeCredentials($excludeCredentials)
+            ->setAuthenticatorSelection(AuthenticatorSelectionCriteria::createFromArray($json['authenticatorSelection']))
+            ->setAttestation($json['attestation'])
+            ->setTimeout($json['timeout'] ?? null)
+            ->setExtensions(isset($json['extensions']) ? AuthenticationExtensionsClientInputs::createFromArray($json['extensions']) : new AuthenticationExtensionsClientInputs())
         ;
     }
 

diff --git a/src/PublicKeyCredentialDescriptor.php b/src/PublicKeyCredentialDescriptor.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/PublicKeyCredentialDescriptorCollection.php b/src/PublicKeyCredentialDescriptorCollection.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2020 Spomky-Labs
+ * Copyright (c) 2014-2021 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.