Issue #11361 - UriCompliance.checkUriCompliance improvements

jetty · Feb 23, 2024 · b094034 · b094034
1 parent 1e5aa10
commit b094034
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java
@@ -357,12 +357,25 @@ private static Set<Violation> copyOf(Set<Violation> violations)
 
     public static String checkUriCompliance(UriCompliance compliance, HttpURI uri, ComplianceViolation.Listener listener)
     {
-        for (UriCompliance.Violation violation : UriCompliance.Violation.values())
+        if (uri.hasViolations())
         {
-            if (uri.hasViolation(violation) && (compliance == null || !compliance.allows(violation)))
-                return violation.getDescription();
-            else if (listener != null)
-                listener.onComplianceViolation(new ComplianceViolation.Event(compliance, violation, uri.toString()));
+            StringBuilder violations = null;
+            for (UriCompliance.Violation violation : UriCompliance.Violation.values())
+            {
+                if (uri.hasViolation(violation) && (compliance == null || !compliance.allows(violation)))
+                {
+                    if (listener != null)
+                        listener.onComplianceViolation(new ComplianceViolation.Event(compliance, violation, uri.toString()));
+
+                    if (violations == null)
+                        violations = new StringBuilder();
+                    else
+                        violations.append(", ");
+                    violations.append(violation.getDescription());
+                }
+            }
+            if (violations != null)
+                return violations.toString();
         }
         return null;
     }