simplesamlphp / simplesamlphp-module-webauthn

lib/Controller/WebAuthn.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
         $frontendData = [];
         $frontendData['challengeEncoded'] = $challengeEncoded;
         $frontendData['state'] = [];
-        foreach (['Source', 'FIDO2Scope','FIDO2Username','FIDO2Displayname','requestTokenModel'] as $stateItem) {
+        foreach (['Source', 'FIDO2Scope', 'FIDO2Username', 'FIDO2Displayname', 'requestTokenModel'] as $stateItem) {
             $frontendData['state'][$stateItem] = $state[$stateItem];
         }
 

lib/Controller/AuthProcess.php

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 
         if ($debugEnabled) {
             $response = new StreamedResponse();
-            $response->setCallback(function ($authObject, $state) {
+            $response->setCallback(function($authObject, $state) {
                 echo $authObject->getDebugBuffer();
                 echo $authObject->getValidateBuffer();
                 echo "Debug mode, not continuing to " . ($state['FIDO2WantsRegister'] ? "credential registration page." : "destination.");

Indentation +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
             'private'          => false,
         ]);
         $response->setExpires(new DateTime('Thu, 19 Nov 1981 08:52:00 GMT'));
-        */
+         */
 
         return $response;
     }

lib/Controller/RegProcess.php

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
         $id = $this->authState::saveState($state, 'webauthn:request');
         if ($debugEnabled === true) {
             $response = new StreamedResponse();
-            $response->setCallback(function ($regObject, $id) {
+            $response->setCallback(function($regObject, $id) {
                 echo $regObject->getDebugBuffer();
                 echo $regObject->getValidateBuffer();
                 echo "<form id='regform' method='POST' action='" .

Indentation +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
             'private'          => false,
         ]);
         $response->setExpires(new DateTime('Thu, 19 Nov 1981 08:52:00 GMT'));
-        */
+         */
 
         return $response;
     }

lib/Controller/ManageToken.php

Indentation +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
             'private'          => false,
         ]);
         $response->setExpires(new DateTime('Thu, 19 Nov 1981 08:52:00 GMT'));
-        */
+         */
 
         return $response;
     }

lib/WebAuthn/WebAuthnRegistrationEvent.php

Indentation +52 added lines, -52 removed lines

@@ -118,9 +118,9 @@ 
             case "android-safetynet":
                 $this->validateAttestationFormatAndroidSafetyNet($attestationArray);
                 break;
-	    case "apple":
-		$this->validateAttestationFormatApple($attestationArray);
-		break;
+        case "apple":
+        $this->validateAttestationFormatApple($attestationArray);
+        break;
             case "tpm":
             case "android-key":
                 $this->fail("Attestation format " . $attestationArray['fmt'] . " validation not supported right now.");
@@ -158,9 +158,9 @@ 
     private function validateAttestationFormatApple(array $attestationArray): void
     {
 
-	// found at: https://www.apple.com/certificateauthority/private/
+    // found at: https://www.apple.com/certificateauthority/private/
 
-	$APPLE_WEBAUTHN_ROOT_CA = "-----BEGIN CERTIFICATE-----
+    $APPLE_WEBAUTHN_ROOT_CA = "-----BEGIN CERTIFICATE-----
 MIICEjCCAZmgAwIBAgIQaB0BbHo84wIlpQGUKEdXcTAKBggqhkjOPQQDAzBLMR8w
 HQYDVQQDDBZBcHBsZSBXZWJBdXRobiBSb290IENBMRMwEQYDVQQKDApBcHBsZSBJ
 bmMuMRMwEQYDVQQIDApDYWxpZm9ybmlhMB4XDTIwMDMxODE4MjEzMloXDTQ1MDMx
@@ -175,66 +175,66 @@ 
 1bWeT0vT
 -----END CERTIFICATE-----";
         // § 8.8 Bullet 1 of the draft spec at https://pr-preview.s3.amazonaws.com/alanwaketan/webauthn/pull/1491.html#sctn-apple-anonymous-attestation
-	// draft implemented in state of 11 Feb 2021
+    // draft implemented in state of 11 Feb 2021
 
-	// I can't help but notice that the verification procedure does NOTHING with CA certs from the chain, nor is there a root to validate to!
-	// Found the root CA with Google, see above, and will perform chain validation even if the spec doesn't say so.
+    // I can't help but notice that the verification procedure does NOTHING with CA certs from the chain, nor is there a root to validate to!
+    // Found the root CA with Google, see above, and will perform chain validation even if the spec doesn't say so.
 
-	// first, clear the openssl error backlog. We might need error data in case things go sideways.
-	while(openssl_error_string() !== false);
+    // first, clear the openssl error backlog. We might need error data in case things go sideways.
+    while(openssl_error_string() !== false);
 
         $stmtDecoded = $attestationArray['attStmt'];
-	if (!isset($stmtDecoded['x5c'])) {
-		$this->fail("Apple attestation statement does not contain an x5c attestation statement!");
-	}
-	// § 8.8 Bullet 2
+    if (!isset($stmtDecoded['x5c'])) {
+        $this->fail("Apple attestation statement does not contain an x5c attestation statement!");
+    }
+    // § 8.8 Bullet 2
         $nonceToHash = $attestationArray['authData'] . $this->clientDataHash;
-	// § 8.8 Bullet 3
-	$nonce = hash("sha256", $nonceToHash, TRUE); // does raw_output have to be FALSE or TRUE?
+    // § 8.8 Bullet 3
+    $nonce = hash("sha256", $nonceToHash, TRUE); // does raw_output have to be FALSE or TRUE?
         $certProps = openssl_x509_parse(Utils\Crypto::der2pem($stmtDecoded['x5c'][0]));	
-	// § 8.8 Bullet 4
+    // § 8.8 Bullet 4
         if (
-           !isset($certProps['extensions']['1.2.840.113635.100.8.2'])
+            !isset($certProps['extensions']['1.2.840.113635.100.8.2'])
            || empty($certProps['extensions']['1.2.840.113635.100.8.2'])
                 ) {
                     $this->fail( "The required nonce value is not present in the OID." );
                 }
-	$toCompare = substr($certProps['extensions']['1.2.840.113635.100.8.2'], 6);
-	if ($nonce != $toCompare) {
-		$this->fail("There is a mismatch between the nonce and the OID (XXX $nonce XXX , XXX $toCompare XXX ).");
-	}
-
-	// chain validation first
-	foreach ( $stmtDecoded['x5c'] as $runIndex => $runCert ) {
-		if (isset($stmtDecoded['x5c'][$runIndex + 1])) { // there is a next cert, so follow the chain
-			$certResource = openssl_x509_read(Utils\Crypto::der2pem($runCert));
-			$signerPubKey = openssl_pkey_get_public(Utils\Crypto::der2pem($stmtDecoded['x5c'][$runIndex + 1]));
-			if (openssl_x509_verify($certResource, $signerPubKey) != 1) {
-				$this->fail("Error during chain validation of the attestation certificate (while validating cert #$runIndex, which is "
+    $toCompare = substr($certProps['extensions']['1.2.840.113635.100.8.2'], 6);
+    if ($nonce != $toCompare) {
+        $this->fail("There is a mismatch between the nonce and the OID (XXX $nonce XXX , XXX $toCompare XXX ).");
+    }
+
+    // chain validation first
+    foreach ( $stmtDecoded['x5c'] as $runIndex => $runCert ) {
+        if (isset($stmtDecoded['x5c'][$runIndex + 1])) { // there is a next cert, so follow the chain
+            $certResource = openssl_x509_read(Utils\Crypto::der2pem($runCert));
+            $signerPubKey = openssl_pkey_get_public(Utils\Crypto::der2pem($stmtDecoded['x5c'][$runIndex + 1]));
+            if (openssl_x509_verify($certResource, $signerPubKey) != 1) {
+                $this->fail("Error during chain validation of the attestation certificate (while validating cert #$runIndex, which is "
                                     . Utils\Crypto::der2pem($runCert)
                                     . "; next cert was "
                                     . Utils\Crypto::der2pem($stmtDecoded['x5c'][$runIndex + 1]));
-			}
-		} else { // last cert, compare to the root
-			$certResource = openssl_x509_read(Utils\Crypto::der2pem($runCert));
-			$signerPubKey = openssl_pkey_get_public($APPLE_WEBAUTHN_ROOT_CA);
-			if (openssl_x509_verify($certResource, $signerPubKey) != 1) {
+            }
+        } else { // last cert, compare to the root
+            $certResource = openssl_x509_read(Utils\Crypto::der2pem($runCert));
+            $signerPubKey = openssl_pkey_get_public($APPLE_WEBAUTHN_ROOT_CA);
+            if (openssl_x509_verify($certResource, $signerPubKey) != 1) {
                                 $this->fail("Error during root CA validation of the attestation chain certificate, which is ".Utils\Crypto::der2pem($runCert));
                         }
-		}
-	}
+        }
+    }
 
         $keyResource = openssl_pkey_get_public(Utils\Crypto::der2pem($stmtDecoded['x5c'][0]));
         if ($keyResource === FALSE) {
-		$this->fail("Did not get a parseable X.509 structure out of the Apple attestation statement - x5c nr. 0 statement was: XXX "
+        $this->fail("Did not get a parseable X.509 structure out of the Apple attestation statement - x5c nr. 0 statement was: XXX "
                     . $stmtDecoded['x5c'][0]
                     . " XXX; PEM equivalent is "
                     . Utils\Crypto::der2pem($stmtDecoded['x5c'][0])
                     . ". OpenSSL error: "
                     . openssl_error_string()
                     );
-	}
-	// $this->credential is a public key in CBOR, not "PEM". We need to convert it first.
+    }
+    // $this->credential is a public key in CBOR, not "PEM". We need to convert it first.
         $keyArray = $this->cborDecode(hex2bin($this->credential));
         $keyObject = new Ec2Key($keyArray);
         $credentialResource = openssl_pkey_get_public($keyObject->asPEM());
@@ -248,20 +248,20 @@ 
                     . openssl_error_string()
                     );
         }
-	// § 8.8 Bullet 5
-	$credentialDetails = openssl_pkey_get_details($credentialResource);
-	$keyDetails = openssl_pkey_get_details($keyResource);
-	if ( $credentialDetails['bits'] != $keyDetails['bits'] ||
+    // § 8.8 Bullet 5
+    $credentialDetails = openssl_pkey_get_details($credentialResource);
+    $keyDetails = openssl_pkey_get_details($keyResource);
+    if ( $credentialDetails['bits'] != $keyDetails['bits'] ||
              $credentialDetails['key']  != $keyDetails['key']  ||
              $credentialDetails['type'] != $keyDetails['type'] ) { 
-		$this->fail("The credential public key does not match the certificate public key in attestationData. ("
-              . $credentialDetails['key'] 
-              . " - "
-              . $keyDetails['key'] 
-              . ")");
-	}
-	$this->pass("Apple attestation format verification passed.");
-	return;
+        $this->fail("The credential public key does not match the certificate public key in attestationData. ("
+                . $credentialDetails['key'] 
+                . " - "
+                . $keyDetails['key'] 
+                . ")");
+    }
+    $this->pass("Apple attestation format verification passed.");
+    return;
     }
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -181,7 +181,7 @@ 
 	// Found the root CA with Google, see above, and will perform chain validation even if the spec doesn't say so.
 
 	// first, clear the openssl error backlog. We might need error data in case things go sideways.
-	while(openssl_error_string() !== false);
+	while (openssl_error_string() !== false);
 
         $stmtDecoded = $attestationArray['attStmt'];
 	if (!isset($stmtDecoded['x5c'])) {
@@ -197,7 +197,7 @@ 
            !isset($certProps['extensions']['1.2.840.113635.100.8.2'])
            || empty($certProps['extensions']['1.2.840.113635.100.8.2'])
                 ) {
-                    $this->fail( "The required nonce value is not present in the OID." );
+                    $this->fail("The required nonce value is not present in the OID.");
                 }
 	$toCompare = substr($certProps['extensions']['1.2.840.113635.100.8.2'], 6);
 	if ($nonce != $toCompare) {
@@ -205,7 +205,7 @@ 
 	}
 
 	// chain validation first
-	foreach ( $stmtDecoded['x5c'] as $runIndex => $runCert ) {
+	foreach ($stmtDecoded['x5c'] as $runIndex => $runCert) {
 		if (isset($stmtDecoded['x5c'][$runIndex + 1])) { // there is a next cert, so follow the chain
 			$certResource = openssl_x509_read(Utils\Crypto::der2pem($runCert));
 			$signerPubKey = openssl_pkey_get_public(Utils\Crypto::der2pem($stmtDecoded['x5c'][$runIndex + 1]));
@@ -219,7 +219,7 @@ 
 			$certResource = openssl_x509_read(Utils\Crypto::der2pem($runCert));
 			$signerPubKey = openssl_pkey_get_public($APPLE_WEBAUTHN_ROOT_CA);
 			if (openssl_x509_verify($certResource, $signerPubKey) != 1) {
-                                $this->fail("Error during root CA validation of the attestation chain certificate, which is ".Utils\Crypto::der2pem($runCert));
+                                $this->fail("Error during root CA validation of the attestation chain certificate, which is " . Utils\Crypto::der2pem($runCert));
                         }
 		}
 	}
@@ -251,9 +251,9 @@ 
 	// § 8.8 Bullet 5
 	$credentialDetails = openssl_pkey_get_details($credentialResource);
 	$keyDetails = openssl_pkey_get_details($keyResource);
-	if ( $credentialDetails['bits'] != $keyDetails['bits'] ||
-             $credentialDetails['key']  != $keyDetails['key']  ||
-             $credentialDetails['type'] != $keyDetails['type'] ) { 
+	if ($credentialDetails['bits'] != $keyDetails['bits'] ||
+             $credentialDetails['key'] != $keyDetails['key'] ||
+             $credentialDetails['type'] != $keyDetails['type']) { 
 		$this->fail("The credential public key does not match the certificate public key in attestationData. ("
               . $credentialDetails['key'] 
               . " - "

lib/Auth/Process/WebAuthn.php

Indentation +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
             $this->stateData->scope = $moduleConfig['scope'];
         }
 
-	// Set the derived scope so we can compare it to the sent host at a later point
-	$httpUtils = new Utils\HTTP();
+    // Set the derived scope so we can compare it to the sent host at a later point
+    $httpUtils = new Utils\HTTP();
         $baseurl = $httpUtils->getSelfHost();
         $hostname = parse_url($baseurl, PHP_URL_HOST);
         if ($hostname !== null) {

lib/WebAuthn/StaticProcessHelper.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public static function saveStateAndRedirect(array &$state): void
     {
         $id = Auth\State::saveState($state, 'webauthn:request');
-	$url = Module::getModuleURL('webauthn/webauthn');
+    $url = Module::getModuleURL('webauthn/webauthn');
         $httpUtils = new Utils\HTTP();
         $httpUtils->redirectTrustedURL($url, ['StateId' => $id]);
     }