From 68421ffba43cdd4eab40c2e05846cc6e12e5fc13 Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Tue, 21 May 2019 15:17:37 +0300
Subject: [PATCH] Backed out changeset 754426d70d28 (bug 1551729) for causing
 wpt failures. CLOSED TREE

---
 .../browser/browser_favicon_firstParty.js     |  4 ++--
 .../browser/browser_favicon_userContextId.js  |  4 ++--
 .../browser_privatebrowsing_favicon.js        |  4 ++--
 .../test/browser_sessionStoreContainer.js     |  2 +-
 ...e_browserElement_CookiesNotThirdParty.html |  4 ++--
 netwerk/cookie/nsCookieService.cpp            | 19 +++++++++++++++----
 netwerk/cookie/nsCookieService.h              |  3 ++-
 netwerk/test/TestCookie.cpp                   |  8 ++++----
 .../http-state/chromium-tests.html.ini        | 12 ------------
 .../cookies/http-state/general-tests.html.ini | 14 --------------
 .../thumbnails/test/thumbnails_background.sjs | 12 ++++++------
 11 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
index 5997c4af5476..d350aee8da57 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
@@ -183,8 +183,8 @@ async function assignCookiesUnderFirstParty(aURL, aFirstParty, aCookieValue) {
 async function generateCookies(aThirdParty) {
   // we generate two different cookies for two first party domains.
   let cookies = [];
-  cookies.push(Math.random().toString());
-  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString() + "=1");
 
   let firstSiteURL;
   let secondSiteURL;
diff --git a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
index 00457eb1a522..62f042aed2e4 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
@@ -128,8 +128,8 @@ function waitOnFaviconLoaded(aFaviconURL) {
 async function generateCookies(aHost) {
   // we generate two different cookies for two userContextIds.
   let cookies = [];
-  cookies.push(Math.random().toString());
-  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString() + "=1");
 
   // Then, we add cookies into the site for 'personal' and 'work'.
   let tabInfoA = await openTabInUserContext(aHost, USER_CONTEXT_ID_PERSONAL);
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
index bac6fa648631..bbeebc5cea1c 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
@@ -189,8 +189,8 @@ add_task(async function test_favicon_privateBrowsing() {
   // Generate two random cookies for non-private window and private window
   // respectively.
   let cookies = [];
-  cookies.push(Math.random().toString());
-  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString() + "=1");
 
   // Open a tab in private window and add a cookie into it.
   await assignCookies(privateWindow.gBrowser, TEST_SITE, cookies[0]);
diff --git a/browser/components/sessionstore/test/browser_sessionStoreContainer.js b/browser/components/sessionstore/test/browser_sessionStoreContainer.js
index 74830f16f0a3..e5627e23c66f 100644
--- a/browser/components/sessionstore/test/browser_sessionStoreContainer.js
+++ b/browser/components/sessionstore/test/browser_sessionStoreContainer.js
@@ -114,7 +114,7 @@ add_task(async function test() {
   for (let userContextId of Object.keys(USER_CONTEXTS)) {
     // Load the page in 3 different contexts and set a cookie
     // which should only be visible in that context.
-    let cookie = USER_CONTEXTS[userContextId];
+    let cookie = USER_CONTEXTS[userContextId] + "=1";
 
     // Open our tab in the given user context.
     let { tab, browser } = await openTabInUserContext(userContextId);
diff --git a/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html b/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
index ff122f31a44f..053953ed6fea 100644
--- a/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
+++ b/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
@@ -5,11 +5,11 @@ file_browserElement_CookiesNotThirdParty.html
 <script type='text/javascript'>
 if (location.search != "?step=2") {
   // Step 1: Set a cookie.
-  document.cookie = "file_browserElement_CookiesNotThirdParty";
+  document.cookie = "file_browserElement_CookiesNotThirdParty=1";
   alert("next");
 } else {
   // Step 2: Read the cookie.
-  if (document.cookie == "file_browserElement_CookiesNotThirdParty") {
+  if (document.cookie == "file_browserElement_CookiesNotThirdParty=1") {
     alert("success: got the correct cookie");
   } else {
     alert('failure: got unexpected cookie: "' + document.cookie + '"');
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index cceae5079db5..23b4fb05a2b0 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3239,7 +3239,8 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
 
   // newCookie says whether there are multiple cookies in the header;
   // so we can handle them separately.
-  bool newCookie = ParseAttributes(aCookieHeader, aCookieAttributes);
+  bool discard = false;
+  bool newCookie = ParseAttributes(aCookieHeader, aCookieAttributes, discard);
 
   // Collect telemetry on how often secure cookies are set from non-secure
   // origins, and vice-versa.
@@ -3385,7 +3386,7 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
     }
   }
 
-  aSetCookie = true;
+  aSetCookie = !discard;
   return newCookie;
 }
 
@@ -3786,7 +3787,8 @@ bool nsCookieService::GetTokenValue(nsACString::const_char_iterator& aIter,
 // folded into the cookie struct here, because we don't know which one to use
 // until we've parsed the header.
 bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
-                                      nsCookieAttributes& aCookieAttributes) {
+                                      nsCookieAttributes& aCookieAttributes,
+                                      bool& aDiscard) {
   static const char kPath[] = "path";
   static const char kDomain[] = "domain";
   static const char kExpires[] = "expires";
@@ -3806,6 +3808,8 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
   aCookieAttributes.isHttpOnly = false;
   aCookieAttributes.sameSite = nsICookie2::SAMESITE_UNSET;
 
+  aDiscard = false;
+
   nsDependentCSubstring tokenString(cookieStart, cookieStart);
   nsDependentCSubstring tokenValue(cookieStart, cookieStart);
   bool newCookie, equalsFound;
@@ -3820,8 +3824,11 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
   if (equalsFound) {
     aCookieAttributes.name = tokenString;
     aCookieAttributes.value = tokenValue;
+    if (aCookieAttributes.name.IsEmpty()) {
+      aDiscard = true;
+    }
   } else {
-    aCookieAttributes.value = tokenString;
+    aDiscard = true;
   }
 
   // extract remaining attributes
@@ -3829,6 +3836,10 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
     newCookie = GetTokenValue(cookieStart, cookieEnd, tokenString, tokenValue,
                               equalsFound);
 
+    if (aDiscard) {
+      continue;
+    }
+
     if (!tokenValue.IsEmpty()) {
       tokenValue.BeginReading(tempBegin);
       tokenValue.EndReading(tempEnd);
diff --git a/netwerk/cookie/nsCookieService.h b/netwerk/cookie/nsCookieService.h
index c0a65bce2aa8..f614cc0822f9 100644
--- a/netwerk/cookie/nsCookieService.h
+++ b/netwerk/cookie/nsCookieService.h
@@ -341,7 +341,8 @@ class nsCookieService final : public nsICookieService,
                             nsDependentCSubstring& aTokenValue,
                             bool& aEqualsFound);
   static bool ParseAttributes(nsDependentCString& aCookieHeader,
-                              nsCookieAttributes& aCookie);
+                              nsCookieAttributes& aCookieAttributes,
+                              bool& aDiscard);
   bool RequireThirdPartyCheck();
   static bool CheckDomain(nsCookieAttributes& aCookie, nsIURI* aHostURI,
                           const nsCString& aBaseDomain, bool aRequireHostMatch);
diff --git a/netwerk/test/TestCookie.cpp b/netwerk/test/TestCookie.cpp
index 7c838a4a1c6c..2129e26ef64e 100644
--- a/netwerk/test/TestCookie.cpp
+++ b/netwerk/test/TestCookie.cpp
@@ -620,7 +620,7 @@ TEST(TestCookie, TestCookieMain)
              nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
   EXPECT_TRUE(CheckResult(cookie.get(), MUST_CONTAIN, R"(test="fubar! = foo)"));
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_CONTAIN, "five"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_NOT_CONTAIN, "five"));
   SetACookie(cookieService, "http://parser.test/", nullptr,
              "test=kill; domain=.parser.test; max-age=0 \n five; max-age=0",
              nullptr);
@@ -632,13 +632,13 @@ TEST(TestCookie, TestCookieMain)
   // cookies to overwrite it
   SetACookie(cookieService, "http://parser.test/", nullptr, "six", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "six"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
   SetACookie(cookieService, "http://parser.test/", nullptr, "seven", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "seven"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
   SetACookie(cookieService, "http://parser.test/", nullptr, " =eight", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "eight"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
   SetACookie(cookieService, "http://parser.test/", nullptr, "test=six",
              nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
diff --git a/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini b/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
index 8bc56f0d4f7f..2140bfe1f36e 100644
--- a/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
+++ b/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
@@ -1,19 +1,7 @@
 [chromium-tests.html]
-  [chromium0009 - chromium0009]
-    expected: FAIL
-
   [chromium0006 - chromium0006]
     expected: FAIL
 
-  [chromium0012 - chromium0012]
-    expected: FAIL
-
-  [disabled-chromium0022 - disabled-chromium0022]
-    expected: FAIL
-
-  [chromium0010 - chromium0010]
-    expected: FAIL
-
   [chromium0007 - chromium0007]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/cookies/http-state/general-tests.html.ini b/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
index b5a16e51a642..6cc93211e20b 100644
--- a/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
+++ b/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
@@ -1,18 +1,4 @@
 [general-tests.html]
-  [0021 - Ignore cookie without key in all 'Set-Cookie'.]
-    expected: FAIL
-
-  [0023 - Ignore cookies without '=' in all 'Set-Cookie'.]
-    expected: FAIL
-
-  [0026 - Ignore malformed cookies in all 'Set-Cookie' v2.]
-    expected: FAIL
-
-  [0027 - Ignore malformed cookies in all 'Set-Cookie' v3.]
-    expected: FAIL
-
   [0028 - [INVALID EXPECTATION\] Ignore malformed cookies in all 'Set-Cookie' v4.]
     expected: FAIL
 
-  [0004 - Ignore cookie without key.]
-    expected: FAIL
diff --git a/toolkit/components/thumbnails/test/thumbnails_background.sjs b/toolkit/components/thumbnails/test/thumbnails_background.sjs
index f1cce96a0edc..5ec635005833 100644
--- a/toolkit/components/thumbnails/test/thumbnails_background.sjs
+++ b/toolkit/components/thumbnails/test/thumbnails_background.sjs
@@ -19,13 +19,13 @@ function handleRequest(req, resp) {
 
   let setCookieScript = "";
   if (opts.setRedCookie) {
-    resp.setHeader("Set-Cookie", "red", false);
-    setCookieScript = '<script>document.cookie="red";</script>';
+    resp.setHeader("Set-Cookie", "red=1", false);
+    setCookieScript = '<script>document.cookie="red=1";</script>';
   }
 
   if (opts.setGreenCookie) {
-    resp.setHeader("Set-Cookie", "green", false);
-    setCookieScript = '<script>document.cookie="green";</script>';
+    resp.setHeader("Set-Cookie", "green=1", false);
+    setCookieScript = '<script>document.cookie="green=1";</script>';
   }
 
   if (opts.iframe) {
@@ -43,14 +43,14 @@ function handleRequest(req, resp) {
   }
 
   if (req.hasHeader("Cookie") &&
-      req.getHeader("Cookie").split(";").indexOf("red") >= 0) {
+      req.getHeader("Cookie").split(";").indexOf("red=1") >= 0) {
     resp.write('<html style="background: #f00;">' + setCookieScript + '</html>');
     resp.finish();
     return;
   }
 
   if (req.hasHeader("Cookie") &&
-      req.getHeader("Cookie").split(";").indexOf("green") >= 0) {
+      req.getHeader("Cookie").split(";").indexOf("green=1") >= 0) {
     resp.write('<html style="background: #0f0;">' + setCookieScript + '</html>');
     resp.finish();
     return;