simplesamlphp / simplesamlphp-module-webauthn

templates/webauthn.tpl.php

Spacing +11 added lines, -11 removed lines

@@ -9,21 +9,21 @@ 
 
     <h1><?php echo htmlspecialchars($this->t('{webauthn:webauthn:heading1}')); ?></h1>
     <h2><?php echo htmlspecialchars($this->t('{webauthn:webauthn:accountEnabled}')); ?></h2>
-    <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) > 0): ?>
+    <?php if ((isset($this->data['FIDO2Tokens']) ? ((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable) ?count($this->data['FIDO2Tokens']) : strlen($this->data['FIDO2Tokens'])) : 0) > 0) : ?>
         <div id="currentTokens">
             <span id='tokencaption'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:tokenList}')); ?></span>
             <ul>
-                <?php foreach($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
-                    <?php if($this->data['FIDO2AuthSuccessful'] == false or $this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
+                <?php foreach ($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
+                    <?php if ($this->data['FIDO2AuthSuccessful'] == false or $this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
                         <li class='othertoken'><?php echo htmlspecialchars($this->data['token'][3]); ?></li>
                     <?php else: ?>
                         <li class='currenttoken'><?php echo htmlspecialchars($this->data['token'][3]); ?> <?php echo htmlspecialchars($this->t('{webauthn:webauthn:currentToken}')); ?></li>
                     <?php endif; ?>
-                <?php endforeach;?>
+                <?php endforeach; ?>
             </ul>
         </div>
     <?php endif; ?>
-    <?php if((isset($this->data['regURL'])?((is_array($this->data['regURL']) || $this->data['regURL'] instanceof Countable)?count($this->data['regURL']):strlen($this->data['regURL'])):0) > 0): ?>
+    <?php if ((isset($this->data['regURL']) ? ((is_array($this->data['regURL']) || $this->data['regURL'] instanceof Countable) ?count($this->data['regURL']) : strlen($this->data['regURL'])) : 0) > 0) : ?>
         <form id='regform' method='POST' action='<?php echo $this->data['regURL']; ?>'>
             <input type='hidden' id='resp' name='response_id' value='0'/>
             <input type='hidden' id='data' name='attestation_client_data_json' value='nix'/>
@@ -36,9 +36,9 @@ 
                 value='<?php echo htmlspecialchars($this->t('{webauthn:webauthn:newTokenDefaultName}')); ?> <?php echo htmlspecialchars((new DateTime("now"))->format('Y-m-d')); ?>' />
         </form>
         <div class='space'></div>
-        <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) > 0): ?>
-            <?php foreach($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
-                <?php if($this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
+        <?php if ((isset($this->data['FIDO2Tokens']) ? ((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable) ?count($this->data['FIDO2Tokens']) : strlen($this->data['FIDO2Tokens'])) : 0) > 0) : ?>
+            <?php foreach ($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
+                <?php if ($this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
                     <form class='deleteform' id='delete-<?php echo htmlspecialchars($index); ?>' method='POST' action='<?php echo $this->data['delURL']; ?>'>
                         <input type='hidden' id='credId-<?php echo htmlspecialchars($index); ?>' name='credId' value='<?php echo htmlspecialchars($this->data['token'][0]); ?>'/>
                         <button type='submit' id='submit-<?php echo htmlspecialchars($index); ?>' name='submit' value='DELETE'>
@@ -46,7 +46,7 @@ 
                         </button>
                     </form>
                 <?php endif; ?>
-            <?php endforeach;?>
+            <?php endforeach; ?>
             <div class='space'></div>
             <form id='nevermind' method='POST' action='<?php echo $this->data['delURL']; ?>'>
                 <button type='submit' id='submit-nevermind' name='submit' value='NEVERMIND'>
@@ -55,7 +55,7 @@ 
             </form>
         <?php endif; ?>
     <?php endif; ?>
-    <?php if((isset($this->data['authURL'])?((is_array($this->data['authURL']) || $this->data['authURL'] instanceof Countable)?count($this->data['authURL']):strlen($this->data['authURL'])):0) > 0): ?>
+    <?php if ((isset($this->data['authURL']) ? ((is_array($this->data['authURL']) || $this->data['authURL'] instanceof Countable) ?count($this->data['authURL']) : strlen($this->data['authURL'])) : 0) > 0) : ?>
         <form id='authform' method='POST' action='<?php echo $this->data['authURL']; ?>'>
             <input type='hidden' id='resp' name='response_id' value='0'/>
             <input type='hidden' id='data_raw_b64' name='client_data_raw' value='garnix'/>
@@ -67,7 +67,7 @@ 
             <input type='hidden' id='operation' name='operation' value='AUTH'/>
             <input type='checkbox' id='credentialChange' name='credentialChange'>
             <label for='credentialChange'>
-                <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) < 2): ?>
+                <?php if ((isset($this->data['FIDO2Tokens']) ? ((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable) ?count($this->data['FIDO2Tokens']) : strlen($this->data['FIDO2Tokens'])) : 0) < 2) : ?>
                     <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsAdd}')); ?>
                 <?php else: ?>
                     <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsModification}')); ?>

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/RegProcess.php

Spacing +1 added lines, -1 removed lines

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

lib/Controller/AuthProcess.php

Spacing +1 added lines, -1 removed lines

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

templates/authentication.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 <?php $this->includeAtTemplateBase('includes/header.php'); ?>
 
     <h1><?php echo htmlspecialchars($this->t('{webauthn:webauthn:heading1}')); ?></h1>
-    <?php if((isset($this->data['authURL'])?((is_array($this->data['authURL']) || $this->data['authURL'] instanceof Countable)?count($this->data['authURL']):strlen($this->data['authURL'])):0) > 0): ?>
+    <?php if ((isset($this->data['authURL']) ? ((is_array($this->data['authURL']) || $this->data['authURL'] instanceof Countable) ?count($this->data['authURL']) : strlen($this->data['authURL'])) : 0) > 0) : ?>
         <form id='authform' method='POST' action='<?php echo $this->data['authURL']; ?>'>
             <input type='hidden' id='resp' name='response_id' value='0'/>
             <input type='hidden' id='data' name='attestation_client_data_json' value='nix'/>

lib/WebAuthn/WebAuthnRegistrationEvent.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
      */
     public const PK_ALGORITHM_ECDSA = "-7";
     public const PK_ALGORITHM_RSA = "-257";
-    public const PK_ALGORITHM = [ self::PK_ALGORITHM_ECDSA, self::PK_ALGORITHM_RSA ];
+    public const PK_ALGORITHM = [self::PK_ALGORITHM_ECDSA, self::PK_ALGORITHM_RSA];
     public const AAGUID_ASSURANCE_LEVEL_NONE = 0;
     public const AAGUID_ASSURANCE_LEVEL_SELF = 1;
     public const AAGUID_ASSURANCE_LEVEL_BASIC = 2;
@@ -184,7 +184,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'])) {
@@ -200,7 +200,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) {
@@ -208,7 +208,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]));
@@ -222,7 +222,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));
                         }
 		}
 	}
@@ -254,9 +254,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'] 
               . " - "