Skip to content

fix: the hive thrift server's ldap authentication pr... in... #55700

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

Draft
orbisai0security wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Draft

fix: the hive thrift server's ldap authentication pr... in... #55700

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
27 changes: 25 additions & 2 deletions ...riftserver/src/main/java/org/apache/hive/service/auth/LdapAuthenticationProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ public void Authenticate(String user, String password) throws AuthenticationExce
List<String> candidatePrincipals = new ArrayList<>();
if (Utils.isBlank(userDNPattern)) {
if (Utils.isNotBlank(baseDN)) {
String pattern = "uid=" + user + "," + baseDN;
String pattern = "uid=" + escapeLdapDN(user) + "," + baseDN;
candidatePrincipals.add(pattern);
}
} else {
String[] patterns = userDNPattern.split(":");
for (String pattern : patterns) {
if (pattern.contains(",") && pattern.contains("=")) {
candidatePrincipals.add(pattern.replaceAll("%s", user));
candidatePrincipals.add(pattern.replace("%s", escapeLdapDN(user)));
}
}
}
Expand Down Expand Up @@ -108,4 +108,27 @@ public void Authenticate(String user, String password) throws AuthenticationExce
private boolean hasDomain(String userName) {
return (ServiceUtils.indexOfDomainMatch(userName) > 0);
}

/**
* Escapes special characters in an LDAP DN attribute value per RFC 4514
* to prevent LDAP injection attacks.
*/
private static String escapeLdapDN(String value) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
switch (c) {
case '\\': sb.append("\\\\"); break;
case ',': sb.append("\\,"); break;
case '+': sb.append("\\+"); break;
case '"': sb.append("\\\""); break;
case '<': sb.append("\\<"); break;
case '>': sb.append("\\>"); break;
case ';': sb.append("\\;"); break;
case '\0': sb.append("\\00"); break;
default: sb.append(c); break;
}
}
return sb.toString();
}
}