diff options
| author | Doug Kelly <dougk.ff7@gmail.com> | 2016-04-29 10:31:24 -0500 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-05-01 02:42:59 +0000 |
| commit | eb44c0e18b2b834b9e014875ef4e374080448f45 (patch) | |
| tree | b1d263d2bd95c2013ba788ec2d3b2e326eabfeba | |
| parent | e2f4c2f127861c3f93861c527d2e9da8cb036a69 (diff) | |
Fix NPE in HttpAuthFilter.getRemoteUser()
HttpAuthFilter.getRemoteUser() was updated to honor the
userNameToLowerCase setting with the change in If4398bc9. However,
remoteUser as returned by RemoteUserUtil.getRemoteUser() can be
null, so we should additionally guard against null values before
performing the toLowerCase() conversion.
Change-Id: I0f3265976824231b9e15fc55dd35d012db4f33bb
| -rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java index 38382aa961..8947a38c09 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java @@ -140,7 +140,8 @@ class HttpAuthFilter implements Filter { String getRemoteUser(HttpServletRequest req) { String remoteUser = RemoteUserUtil.getRemoteUser(req, loginHeader); - return userNameToLowerCase ? remoteUser.toLowerCase(Locale.US) : remoteUser; + return (userNameToLowerCase && remoteUser != null) ? + remoteUser.toLowerCase(Locale.US) : remoteUser; } String getRemoteDisplayname(HttpServletRequest req) { |