paul999 / php-u2flib-server

src/u2flib_server/U2F.php

Doc Comments +1 added lines, -1 removed lines

@@ -408,7 +408,7 @@
      * Fixes a certificate where the signature contains unused bits.
      *
      * @param string $cert
-     * @return mixed
+     * @return string
      */
     private function fixSignatureUnusedBits($cert)
     {

Spacing +45 added lines, -45 removed lines

@@ -97,7 +97,7 @@ 
      */
     public function __construct($appId, $attestDir = null)
     {
-        if(OPENSSL_VERSION_NUMBER < 0x10000000) {
+        if (OPENSSL_VERSION_NUMBER < 0x10000000) {
             throw new Error('OpenSSL has to be at least version 1.0.0, this is ' . OPENSSL_VERSION_TEXT, ERR_OLD_OPENSSL);
         }
         $this->appId = $appId;
@@ -135,19 +135,19 @@ 
      */
     public function doRegister($request, $response, $includeCert = true)
     {
-        if( !is_object( $request ) ) {
+        if (!is_object($request)) {
             throw new \InvalidArgumentException('$request of doRegister() method only accepts object.');
         }
 
-        if( !is_object( $response ) ) {
+        if (!is_object($response)) {
             throw new \InvalidArgumentException('$response of doRegister() method only accepts object.');
         }
 
-        if( property_exists( $response, 'errorCode') ) {
-            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING );
+        if (property_exists($response, 'errorCode')) {
+            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING);
         }
 
-        if( !is_bool( $includeCert ) ) {
+        if (!is_bool($includeCert)) {
             throw new \InvalidArgumentException('$include_cert of doRegister() method only accepts boolean.');
         }
 
@@ -156,8 +156,8 @@ 
         $clientData = $this->base64u_decode($response->clientData);
         $cli = json_decode($clientData);
 
-        if($cli->challenge !== $request->challenge) {
-            throw new Error('Registration challenge does not match', ERR_UNMATCHED_CHALLENGE );
+        if ($cli->challenge !== $request->challenge) {
+            throw new Error('Registration challenge does not match', ERR_UNMATCHED_CHALLENGE);
         }
 
         $registration = new Registration();
@@ -166,8 +166,8 @@ 
         $offs += PUBKEY_LEN;
         // decode the pubKey to make sure it's good
         $tmpKey = $this->pubkey_to_pem($pubKey);
-        if($tmpKey === null) {
-            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE );
+        if ($tmpKey === null) {
+            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE);
         }
         $registration->publicKey = base64_encode($pubKey);
         $khLen = $regData[$offs++];
@@ -185,17 +185,17 @@ 
         $pemCert  = "-----BEGIN CERTIFICATE-----\r\n";
         $pemCert .= chunk_split(base64_encode($rawCert), 64);
         $pemCert .= "-----END CERTIFICATE-----";
-        if($includeCert) {
+        if ($includeCert) {
             $registration->certificate = base64_encode($rawCert);
         }
-        if($this->attestDir) {
-            if(openssl_x509_checkpurpose($pemCert, -1, $this->get_certs()) !== true) {
-                throw new Error('Attestation certificate can not be validated', ERR_ATTESTATION_VERIFICATION );
+        if ($this->attestDir) {
+            if (openssl_x509_checkpurpose($pemCert, -1, $this->get_certs()) !== true) {
+                throw new Error('Attestation certificate can not be validated', ERR_ATTESTATION_VERIFICATION);
             }
         }
 
-        if(!openssl_pkey_get_public($pemCert)) {
-            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE );
+        if (!openssl_pkey_get_public($pemCert)) {
+            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE);
         }
         $signature = substr($rawReg, $offs);
 
@@ -205,10 +205,10 @@ 
         $dataToVerify .= $kh;
         $dataToVerify .= $pubKey;
 
-        if(openssl_verify($dataToVerify, $signature, $pemCert, 'sha256') === 1) {
+        if (openssl_verify($dataToVerify, $signature, $pemCert, 'sha256') === 1) {
             return $registration;
         } else {
-            throw new Error('Attestation signature does not match', ERR_ATTESTATION_SIGNATURE );
+            throw new Error('Attestation signature does not match', ERR_ATTESTATION_SIGNATURE);
         }
     }
 
@@ -223,7 +223,7 @@ 
     {
         $sigs = array();
         foreach ($registrations as $reg) {
-            if( !is_object( $reg ) ) {
+            if (!is_object($reg)) {
                 throw new \InvalidArgumentException('$registrations of getAuthenticateData() method only accepts array of object.');
             }
 
@@ -252,12 +252,12 @@ 
      */
     public function doAuthenticate(array $requests, array $registrations, $response)
     {
-        if( !is_object( $response ) ) {
+        if (!is_object($response)) {
             throw new \InvalidArgumentException('$response of doAuthenticate() method only accepts object.');
         }
 
-        if( property_exists( $response, 'errorCode') ) {
-            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING );
+        if (property_exists($response, 'errorCode')) {
+            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING);
         }
 
         /** @var object|null $req */
@@ -269,35 +269,35 @@ 
         $clientData = $this->base64u_decode($response->clientData);
         $decodedClient = json_decode($clientData);
         foreach ($requests as $req) {
-            if( !is_object( $req ) ) {
+            if (!is_object($req)) {
                 throw new \InvalidArgumentException('$requests of doAuthenticate() method only accepts array of object.');
             }
 
-            if($req->keyHandle === $response->keyHandle && $req->challenge === $decodedClient->challenge) {
+            if ($req->keyHandle === $response->keyHandle && $req->challenge === $decodedClient->challenge) {
                 break;
             }
 
             $req = null;
         }
-        if($req === null) {
-            throw new Error('No matching request found', ERR_NO_MATCHING_REQUEST );
+        if ($req === null) {
+            throw new Error('No matching request found', ERR_NO_MATCHING_REQUEST);
         }
         foreach ($registrations as $reg) {
-            if( !is_object( $reg ) ) {
+            if (!is_object($reg)) {
                 throw new \InvalidArgumentException('$registrations of doAuthenticate() method only accepts array of object.');
             }
 
-            if($reg->keyHandle === $response->keyHandle) {
+            if ($reg->keyHandle === $response->keyHandle) {
                 break;
             }
             $reg = null;
         }
-        if($reg === null) {
-            throw new Error('No matching registration found', ERR_NO_MATCHING_REGISTRATION );
+        if ($reg === null) {
+            throw new Error('No matching registration found', ERR_NO_MATCHING_REGISTRATION);
         }
         $pemKey = $this->pubkey_to_pem($this->base64u_decode($reg->publicKey));
-        if($pemKey === null) {
-            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE );
+        if ($pemKey === null) {
+            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE);
         }
 
         $signData = $this->base64u_decode($response->signatureData);
@@ -306,18 +306,18 @@ 
         $dataToVerify .= hash('sha256', $clientData, true);
         $signature = substr($signData, 5);
 
-        if(openssl_verify($dataToVerify, $signature, $pemKey, 'sha256') === 1) {
+        if (openssl_verify($dataToVerify, $signature, $pemKey, 'sha256') === 1) {
             $ctr = unpack("Nctr", substr($signData, 1, 4));
             $counter = $ctr['ctr'];
             /* TODO: wrap-around should be handled somehow.. */
-            if($counter > $reg->counter) {
+            if ($counter > $reg->counter) {
                 $reg->counter = $counter;
                 return $reg;
             } else {
-                throw new Error('Counter too low.', ERR_COUNTER_TOO_LOW );
+                throw new Error('Counter too low.', ERR_COUNTER_TOO_LOW);
             }
         } else {
-            throw new Error('Authentication failed', ERR_AUTHENTICATION_FAILURE );
+            throw new Error('Authentication failed', ERR_AUTHENTICATION_FAILURE);
         }
     }
 
@@ -328,9 +328,9 @@ 
     {
         $files = array();
         $dir = $this->attestDir;
-        if($dir && $handle = opendir($dir)) {
-            while(false !== ($entry = readdir($handle))) {
-                if(is_file("$dir/$entry")) {
+        if ($dir && $handle = opendir($dir)) {
+            while (false !== ($entry = readdir($handle))) {
+                if (is_file("$dir/$entry")) {
                     $files[] = "$dir/$entry";
                 }
             }
@@ -363,7 +363,7 @@ 
      */
     private function pubkey_to_pem($key)
     {
-        if(strlen($key) !== PUBKEY_LEN || $key[0] !== "\x04") {
+        if (strlen($key) !== PUBKEY_LEN || $key[0] !== "\x04") {
             return null;
         }
 
@@ -379,7 +379,7 @@ 
          */
         $der  = "\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01";
         $der .= "\x06\x08\x2a\x86\x48\xce\x3d\x03\x01\x07\x03\x42";
-        $der .= "\0".$key;
+        $der .= "\0" . $key;
 
         $pem  = "-----BEGIN PUBLIC KEY-----\r\n";
         $pem .= chunk_split(base64_encode($der), 64);
@@ -394,12 +394,12 @@ 
      */
     private function createChallenge()
     {
-        $challenge = openssl_random_pseudo_bytes(32, $crypto_strong );
-        if( $crypto_strong !== true ) {
+        $challenge = openssl_random_pseudo_bytes(32, $crypto_strong);
+        if ($crypto_strong !== true) {
             throw new Error('Unable to obtain a good source of randomness', ERR_BAD_RANDOM);
         }
 
-        $challenge = $this->base64u_encode( $challenge );
+        $challenge = $this->base64u_encode($challenge);
 
         return $challenge;
     }
@@ -412,7 +412,7 @@ 
      */
     private function fixSignatureUnusedBits($cert)
     {
-        if(in_array(hash('sha256', $cert), $this->FIXCERTS)) {
+        if (in_array(hash('sha256', $cert), $this->FIXCERTS)) {
             $cert[strlen($cert) - 257] = "\0";
         }
         return $cert;

examples/cli/u2f-server.php

Spacing +8 added lines, -8 removed lines

@@ -43,10 +43,10 @@ 
 $result;
 $regs;
 
-if(array_key_exists('r', $options)) {
+if (array_key_exists('r', $options)) {
   $mode = "register";
-} elseif(array_key_exists('a', $options)) {
-  if(!array_key_exists('R', $options)) {
+} elseif (array_key_exists('a', $options)) {
+  if (!array_key_exists('R', $options)) {
     print "a registration must be supplied with -R";
     exit(1);
   }
@@ -56,25 +56,25 @@ 
   print "-r or -a must be used\n";
   exit(1);
 }
-if(!array_key_exists('o', $options)) {
+if (!array_key_exists('o', $options)) {
   print "origin must be supplied with -o\n";
   exit(1);
 }
 
 $u2f = new u2flib_server\U2F($options['o']);
 
-if($mode === "register") {
+if ($mode === "register") {
   $challenge = $u2f->getRegisterData();
-} elseif($mode === "authenticate") {
+} elseif ($mode === "authenticate") {
   $challenge = $u2f->getAuthenticateData($regs);
 }
 
 print json_encode($challenge[0]) . "\n";
 $response = fgets(STDIN);
 
-if($mode === "register") {
+if ($mode === "register") {
   $result = $u2f->doRegister($challenge[0], json_decode($response));
-} elseif($mode === "authenticate") {
+} elseif ($mode === "authenticate") {
   $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response));
 }
 

examples/localstorage/index.php

Spacing +8 added lines, -8 removed lines

@@ -77,9 +77,9 @@ 
             }
             return $ret;
         }
-        if($_SERVER['REQUEST_METHOD'] === 'POST') {
-            if(isset($_POST['startRegister'])) {
-                $regs = json_decode($_POST['registrations']) ? : array();
+        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+            if (isset($_POST['startRegister'])) {
+                $regs = json_decode($_POST['registrations']) ?: array();
                 list($data, $reqs) = $u2f->getRegisterData($regs);
                 echo "var request = " . json_encode($data) . ";\n";
                 echo "var signs = " . json_encode($reqs) . ";\n";
@@ -101,7 +101,7 @@ 
             });
         }, 1000);
         <?php
-            } else if($_POST['doRegister']) {
+            } else if ($_POST['doRegister']) {
                 try {
                     $data = $u2f->doRegister(json_decode($_POST['request']), json_decode($_POST['doRegister']));
                     echo "var registration = '" . json_encode($data) . "';\n";
@@ -109,10 +109,10 @@ 
         addRegistration(registration);
         alert("registration successful!");
         <?php
-                } catch(u2flib_server\Error $e) {
+                } catch (u2flib_server\Error $e) {
                     echo "alert('error:" . $e->getMessage() . "');\n";
                 }
-            } else if(isset($_POST['startAuthenticate'])) {
+            } else if (isset($_POST['startAuthenticate'])) {
                 $regs = json_decode($_POST['registrations']);
                 $data = $u2f->getAuthenticateData($regs);
                 echo "var registrations = " . $_POST['registrations'] . ";\n";
@@ -133,7 +133,7 @@ 
             });
         }, 1000);
         <?php
-            } else if($_POST['doAuthenticate']) {
+            } else if ($_POST['doAuthenticate']) {
                 $reqs = json_decode($_POST['request']);
                 $regs = json_decode($_POST['registrations']);
                 try {
@@ -141,7 +141,7 @@ 
                     echo "var registration = '" . json_encode($data) . "';\n";
                     echo "addRegistration(registration);\n";
                     echo "alert('Authentication successful, counter:" . $data->counter . "');\n";
-                } catch(u2flib_server\Error $e) {
+                } catch (u2flib_server\Error $e) {
                     echo "alert('error:" . $e->getMessage() . "');\n";
                 }
             }

examples/pdo/index.php

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
     $sel = $pdo->prepare("select * from users where name = ?");
     $sel->execute(array($name));
     $user = $sel->fetch();
-    if(!$user) {
+    if (!$user) {
         $ins = $pdo->prepare("insert into users (name) values(?)");
         $ins->execute(array($name));
         $sel->execute(array($name));
@@ -93,21 +93,21 @@ 
     <script>
         <?php
 
-        if($_SERVER['REQUEST_METHOD'] === 'POST') {
-          if(!$_POST['username']) {
+        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+          if (!$_POST['username']) {
             echo "alert('no username provided!');";
-          } else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
+          } else if (!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
             echo "alert('no action provided!');";
           } else {
             $user = createAndGetUser($_POST['username']);
 
-            if(isset($_POST['action'])) {
-              switch($_POST['action']):
+            if (isset($_POST['action'])) {
+              switch ($_POST['action']):
                 case 'register':
                   try {
                     $data = $u2f->getRegisterData(getRegs($user->id));
 
-                    list($req,$sigs) = $data;
+                    list($req, $sigs) = $data;
                     $_SESSION['regReq'] = json_encode($req);
                     echo "var req = " . json_encode($req) . ";";
                     echo "var sigs = " . json_encode($sigs) . ";";
@@ -130,7 +130,7 @@ 
             });
         }, 1000);
         <?php
-                  } catch( Exception $e ) {
+                  } catch (Exception $e) {
                     echo "alert('error: " . $e->getMessage() . "');";
                   }
 
@@ -157,28 +157,28 @@ 
             });
         }, 1000);
         <?php
-                  } catch( Exception $e ) {
+                  } catch (Exception $e) {
                     echo "alert('error: " . $e->getMessage() . "');";
                   }
 
                   break;
 
               endswitch;
-            } else if($_POST['register2']) {
+            } else if ($_POST['register2']) {
               try {
                 $reg = $u2f->doRegister(json_decode($_SESSION['regReq']), json_decode($_POST['register2']));
                 addReg($user->id, $reg);
-              } catch( Exception $e ) {
+              } catch (Exception $e) {
                 echo "alert('error: " . $e->getMessage() . "');";
               } finally {
                 $_SESSION['regReq'] = null;
               }
-            } else if($_POST['authenticate2']) {
+            } else if ($_POST['authenticate2']) {
               try {
                 $reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), getRegs($user->id), json_decode($_POST['authenticate2']));
                 updateReg($reg);
                 echo "alert('success: " . $reg->counter . "');";
-              } catch( Exception $e ) {
+              } catch (Exception $e) {
                 echo "alert('error: " . $e->getMessage() . "');";
               } finally {
                 $_SESSION['authReq'] = null;