simplesamlphp / simplesamlphp-module-authcrypt

lib/Auth/Source/Htpasswd.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
         $this->users = [];
 
         if (!$htpasswd = file_get_contents($config['htpasswd_file'])) {
-            throw new \Exception('Could not read ' . $config['htpasswd_file']);
+            throw new \Exception('Could not read '.$config['htpasswd_file']);
         }
 
         $this->users = explode("\n", trim($htpasswd));
@@ -56,8 +56,8 @@ 
         try {
             $this->attributes = Attributes::normalizeAttributesArray($config['static_attributes']);
         } catch (\Exception $e) {
-            throw new \Exception('Invalid static_attributes in authentication source ' .
-                $this->authId . ': ' . $e->getMessage());
+            throw new \Exception('Invalid static_attributes in authentication source '.
+                $this->authId.': '.$e->getMessage());
         }
     }
 
@@ -90,7 +90,7 @@ 
 
                 // Traditional crypt(3)
                 if (Crypto::secureCompare($crypted, crypt($password, $crypted))) {
-                    Logger::debug('User ' . $username . ' authenticated successfully');
+                    Logger::debug('User '.$username.' authenticated successfully');
                     Logger::warning(
                         'CRYPT authentication is insecure. Please consider using something else.'
                     );
@@ -99,13 +99,13 @@ 
 
                 // Apache's custom MD5
                 if (APR1_MD5::check($password, $crypted)) {
-                    Logger::debug('User ' . $username . ' authenticated successfully');
+                    Logger::debug('User '.$username.' authenticated successfully');
                     return $attributes;
                 }
 
                 // PASSWORD_BCRYPT
                 if (Crypto::pwValid($crypted, $password)) {
-                    Logger::debug('User ' . $username . ' authenticated successfully');
+                    Logger::debug('User '.$username.' authenticated successfully');
                     return $attributes;
                 }
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');

lib/Auth/Source/Hash.php

Spacing +8 added lines, -8 removed lines

@@ -46,14 +46,14 @@ 
         // Validate and parse our configuration
         foreach ($config as $userpass => $attributes) {
             if (!is_string($userpass)) {
-                throw new \Exception('Invalid <username>:<passwordhash> for authentication source ' .
-                    $this->authId . ': ' . $userpass);
+                throw new \Exception('Invalid <username>:<passwordhash> for authentication source '.
+                    $this->authId.': '.$userpass);
             }
 
             $userpass = explode(':', $userpass, 2);
             if (count($userpass) !== 2) {
-                throw new \Exception('Invalid <username>:<passwordhash> for authentication source ' .
-                    $this->authId . ': ' . $userpass[0]);
+                throw new \Exception('Invalid <username>:<passwordhash> for authentication source '.
+                    $this->authId.': '.$userpass[0]);
             }
             $username = $userpass[0];
             $passwordhash = $userpass[1];
@@ -61,12 +61,12 @@ 
             try {
                 $attributes = Attributes::normalizeAttributesArray($attributes);
             } catch (\Exception $e) {
-                throw new \Exception('Invalid attributes for user ' . $username .
-                    ' in authentication source ' . $this->authId . ': ' .
+                throw new \Exception('Invalid attributes for user '.$username.
+                    ' in authentication source '.$this->authId.': '.
                     $e->getMessage());
             }
 
-            $this->users[$username . ':' . $passwordhash] = $attributes;
+            $this->users[$username.':'.$passwordhash] = $attributes;
         }
     }
 
@@ -95,7 +95,7 @@ 
                 if (Crypto::pwValid($matches[1], $password)) {
                     return $attrs;
                 } else {
-                    Logger::debug('Incorrect password "' . $password . '" for user ' . $username);
+                    Logger::debug('Incorrect password "'.$password.'" for user '.$username);
                 }
             }
         }