Code of Conduct <inpu

Hi, This issue will be fixed by <a class="issue-link js-issue-link"

<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github

I think I found a clue : <a class="commit-link" href="https://github.com/glpi-proj

User import (ldap) 1102 (with 10.0.12/13/14) instead of 5394 (with 10.0.11) about glpi HOT 4 CLOSED

TheRoby commented on June 22, 2024

User import (ldap) 1102 (with 10.0.12/13/14) instead of 5394 (with 10.0.11)

from glpi.

Comments (4)

cedric-anne commented on June 22, 2024 1

Hi,

This issue will be fixed by #16806. As it requires a migration, the patch cannot be applied in a production environment.

You can apply the following patch instead, on GLPI 10.0.14, to fix the issue until GLPI 10.0.15 is released:

diff --git a/src/User.php b/src/User.php
index 695fe4df5f..5349a49322 100644
--- a/src/User.php
+++ b/src/User.php
@@ -567,7 +567,7 @@ class User extends CommonDBTM
          * and is indexed in the database, making it faster to search.
          */
         return $this->getFromDBByCrit([
-            'user_dn_hash' => md5($user_dn)
+            'user_dn_hash' => md5(Sanitizer::sanitize($user_dn))
         ]);
     }
 
@@ -847,7 +847,7 @@ class User extends CommonDBTM
     {
         // Hash user_dn if set
         if (isset($this->input['user_dn']) && is_string($this->input['user_dn']) && strlen($this->input['user_dn']) > 0) {
-            $this->input['user_dn_hash'] = md5($this->input['user_dn']);
+            $this->input['user_dn_hash'] = md5(Sanitizer::sanitize($this->input['user_dn']));
         }
     }
 
@@ -3503,7 +3503,7 @@ HTML;
         // Hash user_dn if is updated
         if (in_array('user_dn', $this->updates)) {
             $this->updates[] = 'user_dn_hash';
-            $this->fields['user_dn_hash'] = is_string($this->input['user_dn']) && strlen($this->input['user_dn']) > 0 ? md5($this->input['user_dn']) : null;
+            $this->fields['user_dn_hash'] = is_string($this->input['user_dn']) && strlen($this->input['user_dn']) > 0 ? md5(Sanitizer::sanitize($this->input['user_dn'])) : null;
         }
     }

from glpi.

TheRoby commented on June 22, 2024

Hi,
Same problem with 10.0.13

from glpi.

TheRoby commented on June 22, 2024

2ee311a
if i change this :

public function getFromDBbyDn($user_dn)
    {
       [old] return $this->getFromDBByCrit(['user_dn' => $user_dn]);
        /**
         * We use the 'user_dn_hash' field instead of 'user_dn' for performance reasons.
         * The 'user_dn_hash' field is a hashed version of the 'user_dn' field
         * and is indexed in the database, making it faster to search.
         */
        return $this->getFromDBByCrit([
            'user_dn_hash' => md5($user_dn)
        ]);
    }

to the old version, I have 5394 records updated ...

Edit :
With the old getFromDBbyDN i have a lot of "getFromDBByCrit expects to get one result"
With the new, nothing ...

from glpi.

TheRoby commented on June 22, 2024

I think I found a clue :
2ee311a#commitcomment-139834247

from glpi.

Recommend Projects