You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2026/02/26 05:06:05 UTC
(openmeetings) branch master updated: [OPENMEETINGS-2808] user login used in LDAP search is being escaped
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new e1fb43561 [OPENMEETINGS-2808] user login used in LDAP search is being escaped
e1fb43561 is described below
commit e1fb43561b35a5b18825d2d7078727e73ed8c90e
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Thu Feb 26 12:05:55 2026 +0700
[OPENMEETINGS-2808] user login used in LDAP search is being escaped
---
.../java/org/apache/openmeetings/core/ldap/LdapLoginManager.java | 7 ++++---
.../src/test/java/org/apache/openmeetings/ldap/TestLdap.java | 6 ++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 35da96a78..0fa4847c2 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -50,6 +50,7 @@ import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.exception.LdapAuthenticationException;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.api.ldap.model.filter.FilterEncoder;
import org.apache.directory.api.ldap.model.message.AliasDerefMode;
import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
import org.apache.directory.api.ldap.model.message.SearchScope;
@@ -183,7 +184,7 @@ public class LdapLoginManager {
entry = search.getValue();
break;
case SIMPLEBIND:
- userDn = new Dn(String.format(w.options.userDn, login));
+ userDn = new Dn(String.format(w.options.userDn, FilterEncoder.encodeFilterValue(login)));
w.conn.bind(userDn, passwd);
break;
case NONE:
@@ -258,7 +259,7 @@ public class LdapLoginManager {
Entry entry = null;
bindAdmin(w.conn, w.options);
Dn baseDn = new Dn(w.options.searchBase);
- String searchQ = String.format(w.options.searchQuery, login);
+ String searchQ = String.format(w.options.searchQuery, FilterEncoder.encodeFilterValue(login));
try (EntryCursor cursor = new EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
@@ -428,7 +429,7 @@ public class LdapLoginManager {
}
} else if (GroupMode.QUERY == options.groupMode) {
Dn baseDn = new Dn(options.searchBase);
- String searchQ = String.format(options.groupQuery, u.getLogin());
+ String searchQ = String.format(options.groupQuery, FilterEncoder.encodeFilterValue(u.getLogin()));
fillGroups(baseDn, searchQ, groups);
}
return groups;
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
index 2b3869ca1..92b9329c9 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
@@ -180,4 +180,10 @@ public class TestLdap extends AbstractWicketTesterTest {
LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
assertThrows(OmException.class, () -> WebSession.get().signIn(USER1, BAD_PASSWORD, User.Type.LDAP, cfg.getId()));
}
+
+ @Test
+ void testSbndSearchHijack() {
+ LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
+ assertThrows(OmException.class, () -> WebSession.get().signIn("admin)(|(uid=*", BAD_PASSWORD, User.Type.LDAP, cfg.getId()));
+ }
}