Merge pull request #13834 from vespa-engine/bjorncs/jdisc-access-logging

Don't assume remote port header contains a valid port number

1 files changed, 9 insertions, 1 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
index d8b649c9db8..53d775d4349 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
@@ -132,7 +132,15 @@ public class AccessLogRequestLog extends AbstractLifeCycle implements RequestLog
     private static int getRemotePort(final HttpServletRequest request) {
         return Optional.ofNullable(request.getHeader(HEADER_NAME_X_FORWARDED_PORT))
                 .or(() -> Optional.ofNullable(request.getHeader(HEADER_NAME_Y_RP)))
-                .map(Integer::valueOf)
+                .flatMap(AccessLogRequestLog::parsePort)
                 .orElseGet(request::getRemotePort);
     }
+
+    private static Optional<Integer> parsePort(String port) {
+        try {
+            return Optional.of(Integer.valueOf(port));
+        } catch (IllegalArgumentException e) {
+            return Optional.empty();
+        }
+    }
 }