summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-07 16:57:28 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-07 16:57:28 +0200
commitb437ea9fc13457f49c529d9941fd6d58b3d8bc0e (patch)
tree1f6b21e227658ae330e20b6393d51146f9e51688 /jdisc_http_service
parent3019bb20dbb67f59377f415aa8e71512223e7e3a (diff)
Don't log invalid requests for filter execution on servlets
Fix bug where a malformed uri to servlet/JAX-RS resource would trigger an unhandled request exception. Jetty logs unhandled exceptions from filters/servlets as warning with full stack trace.
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
index 609456c562a..f6f07d874d9 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
@@ -55,7 +55,13 @@ class JDiscFilterInvokerFilter implements Filter {
HttpServletRequest httpRequest = (HttpServletRequest)request;
HttpServletResponse httpResponse = (HttpServletResponse)response;
- URI uri = HttpRequestFactory.getUri(httpRequest);
+ URI uri;
+ try {
+ uri = HttpRequestFactory.getUri(httpRequest);
+ } catch (RequestException e) {
+ httpResponse.sendError(e.getResponseStatus(), e.getMessage());
+ return;
+ }
AtomicReference<Boolean> responseReturned = new AtomicReference<>(null);