mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-12-19 12:51:29 +00:00
[Web] fix ldap filter if empty
This commit is contained in:
@@ -493,11 +493,14 @@ function ldap_mbox_login($user, $pass, $iam_settings, $extra = null){
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$user_res = $iam_provider->query()
|
$ldap_query = $iam_provider->query()
|
||||||
->where($iam_settings['username_field'], '=', $user)
|
->where($iam_settings['username_field'], '=', $user)
|
||||||
->whereRaw($iam_settings['filter'])
|
->select([$iam_settings['username_field'], $iam_settings['attribute_field'], 'displayname', 'distinguishedname']);
|
||||||
->select([$iam_settings['username_field'], $iam_settings['attribute_field'], 'displayname', 'distinguishedname'])
|
if (!empty($iam_settings['filter'])) {
|
||||||
->firstOrFail();
|
$ldap_query = $ldap_query->whereRaw($iam_settings['filter']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$user_res = $ldap_query->firstOrFail();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user