Fix #9760 EE9 Cookies

Fix #9760 Only set path and domain if they are not blank
jetty · Jun 7, 2023 · ec0059a · ec0059a
1 parent 774711d
commit ec0059a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java
@@ -2199,15 +2199,20 @@ private static Cookie convertCookie(HttpCookie cookie, CookieCompliance complian
                 //RFC2965 defines the cookie header as supporting path and domain but RFC6265 permits only name=value
                 if (CookieCompliance.RFC2965.equals(compliance))
                 {
-                    result.setPath(cookie.getPath());
-                    result.setDomain(cookie.getDomain());
+                    String path = cookie.getPath();
+                    if (StringUtil.isNotBlank(path))
+                        result.setPath(path);
+
+                    String domain = cookie.getDomain();
+                    if (StringUtil.isNotBlank(domain))
+                        result.setDomain(domain);
                 }
                 return result;
             }
-            catch (Exception ignore)
+            catch (Exception x)
             {
                 if (LOG.isDebugEnabled())
-                    LOG.debug("Bad Cookie", ignore);
+                    LOG.debug("Bad Cookie", x);
             }
             return null;
         }

diff --git a/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java b/jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/RequestTest.java
@@ -1479,8 +1479,8 @@ public void testConnectionClose() throws Exception
     public void testSpecCookies() throws Exception
     {
         _server.stop();
-        _connector.getConnectionFactory(HttpConnectionFactory.class).
-            getHttpConfiguration().setRequestCookieCompliance(CookieCompliance.RFC2965);
+        _connector.getConnectionFactory(HttpConnectionFactory.class)
+            .getHttpConfiguration().setRequestCookieCompliance(CookieCompliance.RFC2965);
         _server.start();
 
         final ArrayList<Cookie> cookies = new ArrayList<>();