opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Fix garbled text with Unicode display names obtained from HTTP headers

Change-Id: I6d848d28cf453b8bf3d3af888f39fe5b11ef3c3f
This commit is contained in:
David Pursehouse
2017-01-27 08:42:32 +09:00
parent 77b12ec750 7059cbd8da
commit 4bafe6d0bb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
View File

@@ -18,6 +18,8 @@ import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Strings.emptyToNull;
import static com.google.common.net.HttpHeaders.AUTHORIZATION;
import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_GERRIT;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.HtmlDomUtil;
@@ -143,7 +145,8 @@ class HttpAuthFilter implements Filter {
String getRemoteDisplayname(HttpServletRequest req) {
if (displaynameHeader != null) {
return emptyToNull(req.getHeader(displaynameHeader));
String raw = req.getHeader(displaynameHeader);
return emptyToNull(new String(raw.getBytes(ISO_8859_1), UTF_8));
}
return null;
}