libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Fix LDAP RDN resolution based on unescaped comma split

Browse source
This commit is contained in:
Dylan Plecki 2015-06-29 17:24:17 -05:00
parent af2e3de96d
commit 8ae242a6ed
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/model/LDAPDn.java
View file

@ -2,6 +2,8 @@ package org.keycloak.federation.ldap.idm.model;
import java.util.Deque; import java.util.Deque;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
@ -10,12 +12,15 @@ public class LDAPDn {
private final Deque<Entry> entries = new LinkedList<>(); private final Deque<Entry> entries = new LinkedList<>();
private static final Pattern dnRegex = Pattern.compile("[^,\\\\]*(?:\\\\.[^,\\\\]*)");
public static LDAPDn fromString(String dnString) { public static LDAPDn fromString(String dnString) {
LDAPDn dn = new LDAPDn(); LDAPDn dn = new LDAPDn();
String[] rdns = dnString.split(","); Matcher dnMatches = dnRegex.matcher(dnString);
for (String entryStr : rdns) {
String[] rdn = entryStr.split("="); while (dnMatches.find()) {
String[] rdn = dnMatches.group(1).split("=");
dn.addLast(rdn[0].trim(), rdn[1].trim()); dn.addLast(rdn[0].trim(), rdn[1].trim());
} }