Changeset 267621 in webkit

Timestamp:

Sep 26, 2020, 6:52:34 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Do not set site for cookies twice in case of redirection
​https://bugs.webkit.org/show_bug.cgi?id=217010

Reviewed by Michael Catanzaro.

Source/WebCore:

Only set is-toplevel-navigation on SoupMessage when same site info is present.

• platform/network/soup/ResourceRequestSoup.cpp:

(WebCore::ResourceRequest::updateSoupMessageMembers const):

Source/WebKit:

ResourceRequest::updateSoupMessage() already fills the same site information, but we are duplicating the code in
NetworkDataTaskSoup::continueHTTPRedirection().

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::NetworkDataTaskSoup::continueHTTPRedirection): Do not set same site information here, it will be done
again in NetworkDataTaskSoup::createRequest().

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Do not set site for cookies twice in case of redirection
+        https://bugs.webkit.org/show_bug.cgi?id=217010
+
+        Reviewed by Michael Catanzaro.
+
+        Only set is-toplevel-navigation on SoupMessage when same site info is present.
+
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateSoupMessageMembers const):
+
 2020-09-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp

@@ -113 +113 @@
 
 #if SOUP_CHECK_VERSION(2, 69, 90)
-    if (m_sameSiteDisposition == ResourceRequest::SameSiteDisposition::SameSite) {
-        GUniquePtr<SoupURI> siteForCookies = urlToSoupURI(m_url);
-        soup_message_set_site_for_cookies(soupMessage, siteForCookies.get());
-    }
-
-    soup_message_set_is_top_level_navigation(soupMessage, isTopSite());
+    if (!isSameSiteUnspecified()) {
+        if (isSameSite()) {
+            GUniquePtr<SoupURI> siteForCookies = urlToSoupURI(m_url);
+            soup_message_set_site_for_cookies(soupMessage, siteForCookies.get());
+        }
+        soup_message_set_is_top_level_navigation(soupMessage, isTopSite());
+    }
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Do not set site for cookies twice in case of redirection
+        https://bugs.webkit.org/show_bug.cgi?id=217010
+
+        Reviewed by Michael Catanzaro.
+
+        ResourceRequest::updateSoupMessage() already fills the same site information, but we are duplicating the code in
+        NetworkDataTaskSoup::continueHTTPRedirection().
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::continueHTTPRedirection): Do not set same site information here, it will be done
+        again in NetworkDataTaskSoup::createRequest().
+
 2020-09-25  Hoa Dinh  <dvh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -696 +696 @@
     request.removeCredentials();
 
-    if (isTopLevelNavigation()) {
+    if (isTopLevelNavigation())
         request.setFirstPartyForCookies(request.url());
-#if SOUP_CHECK_VERSION(2, 69, 90)
-        soup_message_set_is_top_level_navigation(m_soupMessage.get(), true);
-#endif
-    }
-
-#if SOUP_CHECK_VERSION(2, 69, 90)
-    if (request.isSameSite()) {
-        GUniquePtr<SoupURI> requestURI = urlToSoupURI(request.url());
-        soup_message_set_site_for_cookies(m_soupMessage.get(), requestURI.get());
-    }
-#endif
 
     if (isCrossOrigin) {