Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OcraService.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
      * @return Tiqr_OcraService_Interface
      * @throws Exception An exception if an unknown orca service type is requested.
      */
-    public static function getOcraService(string $type="tiqr", array $options=array(), LoggerInterface $logger=null)
+    public static function getOcraService(string $type = "tiqr", array $options = array(), LoggerInterface $logger = null)
     {
         if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+            $logger = new \Psr\Log\NullLogger();
 
         switch ($type) {
             case "tiqr":

Braces +3 added lines, -2 removed lines

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

library/tiqr/Tiqr/DeviceStorage.php

Spacing +2 added lines, -2 removed lines

@@ -45,10 +45,10 @@
      * @param LoggerInterface $logger
      * @throws Exception An exception if an unknown storage is requested.
      */
-    public static function getStorage($type="dummy", $options=array(), LoggerInterface $logger=null)
+    public static function getStorage($type = "dummy", $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

@@ -47,8 +47,9 @@
      */
     public static function getStorage($type="dummy", $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/OATH/OCRAParser.php

Spacing +25 added lines, -25 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	private function parseOCRASuite($ocraSuite) {
 		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('OCRASuite not in string format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$ocraSuite = strtoupper($ocraSuite);
@@ -53,54 +53,54 @@ 
 
 		$s = explode(':', $ocraSuite);
 		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('Invalid OCRASuite format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$algo = explode('-', $s[0]);
 		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+			throw new Exception('Invalid OCRA version: '.var_export($s[0], TRUE));
 		}
 
 		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+			throw new Exception('Unsupported OCRA algorithm: '.var_export($algo[0], TRUE));
 		}
 
 		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+			throw new Exception('Unsupported OCRA version: '.var_export($algo[1], TRUE));
 		}
 		$this->OCRAVersion = $algo[1];
 
 		$cf = explode('-', $s[1]);
 		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function: '.var_export($s[1], TRUE));
 		}
 
 		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+			throw new Exception('Unsupported OCRA suite crypto function: '.var_export($cf[0], TRUE));
 		}
 		$this->CryptoFunctionType = $cf[0];
 
 		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+			throw new Exception('Unsupported hash function in OCRA suite crypto function: '.var_export($cf[1], TRUE));
 		}
 		$this->CryptoFunctionHash = $cf[1];
 		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
 
 		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function truncation length: '.var_export($cf[2], TRUE));
 		}
 		$this->CryptoFunctionTruncation = intval($cf[2]);
 
 		$di = explode('-', $s[2]);
 		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+			throw new Exception('Invalid OCRA suite data input: '.var_export($s[2], TRUE));
 		}
 
 		$data_input = array();
-		foreach($di as $elem) {
+		foreach ($di as $elem) {
 			$letter = $elem[0];
 			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+				throw new Exception('Duplicate field in OCRA suite data input: '.var_export($elem, TRUE));
 			}
 			$data_input[$letter] = 1;
 
@@ -112,13 +112,13 @@ 
 				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
 					$q_len = intval($match[2]);
 					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input question length: '.var_export($q_len, TRUE));
 					}
 					$this->Q = TRUE;
 					$this->QType = $match[1];
 					$this->QLength = $q_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input question: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'P') {
 				if (strlen($elem) == 1) {
@@ -126,7 +126,7 @@ 
 				} else {
 					$p_algo = substr($elem, 1);
 					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+						throw new Exception('Unsupported OCRA suite PIN hash function: '.var_export($elem, TRUE));
 					}
 					$this->P = TRUE;
 					$this->PType = $p_algo;
@@ -138,13 +138,13 @@ 
 				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
 					$s_len = intval($match[1]);
 					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input session information length: '.var_export($s_len, TRUE));
 					}
 
 					$this->S = TRUE;
 					$this->SLength = $s_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input session information length: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'T') {
 				if (strlen($elem) == 1) {
@@ -153,7 +153,7 @@ 
 					preg_match_all('/(\d+)([HMS])/', $elem, $match);
 
 					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$length = 0;
@@ -161,21 +161,21 @@ 
 						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
 					}
 					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$this->T = TRUE;
 					$this->TLength = $length;
 				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 				}
 			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+				throw new Exception('Unsupported OCRA suite data input field: '.var_export($elem, TRUE));
 			}
 		}
 
 		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+			throw new Exception('OCRA suite data input question not defined: '.var_export($s[2], TRUE));
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 
         $bytes = Tiqr_Random::randomBytes($q_length);
 
-		switch($q_type) {
+		switch ($q_type) {
 			case 'A':
 				$challenge = base64_encode($bytes);
 				$tr = implode("", unpack('H*', $bytes));
@@ -209,7 +209,7 @@ 
 				$challenge = implode("", unpack('N*', $bytes));
 				break;
 			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+				throw new Exception('Unsupported OCRASuite challenge type: '.var_export($q_type, TRUE));
 				break;
 		}
 
@@ -233,7 +233,7 @@ 
 			$result &= ($s1[$i] == $s2[$i]);
 		}
 
-		return (boolean)$result;
+		return (boolean) $result;
 	}
 
 }

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/Service.php

Spacing +37 added lines, -37 removed lines

@@ -109,7 +109,7 @@ 
     // INVALID_USERID: The client authenticated a different user than the server expected. This error is returned when
     // the application stated an authentication session specifying the userId and later during the authentication
     // provides a different userId
-    const AUTH_RESULT_INVALID_USERID    = 5;
+    const AUTH_RESULT_INVALID_USERID = 5;
     
     /**
      * The default OCRA Suite (RFC 6287) to use for authentication in Tiqr
@@ -244,7 +244,7 @@ 
      * @param int $version The tiqr protocol version to use (defaults to the latest)
      * @throws Exception
      */
-    public function __construct(LoggerInterface $logger, array $options=array(), int $version = 2)
+    public function __construct(LoggerInterface $logger, array $options = array(), int $version = 2)
     {
         $this->_options = $options; // Used to later get settings for Tiqr_Message_*
         $this->logger = $logger;
@@ -347,7 +347,7 @@ 
                 case 'APNS':
                 case 'APNS_DIRECT':
                     $apns_version = $this->_options['apns.version'] ?? 2;
-                    if ($apns_version !=2)
+                    if ($apns_version != 2)
                         throw new InvalidArgumentException("Unsupported APNS version '$apns_version'");
                     $message = new Tiqr_Message_APNS2($this->_options, $this->logger);
                     break;
@@ -364,7 +364,7 @@ 
 
             $this->logger->info(sprintf('Creating and sending a %s push notification', $notificationType));
             $message->setId(time());
-            $message->setText("Please authenticate for " . $this->_name);
+            $message->setText("Please authenticate for ".$this->_name);
             $message->setAddress($notificationAddress);
             $message->setCustomProperty('challenge', $this->_getChallengeUrl($sessionKey));
             $message->send();
@@ -410,13 +410,13 @@ 
      * @return string The authentication sessionKey
      * @throws Exception when starting the authentication session failed
      */
-    public function startAuthenticationSession(string $userId="", string $sessionId="", string $spIdentifier=""): string
+    public function startAuthenticationSession(string $userId = "", string $sessionId = "", string $spIdentifier = ""): string
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
-        if ($spIdentifier=="") {
+        if ($spIdentifier == "") {
             $spIdentifier = $this->_identifier;
         }
 
@@ -425,7 +425,7 @@ 
         
         $data = array("sessionId"=>$sessionId, "challenge"=>$challenge, "spIdentifier" => $spIdentifier);
         
-        if ($userId!="") {
+        if ($userId != "") {
             $data["userId"] = $userId;
         }
         
@@ -449,9 +449,9 @@ 
      * @return String The enrollment key
      * @throws Exception when start the enrollement session failed
      */
-    public function startEnrollmentSession(string $userId, string $displayName, string $sessionId=""): string
+    public function startEnrollmentSession(string $userId, string $displayName, string $sessionId = ""): string
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
         $enrollmentKey = $this->_uniqueSessionKey();
@@ -471,9 +471,9 @@ 
      * @param string $sessionId The application's session identifier (defaults to php session)
      * @throws Exception when resetting the session failed
      */
-    public function resetEnrollmentSession(string $sessionId=""): void
+    public function resetEnrollmentSession(string $sessionId = ""): void
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
@@ -508,9 +508,9 @@ 
      *
      * @throws Exception when an error communicating with the state storage backend was detected
      */
-    public function getEnrollmentStatus(string $sessionId=""): int
+    public function getEnrollmentStatus(string $sessionId = ""): int
     { 
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         $status = $this->_getStateValue(self::PREFIX_ENROLLMENT_STATUS, $sessionId);
@@ -663,7 +663,7 @@ 
             if (NULL === $data) {
                 throw new RuntimeException('Enrollment secret not found');
             }
-            if ( !is_array($data) || !is_string($data["userId"] ?? NULL)) {
+            if (!is_array($data) || !is_string($data["userId"] ?? NULL)) {
                 throw new RuntimeException('Invalid enrollment data');
             }
 
@@ -703,7 +703,7 @@ 
                 $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
             } else {
                 $this->logger->error(
-                    'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' .
+                    'Enrollment status is not finalized, enrollmentsecret was not found in state storage. '.
                     'Warning! the method will still return "true" as a result.'
                 );
             }
@@ -761,9 +761,9 @@ 
             throw $e;
         }
 
-        $sessionId = $state["sessionId"] ?? NULL;   // Application's sessionId
-        $challenge = $state["challenge"] ?? NULL;   // The challenge we sent to the Tiqr client
-        if (!is_string($sessionId) || (!is_string($challenge)) ) {
+        $sessionId = $state["sessionId"] ?? NULL; // Application's sessionId
+        $challenge = $state["challenge"] ?? NULL; // The challenge we sent to the Tiqr client
+        if (!is_string($sessionId) || (!is_string($challenge))) {
             throw new RuntimeException('Invalid state for state storage');
         }
 
@@ -772,7 +772,7 @@ 
         $challengeUserId = $state["userId"] ?? NULL;
 
         // If the application requested a specific userId, verify that that is that userId that we're now authenticating
-        if ($challengeUserId!==NULL && ($userId !== $challengeUserId)) {
+        if ($challengeUserId !== NULL && ($userId !== $challengeUserId)) {
             $this->logger->error(
                 sprintf('Authentication failed: the requested userId "%s" does not match userId "%s" that is being authenticated',
                 $challengeUserId, $userId)
@@ -820,9 +820,9 @@ 
      *
      * @throws Exception when there was an error communicating with the storage backed
      */
-    public function logout(string $sessionId=""): void
+    public function logout(string $sessionId = ""): void
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         
@@ -862,9 +862,9 @@ 
      *
      * Does not throw
      */
-    public function getAuthenticatedUser(string $sessionId=""): ?string
+    public function getAuthenticatedUser(string $sessionId = ""): ?string
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $this->logger->debug('Using the PHP session id, as no session id was provided');
             $sessionId = session_id(); 
         }
@@ -908,22 +908,22 @@ 
         $challenge = $state["challenge"] ?? '';
         $spIdentifier = $state["spIdentifier"] ?? '';
 
-        if ( (strpos($this->_protocolAuth, 'https://') === 0) || (strpos($this->_protocolAuth, 'http://') === 0) ) {
+        if ((strpos($this->_protocolAuth, 'https://') === 0) || (strpos($this->_protocolAuth, 'http://') === 0)) {
             // Create universal Link
-            $parameters=array();
+            $parameters = array();
             if (!is_null($userId)) {
-                $parameters[]='u='.urlencode($userId);
+                $parameters[] = 'u='.urlencode($userId);
             }
-            $parameters[]='s='.urlencode($sessionKey);
-            $parameters[]='q='.urlencode($challenge);
-            $parameters[]='i='.urlencode($this->getIdentifier());
-            $parameters[]='v='.urlencode($this->_protocolVersion);
+            $parameters[] = 's='.urlencode($sessionKey);
+            $parameters[] = 'q='.urlencode($challenge);
+            $parameters[] = 'i='.urlencode($this->getIdentifier());
+            $parameters[] = 'v='.urlencode($this->_protocolVersion);
             return $this->_protocolAuth.'?'.implode('&', $parameters);
         }
 
         // Create custom URL scheme
         // Last bit is the spIdentifier
-        return $this->_protocolAuth."://".(!is_null($userId)?urlencode($userId).'@':'').$this->getIdentifier()."/".$sessionKey."/".$challenge."/".urlencode($spIdentifier)."/".$this->_protocolVersion;
+        return $this->_protocolAuth."://".(!is_null($userId) ?urlencode($userId).'@' : '').$this->getIdentifier()."/".$sessionKey."/".$challenge."/".urlencode($spIdentifier)."/".$this->_protocolVersion;
     }
 
     /**
@@ -934,7 +934,7 @@ 
     {
         // The are two formats see: https://tiqr.org/technical/protocol/
 
-        if ( (strpos($this->_protocolEnroll, 'https://') === 0) || (strpos($this->_protocolEnroll, 'http://') === 0) ) {
+        if ((strpos($this->_protocolEnroll, 'https://') === 0) || (strpos($this->_protocolEnroll, 'http://') === 0)) {
             // Create universal Link
             return $this->_protocolEnroll.'?metadata='.urlencode($metadataUrl);
         }
@@ -953,7 +953,7 @@ 
     protected function _uniqueSessionKey(): string
     {
 
-        return bin2hex( Tiqr_Random::randomBytes(self::SESSION_KEY_LENGTH_BYTES) );
+        return bin2hex(Tiqr_Random::randomBytes(self::SESSION_KEY_LENGTH_BYTES));
     }
     
     /**
@@ -984,7 +984,7 @@ 
      */
     protected function _setStateValue(string $key_prefix, string $key, $value, int $expire): void {
         $this->_stateStorage->setValue(
-            $key_prefix . $this->_hashKey($key),
+            $key_prefix.$this->_hashKey($key),
             $value,
             $expire
         );
@@ -1001,7 +1001,7 @@ 
 
     protected function _getStateValue(string $key_prefix, string $key) {
         return $this->_stateStorage->getValue(
-            $key_prefix . $this->_hashKey($key)
+            $key_prefix.$this->_hashKey($key)
         );
     }
 
@@ -1015,7 +1015,7 @@ 
      */
     protected function _unsetStateValue(string $key_prefix, string $key): void {
         $this->_stateStorage->unsetValue(
-            $key_prefix . $this->_hashKey($key)
+            $key_prefix.$this->_hashKey($key)
         );
     }
 

Braces +8 added lines, -7 removed lines

@@ -287,8 +287,7 @@ 
         if (isset($options['ocraservice']) && $options['ocraservice']['type'] != 'tiqr') {
             $options['ocraservice']['ocra.suite'] = $this->_ocraSuite;
             $this->_ocraService = Tiqr_OcraService::getOcraService($options['ocraservice']['type'], $options['ocraservice'], $logger);
-        }
-        else { // Create default ocraservice
+        } else { // Create default ocraservice
             $this->_ocraService = Tiqr_OcraService::getOcraService('tiqr', array('ocra.suite' => $this->_ocraSuite), $logger);
         }
     }
@@ -347,8 +346,9 @@ 
                 case 'APNS':
                 case 'APNS_DIRECT':
                     $apns_version = $this->_options['apns.version'] ?? 2;
-                    if ($apns_version !=2)
-                        throw new InvalidArgumentException("Unsupported APNS version '$apns_version'");
+                    if ($apns_version !=2) {
+                                            throw new InvalidArgumentException("Unsupported APNS version '$apns_version'");
+                    }
                     $message = new Tiqr_Message_APNS2($this->_options, $this->logger);
                     break;
 
@@ -514,7 +514,9 @@ 
             $sessionId = session_id(); 
         }
         $status = $this->_getStateValue(self::PREFIX_ENROLLMENT_STATUS, $sessionId);
-        if (is_null($status)) return self::ENROLLMENT_STATUS_IDLE;
+        if (is_null($status)) {
+            return self::ENROLLMENT_STATUS_IDLE;
+        }
         return $status;
     }
         
@@ -871,8 +873,7 @@ 
         
         try {
             return $this->_getStateValue("authenticated_", $sessionId);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('getAuthenticatedUser failed', array('exception'=>$e));
             return NULL;
         }