[tomcat] 01/03: Remove the checkNormalize test that is no longer necessary

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 571d07654ba28d1e75481b04d43d5b40b9d846bb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 13 11:58:45 2020 +0000

    Remove the checkNormalize test that is no longer necessary
    
    The restriction of URIEncoding to US-ASCII supersets means that it is no
    longer possible for byte to character conversion to result in a URI that
    is not normalized.
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index f448f8f..66cd016 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -640,10 +640,9 @@ public class CoyoteAdapter implements Adapter {
             if (normalize(req.decodedURI())) {
                 // Character decoding
                 convertURI(decodedURI, request);
-                // Check that the URI is still normalized
-                if (!checkNormalize(req.decodedURI())) {
-                    response.sendError(400, "Invalid URI");
-                }
+                // URIEncoding values are limited to US-ASCII supersets.
+                // Therefore it is not necessary to check that the URI remains
+                // normalized after character decoding
             } else {
                 response.sendError(400, "Invalid URI");
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org