From b037d0efddb54809d16070aff87fd9a192fbeb73 Mon Sep 17 00:00:00 2001
From: Istvan Basa <basipottom@gmail.com>
Date: Wed, 21 Apr 2021 06:25:45 +0200
Subject: [PATCH] fix ldap ad authentication filter query mechanism (#7441)

---
 app/Models/Ldap.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php
index 9de8ca0cd1..f06da90581 100644
--- a/app/Models/Ldap.php
+++ b/app/Models/Ldap.php
@@ -93,8 +93,12 @@ class Ldap extends Model
 
         \Log::debug('Attempting to login using distinguished name:'.$userDn);
 
-
+        
         $filterQuery = $settings->ldap_auth_filter_query . $username;
+        $filter = Setting::getSettings()->ldap_filter;
+        $filterQuery = "({$filter}({$filterQuery}))";
+
+        \Log::debug('Filter query: '.$filterQuery);
 
 
         if (!$ldapbind = @ldap_bind($connection, $userDn, $password)) {