Changeset 229032 in webkit

Timestamp:

Feb 26, 2018 12:02:40 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Cookies are not being added to the Cookie field in Request Headers
​https://bugs.webkit.org/show_bug.cgi?id=183095

Patch by Christopher Reid <​chris.reid@sony.com> on 2018-02-26
Reviewed by Alex Christensen.

Populating the Cookie request header field now that cookies are no longer handled in libcurl.

• platform/network/curl/CookieJarCurlDatabase.cpp: Renaming the httpOnly variable as its actual use wasn't clear
• platform/network/curl/ResourceHandleCurl.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CookieJarCurlDatabase.cpp (modified) (1 diff)
• platform/network/curl/ResourceHandleCurl.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-26  Christopher Reid  <chris.reid@sony.com>
+
+        [Curl] Cookies are not being added to the Cookie field in Request Headers
+        https://bugs.webkit.org/show_bug.cgi?id=183095
+
+        Reviewed by Alex Christensen.
+
+        Populating the Cookie request header field now that cookies are no longer handled in libcurl.
+
+        * platform/network/curl/CookieJarCurlDatabase.cpp: Renaming the httpOnly variable as its actual use wasn't clear
+        * platform/network/curl/ResourceHandleCurl.cpp:
+
 2018-02-26  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp

@@ -39 +39 @@
 namespace WebCore {
 
-static String cookiesForSession(const NetworkStorageSession& session, const URL&, const URL& url, bool httponly)
+static String cookiesForSession(const NetworkStorageSession& session, const URL&, const URL& url, bool forHTTPHeader)
 {
     StringBuilder cookies;
 
     CookieJarDB& cookieJarDB = session.cookieDatabase();
-    auto isHttpOnly = (httponly ? std::nullopt : std::optional<bool> {false});
+    auto searchHTTPOnly = (forHTTPHeader ? std::nullopt : std::optional<bool> {false});
     auto secure = url.protocolIs("https") ? std::nullopt : std::optional<bool> {false};
 
     Vector<Cookie> results;
-    if (cookieJarDB.searchCookies(url.string(), isHttpOnly, secure, std::nullopt, results)) {
+    if (cookieJarDB.searchCookies(url.string(), searchHTTPOnly, secure, std::nullopt, results)) {
         for (auto result : results) {
             if (!cookies.isEmpty())

trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp

@@ -34 +34 @@
 
 #include "CookieJarCurl.h"
+#include "CookiesStrategy.h"
 #include "CredentialStorage.h"
 #include "CurlCacheManager.h"
@@ -41 +42 @@
 #include "HTTPParsers.h"
 #include "Logging.h"
+#include "NetworkStorageSession.h"
 #include "ResourceHandleInternal.h"
 #include "SharedBuffer.h"
@@ -132 +134 @@
         }
     }
+
+    auto& storageSession = NetworkStorageSession::defaultStorageSession();
+    auto& cookieJar = storageSession.cookieStorage();
+    auto includeSecureCookies = request.url().protocolIs("https") ? IncludeSecureCookies::Yes : IncludeSecureCookies::No;
+    String cookieHeaderField = cookieJar.cookieRequestHeaderFieldValue(storageSession, request.firstPartyForCookies(), request.url(), std::nullopt, std::nullopt, includeSecureCookies).first;
+    if (!cookieHeaderField.isEmpty())
+        request.addHTTPHeaderField(HTTPHeaderName::Cookie, cookieHeaderField);
 
     CurlRequest::ShouldSuspend shouldSuspend = d->m_defersLoading ? CurlRequest::ShouldSuspend::Yes : CurlRequest::ShouldSuspend::No;