Let X-Forwarded-For HTTP header take precedence for remote address in access log

1 files changed, 13 insertions, 0 deletions

diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
index cdcd2d76883..1048d7b6422 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
@@ -90,4 +90,17 @@ public class AccessLogRequestLogTest {
         assertThat(actualRawQuery.get(), is(rawQuery));
     }
 
+    @Test
+    public void verify_x_forwarded_for_precedence () {
+        HttpServletRequest httpServletRequest = mock(HttpServletRequest.class);
+        when(httpServletRequest.getRequestURI()).thenReturn("//search/");
+        when(httpServletRequest.getQueryString()).thenReturn("q=%%2");
+        when(httpServletRequest.getHeader("x-forwarded-for")).thenReturn("1.2.3.4");
+        when(httpServletRequest.getHeader("y-ra")).thenReturn("2.3.4.5");
+
+        AccessLogEntry accessLogEntry = new AccessLogEntry();
+        AccessLogRequestLog.populateAccessLogEntryFromHttpServletRequest(httpServletRequest, accessLogEntry);
+        assertThat(accessLogEntry.getRemoteAddress(), is("1.2.3.4"));
+    }
+
 }