Skip to content

A free open source IT asset/license management system

Improve LDAP escaping to better reflect modern PHP standards

Brady Wetherington3a7e00ccc3f8
diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php
index f677eabd35..127ca4d98e 100644
--- a/app/Models/Ldap.php
+++ b/app/Models/Ldap.php
@@ -195,7 +195,7 @@ class Ldap extends Model
$connection = self::connectToLdap();
$ldap_username_field = $settings->ldap_username_field;
$baseDn = $settings->ldap_basedn;
- $userDn = $ldap_username_field.'='.$username.','.$settings->ldap_basedn;
+ $userDn = $ldap_username_field . '=' . ldap_escape($username, '', LDAP_ESCAPE_DN) . ',' . $settings->ldap_basedn;
if ($settings->is_ad == '1') {
// Check if they are using the userprincipalname for the username field.
@@ -213,7 +213,7 @@ class Ldap extends Model
}
}
- $filterQuery = $settings->ldap_auth_filter_query.$username;
+ $filterQuery = $settings->ldap_auth_filter_query . ldap_escape($username, '', LDAP_ESCAPE_FILTER);
$filter = Setting::getSettings()->ldap_filter; //FIXME - this *does* respect the ldap filter, but I believe that AdLdap2 did *not*.
$filterQuery = "({$filter}({$filterQuery}))";