commit c475b57ba17ca4100c624568b29f2dfc51ab9a61
author Saša Živkov <sasa.zivkov@sap.com> Wed May 27 16:45:13 2020 +0200
committer Luca Milanesio <luca.milanesio@gmail.com> Fri May 29 21:10:06 2020 +0000
tree 69113aa692bc767189faf7b7f884fcc34dc3709a
parent d505dccf5c438868ab0a1192d066a9500fb04ff3

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

java/com/google/gerrit/server/auth/ldap/LdapRealm.java

diff --git a/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
index b047488..be6303d 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 @@
       values.put(name, m.get(name));
     }
 
-    String r = p.replace(values);
+    String r = p.replace(values).trim();
     return r.isEmpty() ? null : r;
   }