Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserStorage/GenericStore.php

Indentation +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     public function createUser($userId, $displayName) 
     {
         $user = array("userId"=>$userId,
-                      "displayName"=>$displayName);
+                        "displayName"=>$displayName);
         return $this->_saveUser($userId, $user);
     }
 
@@ -77,7 +77,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationType"])) {
-               return $data["notificationType"];
+                return $data["notificationType"];
             }
         }
         return NULL;
@@ -102,7 +102,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationAddress"])) {
-               return $data["notificationAddress"];
+                return $data["notificationAddress"];
             }
         }
         $this->logger->info('Unable to find notification address for user');

library/tiqr/Tiqr/UserStorage/Pdo.php

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
         parent::__construct($config, $logger, $secretconfig);
         $this->tablename = isset($config['table']) ? $config['table'] : 'tiqruser';
         try {
-            $this->handle = new PDO($config['dsn'],$config['username'],$config['password']);
+            $this->handle = new PDO($config['dsn'], $config['username'], $config['password']);
         } catch (PDOException $e) {
             $this->logger->error(
                 sprintf('Unable to establish a PDO connection. Error message from PDO: %s', $e->getMessage())
@@ -61,7 +61,7 @@ 
         } else {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (displayname,userid) VALUES (?,?)");
         }
-        if ($sth->execute(array($displayName,$userId))){
+        if ($sth->execute(array($displayName, $userId))) {
             return $this->userExists($userId);
         }
         $this->logger->error('The user could not be saved in the user storage (PDO)');
@@ -105,7 +105,7 @@ 
     public function setNotificationType($userId, $type)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET notificationtype = ? WHERE userid = ?");
-        if (!$sth->execute(array($type,$userId))) {
+        if (!$sth->execute(array($type, $userId))) {
             $this->logger->error('Unable to set the notification type in user storage for a given user (PDO)');
         }
     }
@@ -122,7 +122,7 @@ 
     public function setNotificationAddress($userId, $address)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET notificationaddress = ?  WHERE userid = ?");
-        if (!$sth->execute(array($address,$userId))) {
+        if (!$sth->execute(array($address, $userId))) {
             $this->logger->error('Unable to set the notification address in user storage for a given user (PDO)');
         }
     }
@@ -139,7 +139,7 @@ 
     public function setLoginAttempts($userId, $amount)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET loginattempts = ? WHERE userid = ?");
-        if (!$sth->execute(array($amount,$userId))) {
+        if (!$sth->execute(array($amount, $userId))) {
             $this->logger->error('Unable to set login attempts in user storage for a given user (PDO)');
         }
     }
@@ -172,7 +172,7 @@ 
     
     public function setTemporaryBlockAttempts($userId, $amount) {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET tmpblockattempts = ? WHERE userid = ?");
-        if (!$sth->execute(array($amount,$userId))) {
+        if (!$sth->execute(array($amount, $userId))) {
             $this->logger->error('Unable to set temp login attempts in user storage for a given user (PDO)');
         }
     }
@@ -197,7 +197,7 @@ 
     public function setTemporaryBlockTimestamp($userId, $timestamp)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET tmpblocktimestamp = ? WHERE userid = ?");
-        if (!$sth->execute(array($timestamp,$userId))) {
+        if (!$sth->execute(array($timestamp, $userId))) {
             $this->logger->error('Unable to update temp lock timestamp in user storage for a given user (PDO)');
         }
     }

library/tiqr/Tiqr/UserStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      *
      * @return Tiqr_UserStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, $type="dummy", $options=array())
+    public static function getEncryption(LoggerInterface $logger, $type = "dummy", $options = array())
     {
         $logger->info(sprintf('Using %s as UserStorage encryption type', $type));
         switch ($type) {

library/tiqr/Tiqr/Service.php

Indentation +37 added lines, -37 removed lines

@@ -552,17 +552,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);
 
@@ -585,18 +585,18 @@ 
      */
     public function getEnrollmentSecret($enrollmentKey)
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
-         $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET);
-         $enrollmentData = [
-             "userId" => $data["userId"],
-             "sessionId" => $data["sessionId"]
-         ];
-         $this->_stateStorage->setValue(
-             self::PREFIX_ENROLLMENT_SECRET . $secret,
-             $enrollmentData,
-             self::ENROLLMENT_EXPIRE
-         );
-         return $secret;
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+            $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET);
+            $enrollmentData = [
+                "userId" => $data["userId"],
+                "sessionId" => $data["sessionId"]
+            ];
+            $this->_stateStorage->setValue(
+                self::PREFIX_ENROLLMENT_SECRET . $secret,
+                $enrollmentData,
+                self::ENROLLMENT_EXPIRE
+            );
+            return $secret;
     } 
 
     /**
@@ -635,18 +635,18 @@ 
      */
     public function finalizeEnrollment($enrollmentSecret) 
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
-         if (is_array($data)) {
-             // Enrollment is finalized, destroy our session data.
-             $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
-             $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
-         } else {
-             $this->logger->error(
-                 'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' .
-                 'Warning! the method will still return "true" as a result.'
-             );
-         }
-         return true;
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
+            if (is_array($data)) {
+                // Enrollment is finalized, destroy our session data.
+                $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
+                $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
+            } else {
+                $this->logger->error(
+                    'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' .
+                    'Warning! the method will still return "true" as a result.'
+                );
+            }
+            return true;
     }
 
     /**
@@ -683,7 +683,7 @@ 
 
         $challengeUserId = NULL;
         if (isset($state["userId"])) {
-          $challengeUserId = $state["userId"];
+            $challengeUserId = $state["userId"];
         }
         // Check if we're dealing with a second factor
         if ($challengeUserId!=NULL && ($userId != $challengeUserId)) {
@@ -830,6 +830,6 @@ 
      */
     protected function _setEnrollmentStatus($sessionId, $status)
     {
-       $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE);
+        $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE);
     }
 }

Spacing +35 added lines, -35 removed lines

@@ -74,12 +74,12 @@ 
     /**
      * Enrollment status codes
      */
-    const ENROLLMENT_STATUS_IDLE = 1;        // Nothing happens
+    const ENROLLMENT_STATUS_IDLE = 1; // Nothing happens
     const ENROLLMENT_STATUS_INITIALIZED = 2; // An enrollment session has begun
-    const ENROLLMENT_STATUS_RETRIEVED = 3;   // The device has retrieved the metadata
-    const ENROLLMENT_STATUS_PROCESSED = 4;   // The device has snet back a secret
-    const ENROLLMENT_STATUS_FINALIZED = 5;   // The application has stored the secret
-    const ENROLLMENT_STATUS_VALIDATED = 6;   // A first succesful authentication was performed
+    const ENROLLMENT_STATUS_RETRIEVED = 3; // The device has retrieved the metadata
+    const ENROLLMENT_STATUS_PROCESSED = 4; // The device has snet back a secret
+    const ENROLLMENT_STATUS_FINALIZED = 5; // The application has stored the secret
+    const ENROLLMENT_STATUS_VALIDATED = 6; // A first succesful authentication was performed
 
     const PREFIX_ENROLLMENT_SECRET = 'enrollsecret';
     const PREFIX_ENROLLMENT = 'enroll';
@@ -162,7 +162,7 @@ 
      * @param array $options
      * @param int $version The protocol version to use (defaults to the latest)
      */
-    public function __construct(LoggerInterface $logger, $options=array(), $version = 2)
+    public function __construct(LoggerInterface $logger, $options = array(), $version = 2)
     {
         $this->_options = $options;
         $this->logger = $logger;
@@ -306,7 +306,7 @@ 
             $this->logger->info(sprintf('Creating and sending a %s push notification', $notificationType));
             $message = new $class($this->_options);
             $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();
@@ -375,13 +375,13 @@ 
      * @param String $spIdentifier If SP and IDP are 2 different things, pass the url/identifier of the SP the user is logging into.
      *                             For setups where IDP==SP, just leave this blank.
      */
-    public function startAuthenticationSession($userId="", $sessionId="", $spIdentifier="")
+    public function startAuthenticationSession($userId = "", $sessionId = "", $spIdentifier = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
-        if ($spIdentifier=="") {
+        if ($spIdentifier == "") {
             $spIdentifier = $this->_identifier;
         }
 
@@ -391,11 +391,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;
     }
@@ -415,9 +415,9 @@ 
      *                           to php session)
      * @return String The enrollment key
      */
-    public function startEnrollmentSession($userId, $displayName, $sessionId="")
+    public function startEnrollmentSession($userId, $displayName, $sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
         $enrollmentKey = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT);
@@ -426,7 +426,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;
@@ -437,9 +437,9 @@ 
      * @param $sessionId The application's session identifier (defaults
      *                   to php session)
      */
-    public function resetEnrollmentSession($sessionId="")
+    public function resetEnrollmentSession($sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
@@ -484,9 +484,9 @@ 
      *               A first successful authentication was performed 
      *               (todo: currently not used)
      */
-    public function getEnrollmentStatus($sessionId="")
+    public function getEnrollmentStatus($sessionId = "")
     { 
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         $status = $this->_stateStorage->getValue("enrollstatus".$sessionId);
@@ -545,7 +545,7 @@ 
      */
     public function getEnrollmentMetadata($enrollmentKey, $authenticationUrl, $enrollmentUrl)
     {
-        $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');
             return false;
@@ -564,7 +564,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;
@@ -585,14 +585,14 @@ 
      */
     public function getEnrollmentSecret($enrollmentKey)
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
          $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET);
          $enrollmentData = [
              "userId" => $data["userId"],
              "sessionId" => $data["sessionId"]
          ];
          $this->_stateStorage->setValue(
-             self::PREFIX_ENROLLMENT_SECRET . $secret,
+             self::PREFIX_ENROLLMENT_SECRET.$secret,
              $enrollmentData,
              self::ENROLLMENT_EXPIRE
          );
@@ -642,7 +642,7 @@ 
              $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
          } 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.'
              );
          }
@@ -672,7 +672,7 @@ 
      */
     public function authenticate($userId, $userSecret, $sessionKey, $response)
     {
-        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
         if (is_null($state)) {
             $this->logger->info('The auth challenge could not be found in the state storage');
             return self::AUTH_RESULT_INVALID_CHALLENGE;
@@ -686,7 +686,7 @@ 
           $challengeUserId = $state["userId"];
         }
         // Check if we're dealing with a second factor
-        if ($challengeUserId!=NULL && ($userId != $challengeUserId)) {
+        if ($challengeUserId != NULL && ($userId != $challengeUserId)) {
             $this->logger->error(
                 'Authentication failed: the first factor user id does not match with that of the second factor'
             );
@@ -704,7 +704,7 @@ 
             $this->_stateStorage->setValue("authenticated_".$sessionId, $userId, self::LOGIN_EXPIRE);
             
             // Clean up the challenge.
-            $this->_stateStorage->unsetValue(self::PREFIX_CHALLENGE . $sessionKey);
+            $this->_stateStorage->unsetValue(self::PREFIX_CHALLENGE.$sessionKey);
             $this->logger->info('Authentication succeeded');
             return self::AUTH_RESULT_AUTHENTICATED;
         }
@@ -717,9 +717,9 @@ 
      * @param String $sessionId The application's session identifier (defaults
      *                          to the php session).
      */
-    public function logout($sessionId="")
+    public function logout($sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         
@@ -754,9 +754,9 @@ 
      * @return mixed An array with user data if a user was logged in or NULL if
      *               no user is logged in.
      */
-    public function getAuthenticatedUser($sessionId="")
+    public function getAuthenticatedUser($sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $this->logger->debug('Using the PHP session id, as no session id was provided');
             $sessionId = session_id(); 
         }
@@ -775,7 +775,7 @@ 
      */
     protected function _getChallengeUrl($sessionKey)
     {                
-        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
         if (is_null($state)) {
             $this->logger->error(
                 'Unable find an existing challenge url in the state storage based on the existing session key'
@@ -783,7 +783,7 @@ 
             return false;
         }
         
-        $userId   = NULL;
+        $userId = NULL;
         $challenge = $state["challenge"];
         if (isset($state["userId"])) {
             $userId = $state["userId"];
@@ -791,7 +791,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;
     }
 
     /**
@@ -815,7 +815,7 @@ 
     protected function _uniqueSessionKey($prefix)
     {      
         $value = 1;
-        while ($value!=NULL) {
+        while ($value != NULL) {
             $sessionKey = $this->_ocraWrapper->generateSessionKey();
             $value = $this->_stateStorage->getValue($prefix.$sessionKey);
         }

library/tiqr/Tiqr/StateStorage.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
      *                       options per type.
      * @throws Exception If an unknown type is requested.
      */
-    public static function getStorage($type="file", $options=array(), LoggerInterface $logger)
+    public static function getStorage($type = "file", $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "file":
@@ -71,7 +71,7 @@ 
                     }
                 }
 
-                $pdoInstance = new PDO($options['dsn'],$options['username'],$options['password']);
+                $pdoInstance = new PDO($options['dsn'], $options['username'], $options['password']);
                 // Set a hard-coded default for the probability the expired state is removed
                 // 0.1 translates to a 10% chance the garbage collection is executed
                 $cleanupProbability = 0.1;
@@ -86,9 +86,9 @@ 
                 if (!isset($type)) {
                     throw new Exception('Class name not set');
                 } elseif (!class_exists($type)) {
-                    throw new Exception('Class not found: ' . var_export($type, TRUE));
+                    throw new Exception('Class not found: '.var_export($type, TRUE));
                 } elseif (!is_subclass_of($type, 'Tiqr_StateStorage_Abstract')) {
-                    throw new Exception('Class ' . $type . ' not subclass of Tiqr_StateStorage_Abstract');
+                    throw new Exception('Class '.$type.' not subclass of Tiqr_StateStorage_Abstract');
                 }
                 $instance = new $type($options);
         }

library/tiqr/Tiqr/DeviceStorage.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
      *                       config options per type.
      * @throws Exception An exception if an unknown storage is requested.
      */
-    public static function getStorage($type="dummy", $options=array(), LoggerInterface $logger)
+    public static function getStorage($type = "dummy", $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "dummy":
@@ -59,7 +59,7 @@ 
             default:
                 $instance = NULL;
         }
-        if ($instance!=NULL) {
+        if ($instance != NULL) {
             $instance->init();
             return $instance;
         }

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         $this->logger = $logger;
         $this->tablename = isset($config['table']) ? $config['table'] : 'tiqrusersecret';
         try {
-            $this->handle = new PDO($config['dsn'],$config['username'],$config['password']);
+            $this->handle = new PDO($config['dsn'], $config['username'], $config['password']);
         } catch (PDOException $e) {
             $this->logger->error(
                 sprintf('Unable to establish a PDO connection. Error message from PDO: %s', $e->getMessage())
@@ -61,7 +61,7 @@ 
     public function getUserSecret($userId)
     {
         $sth = $this->handle->prepare("SELECT secret FROM ".$this->tablename." WHERE userid = ?");
-        if($sth->execute(array($userId))) {
+        if ($sth->execute(array($userId))) {
             return $sth->fetchColumn();
         }
         $this->logger->error('Unable to retrieve user secret from user secret storage (PDO)');
@@ -80,7 +80,7 @@ 
         } else {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (secret,userid) VALUES (?,?)");
         }
-        if (!$sth->execute(array($secret,$userId))) {
+        if (!$sth->execute(array($secret, $userId))) {
             $this->logger->error('Unable to persist user secret in user secret storage (PDO)');
         }
     }