Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OcraService/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $this->logger = $logger;
 
         // Set the OCRA suite
-        $this->_ocraSuite = $config['ocra.suite'] ?? 'OCRA-1:HOTP-SHA1-6:QH10-S';   // Use tiqr server default suite
+        $this->_ocraSuite = $config['ocra.suite'] ?? 'OCRA-1:HOTP-SHA1-6:QH10-S'; // Use tiqr server default suite
         $this->_ocraParser = new OATH_OCRAParser($this->_ocraSuite);
     }
 

library/tiqr/Tiqr/DeviceStorage.php

Spacing +2 added lines, -2 removed lines

@@ -40,10 +40,10 @@
      * @param LoggerInterface $logger
      * @throws Exception An exception if an unknown storage is requested.
      */
-    public static function getStorage(string $type="dummy", Array $options=array(), LoggerInterface $logger=null)
+    public static function getStorage(string $type = "dummy", Array $options = array(), LoggerInterface $logger = null)
     {
         if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+            $logger = new \Psr\Log\NullLogger();
 
         switch ($type) {
             case "dummy":

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
      */
     public static function getStorage(string $type="dummy", Array $options=array(), LoggerInterface $logger=null)
     {
-        if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+        if (!$logger) {
+                    $logger=new \Psr\Log\NullLogger();
+        }
 
         switch ($type) {
             case "dummy":

library/tiqr/Tiqr/UserSecretStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      *
      * @return Tiqr_UserSecretStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, string $type="dummy", array $options=array()): Tiqr_UserSecretStorage_Encryption_Interface
+    public static function getEncryption(LoggerInterface $logger, string $type = "dummy", array $options = array()): Tiqr_UserSecretStorage_Encryption_Interface
     {
         $instance = null;
         $logger->info(sprintf('Using "%s" as UserSecretStorage encryption type', $type));

library/tiqr/Tiqr/UserSecretStorage/Encryption/OpenSSL.php

Indentation +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
     }
     
     /**
-      * Decrypts the given data.
+     * Decrypts the given data.
      *
      * @param string $data Data to decrypt.
      * @return string decrypted data

Spacing +22 added lines, -22 removed lines

@@ -48,22 +48,22 @@ 
     */
 
     private $_supportedCiphers = [
-        'aes-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aes-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aes-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aes-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aes-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aes-256-gcm' => [ 'tag' => true, 'key' => 32 ],
-        'chacha20' => [ 'tag' => false, 'key' => 32 ],
-        'camellia-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'camellia-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'camellia-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aria-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aria-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aria-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aria-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-256-gcm' => [ 'tag' => true, 'key' => 32 ],
+        'aes-128-cbc' => ['tag' => false, 'key' => 16],
+        'aes-128-gcm' => ['tag' => true, 'key' => 16],
+        'aes-192-cbc' => ['tag' => false, 'key' => 24],
+        'aes-192-gcm' => ['tag' => true, 'key' => 24],
+        'aes-256-cbc' => ['tag' => false, 'key' => 32],
+        'aes-256-gcm' => ['tag' => true, 'key' => 32],
+        'chacha20' => ['tag' => false, 'key' => 32],
+        'camellia-128-cbc' => ['tag' => false, 'key' => 16],
+        'camellia-192-cbc' => ['tag' => false, 'key' => 24],
+        'camellia-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-128-cbc' => ['tag' => false, 'key' => 16],
+        'aria-128-gcm' => ['tag' => true, 'key' => 16],
+        'aria-192-cbc' => ['tag' => false, 'key' => 24],
+        'aria-192-gcm' => ['tag' => true, 'key' => 24],
+        'aria-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-256-gcm' => ['tag' => true, 'key' => 32],
     ];
 
     /**
@@ -136,12 +136,12 @@ 
         // A longer key is not a problem, but could indicate a configuration error
         $key_length = $this->_supportedCiphers[$this->_cipher]['key'];
         if (strlen($key) != $key_length) {
-            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got " . strlen($key) . " bytes");
+            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got ".strlen($key)." bytes");
         }
 
         // openssl_encrypt returns the ciphertext as a base64 encoded string, so we don't need to encode it again
         // The tag is returned as a binary string, but only if the cipher requires a tag
-        $tag='';
+        $tag = '';
         if ($this->_supportedCiphers[$this->_cipher]['tag']) {
             $encrypted = openssl_encrypt($data, $this->_cipher, $key, 0, $iv, $tag, '', 16);
         } else {
@@ -153,7 +153,7 @@ 
         $tag = $this->_supportedCiphers[$this->_cipher]['tag'] ? $tag : '';
         // Return the encoded ciphertext, including the IV, tag and cipher
         // <cipher>:<key_id>:iv<>:<tag>:<ciphertext>
-        $encoded = $this->_cipher . ":" . $this->_key_id . ":" . base64_encode($iv) . ":" . base64_encode($tag) . ":" . $encrypted;
+        $encoded = $this->_cipher.":".$this->_key_id.":".base64_encode($iv).":".base64_encode($tag).":".$encrypted;
 
         return $encoded;
     }
@@ -192,19 +192,19 @@ 
         }
 
         // IV
-        $iv = base64_decode($split_data[2],true);
+        $iv = base64_decode($split_data[2], true);
         if ($iv === false) {
             throw new RuntimeException("Error decoding IV");
         }
 
         // Tag
-        $tag = base64_decode($split_data[3],true);
+        $tag = base64_decode($split_data[3], true);
         if ($tag === false) {
             throw new RuntimeException("Error decoding tag");
         }
         $ciphertext = $split_data[4];
 
-        $plaintext=openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
+        $plaintext = openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
         if ($plaintext === false) {
             throw new RuntimeException("Error decrypting data");
         }

library/tiqr/Tiqr/UserSecretStorage/Encryption/Plain.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     }
     
     /**
-      * Decrypts the given data.
+     * Decrypts the given data.
      *
      * @param String $data Data to decrypt.
      *

library/tiqr/Tiqr/DeviceStorage/TokenExchange.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     {
         $url = $this->_options["url"]."?appId=".$this->_options["appid"];
         
-        $url.= "&notificationToken=".$notificationToken;
+        $url .= "&notificationToken=".$notificationToken;
 
         $ch = curl_init();
 
@@ -53,12 +53,12 @@ 
         $output = curl_exec($ch);
         curl_close($ch);
 
-        if (stripos($output, "not found")!==false) {
+        if (stripos($output, "not found") !== false) {
             $this->logger->error('Token Exchange failed and responded with: not found', ['full output' => $output]);
             return false;
         }
 
-        if (stripos($output, "error")!==false) {
+        if (stripos($output, "error") !== false) {
             $this->logger->error('Token Exchange failed and responded with: error', ['full output' => $output]);
             return false;
         }

library/tiqr/Tiqr/Message/FCM.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
     /**
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir )
+    private function getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir)
     {
         $client = new Google_Client();
         $client->setLogger($this->logger);
@@ -61,8 +61,8 @@ 
             $pool = new FilesystemCachePool($filesystem);
 
             //set up a callback to log token refresh
-            $logger=$this->logger;
-            $tokenCallback = function ($cacheKey, $accessToken) use ($logger) {
+            $logger = $this->logger;
+            $tokenCallback = function($cacheKey, $accessToken) use ($logger) {
                 $logger->info(sprintf('New access token received at cache key %s', $cacheKey));
             };
             $client->setTokenCallback($tokenCallback);
@@ -94,9 +94,9 @@ 
      * @param  $retry           boolean is this a 2nd attempt
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function _sendFirebase(string $deviceToken, string $alert, string $challenge, string $projectId, string $credentialsFile, bool $cacheTokens, string $tokenCacheDir, bool $retry=false)
+    private function _sendFirebase(string $deviceToken, string $alert, string $challenge, string $projectId, string $credentialsFile, bool $cacheTokens, string $tokenCacheDir, bool $retry = false)
     {
-        $apiurl = sprintf('https://fcm.googleapis.com/v1/projects/%s/messages:send',$projectId);
+        $apiurl = sprintf('https://fcm.googleapis.com/v1/projects/%s/messages:send', $projectId);
 
         $fields = [
             'message' => [
@@ -113,7 +113,7 @@ 
 
         try {
             $headers = array(
-                'Authorization: Bearer ' . $this->getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir),
+                'Authorization: Bearer '.$this->getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir),
                 'Content-Type: application/json',
             );
         } catch (\Google\Exception $e) {
@@ -137,13 +137,13 @@ 
         }
 
         if (!empty($errors)) {
-            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ". $errors, true);
+            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ".$errors, true);
         }
 
         // Wait and retry once in case of a 502 Bad Gateway error
         if ($statusCode === 502 && !($retry)) {
             sleep(2);
-            $this->_sendFirebase($deviceToken, $alert, $challenge, $projectId, $credentialsFile,  $cacheTokens,  $tokenCacheDir, true);
+            $this->_sendFirebase($deviceToken, $alert, $challenge, $projectId, $credentialsFile, $cacheTokens, $tokenCacheDir, true);
             return;
         }
 
@@ -154,7 +154,7 @@ 
         // handle errors, ignoring registration_id's
         $response = json_decode($result, true);
         foreach ($response as $k => $v) {
-            if ($k=="error") {
+            if ($k == "error") {
                 throw new Tiqr_Message_Exception_SendFailure(sprintf("Error in FCM response: %s", $result), true);
             }
         }

library/tiqr/Tiqr/UserStorage/Pdo.php

Indentation -2 removed lines

@@ -30,13 +30,11 @@
     notificationtype varchar(10),
     notificationaddress varchar(256)
 );
-
  *
  * In version 3.0 the format of the tmpblocktimestamp was changed from a datetime format to an integer.
  * Because it holds a unix timestamp a 64-bit (8-byte) integer. To upgrade the user table to the new format use:
 
 ALTER TABLE user MODIFY tmpblocktimestamp BIGINT;
-
  */
 
 use Psr\Log\LoggerInterface;

Spacing +17 added lines, -17 removed lines

@@ -98,21 +98,21 @@ 
      */
     private function _getStringValue(string $columnName, string $userId): string
     {
-        if ( !in_array($columnName, $this->_allowedStringColumns) ) {
+        if (!in_array($columnName, $this->_allowedStringColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT ' . $columnName . ' FROM ' . $this->tablename . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT '.$columnName.' FROM '.$this->tablename.' WHERE userid = ?');
             $sth->execute(array($userId));
-            $res=$sth->fetchColumn();
+            $res = $sth->fetchColumn();
             if ($res === false) {
                 // No result
                 $this->logger->error(sprintf('No result getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('User not found');
             }
             if ($res === NULL) {
-                return '';  // Value unset
+                return ''; // Value unset
             }
             if (!is_string($res)) {
                 $this->logger->error(sprintf('Expected string type while getting "%s" for user "%s"', $columnName, $userId));
@@ -136,28 +136,28 @@ 
      */
     private function _getIntValue(string $columnName, string $userId): int
     {
-        if ( !in_array($columnName, $this->_allowedIntColumns) ) {
+        if (!in_array($columnName, $this->_allowedIntColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT ' . $columnName . ' FROM ' . $this->tablename . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT '.$columnName.' FROM '.$this->tablename.' WHERE userid = ?');
             $sth->execute(array($userId));
-            $res=$sth->fetchColumn();
+            $res = $sth->fetchColumn();
             if ($res === false) {
                 // No result
                 $this->logger->error(sprintf('No result getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('User not found');
             }
             if ($res === NULL) {
-                return 0;  // Value unset
+                return 0; // Value unset
             }
             // Return type for integers depends on the PDO driver, can be string
             if (!is_numeric($res)) {
                 $this->logger->error(sprintf('Expected int type while getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('Unexpected return type');
             }
-            return (int)$res;
+            return (int) $res;
         }
         catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
@@ -174,11 +174,11 @@ 
      */
     private function _setStringValue(string $columnName, string $userId, string $value): void
     {
-        if ( !in_array($columnName, $this->_allowedStringColumns) ) {
+        if (!in_array($columnName, $this->_allowedStringColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
         try {
-            $sth = $this->handle->prepare('UPDATE ' . $this->tablename . ' SET ' . $columnName . ' = ? WHERE userid = ?');
+            $sth = $this->handle->prepare('UPDATE '.$this->tablename.' SET '.$columnName.' = ? WHERE userid = ?');
             $sth->execute(array($value, $userId));
             if ($sth->rowCount() == 0) {
                 // Required for mysql which only returns the number of rows that were actually updated
@@ -202,11 +202,11 @@ 
      */
     private function _setIntValue(string $columnName, string $userId, int $value): void
     {
-        if ( !in_array($columnName, $this->_allowedIntColumns) ) {
+        if (!in_array($columnName, $this->_allowedIntColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
         try {
-            $sth = $this->handle->prepare('UPDATE ' . $this->tablename . ' SET ' . $columnName . ' = ? WHERE userid = ?');
+            $sth = $this->handle->prepare('UPDATE '.$this->tablename.' SET '.$columnName.' = ? WHERE userid = ?');
             $sth->execute(array($value, $userId));
             if ($sth->rowCount() == 0) {
                 // Required for mysql which only returns the number of rows that were actually updated
@@ -318,17 +318,17 @@ 
     {
         // Check for blocked
         if ($this->_getIntValue('blocked', $userId) != 0) {
-            return true;   // Blocked
+            return true; // Blocked
         }
 
         if (0 == $tempBlockDuration) {
-            return false;   // No check for temporary block
+            return false; // No check for temporary block
         }
 
         // Check for temporary block
         $timestamp = $this->getTemporaryBlockTimestamp($userId);
         // if no temporary block timestamp is set or if the temporary block is expired, return false
-        if ( 0 == $timestamp || ($timestamp + $tempBlockDuration * 60) < time()) {
+        if (0 == $timestamp || ($timestamp + $tempBlockDuration * 60) < time()) {
             return false;
         }
         return true;
@@ -384,7 +384,7 @@ 
             $sth->execute();
         }
         catch (Exception $e) {
-            $statusMessage = "Error reading from UserStorage_PDO: ". $e->getMessage();
+            $statusMessage = "Error reading from UserStorage_PDO: ".$e->getMessage();
             return false;
         }
 

Braces +7 added lines, -14 removed lines

@@ -119,8 +119,7 @@ 
                 throw new RuntimeException('Unexpected return type');
             }
             return $res;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -158,8 +157,7 @@ 
                 throw new RuntimeException('Unexpected return type');
             }
             return (int)$res;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -186,8 +184,7 @@ 
                     throw new RuntimeException('User not found');
                 }
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error updating user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -214,8 +211,7 @@ 
                     throw new RuntimeException('User not found');
                 }
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error updating user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -232,8 +228,7 @@ 
         try {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (displayname,userid) VALUES (?,?)");
             $sth->execute(array($displayName, $userId));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(sprintf('Error creating user "%s"', $userId), array('exception'=>$e));
             throw new ReadWriteException('The user could not be saved in the user storage (PDO)');
         }
@@ -248,8 +243,7 @@ 
             $sth = $this->handle->prepare("SELECT userid FROM ".$this->tablename." WHERE userid = ?");
             $sth->execute(array($userId));
             return (false !== $sth->fetchColumn());
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error checking user exists', array('exception'=>$e, 'userId'=>$userId));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -382,8 +376,7 @@ 
         try {
             $sth = $this->handle->prepare('SELECT displayname, notificationtype, notificationaddress, loginattempts, tmpblockattempts, blocked, tmpblocktimestamp FROM '.$this->tablename.' LIMIT 1');
             $sth->execute();
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $statusMessage = "Error reading from UserStorage_PDO: ". $e->getMessage();
             return false;
         }

library/tiqr/Tiqr/StateStorage/Memcache.php

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
      * The default configuration
      */
     const DEFAULT_HOST = '127.0.0.1';
-    const DEFAULT_PORT =  11211;
+    const DEFAULT_PORT = 11211;
     
     /**
      * Get the prefix to use for all keys in memcache.
@@ -106,7 +106,7 @@ 
     /**
      * @see Tiqr_StateStorage_StateStorageInterface::setValue()
      */
-    public function setValue(string $key, $value, int $expire=0): void
+    public function setValue(string $key, $value, int $expire = 0): void
     {
         if (empty($key)) {
             throw new InvalidArgumentException('Empty key not allowed');
@@ -160,7 +160,7 @@ 
         if ($result === false) {
             // Memcache interface does not provide error information, either the key does not exist or
             // there was an error communicating with the memcache
-            $this->logger->info( sprintf('Unable to get key "%s" from memcache StateStorage', $key) );
+            $this->logger->info(sprintf('Unable to get key "%s" from memcache StateStorage', $key));
             return null;
         }
         return $result;
@@ -176,7 +176,7 @@ 
             $key = bin2hex(random_bytes(16));
             $this->setValue($key, 'healthcheck', 10);
         } catch (Exception $e) {
-            $statusMessage = 'Unable to store key in memcache: ' . $e->getMessage();
+            $statusMessage = 'Unable to store key in memcache: '.$e->getMessage();
             return false;
         }