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}')); ?>

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>

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

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;
     }

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/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/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.");

Indentation +4 added lines, -4 removed lines

@@ -149,10 +149,10 @@ 
         /**
          * §7.2 STEP 18 : detect physical object cloning on the token
          */
-	$counter = $authObject->getCounter();
-	if ($previousCounter == 0 && $counter == 0) {
+    $counter = $authObject->getCounter();
+    if ($previousCounter == 0 && $counter == 0) {
                 // no cloning check, it is a brand new token
-	} elseif ($counter > $previousCounter) {
+    } elseif ($counter > $previousCounter) {
             // Signature counter was incremented compared to last time, good
             $store = $state['webauthn:store'];
             $store->updateSignCount($oneToken[0], $counter);
@@ -208,7 +208,7 @@ 
             'private'          => false,
         ]);
         $response->setExpires(new DateTime('Thu, 19 Nov 1981 08:52:00 GMT'));
-        */
+         */
 
         return $response;
     }

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'/>

Braces +5 added lines, -2 removed lines

@@ -18,8 +18,11 @@
             <input type='hidden' id='operation' name='operation' value='AUTH'/>
             <button type='button' id='authformSubmit'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:authTokenButton}')); ?></button>
         </form>
-    <?php else: ?>
-        <p>Please first register your token on the <a href="<?php echo htmlspecialchars(SimpleSAML\Module::getModuleURL('webauthn/registration.php')); ?>">registration page</a> before continuing.
+    <?php else {
+    : ?>
+        <p>Please first register your token on the <a href="<?php echo htmlspecialchars(SimpleSAML\Module::getModuleURL('webauthn/registration.php'));
+}
+?>">registration page</a> before continuing.
     <?php endif; ?>
     <script src="<?php echo htmlspecialchars(SimpleSAML\Module::getModuleUrl('webauthn/')); ?>assets/js/webauthn.js"></script>
     <script src="<?php echo htmlspecialchars(SimpleSAML\Module::getModuleUrl('webauthn/')); ?>assets/js/authentication.js"></script>

src/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];
         }
 

src/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;
     }

src/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.");

Indentation +4 added lines, -4 removed lines

@@ -149,10 +149,10 @@ 
         /**
          * §7.2 STEP 18 : detect physical object cloning on the token
          */
-	$counter = $authObject->getCounter();
-	if ($previousCounter == 0 && $counter == 0) {
+    $counter = $authObject->getCounter();
+    if ($previousCounter == 0 && $counter == 0) {
                 // no cloning check, it is a brand new token
-	} elseif ($counter > $previousCounter) {
+    } elseif ($counter > $previousCounter) {
             // Signature counter was incremented compared to last time, good
             $store = $state['webauthn:store'];
             $store->updateSignCount($oneToken[0], $counter);
@@ -208,7 +208,7 @@ 
             'private'          => false,
         ]);
         $response->setExpires(new DateTime('Thu, 19 Nov 1981 08:52:00 GMT'));
-        */
+         */
 
         return $response;
     }