Skip to content

fix ldap group filter for OpenDirectory #51379

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
morrySnow merged 6 commits into from
Aug 28, 2025
Merged

fix ldap group filter for OpenDirectory #51379

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac03060
fix ldap group filter for OpenDirectory
May 30, 2025
9ae4d3a
fixed syntax and ldap dn attribute
Jul 10, 2025
6028bc4
PR review comments
Jul 14, 2025
a8388f0
PR review comments
Jul 14, 2025
4235652
fix review comments
Jul 15, 2025
2885c38
fix styles
Aug 5, 2025
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
33 changes: 15 additions & 18 deletions fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/ldap/LdapClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public boolean checkUpdate(String ldapPassword) {
private void init() {
LdapInfo ldapInfo = Env.getCurrentEnv().getAuth().getLdapInfo();
if (ldapInfo == null || !ldapInfo.isValid()) {
LOG.error("info is null, maybe no ldap admin password is set.");
LOG.error("LDAP info is null or invalid, LDAP admin password may not be set");
ErrorReport.report(ErrorCode.ERROR_LDAP_CONFIGURATION_ERR);
throw new RuntimeException("ldapTemplate is not initialized");
}
Expand Down Expand Up @@ -163,18 +163,18 @@ List<String> getGroups(String userName) {
return groups;
}
List<String> groupDns;

// Support Open Directory implementations
// If no group filter is configured, it defaults to querying groups based on the attribute 'member'
// for standard LDAP implementations
if (!LdapConfig.ldap_group_filter.isEmpty()) {
// Support Open Directory implementations
String filter = LdapConfig.ldap_group_filter.replace("{login}", userName);
groupDns = getDn(org.springframework.ldap.query.LdapQueryBuilder.query()
.base(LdapConfig.ldap_group_basedn)
.filter(getGroupFilter(LdapConfig.ldap_group_filter, userName)));
.attributes("dn")
.base(LdapConfig.ldap_group_basedn)
.filter(filter));
} else {
// Standard LDAP using member attribute
groupDns = getDn(org.springframework.ldap.query.LdapQueryBuilder.query()
.base(LdapConfig.ldap_group_basedn)
.where("member").is(userDn));
.base(LdapConfig.ldap_group_basedn)
.where("member").is(userDn));
}

if (groupDns == null) {
Expand Down Expand Up @@ -209,11 +209,12 @@ private String getUserDn(String userName) {
private List<String> getDn(LdapQuery query) {
init();
try {
return clientInfo.getLdapTemplatePool().search(query, new AbstractContextMapper<String>() {
protected String doMapFromContext(DirContextOperations ctx) {
return ctx.getNameInNamespace();
}
});
return clientInfo.getLdapTemplatePool().search(query,
new AbstractContextMapper<String>() {
protected String doMapFromContext(DirContextOperations ctx) {
return ctx.getNameInNamespace();
}
});
} catch (Exception e) {
LOG.error("Get user dn fail.", e);
ErrorReport.report(ErrorCode.ERROR_LDAP_CONFIGURATION_ERR);
Expand All @@ -224,8 +225,4 @@ protected String doMapFromContext(DirContextOperations ctx) {
private String getUserFilter(String userFilter, String userName) {
return userFilter.replaceAll("\\{login}", userName);
}

private String getGroupFilter(String groupFilter, String userName) {
return groupFilter.replaceAll("\\{login}", userName);
}
}
Loading