public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Web] fix ldap filter if empty
d22cafac
data/web/inc/functions.auth.inc.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)Diff
diff --git a/data/web/inc/functions.auth.inc.php b/data/web/inc/functions.auth.inc.php
index d325c072..6075ab76 100644
--- a/data/web/inc/functions.auth.inc.php
+++ b/data/web/inc/functions.auth.inc.php
@@ -493,11 +493,14 @@ function ldap_mbox_login($user, $pass, $iam_settings, $extra = null){
}
try {
- $user_res = $iam_provider->query()
+ $ldap_query = $iam_provider->query()
->where($iam_settings['username_field'], '=', $user)
- ->whereRaw($iam_settings['filter'])
- ->select([$iam_settings['username_field'], $iam_settings['attribute_field'], 'displayname', 'distinguishedname'])
- ->firstOrFail();
+ ->select([$iam_settings['username_field'], $iam_settings['attribute_field'], 'displayname', 'distinguishedname']);
+ if (!empty($iam_settings['filter'])) {
+ $ldap_query = $ldap_query->whereRaw($iam_settings['filter']);
+ }
+
+ $user_res = $ldap_query->firstOrFail();
} catch (Exception $e) {
return false;
}