From a0a314aecef200fdfe1f0f686fad992cd49836eb Mon Sep 17 00:00:00 2001 From: Stefan Guilhen Date: Thu, 27 Feb 2025 10:23:52 -0300 Subject: [PATCH] Append comma to the relative DN only if it is missing Signed-off-by: Stefan Guilhen --- .../src/main/java/org/keycloak/storage/ldap/LDAPConfig.java | 3 ++- .../ldap/mappers/membership/group/GroupMapperConfig.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java index 2ed7df97fe1..91d5a9a0ca1 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java @@ -82,7 +82,8 @@ public class LDAPConfig { public String getRelativeCreateDn() { String relativeCreateDn = config.getFirst(LDAPConstants.RELATIVE_CREATE_DN); if(relativeCreateDn != null) { - return relativeCreateDn + ","; + relativeCreateDn = relativeCreateDn.trim(); + return relativeCreateDn.endsWith(",") ? relativeCreateDn : relativeCreateDn + ","; } return ""; } diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java index d5a313c5092..df7a0dc7f26 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java @@ -83,7 +83,8 @@ public class GroupMapperConfig extends CommonLDAPGroupMapperConfig { public String getRelativeCreateDn() { String relativeCreateDn = mapperModel.getConfig().getFirst(GROUPS_RELATIVE_CREATE_DN); if(relativeCreateDn != null) { - return relativeCreateDn + ","; + relativeCreateDn = relativeCreateDn.trim(); + return relativeCreateDn.endsWith(",") ? relativeCreateDn : relativeCreateDn + ","; } return ""; }