Changeset 54352 in webkit

Timestamp:

Feb 4, 2010 10:09:15 AM (8 years ago)

Author:

xan@webkit.org

Message:

2010-02-04 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

Bump minimum libsoup requirement to 2.29.90

• configure.ac:

WebCore:

2010-02-04 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

Set first party URI in all SoupMessages. This allows libsoup to
implement a "no third party cookies" policy in case it wants
to. Also start a non-JSC-specific, gtk-specific GOwnPtr module and
use it for SoupURI.

• platform/network/soup/CookieJarSoup.cpp: (WebCore::setCookies):
• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::restartedCallback): (WebCore::startHttp):
• platform/network/soup/ResourceRequestSoup.cpp: (WebCore::ResourceRequest::toSoupMessage): (WebCore::ResourceRequest::updateFromSoupMessage):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/soup/CookieJarSoup.cpp (modified) (3 diffs)
• WebCore/platform/network/soup/ResourceHandleSoup.cpp (modified) (3 diffs)
• WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (3 diffs)
• configure.ac (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2010-02-04  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Bump minimum libsoup requirement to 2.29.90
+
+        * configure.ac:
+
 2010-02-02  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-04  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Set first party URI in all SoupMessages. This allows libsoup to
+        implement a "no third party cookies" policy in case it wants
+        to. Also start a non-JSC-specific, gtk-specific GOwnPtr module and
+        use it for SoupURI.
+
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::setCookies):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::restartedCallback):
+        (WebCore::startHttp):
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::toSoupMessage):
+        (WebCore::ResourceRequest::updateFromSoupMessage):
+
 2010-02-04  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/platform/network/soup/CookieJarSoup.cpp

@@ -25 +25 @@
 #include "CString.h"
 #include "Document.h"
+#include "GOwnPtrGtk.h"
 #include "KURL.h"
 
@@ -55 +56 @@
 }
 
-void setCookies(Document* /*document*/, const KURL& url, const String& value)
+void setCookies(Document* document, const KURL& url, const String& value)
 {
     SoupCookieJar* jar = defaultCookieJar();
@@ -61 +62 @@
         return;
 
-    SoupURI* origin = soup_uri_new(url.string().utf8().data());
+    GOwnPtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
+    GOwnPtr<SoupURI> firstParty(soup_uri_new(document->firstPartyForCookies().string().utf8().data()));
 
-    soup_cookie_jar_set_cookie(jar, origin, value.utf8().data());
-    soup_uri_free(origin);
+    soup_cookie_jar_set_cookie_with_first_party(jar,
+                                                origin.get(),
+                                                firstParty.get(),
+                                                value.utf8().data());
 }
 

trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -35 +35 @@
 #include "FileSystem.h"
 #include "Frame.h"
+#include "GOwnPtrGtk.h"
 #include "HTTPParsers.h"
 #include "Logging.h"
@@ -210 +211 @@
     if (d->client())
         d->client()->willSendRequest(handle, request, response);
+
+    // Update the first party in case the base URL changed with the redirect
+    String firstPartyString = request.firstPartyForCookies().string();
+    if (!firstPartyString.isEmpty()) {
+        GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
+        soup_message_set_first_party(d->m_msg, firstParty.get());
+    }
 }
 
@@ -485 +493 @@
     g_signal_connect(d->m_msg, "got-chunk", G_CALLBACK(gotChunkCallback), handle);
 
+    String firstPartyString = request.firstPartyForCookies().string();
+    if (!firstPartyString.isEmpty()) {
+        GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
+        soup_message_set_first_party(d->m_msg, firstParty.get());
+    }
     g_object_set_data(G_OBJECT(d->m_msg), "resourceHandle", reinterpret_cast<void*>(handle));
 

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

@@ -23 +23 @@
 #include "CString.h"
 #include "GOwnPtr.h"
+#include "GOwnPtrGtk.h"
 #include "PlatformString.h"
 
@@ -43 +44 @@
         for (HTTPHeaderMap::const_iterator it = headers.begin(); it != end; ++it)
             soup_message_headers_append(soupHeaders, it->first.string().utf8().data(), it->second.utf8().data());
+    }
+
+    String firstPartyString = firstPartyForCookies().string();
+    if (!firstPartyString.isEmpty()) {
+        GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
+        soup_message_set_first_party(soupMessage, firstParty.get());
     }
 
@@ -70 +77 @@
         m_httpBody = FormData::create(soupMessage->request_body->data, soupMessage->request_body->length);
 
-    // FIXME: m_allowCookies and m_firstPartyForCookies should
-    // probably be handled here and on doUpdatePlatformRequest
-    // somehow.
+    SoupURI* firstParty = soup_message_get_first_party(soupMessage);
+    if (firstParty) {
+        GOwnPtr<gchar> firstPartyURI(soup_uri_to_string(firstParty, FALSE));
+        m_firstPartyForCookies = KURL(KURL(), String::fromUTF8(firstPartyURI.get()));
+    }
+
+    // FIXME: m_allowCookies should probably be handled here and on
+    // doUpdatePlatformRequest somehow.
 }
 

trunk/configure.ac

@@ -191 +191 @@
 
 # minimum base dependencies
-LIBSOUP_REQUIRED_VERSION=2.28.2
+LIBSOUP_REQUIRED_VERSION=2.29.90
 CAIRO_REQUIRED_VERSION=1.6
 FONTCONFIG_REQUIRED_VERSION=2.4