summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaša Živkov <sasa.zivkov@sap.com>2020-05-27 16:45:13 +0200
committerLuca Milanesio <luca.milanesio@gmail.com>2020-05-29 21:10:06 +0000
commitc475b57ba17ca4100c624568b29f2dfc51ab9a61 (patch)
tree69113aa692bc767189faf7b7f884fcc34dc3709a
parentd505dccf5c438868ab0a1192d066a9500fb04ff3 (diff)
Trim parameterized strings evaluated from LdapRealm
The fullName attribute is computed based on the following parameterized string: "${givenName} ${sn}" for Active Directory LDAP. If the "sn" attribute is not set for a user in LDAP then the result of this evaluation will end with a whitespace which is ugly for a full name. Change-Id: Ic4ae0a47417d401a223c059c5ba7a35309aa2c58
-rw-r--r--java/com/google/gerrit/server/auth/ldap/LdapRealm.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
index b047488097..be6303dfca 100644
--- a/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
+++ b/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
@@ -217,7 +217,7 @@ class LdapRealm extends AbstractRealm {
values.put(name, m.get(name));
}
- String r = p.replace(values);
+ String r = p.replace(values).trim();
return r.isEmpty() ? null : r;
}