Fixed case sensitivity issues

- Transform the LDAP models username during import so it persists through attribute handlers.
- Closes #579

Author: stevebauman

src/Commands/Import.php

@@ -43,7 +43,7 @@ class Import
      */
     public function __construct(User $user, Model $model, array $credentials = [])
     {
-        $this->user = $user;
+        $this->user = $this->transformUsername($user);
         $this->model = $model;
         $this->credentials = $credentials;
     }
@@ -113,12 +113,7 @@ protected function findByCredentials()
      */
     protected function sync(Model $model)
     {
-        $toSync = Config::get('ldap_auth.sync_attributes', [
-            'email' => 'userprincipalname',
-            'name' => 'cn',
-        ]);
-
-        foreach ($toSync as $modelField => $ldapField) {
+        foreach ($this->getLdapSyncAttributes() as $modelField => $ldapField) {
             // If the field is a loaded class and contains a `handle()` method,
             // we need to construct the attribute handler.
             if ($this->isHandler($ldapField)) {
@@ -138,6 +133,24 @@ protected function sync(Model $model)
         }
     }
 
+    /**
+     * Transforms the username of the given user to avoid case sensitivity issues.
+     *
+     * We want to transform the username on the user model so it persists through attribute handlers.
+     *
+     * @param User $user
+     *
+     * @return User
+     */
+    protected function transformUsername(User $user)
+    {
+        $attribute = $this->getLdapDiscoveryUsername();
+
+        $user->setFirstAttribute($attribute, strtolower($user->getFirstAttribute($attribute)));
+
+        return $user;
+    }
+
     /**
      * Determines if the given handler value is a class that contains the 'handle' method.
      *
@@ -147,8 +160,29 @@ protected function sync(Model $model)
      */
     protected function isHandler($handler)
     {
-        return is_string($handler) &&
-            class_exists($handler) &&
-            method_exists($handler, 'handle');
+        return is_string($handler) && class_exists($handler) && method_exists($handler, 'handle');
+    }
+
+    /**
+     * Returns the configured LDAP sync attributes.
+     *
+     * @return array
+     */
+    protected function getLdapSyncAttributes()
+    {
+        return Config::get('ldap_auth.sync_attributes', [
+            'email' => 'userprincipalname',
+            'name' => 'cn',
+        ]);
+    }
+
+    /**
+     * Returns the configured LDAP discovery username attribute.
+     *
+     * @return string
+     */
+    protected function getLdapDiscoveryUsername()
+    {
+        return Config::get('ldap_auth.usernames.ldap.discover', 'userprincipalname');
     }
 }

tests/DatabaseImporterTest.php

@@ -29,7 +29,7 @@ public function ldap_users_are_not_duplicated_with_alternate_casing()
     {
         $user = $this->makeLdapUser([
             'cn' => 'John Doe',
-            'userprincipalname' => 'jdoe@email.com',
+            'userprincipalname' => 'jdoe@EMAIL.com',
         ]);
 
         $m1 = (new Import($user, new TestUser(), ['email' => '[email protected]']))->handle();