Add use-statements

Author: tvdijen

lib/Auth/Source/Hash.php

@@ -2,6 +2,10 @@
 
 namespace SimpleSAML\Module\authcrypt\Auth\Source;
 
+use SimpleSAML\Logger;
+use SimpleSAML\Utils\Attributes;
+use SimpleSAML\Utils\Crypto;
+
 /**
  * Authentication source for username & hashed password.
  *
@@ -55,7 +59,7 @@ public function __construct($info, $config)
             $passwordhash = $userpass[1];
 
             try {
-                $attributes = \SimpleSAML\Utils\Attributes::normalizeAttributesArray($attributes);
+                $attributes = Attributes::normalizeAttributesArray($attributes);
             } catch (\Exception $e) {
                 throw new \Exception('Invalid attributes for user '.$username.
                     ' in authentication source '.$this->authId.': '.
@@ -91,10 +95,10 @@ protected function login($username, $password)
         foreach ($this->users as $userpass => $attrs) {
             $matches = explode(':', $userpass, 2);
             if ($matches[0] === $username) {
-                if (\SimpleSAML\Utils\Crypto::pwValid($matches[1], $password)) {
+                if (Crypto::pwValid($matches[1], $password)) {
                     return $attrs;
                 } else {
-                    \SimpleSAML\Logger::debug('Incorrect password "'.$password.'" for user '.$username);
+                    Logger::debug('Incorrect password "'.$password.'" for user '.$username);
                 }
             }
         }

lib/Auth/Source/Htpasswd.php

@@ -9,6 +9,9 @@
  * @package SimpleSAMLphp
  */
 
+use SimpleSAML\Logger;
+use SimpleSAML\Utils\Attributes;
+use SimpleSAML\Utils\Crypto;
 use WhiteHat101\Crypt\APR1_MD5;
 
 class Htpasswd extends \SimpleSAML\Module\core\Auth\UserPassBase
@@ -53,7 +56,7 @@ public function __construct($info, $config)
         $this->users = explode("\n", trim($htpasswd));
 
         try {
-            $this->attributes = \SimpleSAML\Utils\Attributes::normalizeAttributesArray($config['static_attributes']);
+            $this->attributes = Attributes::normalizeAttributesArray($config['static_attributes']);
         } catch (\Exception $e) {
             throw new \Exception('Invalid static_attributes in authentication source '.
                 $this->authId.': '.$e->getMessage());
@@ -91,23 +94,23 @@ protected function login($username, $password)
                 $attributes = array_merge(['uid' => [$username]], $this->attributes);
 
                 // Traditional crypt(3)
-                if (\SimpleSAML\Utils\Crypto::secureCompare($crypted, crypt($password, $crypted))) {
-                    \SimpleSAML\Logger::debug('User '.$username.' authenticated successfully');
-                    \SimpleSAML\Logger::warning(
+                if (Crypto::secureCompare($crypted, crypt($password, $crypted))) {
+                    Logger::debug('User '.$username.' authenticated successfully');
+                    Logger::warning(
                         'CRYPT authentication is insecure. Please consider using something else.'
                     );
                     return $attributes;
                 }
 
                 // Apache's custom MD5
                 if (APR1_MD5::check($password, $crypted)) {
-                    \SimpleSAML\Logger::debug('User '.$username.' authenticated successfully');
+                    Logger::debug('User '.$username.' authenticated successfully');
                     return $attributes;
                 }
 
                 // PASSWORD_BCRYPT
-                if (\SimpleSAML\Utils\Crypto::pwValid($crypted, $password)) {
-                    \SimpleSAML\Logger::debug('User '.$username.' authenticated successfully');
+                if (Crypto::pwValid($crypted, $password)) {
+                    Logger::debug('User '.$username.' authenticated successfully');
                     return $attributes;
                 }
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');