Yubico / php-u2flib-server

src/u2flib_server/U2F.php

Spacing +50 added lines, -50 removed lines

@@ -116,13 +116,13 @@ 
      */
     public function __construct($appId, $attestDir = null, $facetIds = null)
     {
-        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);
+        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;
         $this->attestDir = $attestDir;
 
-        if(!is_array($facetIds)) {
+        if (!is_array($facetIds)) {
             $facetIds = [$appId];
         }
         $this->facetIds = $facetIds;
@@ -159,19 +159,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') && $response->errorCode !== 0 ) {
-            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING );
+        if (property_exists($response, 'errorCode') && $response->errorCode !== 0) {
+            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.');
         }
 
@@ -180,15 +180,15 @@ 
         $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);
         }
 
-        if(isset($cli->typ) && $cli->typ !== REQUEST_TYPE_REGISTER) {
+        if (isset($cli->typ) && $cli->typ !== REQUEST_TYPE_REGISTER) {
             throw new Error('ClientData type is invalid', ERR_BAD_TYPE);
         }
 
-        if(isset($cli->origin) && !in_array($cli->origin, $this->facetIds, true)) {
+        if (isset($cli->origin) && !in_array($cli->origin, $this->facetIds, true)) {
             throw new Error('App ID does not match the origin', ERR_NO_MATCHING_ORIGIN);
         }
 
@@ -198,8 +198,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++];
@@ -217,17 +217,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);
 
@@ -237,10 +237,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);
         }
     }
 
@@ -256,7 +256,7 @@ 
         $sigs = array();
         $challenge = $this->createChallenge();
         foreach ($registrations as $reg) {
-            if( !is_object( $reg ) ) {
+            if (!is_object($reg)) {
                 throw new \InvalidArgumentException('$registrations of getAuthenticateData() method only accepts array of object.');
             }
             /** @var Registration $reg */
@@ -286,12 +286,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') && $response->errorCode !== 0 ) {
-            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING );
+        if (property_exists($response, 'errorCode') && $response->errorCode !== 0) {
+            throw new Error('User-agent returned error. Error code: '.$response->errorCode, ERR_BAD_UA_RETURNING);
         }
 
         /** @var object|null $req */
@@ -303,43 +303,43 @@ 
         $clientData = $this->base64u_decode($response->clientData);
         $decodedClient = json_decode($clientData);
 
-        if(isset($decodedClient->typ) && $decodedClient->typ !== REQUEST_TYPE_AUTHENTICATE) {
+        if (isset($decodedClient->typ) && $decodedClient->typ !== REQUEST_TYPE_AUTHENTICATE) {
             throw new Error('ClientData type is invalid', ERR_BAD_TYPE);
         }
 
         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);
         }
-        if(isset($decodedClient->origin) && !in_array($decodedClient->origin, $this->facetIds, true)) {
+        if (isset($decodedClient->origin) && !in_array($decodedClient->origin, $this->facetIds, true)) {
             throw new Error('App ID does not match the origin', ERR_NO_MATCHING_ORIGIN);
         }
         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);
@@ -348,22 +348,22 @@ 
         $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) {
             $upb = unpack("Cupb", substr($signData, 0, 1)); 
-            if($upb['upb'] !== 1) { 
-                throw new Error('User presence byte value is invalid', ERR_BAD_USER_PRESENCE );
+            if ($upb['upb'] !== 1) { 
+                throw new Error('User presence byte value is invalid', ERR_BAD_USER_PRESENCE);
             }
             $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 self::castObjectToRegistration($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);
         }
     }
 
@@ -396,9 +396,9 @@ 
     {
         $files = array();
         $dir = $this->attestDir;
-        if($dir !== null && is_dir($dir) && $handle = opendir($dir)) {
-            while(false !== ($entry = readdir($handle))) {
-                if(is_file("$dir/$entry")) {
+        if ($dir !== null && is_dir($dir) && $handle = opendir($dir)) {
+            while (false !== ($entry = readdir($handle))) {
+                if (is_file("$dir/$entry")) {
                     $files[] = "$dir/$entry";
                 }
             }
@@ -433,7 +433,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;
         }
 
@@ -465,7 +465,7 @@ 
     private function createChallenge()
     {
         $challenge = random_bytes(32);
-        $challenge = $this->base64u_encode( $challenge );
+        $challenge = $this->base64u_encode($challenge);
 
         return $challenge;
     }
@@ -478,7 +478,7 @@ 
      */
     private function fixSignatureUnusedBits($cert)
     {
-        if(in_array(hash('sha256', $cert), $this->FIXCERTS, true)) {
+        if (in_array(hash('sha256', $cert), $this->FIXCERTS, true)) {
             $cert[strlen($cert) - 257] = "\0";
         }
         return $cert;