🐛 Fix error in RequestLogger when URL contains illegal hex percent en…

…coded characters
SoftInstigate · Sep 17, 2024 · 8a5b039 · 8a5b039
1 parent 044db87
commit 8a5b039
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/core/src/main/java/org/restheart/handlers/RequestLogger.java b/core/src/main/java/org/restheart/handlers/RequestLogger.java
@@ -20,19 +20,12 @@
  */
 package org.restheart.handlers;
 
-import io.undertow.security.api.SecurityContext;
-import io.undertow.server.ExchangeCompletionListener;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.server.handlers.Cookie;
-import io.undertow.util.HeaderValues;
-import io.undertow.util.Headers;
-import io.undertow.util.LocaleUtils;
-import io.undertow.util.QueryParameterUtils;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.Map;
+
 import static org.fusesource.jansi.Ansi.Color.GREEN;
 import static org.fusesource.jansi.Ansi.Color.RED;
 import static org.fusesource.jansi.Ansi.ansi;
@@ -45,6 +38,15 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
+import io.undertow.security.api.SecurityContext;
+import io.undertow.server.ExchangeCompletionListener;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.handlers.Cookie;
+import io.undertow.util.HeaderValues;
+import io.undertow.util.Headers;
+import io.undertow.util.LocaleUtils;
+import io.undertow.util.QueryParameterUtils;
+
 /**
  *
  * @author Andrea Di Cesare {@literal <andrea@softinstigate.com>}
@@ -112,10 +114,8 @@ protected void dumpExchange(HttpServerExchange exchange, Integer logLevel) {
             if (exchange.getQueryString() != null
                     && !exchange.getQueryString().isEmpty()) {
                 try {
-                    sb.append("?").append(URLDecoder.decode(exchange.getQueryString(),
-                            QueryParameterUtils
-                                    .getQueryParamEncoding(exchange)));
-                } catch (UnsupportedEncodingException uee) {
+                    sb.append("?").append(URLDecoder.decode(exchange.getQueryString(), QueryParameterUtils.getQueryParamEncoding(exchange)));
+                } catch (UnsupportedEncodingException | IllegalArgumentException uee) {
                     sb.append("?").append(exchange.getQueryString());
                 }
             }