Revert logic in Request.setMetaData, clear emptySegment on HttpUri.cl…

…ear() (#6468) Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Manually merged as ECA checks are broken
jetty · Jun 24, 2021 · bc0fbbb · bc0fbbb
1 parent 4673846
commit bc0fbbb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
@@ -653,6 +653,7 @@ public Mutable clear()
             _fragment = null;
             _uri = null;
             _decodedPath = null;
+            _emptySegment = false;
             _violations.clear();
             return this;
         }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -1693,24 +1693,21 @@ public void setMetaData(MetaData.Request request)
         {
             ambiguous = uri.isAmbiguous();
             compliance = _channel == null || _channel.getHttpConfiguration() == null ? null : _channel.getHttpConfiguration().getUriCompliance();
-            if (compliance != null)
-            {
-                if (!compliance.allows(UriCompliance.Violation.UTF16_ENCODINGS) && uri.hasUtf16Encoding())
-                    throw new BadMessageException("UTF16 % encoding not supported");
+            if (uri.hasUtf16Encoding() && (compliance == null || !compliance.allows(UriCompliance.Violation.UTF16_ENCODINGS)))
+                throw new BadMessageException("UTF16 % encoding not supported");
 
-                if (ambiguous)
-                {
-                    if (uri.hasAmbiguousSegment() && !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_SEGMENT))
-                        throw new BadMessageException("Ambiguous segment in URI");
-                    if (uri.hasAmbiguousEmptySegment() && !compliance.allows(UriCompliance.Violation.AMBIGUOUS_EMPTY_SEGMENT))
-                        throw new BadMessageException("Ambiguous empty segment in URI");
-                    if (uri.hasAmbiguousSeparator() && !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_SEPARATOR))
-                        throw new BadMessageException("Ambiguous segment in URI");
-                    if (uri.hasAmbiguousParameter() && !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_PARAMETER))
-                        throw new BadMessageException("Ambiguous path parameter in URI");
-                    if (uri.hasAmbiguousEncoding() && !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_ENCODING))
-                        throw new BadMessageException("Ambiguous path encoding in URI");
-                }
+            if (ambiguous)
+            {
+                if (uri.hasAmbiguousSegment() && (compliance == null || !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_SEGMENT)))
+                    throw new BadMessageException("Ambiguous segment in URI");
+                if (uri.hasAmbiguousEmptySegment() && (compliance == null || !compliance.allows(UriCompliance.Violation.AMBIGUOUS_EMPTY_SEGMENT)))
+                    throw new BadMessageException("Ambiguous empty segment in URI");
+                if (uri.hasAmbiguousSeparator() && (compliance == null || !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_SEPARATOR)))
+                    throw new BadMessageException("Ambiguous segment in URI");
+                if (uri.hasAmbiguousParameter() && (compliance == null || !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_PARAMETER)))
+                    throw new BadMessageException("Ambiguous path parameter in URI");
+                if (uri.hasAmbiguousEncoding() && (compliance == null || !compliance.allows(UriCompliance.Violation.AMBIGUOUS_PATH_ENCODING)))
+                    throw new BadMessageException("Ambiguous path encoding in URI");
             }
         }