[UNDERTOW-2740] Make the parsing of client Cookie header at server fully compatible with RFC6265 regardless of UndertowOptions.ENABLE_RFC6265_COOKIE_VALIDATION config

Notice that we are keeping legacy compatibility to some extent here, as long as Undertow works by default with RFC6265

Signed-off-by: Flavia Rainone <frainone@redhat.com>

Author: fl4via

core/src/main/java/io/undertow/util/Cookies.java

@@ -276,7 +276,6 @@ static Map<String, Cookie> parseRequestCookies(List<String> cookies, CookieStore
     private static void parseCookie(final String cookie, final CookieStore parsedCookies, final int maxCookies, final boolean allowEqualInValue, final boolean commaIsSeperator, final boolean allowHttpSeparatorsV0, final boolean rfc6265CookieValidationEnabled) {
 
         CookieJar cookieJar = new CookieJar();
-        cookieJar.rfc6265ParsingEnabled = rfc6265CookieValidationEnabled;
         cookieJar.parsedCookies = parsedCookies;
         cookieJar.maxCookies = maxCookies;
         for (int i = 0; i < cookie.length(); ++i) {
@@ -468,11 +467,9 @@ private static void createCookie(final String value, final CookieJar cookieJar)
 
     private static void applyAdditional( final CookieJar cookieJar, final String name, final String value) {
         // RFC 6265 treats the domain, path and version attributes of an RFC 2109 cookie as a separate cookies
-        if (!name.isEmpty() && name.charAt(0) == '$') {
-            if (!OBSOLETE_COOKIE_PATTERN.matcher(name).find() || cookieJar.rfc6265ParsingEnabled) {
-                Cookie c = new CookieImpl(name, value);
-                cookieJar.parsedCookies.add(c);
-            }
+        if (!name.isEmpty() && name.charAt(0) == '$' && OBSOLETE_COOKIE_PATTERN.matcher(name).find()) {
+            Cookie c = new CookieImpl(name, value);
+            cookieJar.parsedCookies.add(c);
         }
         if (cookieJar.version == 1) {
             // rfc2109 - add metadata to
@@ -592,7 +589,6 @@ private Cookies() {
     }
 
     private static class CookieJar {
-        public boolean rfc6265ParsingEnabled;
         //Currently parsed cookie, if V1, all $ will be applied to it, until
         CookieImpl currentCookie;
         int maxCookies;

core/src/test/java/io/undertow/util/CookiesTestCase.java

@@ -451,7 +451,7 @@ public void testQuotedEscapedStringInRequestCookie() {
     public void testSimpleJSONObjectInRequestCookies() {
         // allowEqualInValue and allowHttpSepartorsV0 needs to be enabled to handle this cookie
         // Also, commaIsSeperator needs to be set to false
-        OptionMap options = OptionMap.builder().set(UndertowOptions.MAX_COOKIES, 2)
+        OptionMap options = OptionMap.builder().set(UndertowOptions.MAX_COOKIES, 5)
                 .set(UndertowOptions.ALLOW_EQUALS_IN_COOKIE_VALUE, true)
                 .set(UndertowOptions.ENABLE_RFC6265_COOKIE_VALIDATION, false).getMap();
         Map<String, Cookie> cookies = parseRequestCookies(Arrays.asList(
@@ -653,7 +653,7 @@ public void testMultipleRFC2109() {
                 .set(UndertowOptions.ALLOW_EQUALS_IN_COOKIE_VALUE, false)
                 .set(UndertowOptions.ENABLE_RFC6265_COOKIE_VALIDATION, false).getMap();
         Cookies.parseRequestCookies(toParse, parsedCookies, options);
-        Assert.assertEquals(""+parsedCookies,3, parsedCookies.size());
+        Assert.assertEquals(""+parsedCookies,6, parsedCookies.size());
         List<Cookie> lst = parsedCookies.get("CUSTOMER");
         Assert.assertEquals(2, lst.size());
         Cookie cookie = lst.get(0);