simplesamlphp / simplesamlphp-module-webauthn

lib/Store.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
         }
 
         if (!is_array($config)) {
-            throw new Exception('Invalid configuration for consent store option: '.var_export($config, true));
+            throw new Exception('Invalid configuration for consent store option: ' . var_export($config, true));
         }
 
         if (!array_key_exists(0, $config)) {

www/managetoken.php

Switch Indentation +13 added lines, -13 removed lines

@@ -26,18 +26,18 @@
     throw new Exception("Attempt to access the token management page unauthenticated.");
 }
 switch ($_POST['submit']) {
-    case "NEVERMIND":
-        Auth\ProcessingChain::resumeProcessing($state);
-        break;
-    case "DELETE":
-        if ($state['FIDO2AuthSuccessful'] == $_POST['credId']) {
-            throw new Exception("Attempt to delete the currently used credential despite UI preventing this.");
-        }
-        $store = $state['webauthn:store'];
-        $store->deleteTokenData($_POST['credId']);
-        Auth\ProcessingChain::resumeProcessing($state);
-        break;
-    default:
-        throw new Exception("Unknown submit button state.");
+        case "NEVERMIND":
+            Auth\ProcessingChain::resumeProcessing($state);
+            break;
+        case "DELETE":
+            if ($state['FIDO2AuthSuccessful'] == $_POST['credId']) {
+                throw new Exception("Attempt to delete the currently used credential despite UI preventing this.");
+            }
+            $store = $state['webauthn:store'];
+            $store->deleteTokenData($_POST['credId']);
+            Auth\ProcessingChain::resumeProcessing($state);
+            break;
+        default:
+            throw new Exception("Unknown submit button state.");
 }
 

lib/Auth/Process/WebAuthn.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
             $this->store = Store::parseStoreConfig($config['store']);
         } catch (\Exception $e) {
             Logger::error(
-                'webauthn: Could not create storage: '.
+                'webauthn: Could not create storage: ' .
                 $e->getMessage()
             );
         }
@@ -132,8 +132,8 @@ 
         assert(array_key_exists('metadata-set', $state['Source']));
 
         if (!array_key_exists($this->usernameAttrib, $state['Attributes'])) {
-            Logger::warning('webauthn: cannot determine if user needs second factor, missing attribute "'.
-                $this->usernameAttrib.'".');
+            Logger::warning('webauthn: cannot determine if user needs second factor, missing attribute "' .
+                $this->usernameAttrib . '".');
             return;
         }
 

bin/updateMetadata.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(dirname(dirname(dirname(__DIR__))).'/vendor/autoload.php');
+require_once(dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php');
 
 use Lcobucci\JWT\Parser;
 use SimpleSAML\Utils\Config as SSPConfig;
@@ -12,7 +12,7 @@ 
     );
 }
 
-$toc = file_get_contents('https://mds2.fidoalliance.org/?token='.$argv[1]);
+$toc = file_get_contents('https://mds2.fidoalliance.org/?token=' . $argv[1]);
 
 const YUBICO_CA = "MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZdWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAwMDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbwnebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXwLvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJhjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kthX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2kLVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1UsG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqcU9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==";
 
@@ -20,13 +20,13 @@ 
 
 $res = [];
 foreach ($token->getClaim('entries') as $oneEntryObject) {
-    $thisUrl = $oneEntryObject->url."?token=".$argv[1];
+    $thisUrl = $oneEntryObject->url . "?token=" . $argv[1];
     $mdB64 = file_get_contents($thisUrl);
     $mdArray = json_decode(base64_decode($mdB64), true);
     if (isset($mdArray['aaguid']) && isset($mdArray['attestationRootCertificates'][0])) {
         $compressedAaguid = strtolower(str_replace('-', '', $mdArray['aaguid']));
         // we need C and O values for the attestation certificates. Extract those from the first root
-        $x509 = openssl_x509_parse("-----BEGIN CERTIFICATE-----\n".$mdArray['attestationRootCertificates'][0]."\n-----END CERTIFICATE-----");
+        $x509 = openssl_x509_parse("-----BEGIN CERTIFICATE-----\n" . $mdArray['attestationRootCertificates'][0] . "\n-----END CERTIFICATE-----");
         // print_r($x509);
         if (isset($x509['subject']['C']) && isset($x509['subject']['O'])) {
             $res[$compressedAaguid] = [
@@ -91,6 +91,6 @@ 
 ];
 
 file_put_contents(
-    SSPConfig::getConfigDir().'/'.WebAuthnRegistrationEvent::AAGUID_CONFIG_FILE,
+    SSPConfig::getConfigDir() . '/' . WebAuthnRegistrationEvent::AAGUID_CONFIG_FILE,
     json_encode($res, JSON_PRETTY_PRINT)
 );

lib/WebAuthn/AAGUID.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
      */
     protected function __construct()
     {
-        $path = SSPConfig::getConfigDir().'/'.self::AAGUID_CONFIG_FILE;
+        $path = SSPConfig::getConfigDir() . '/' . self::AAGUID_CONFIG_FILE;
         if (!file_exists($path)) {
             Logger::warning('Missing "webauthn_tokens.json" configuration file. No device will be recognized.');
             return null;
@@ -51,7 +51,7 @@ 
         $json = json_decode($data, true);
         if (!is_array($json)) {
             // there was probably an error decoding the config, log the error and pray for the best
-            Logger::warning('Broken configuration file "'.$path.'": could not JSON-decode it.');
+            Logger::warning('Broken configuration file "' . $path . '": could not JSON-decode it.');
         } else {
             $this->dictionary = $json;
         }

www/regprocess.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 $regObject = new WebAuthnRegistrationEvent(
     $_POST['type'],
-    ( $state['FIDO2Scope'] === null ? $state['FIDO2DerivedScope'] : $state['FIDO2Scope'] ),
+    ($state['FIDO2Scope'] === null ? $state['FIDO2DerivedScope'] : $state['FIDO2Scope']),
     $state['FIDO2SignupChallenge'],
     $state['IdPMetadata']['entityid'],
     base64_decode($_POST['attestation_object']),

templates/webauthn.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}')); ?>

Braces +10 added lines, -4 removed lines

@@ -16,8 +16,11 @@ 
                 <?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 else {
+    : ?>
+                        <li class='currenttoken'><?php echo htmlspecialchars($this->data['token'][3]);
+}
+?> <?php echo htmlspecialchars($this->t('{webauthn:webauthn:currentToken}')); ?></li>
                     <?php endif; ?>
                 <?php endforeach;?>
             </ul>
@@ -69,8 +72,11 @@ 
             <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 echo htmlspecialchars($this->t('{webauthn:webauthn:wantsAdd}')); ?>
-                <?php else: ?>
-                    <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsModification}')); ?>
+                <?php else {
+    : ?>
+                    <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsModification}'));
+}
+?>
                 <?php endif; ?>
             </label><br/>
             <button type='button' id='authformSubmit'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:authTokenButton}')); ?></button>

www/authprocess.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 
 $authObject = new WebAuthnAuthenticationEvent(
     $_POST['type'],
-    ( $state['FIDO2Scope'] === null ? $state['FIDO2DerivedScope'] : $state['FIDO2Scope'] ), 
+    ($state['FIDO2Scope'] === null ? $state['FIDO2DerivedScope'] : $state['FIDO2Scope']), 
     $state['FIDO2SignupChallenge'], 
     $state['IdPMetadata']['entityid'], 
     base64_decode($_POST['authenticator_data']), 
@@ -81,10 +81,10 @@ 
 if ($debugEnabled) {
     echo $authObject->getDebugBuffer();
     echo $authObject->getValidateBuffer();
-    echo "Debug mode, not continuing to ". ($state['FIDO2WantsRegister'] ? "credential registration page." : "destination.");
+    echo "Debug mode, not continuing to " . ($state['FIDO2WantsRegister'] ? "credential registration page." : "destination.");
 } else {
     if ($state['FIDO2WantsRegister']) {
-        header("Location: ".Module::getModuleURL('webauthn/webauthn.php?StateId='.urlencode($id)));
+        header("Location: " . Module::getModuleURL('webauthn/webauthn.php?StateId=' . urlencode($id)));
     } else {
         Auth\ProcessingChain::resumeProcessing($state);
     }

www/webauthn.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
 use SimpleSAML\Utils;
-use SimpleSAML\XHTML\Template;;
+use SimpleSAML\XHTML\Template; ;
 use Webmozart\Assert\Assert;
 
 $globalConfig = Configuration::getInstance();
@@ -61,7 +61,7 @@ 
 $frontendData = [];
 $frontendData['challengeEncoded'] = $challengeEncoded;
 $frontendData['state'] = [];
-foreach (['Source','FIDO2Scope','FIDO2Username','FIDO2Displayname','requestTokenModel'] as $stateItem) {
+foreach (['Source', 'FIDO2Scope', 'FIDO2Username', 'FIDO2Displayname', 'requestTokenModel'] as $stateItem) {
     Assert::isArray($state[$stateItem]);
     $frontendData['state'][$stateItem] = $state[$stateItem];
 }