Updates from review

jetty · Feb 15, 2023 · 13ba312 · 13ba312
1 parent 21bce64
commit 13ba312
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java
@@ -424,12 +424,6 @@ protected boolean isRFC6265RejectedCharacter(boolean inQuoted, char c)
             }
             else
             {
-                /* From RFC6265 - Section 4.1.1 - Syntax
-                 *  cookie-octet  = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E
-                 *                  ; US-ASCII characters excluding CTLs,
-                 *                  ; whitespace DQUOTE, comma, semicolon,
-                 *                  ; and backslash
-                 */
                 return Character.isISOControl(c) || // control characters
                     c > 127 || // 8-bit characters
                     c == ',' || // comma

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
@@ -301,19 +301,17 @@ public static List<Param> rfc6265Cookies()
             new Param("A= 1; B=2; C=3", "A=1", "B=2", "C=3"),
             new Param("A=\"1; B=2\"; C=3", "C=3"),
             new Param("A=\"1; B=2; C=3"),
-            new Param("A=\"1 B=2\"; C=3", "A=1 B=2", "C=3"), // Why should A be rejected? Shouldn't it be A=<1 B=2>?
+            new Param("A=\"1 B=2\"; C=3", "A=1 B=2", "C=3"),
             new Param("A=\"\"1; B=2; C=3", "B=2", "C=3"),
             new Param("A=\"\" ; B=2; C=3", "A=", "B=2", "C=3"),
             new Param("A=\"\"; B=2; C=3", "A=", "B=2", "C=3"),
             new Param("A=1\"\"; B=2; C=3", "B=2", "C=3"),
             new Param("A=1\"; B=2; C=3", "B=2", "C=3"),
             new Param("A=1\"1; B=2; C=3", "B=2", "C=3"),
-            /* TODO Use Legacy mode for these
-            new Param("A=\" 1\"; B=2; C=3", "A=1", "B=2", "C=3"), // Why should the whitespaces be trimmed? They were not in the prev impl.
-            new Param("A=\"1 \"; B=2; C=3", "A=1", "B=2", "C=3"), // ditto
-            new Param("A=\" 1 \"; B=2; C=3", "A=1", "B=2", "C=3"), // ditto
-            new Param("A=\" 1 1 \"; B=2; C=3", "A=1 1", "B=2", "C=3"), // ditto
-             */
+            new Param("A=\" 1\"; B=2; C=3", "A= 1", "B=2", "C=3"),
+            new Param("A=\"1 \"; B=2; C=3", "A=1 ", "B=2", "C=3"),
+            new Param("A=\" 1 \"; B=2; C=3", "A= 1 ", "B=2", "C=3"),
+            new Param("A=\" 1 1 \"; B=2; C=3", "A= 1 1 ", "B=2", "C=3"),
             new Param("A=1,; B=2; C=3", "B=2", "C=3"),
             new Param("A=\"1,\"; B=2; C=3", "B=2", "C=3"),
             new Param("A=\\1; B=2; C=3", "B=2", "C=3"),