simplesamlphp / simplesamlphp-module-sqlauth

src/Auth/Source/SQL.php

Spacing +17 added lines, -17 removed lines

@@ -68,14 +68,14 @@ 
         // Make sure that all required parameters are present.
         foreach (['dsn', 'username', 'password', 'query'] as $param) {
             if (!array_key_exists($param, $config)) {
-                throw new Exception('Missing required attribute \'' . $param .
-                    '\' for authentication source ' . $this->authId);
+                throw new Exception('Missing required attribute \''.$param.
+                    '\' for authentication source '.$this->authId);
             }
 
             if (!is_string($config[$param])) {
-                throw new Exception('Expected parameter \'' . $param .
-                    '\' for authentication source ' . $this->authId .
-                    ' to be a string. Instead it was: ' .
+                throw new Exception('Expected parameter \''.$param.
+                    '\' for authentication source '.$this->authId.
+                    ' to be a string. Instead it was: '.
                     var_export($config[$param], true));
             }
         }
@@ -101,10 +101,10 @@ 
             $db = new PDO($this->dsn, $this->username, $this->password, $this->options);
         } catch (PDOException $e) {
             // Obfuscate the password if it's part of the dsn
-            $obfuscated_dsn =  preg_replace('/(user|password)=(.*?([;]|$))/', '${1}=***', $this->dsn);
+            $obfuscated_dsn = preg_replace('/(user|password)=(.*?([;]|$))/', '${1}=***', $this->dsn);
 
-            throw new \Exception('sqlauth:' . $this->authId . ': - Failed to connect to \'' .
-                $obfuscated_dsn . '\': ' . $e->getMessage());
+            throw new \Exception('sqlauth:'.$this->authId.': - Failed to connect to \''.
+                $obfuscated_dsn.'\': '.$e->getMessage());
         }
 
         $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -148,30 +148,30 @@ 
         try {
             $sth = $db->prepare($this->query);
         } catch (PDOException $e) {
-            throw new Exception('sqlauth:' . $this->authId .
-                ': - Failed to prepare query: ' . $e->getMessage());
+            throw new Exception('sqlauth:'.$this->authId.
+                ': - Failed to prepare query: '.$e->getMessage());
         }
 
         try {
             $sth->execute(['username' => $username, 'password' => $password]);
         } catch (PDOException $e) {
-            throw new Exception('sqlauth:' . $this->authId .
-                ': - Failed to execute query: ' . $e->getMessage());
+            throw new Exception('sqlauth:'.$this->authId.
+                ': - Failed to execute query: '.$e->getMessage());
         }
 
         try {
             $data = $sth->fetchAll(PDO::FETCH_ASSOC);
         } catch (PDOException $e) {
-            throw new Exception('sqlauth:' . $this->authId .
-                ': - Failed to fetch result set: ' . $e->getMessage());
+            throw new Exception('sqlauth:'.$this->authId.
+                ': - Failed to fetch result set: '.$e->getMessage());
         }
 
-        Logger::info('sqlauth:' . $this->authId . ': Got ' . count($data) .
+        Logger::info('sqlauth:'.$this->authId.': Got '.count($data).
             ' rows from database');
 
         if (count($data) === 0) {
             // No rows returned - invalid username/password
-            Logger::error('sqlauth:' . $this->authId .
+            Logger::error('sqlauth:'.$this->authId.
                 ': No rows in result set. Probably wrong username/password.');
             throw new Error\Error('WRONGUSERPASS');
         }
@@ -202,7 +202,7 @@ 
             }
         }
 
-        Logger::info('sqlauth:' . $this->authId . ': Attributes: ' . implode(',', array_keys($attributes)));
+        Logger::info('sqlauth:'.$this->authId.': Attributes: '.implode(',', array_keys($attributes)));
 
         return $attributes;
     }

src/Auth/Source/PasswordVerify.php

Indentation +3 added lines, -3 removed lines

@@ -172,13 +172,13 @@ 
                 || is_null($row[$this->passwordhashcolumn]))
             {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' must be in every result tuple.');
+                                            ': column ' . $this->passwordhashcolumn . ' must be in every result tuple.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
             if( $pwhash ) {
                 if( $pwhash != $row[$this->passwordhashcolumn] ) {
                     \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                              ': column ' . $this->passwordhashcolumn . ' must be THE SAME in every result tuple.');
+                                                ': column ' . $this->passwordhashcolumn . ' must be THE SAME in every result tuple.');
                     throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
                 }
             }
@@ -191,7 +191,7 @@ 
         if( is_null($pwhash)) {
             if( $pwhash != $row[$this->passwordhashcolumn] ) {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' does not contain a password hash.');
+                                            ': column ' . $this->passwordhashcolumn . ' does not contain a password hash.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
         }

Spacing +13 added lines, -13 removed lines

@@ -59,10 +59,10 @@ 
         // Call the parent constructor first, as required by the interface
         parent::__construct($info, $config);
 
-        if( array_key_exists('passwordhashcolumn', $config )) {
+        if (array_key_exists('passwordhashcolumn', $config)) {
             $this->passwordhashcolumn = $config['passwordhashcolumn'];
         }
-        if( !$this->passwordhashcolumn ) {
+        if (!$this->passwordhashcolumn) {
             $this->passwordhashcolumn = 'passwordhash';
         }
     }
@@ -75,7 +75,7 @@ 
      * @param array  $forbiddenAttributes An array of attributes to never return
      * @return array  Associative array with the users attributes.
      */
-    protected function extractAttributes( $data, $forbiddenAttributes = array() )
+    protected function extractAttributes($data, $forbiddenAttributes = array())
     {
         $attributes = [];
         foreach ($data as $row) {
@@ -172,13 +172,13 @@ 
                 || is_null($row[$this->passwordhashcolumn]))
             {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' must be in every result tuple.');
+                                          ': column '.$this->passwordhashcolumn.' must be in every result tuple.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
-            if( $pwhash ) {
-                if( $pwhash != $row[$this->passwordhashcolumn] ) {
+            if ($pwhash) {
+                if ($pwhash != $row[$this->passwordhashcolumn]) {
                     \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                              ': column ' . $this->passwordhashcolumn . ' must be THE SAME in every result tuple.');
+                                              ': column '.$this->passwordhashcolumn.' must be THE SAME in every result tuple.');
                     throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
                 }
             }
@@ -188,10 +188,10 @@ 
          * This should never happen as the count(data) test above would have already thrown.
          * But checking twice doesn't hurt.
          */
-        if( is_null($pwhash)) {
-            if( $pwhash != $row[$this->passwordhashcolumn] ) {
+        if (is_null($pwhash)) {
+            if ($pwhash != $row[$this->passwordhashcolumn]) {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' does not contain a password hash.');
+                                          ': column '.$this->passwordhashcolumn.' does not contain a password hash.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
         }
@@ -200,13 +200,13 @@ 
          * VERIFICATION!
          * Now to check if the password the user supplied is actually valid
          */
-        if( !password_verify( $password, $pwhash )) {
-            \SimpleSAML\Logger::error('sqlauth:'.$this->authId. ': password is incorrect.');
+        if (!password_verify($password, $pwhash)) {
+            \SimpleSAML\Logger::error('sqlauth:'.$this->authId.': password is incorrect.');
             throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
         }
 
         
-        $attributes = $this->extractAttributes( $data, array($this->passwordhashcolumn) );
+        $attributes = $this->extractAttributes($data, array($this->passwordhashcolumn));
 
         \SimpleSAML\Logger::info('sqlauth:'.$this->authId.': Attributes: '.
             implode(',', array_keys($attributes)));