Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OcraService/Abstract.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 
 use Psr\Log\LoggerInterface;
 
-require_once(__DIR__ . '/../OATH/OCRAParser.php');
+require_once(__DIR__.'/../OATH/OCRAParser.php');
 
 abstract class Tiqr_OcraService_Abstract implements Tiqr_OcraService_Interface
 {
@@ -37,7 +37,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

Indentation +32 added lines, -32 removed lines

@@ -547,17 +547,17 @@ 
         }
 
         $metadata = array("service"=>
-                               array("displayName"       => $this->_name,
-                                     "identifier"        => $this->_identifier,
-                                     "logoUrl"           => $this->_logoUrl,
-                                     "infoUrl"           => $this->_infoUrl,
-                                     "authenticationUrl" => $authenticationUrl,
-                                     "ocraSuite"         => $this->_ocraSuite,
-                                     "enrollmentUrl"     => $enrollmentUrl
-                               ),
-                          "identity"=>
-                               array("identifier" =>$data["userId"],
-                                     "displayName"=>$data["displayName"]));
+                                array("displayName"       => $this->_name,
+                                        "identifier"        => $this->_identifier,
+                                        "logoUrl"           => $this->_logoUrl,
+                                        "infoUrl"           => $this->_infoUrl,
+                                        "authenticationUrl" => $authenticationUrl,
+                                        "ocraSuite"         => $this->_ocraSuite,
+                                        "enrollmentUrl"     => $enrollmentUrl
+                                ),
+                            "identity"=>
+                                array("identifier" =>$data["userId"],
+                                        "displayName"=>$data["displayName"]));
 
         $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
 
@@ -587,27 +587,27 @@ 
      */
     public function getEnrollmentSecret(string $enrollmentKey): string
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
-         if (!is_array($data)) {
-             $this->logger->error('getEnrollmentSecret: enrollment key not found');
-             throw new RuntimeException('enrollment key not found');
-         }
-         $userId = $data["userId"] ?? NULL;
-         $sessionId = $data["sessionId"] ?? NULL;
-         if (!is_string($userId) || !(is_string($sessionId))) {
-             throw new RuntimeException('getEnrollmentSecret: invalid enrollment data');
-         }
-         $enrollmentData = [
-             "userId" => $userId,
-             "sessionId" => $sessionId
-         ];
-         $enrollmentSecret = $this->_uniqueSessionKey();
-         $this->_stateStorage->setValue(
-             self::PREFIX_ENROLLMENT_SECRET . $enrollmentSecret,
-             $enrollmentData,
-             self::ENROLLMENT_EXPIRE
-         );
-         return $enrollmentSecret;
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+            if (!is_array($data)) {
+                $this->logger->error('getEnrollmentSecret: enrollment key not found');
+                throw new RuntimeException('enrollment key not found');
+            }
+            $userId = $data["userId"] ?? NULL;
+            $sessionId = $data["sessionId"] ?? NULL;
+            if (!is_string($userId) || !(is_string($sessionId))) {
+                throw new RuntimeException('getEnrollmentSecret: invalid enrollment data');
+            }
+            $enrollmentData = [
+                "userId" => $userId,
+                "sessionId" => $sessionId
+            ];
+            $enrollmentSecret = $this->_uniqueSessionKey();
+            $this->_stateStorage->setValue(
+                self::PREFIX_ENROLLMENT_SECRET . $enrollmentSecret,
+                $enrollmentData,
+                self::ENROLLMENT_EXPIRE
+            );
+            return $enrollmentSecret;
     }
 
     /**

Spacing +38 added lines, -38 removed lines

@@ -117,7 +117,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
@@ -223,7 +223,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;
@@ -337,7 +337,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();
@@ -383,13 +383,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;
         }
 
@@ -398,11 +398,11 @@ 
         
         $data = array("sessionId"=>$sessionId, "challenge"=>$challenge, "spIdentifier" => $spIdentifier);
         
-        if ($userId!="") {
+        if ($userId != "") {
             $data["userId"] = $userId;
         }
         
-        $this->_stateStorage->setValue(self::PREFIX_CHALLENGE . $sessionKey, $data, self::CHALLENGE_EXPIRE);
+        $this->_stateStorage->setValue(self::PREFIX_CHALLENGE.$sessionKey, $data, self::CHALLENGE_EXPIRE);
        
         return $sessionKey;
     }
@@ -422,9 +422,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();
@@ -433,7 +433,7 @@ 
             "displayName" => $displayName,
             "sessionId" => $sessionId
         ];
-        $this->_stateStorage->setValue(self::PREFIX_ENROLLMENT . $enrollmentKey, $data, self::ENROLLMENT_EXPIRE);
+        $this->_stateStorage->setValue(self::PREFIX_ENROLLMENT.$enrollmentKey, $data, self::ENROLLMENT_EXPIRE);
         $this->_setEnrollmentStatus($sessionId, self::ENROLLMENT_STATUS_INITIALIZED);
 
         return $enrollmentKey;
@@ -444,9 +444,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();
         }
 
@@ -481,9 +481,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->_stateStorage->getValue(self::PREFIX_ENROLLMENT_STATUS.$sessionId);
@@ -540,7 +540,7 @@ 
      */
     public function getEnrollmentMetadata(string $enrollmentKey, string $authenticationUrl, string $enrollmentUrl): array
     {
-        $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+        $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
         if (!is_array($data)) {
             $this->logger->error('Unable to find enrollment metadata in state storage');
             throw new Exception('Unable to find enrollment metadata in state storage');
@@ -559,7 +559,7 @@ 
                                array("identifier" =>$data["userId"],
                                      "displayName"=>$data["displayName"]));
 
-        $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+        $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
 
         $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_RETRIEVED);
         return $metadata;
@@ -587,7 +587,7 @@ 
      */
     public function getEnrollmentSecret(string $enrollmentKey): string
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
          if (!is_array($data)) {
              $this->logger->error('getEnrollmentSecret: enrollment key not found');
              throw new RuntimeException('enrollment key not found');
@@ -603,7 +603,7 @@ 
          ];
          $enrollmentSecret = $this->_uniqueSessionKey();
          $this->_stateStorage->setValue(
-             self::PREFIX_ENROLLMENT_SECRET . $enrollmentSecret,
+             self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret,
              $enrollmentData,
              self::ENROLLMENT_EXPIRE
          );
@@ -631,11 +631,11 @@ 
     public function validateEnrollmentSecret(string $enrollmentSecret): string
     {
         try {
-            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET . $enrollmentSecret);
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
             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');
             }
 
@@ -665,17 +665,17 @@ 
     public function finalizeEnrollment(string $enrollmentSecret): bool
     {
         try {
-            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET . $enrollmentSecret);
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
             if (NULL === $data) {
                 throw new RuntimeException('Enrollment secret not found');
             }
             if (is_array($data)) {
                 // Enrollment is finalized, destroy our session data.
-                $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET . $enrollmentSecret);
+                $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
                 $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.'
                 );
             }
@@ -723,7 +723,7 @@ 
     public function authenticate(string $userId, string $userSecret, string $sessionKey, string $response): int
     {
         try {
-            $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+            $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
             if (is_null($state)) {
                 $this->logger->notice('The auth challenge could not be found in the state storage');
                 return self::AUTH_RESULT_INVALID_CHALLENGE;
@@ -733,9 +733,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');
         }
 
@@ -744,7 +744,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)
@@ -761,7 +761,7 @@ 
 
         if ($equal) {
             // Set application session as authenticated
-            $this->_stateStorage->setValue(self::PREFIX_AUTHENTICATED . $sessionId, $userId, self::LOGIN_EXPIRE);
+            $this->_stateStorage->setValue(self::PREFIX_AUTHENTICATED.$sessionId, $userId, self::LOGIN_EXPIRE);
             $this->logger->notice(sprintf('Authenticated user "%s" in session "%s"', $userId, $sessionId));
 
             // Cleanup challenge
@@ -770,7 +770,7 @@ 
             // Cleaning up only after successful authentication enables the user to retry authentication after e.g. an
             // invalid response
             try {
-                $this->_stateStorage->unsetValue(self::PREFIX_CHALLENGE . $sessionKey); // May throw
+                $this->_stateStorage->unsetValue(self::PREFIX_CHALLENGE.$sessionKey); // May throw
             } catch (Exception $e) {
                 // Only log error
                 $this->logger->warning('Could not delete authentication session key', array('error' => $e));
@@ -792,9 +792,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(); 
         }
         
@@ -834,9 +834,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(); 
         }
@@ -864,7 +864,7 @@ 
         // We probably just generated the challenge and stored it in the StateStorage
         // We can save a roundtrip to the storage backend here by reusing this information
 
-        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
         if (is_null($state)) {
             $this->logger->error(
                 sprintf(
@@ -880,7 +880,7 @@ 
         $spIdentifier = $state["spIdentifier"] ?? '';
         
         // 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;
     }
 
     /**
@@ -902,7 +902,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));
     }
     
     /**

Braces +5 added lines, -5 removed lines

@@ -263,8 +263,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);
         }
     }
@@ -487,7 +486,9 @@ 
             $sessionId = session_id(); 
         }
         $status = $this->_stateStorage->getValue(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;
     }
         
@@ -843,8 +844,7 @@ 
         
         try {
             return $this->_stateStorage->getValue("authenticated_".$sessionId);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('getAuthenticatedUser failed', array('exception'=>$e));
             return NULL;
         }

library/tiqr/Tiqr/Random.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public static function randomBytes(int $length): string
     {
         // Get $length cryptographically secure pseudo-random bytes
-        $rnd=\random_bytes($length);
+        $rnd = \random_bytes($length);
 
         if (strlen($rnd) !== $length) {
             throw new Exception("random_bytes did not return the requested number of bytes");

library/tiqr/Tiqr/StateStorage.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      * @throws RuntimeException When the options configuration array misses a required parameter
      *
      */
-    public static function getStorage(string $type="file", array $options=array(), LoggerInterface $logger)
+    public static function getStorage(string $type = "file", array $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "file":

library/tiqr/Tiqr/Exception/ReadWriteException.php

Spacing +1 added lines, -1 removed lines

@@ -22,6 +22,6 @@
     {
         // $code must be int, otherwise this throws with Error("Wrong parameters for ReadWriteException")
         // PDOException::getCode() can return a sting
-        return new self($e->getMessage(), (int)$e->getCode(), $e );
+        return new self($e->getMessage(), (int) $e->getCode(), $e);
     }
 }