Skip to content

Escape some additional values used in LDAP filters #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-aleksander merged 1 commit into from
Jun 30, 2025
Merged

Escape some additional values used in LDAP filters #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions crates/defguard_core/src/enterprise/ldap/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::{
};

use ldap3::{
adapters::PagedResults, drive, LdapConnAsync, LdapConnSettings, Mod, Scope, SearchEntry,
adapters::PagedResults, drive, ldap_escape, LdapConnAsync, LdapConnSettings, Mod, Scope,
SearchEntry,
};

use super::error::LdapError;
Expand Down Expand Up @@ -112,7 +113,11 @@ impl super::LDAPConnection {
&mut self,
user_dn: &str,
) -> Result<Vec<SearchEntry>, LdapError> {
let filter = format!("({}={})", self.config.ldap_group_member_attr, user_dn);
let user_dn_escaped = ldap_escape(user_dn);
let filter = format!(
"({}={})",
self.config.ldap_group_member_attr, user_dn_escaped
);
let (rs, res) = self
.ldap
.search(
Expand Down Expand Up @@ -252,13 +257,15 @@ impl super::LDAPConnection {
groupname: &str,
) -> Result<bool, LdapError> {
debug!("Checking if user {user_dn} is member of group {groupname}");
let user_dn_escaped = ldap_escape(user_dn);
let groupname_escaped = ldap_escape(groupname);
let filter = format!(
"(&(objectClass={})({}={})({}={}))",
self.config.ldap_group_obj_class,
self.config.ldap_groupname_attr,
groupname,
groupname_escaped,
self.config.ldap_group_member_attr,
user_dn
user_dn_escaped
);
debug!(
"Using the following filter for group search: {filter} and base: {}",
Expand All @@ -283,9 +290,10 @@ impl super::LDAPConnection {
groupname: &str,
) -> Result<Vec<String>, LdapError> {
debug!("Searching for group memberships for group {}", groupname);
let groupname_escaped = ldap_escape(groupname);
let filter = format!(
"(&(objectClass={})({}={}))",
self.config.ldap_group_obj_class, self.config.ldap_groupname_attr, groupname
self.config.ldap_group_obj_class, self.config.ldap_groupname_attr, groupname_escaped
);
debug!(
"Using the following filter for group search: {filter} and base: {}",
Expand Down Expand Up @@ -335,7 +343,11 @@ impl super::LDAPConnection {
let mut group_filters = vec![];
for group in self.config.ldap_sync_groups.iter() {
let group_dn = self.config.group_dn(group);
group_filters.push(format!("({}={})", self.config.ldap_member_attr, group_dn));
let group_dn_escaped = ldap_escape(&group_dn);
group_filters.push(format!(
"({}={})",
self.config.ldap_member_attr, group_dn_escaped
));
}
debug!(
"Using the following group filters for user search: {:?}",
Expand Down
9 changes: 6 additions & 3 deletions crates/defguard_core/src/enterprise/ldap/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,9 @@ impl LDAPConnection {
/// Checks if a group with the given name exists in LDAP.
async fn group_exists(&mut self, groupname: &str) -> Result<bool, LdapError> {
let groupname_attr = self.config.ldap_groupname_attr.clone();
let groupname_escaped = ldap_escape(groupname);
let res = self
.search_groups(format!("({groupname_attr}={groupname})").as_str())
.search_groups(format!("({groupname_attr}={groupname_escaped})").as_str())
.await?;

Ok(!res.is_empty())
Expand All @@ -451,8 +452,9 @@ impl LDAPConnection {
/// Checks if a user with the given username exists in LDAP.
async fn user_exists_by_username(&mut self, username: &str) -> Result<bool, LdapError> {
let username_attr = self.config.ldap_username_attr.clone();
let username_escaped = ldap_escape(username);
let res = self
.search_users(format!("({username_attr}={username})").as_str())
.search_users(format!("({username_attr}={username_escaped})").as_str())
.await?;

Ok(!res.is_empty())
Expand All @@ -465,8 +467,9 @@ impl LDAPConnection {
/// the RDN would be `test` (assuming `cn` is the RDN attribute).
async fn user_exists_by_rdn(&mut self, rdn: &str) -> Result<bool, LdapError> {
let rdn_attr = self.config.get_rdn_attr();
let rdn_escaped = ldap_escape(rdn);
let res = self
.search_users(format!("({rdn_attr}={rdn})").as_str())
.search_users(format!("({rdn_attr}={rdn_escaped})").as_str())
.await?;

Ok(!res.is_empty())
Expand Down