Changeset 185553 in webkit

Timestamp:

Jun 15, 2015, 9:36:24 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Custom URI schemes don't work for requests containing a fragment identifier
​https://bugs.webkit.org/show_bug.cgi?id=145969

Reviewed by Sergio Villar Senin.

Source/WebCore:

For URIs like foo:bar#baz, what the custom protocol manager
receives in the UI process is foo:bar, so the user can't handle fragments.

• platform/network/soup/ResourceRequestSoup.cpp:

(WebCore::ResourceRequest::updateSoupRequest): If the SoupRequest
is a WebKitSoupRequestGeneric, call
webkitSoupRequestGenericSetRequest with the ResourceRequest.

• platform/network/soup/WebKitSoupRequestGeneric.cpp:

(webkitSoupRequestGenericSetRequest):
(webkitSoupRequestGenericGetRequest):

• platform/network/soup/WebKitSoupRequestGeneric.h:

Source/WebKit2:

Use the WebKitSoupRequestGeneric request instead of creating a new one
from the SoupRequest URI, since that is the network one and doesn't
contain the fragment identifier part.

• Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:

(WebKit::CustomProtocolManagerImpl::start):

Tools:

Add a test case to the custom URI schemes unit test.

• TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:

(testWebContextURIScheme):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (2 diffs)
• Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (modified) (3 diffs)
• Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
+        https://bugs.webkit.org/show_bug.cgi?id=145969
+
+        Reviewed by Sergio Villar Senin.
+
+        For URIs like foo:bar#baz, what the custom protocol manager
+        receives in the UI process is foo:bar, so the user can't handle fragments.
+
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateSoupRequest): If the SoupRequest
+        is a WebKitSoupRequestGeneric, call
+        webkitSoupRequestGenericSetRequest with the ResourceRequest.
+        * platform/network/soup/WebKitSoupRequestGeneric.cpp:
+        (webkitSoupRequestGenericSetRequest):
+        (webkitSoupRequestGenericGetRequest):
+        * platform/network/soup/WebKitSoupRequestGeneric.h:
+
 2015-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -27 +27 @@
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
+#include "WebKitSoupRequestGeneric.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
@@ -129 +130 @@
     *initiatingPageIDPtr = m_initiatingPageID;
     g_object_set_data_full(G_OBJECT(soupRequest), g_intern_static_string(gSoupRequestInitiatingPageIDKey), initiatingPageIDPtr, fastFree);
+
+    if (WEBKIT_IS_SOUP_REQUEST_GENERIC(soupRequest))
+        webkitSoupRequestGenericSetRequest(WEBKIT_SOUP_REQUEST_GENERIC(soupRequest), *this);
 }
 

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

@@ -21 +21 @@
 #include "WebKitSoupRequestGeneric.h"
 
+#include "ResourceRequest.h"
 #include <wtf/text/CString.h>
 
@@ -30 +31 @@
     CString mimeType;
     goffset contentLength;
+    ResourceRequest resourceRequest;
 };
 
@@ -93 +95 @@
     request->priv->mimeType = mimeType;
 }
+
+void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric* request, const ResourceRequest& resourceRequest)
+{
+    request->priv->resourceRequest = resourceRequest;
+}
+
+const ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
+{
+    return request->priv->resourceRequest;
+}

trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h

@@ -27 +27 @@
 G_BEGIN_DECLS
 
+namespace WebCore {
+class ResourceRequest;
+}
+
 #define WEBKIT_TYPE_SOUP_REQUEST_GENERIC            (webkit_soup_request_generic_get_type())
 #define WEBKIT_SOUP_REQUEST_GENERIC(object)         (G_TYPE_CHECK_INSTANCE_CAST((object), WEBKIT_TYPE_SOUP_REQUEST_GENERIC, WebKitSoupRequestGeneric))
@@ -54 +58 @@
 void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric*, goffset contentLength);
 void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric*, const char* mimeType);
+void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric*, const WebCore::ResourceRequest&);
+const WebCore::ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric*);
 
 G_END_DECLS

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
+        https://bugs.webkit.org/show_bug.cgi?id=145969
+
+        Reviewed by Sergio Villar Senin.
+
+        Use the WebKitSoupRequestGeneric request instead of creating a new one
+        from the SoupRequest URI, since that is the network one and doesn't
+        contain the fragment identifier part.
+
+        * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+        (WebKit::CustomProtocolManagerImpl::start):
+
 2015-06-15  Hyungwook Lee  <hyungwook.lee@navercorp.com>
 

trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp

@@ -191 +191 @@
     m_customProtocolMap.set(customProtocolID, std::make_unique<WebSoupRequestAsyncData>(task, request));
 
-    WebCore::ResourceRequest resourceRequest(SOUP_REQUEST(request));
-    m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, resourceRequest), 0);
+    m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, webkitSoupRequestGenericGetRequest(request)), 0);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
+        https://bugs.webkit.org/show_bug.cgi?id=145969
+
+        Reviewed by Sergio Villar Senin.
+
+        Add a test case to the custom URI schemes unit test.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+        (testWebContextURIScheme):
+
 2015-06-15  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp

@@ -215 +215 @@
     g_assert(!strncmp(mainResourceData, echoHTML.get(), mainResourceDataSize));
 
+    test->loadURI("echo:with#fragment");
+    test->waitUntilLoadFinished();
+    g_assert_cmpstr(webkit_uri_scheme_request_get_path(test->m_uriSchemeRequest.get()), ==, "with");
+    g_assert_cmpstr(webkit_uri_scheme_request_get_uri(test->m_uriSchemeRequest.get()), ==, "echo:with#fragment");
+    echoHTML.reset(g_strdup_printf(kEchoHTMLFormat, webkit_uri_scheme_request_get_path(test->m_uriSchemeRequest.get())));
+    mainResourceDataSize = 0;
+    mainResourceData = test->mainResourceData(mainResourceDataSize);
+    g_assert_cmpint(mainResourceDataSize, ==, strlen(echoHTML.get()));
+    g_assert(!strncmp(mainResourceData, echoHTML.get(), mainResourceDataSize));
+
     test->registerURISchemeHandler("nomime", kBarHTML, -1, 0);
     test->m_loadEvents.clear();