Merge pull request #1392 from ropalka/UNDERTOW-2123

[UNDERTOW-2123] always URL decode pathInfo and servletPath as required by Servlet specification

Author: ropalka

servlet/src/main/java/io/undertow/servlet/spec/AsyncContextImpl.java

@@ -61,6 +61,7 @@
 import io.undertow.servlet.handlers.ServletDebugPageHandler;
 import io.undertow.servlet.handlers.ServletPathMatch;
 import io.undertow.servlet.handlers.ServletRequestContext;
+import io.undertow.util.CanonicalPathUtils;
 import io.undertow.util.Headers;
 import io.undertow.util.SameThreadExecutor;
 import io.undertow.util.StatusCodes;
@@ -178,8 +179,7 @@ public void dispatch() {
                 //this should never happen
                 throw UndertowServletMessages.MESSAGES.couldNotFindContextToDispatchTo(requestImpl.getOriginalContextPath());
             }
-            //UNDERTOW-1591 use original, decoded value to dispatch, this should match: ServletInitialHandler.handleRequest
-            String toDispatch = requestImpl.getExchange().getRelativePath();
+            String toDispatch = CanonicalPathUtils.canonicalize(requestImpl.getOriginalRequestURI()).substring(requestImpl.getOriginalContextPath().length());
             String qs = requestImpl.getOriginalQueryString();
             if (qs != null && !qs.isEmpty()) {
                 toDispatch = toDispatch + "?" + qs;

servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java

@@ -18,6 +18,7 @@
 
 package io.undertow.servlet.spec;
 
+import io.undertow.UndertowOptions;
 import io.undertow.security.api.SecurityContext;
 import io.undertow.security.idm.Account;
 import io.undertow.server.HttpServerExchange;
@@ -54,6 +55,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
@@ -286,16 +288,29 @@ public String getMethod() {
 
     @Override
     public String getPathInfo() {
-        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        if (match != null) {
-            return match.getRemaining();
+        final ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        return match != null ? decodeURL(match.getRemaining()) : null;
+    }
+
+    private String decodeURL(final String s) {
+        try {
+            return s != null && s.length() > 0 ? URLDecoder.decode(s, getURLEncoding()) : s;
+        } catch (UnsupportedEncodingException ignored) {
+            throw new IllegalStateException(); // cannot happen
         }
-        return null;
+    }
+
+    private String getURLEncoding() {
+        return exchange.getConnection().getUndertowOptions().get(UndertowOptions.URL_CHARSET, StandardCharsets.UTF_8.name());
     }
 
     @Override
     public String getPathTranslated() {
-        return getRealPath(getPathInfo());
+        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        if (match != null) {
+            return getRealPath(match.getRemaining());
+        }
+        return null;
     }
 
     @Override
@@ -413,11 +428,8 @@ public StringBuffer getRequestURL() {
 
     @Override
     public String getServletPath() {
-        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        if (match != null) {
-            return match.getMatched();
-        }
-        return "";
+        final ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        return match != null ? decodeURL(match.getMatched()) : "";
     }
 
     @Override
@@ -1156,7 +1168,11 @@ public String getOriginalServletPath() {
         if(uri != null) {
             return uri;
         }
-        return getServletPath();
+        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        if (match != null) {
+            return match.getMatched();
+        }
+        return "";
     }
 
     public String getOriginalPathInfo() {
@@ -1168,7 +1184,11 @@ public String getOriginalPathInfo() {
         if(uri != null) {
             return uri;
         }
-        return getPathInfo();
+        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        if (match != null) {
+            return match.getRemaining();
+        }
+        return null;
     }
 
     public String getOriginalContextPath() {