fix: corrected login via LDAP (#3319)

thorsten · Jan 11, 2025 · 5a8710e · 5a8710e
1 parent 253cec2
commit 5a8710e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/phpmyfaq/src/phpMyFAQ/Auth/AuthLdap.php b/phpmyfaq/src/phpMyFAQ/Auth/AuthLdap.php
@@ -71,8 +71,14 @@ public function __construct(Configuration $configuration)
      */
     public function create(string $login, #[SensitiveParameter] string $password, string $domain = ''): bool
     {
+        $result = false;
         $user = new User($this->configuration);
-        $result = $user->createUser($login, '', $domain);
+
+        try {
+            $result = $user->createUser($login, '', $domain);
+        } catch (\Exception $e) {
+            $this->configuration->getLogger()->info($e->getMessage());
+        }
 
         $this->connect($this->activeServer);
 

diff --git a/phpmyfaq/src/phpMyFAQ/User/CurrentUser.php b/phpmyfaq/src/phpMyFAQ/User/CurrentUser.php
@@ -147,6 +147,7 @@ public function login(string $login, string $password): bool
         }
 
         // Attempt to authenticate user by login and password
+        $this->authContainer = $this->sortAuthContainer($this->authContainer);
         foreach ($this->authContainer as $authSource => $auth) {
             if (!$this->checkAuth($auth)) {
                 continue; // Skip invalid Auth objects
@@ -753,4 +754,19 @@ protected function isFailedLastLoginAttempt(): bool
         $result = $this->configuration->getDb()->query($select);
         return $this->configuration->getDb()->numRows($result) !== 0;
     }
+
+    protected function sortAuthContainer(array $authContainer): array
+    {
+        uksort($authContainer, function ($a, $b) {
+            if ($a === 'local') {
+                return 1;
+            }
+            if ($b === 'local') {
+                return -1;
+            }
+            return 0;
+        });
+
+        return $authContainer;
+    }
 }