Changeset 169112 in webkit

Timestamp:

May 20, 2014 8:20:52 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
​https://bugs.webkit.org/show_bug.cgi?id=133119

Reviewed by Sergio Villar Senin.

Source/WebKit2:
The problem is that we were checking whether the passed in
WKURLResponseRef is NULL or not, but it's always a valid object
that can contain a NULL WebCore::ResourceResponse.

• WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:

(willSendRequestForFrame): Pass NULL as redirect-response
parameter of WebKitWebPage::send-request signal when the
WebCore::ResourceResponse of the passed in WKURLResponseRef is NULL.

Tools:
Check that redirect response parameter of
WebKitWebPage::send-request signal is NULL when not redirecting
and a valid WebKitURIResponse object when redirecting.

• TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:

(testWebResourceSendRequest):
(serverCallback):

• TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:

(sendRequestCallback):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp (modified) (3 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
+        https://bugs.webkit.org/show_bug.cgi?id=133119
+
+        Reviewed by Sergio Villar Senin.
+
+        The problem is that we were checking whether the passed in
+        WKURLResponseRef is NULL or not, but it's always a valid object
+        that can contain a NULL WebCore::ResourceResponse.
+
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+        (willSendRequestForFrame): Pass NULL as redirect-response
+        parameter of WebKitWebPage::send-request signal when the
+        WebCore::ResourceResponse of the passed in WKURLResponseRef is NULL.
+
 2014-05-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

@@ -164 +164 @@
 {
     GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(toImpl(wkRequest)->resourceRequest()));
-    GRefPtr<WebKitURIResponse> redirectResponse = wkRedirectResponse ? adoptGRef(webkitURIResponseCreateForResourceResponse(toImpl(wkRedirectResponse)->resourceResponse())) : 0;
+    const ResourceResponse& redirectResourceResponse = toImpl(wkRedirectResponse)->resourceResponse();
+    GRefPtr<WebKitURIResponse> redirectResponse = !redirectResourceResponse.isNull() ? adoptGRef(webkitURIResponseCreateForResourceResponse(redirectResourceResponse)) : nullptr;
 
     gboolean returnValue;
@@ -180 +181 @@
     message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
     message.set(String::fromUTF8("Request"), newRequest.get());
-    if (!toImpl(wkRedirectResponse)->resourceResponse().isNull())
+    if (!redirectResourceResponse.isNull())
         message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
     WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), ImmutableDictionary::create(std::move(message)).get());

trunk/Tools/ChangeLog

@@ +1 @@
+2014-05-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
+        https://bugs.webkit.org/show_bug.cgi?id=133119
+
+        Reviewed by Sergio Villar Senin.
+
+        Check that redirect response parameter of
+        WebKitWebPage::send-request signal is NULL when not redirecting
+        and a valid WebKitURIResponse object when redirecting.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
+        (testWebResourceSendRequest):
+        (serverCallback):
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+        (sendRequestCallback):
+
 2014-05-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -639 +639 @@
     // URI changed after a redirect.
     test->setExpectedNewResourceURI(kServer->getURIForPath("/redirected.js"));
-    test->setExpectedNewResourceURIAfterRedirection(kServer->getURIForPath("/javascript.js"));
+    test->setExpectedNewResourceURIAfterRedirection(kServer->getURIForPath("/javascript-after-redirection.js"));
     test->loadURI(kServer->getURIForPath("redirected-javascript.html").data());
     test->waitUntilResourceLoadFinished();
@@ -718 +718 @@
         addCacheHTTPHeadersToResponse(message);
         soup_message_headers_append(message->response_headers, "Content-Type", "text/css");
-    } else if (g_str_equal(path, "/javascript.js")) {
+    } else if (g_str_equal(path, "/javascript.js") || g_str_equal(path, "/javascript-after-redirection.js")) {
         soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, kJavascript, strlen(kJavascript));
         soup_message_headers_append(message->response_headers, "Content-Type", "text/javascript");
@@ -755 +755 @@
     } else if (g_str_equal(path, "/redirected.js")) {
         soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
-        soup_message_headers_append(message->response_headers, "Location", "/remove-this/javascript.js");
+        soup_message_headers_append(message->response_headers, "Location", "/remove-this/javascript-after-redirection.js");
     } else if (g_str_equal(path, "/redirected-to-cancel.js")) {
         soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);

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

@@ -130 +130 @@
 }
 
-static gboolean sendRequestCallback(WebKitWebPage*, WebKitURIRequest* request, WebKitURIResponse*, gpointer)
+static gboolean sendRequestCallback(WebKitWebPage*, WebKitURIRequest* request, WebKitURIResponse* redirectResponse, gpointer)
 {
     const char* requestURI = webkit_uri_request_get_uri(request);
@@ -139 +139 @@
         GUniquePtr<char> newURI(g_strdup_printf("%s/javascript.js", prefix.get()));
         webkit_uri_request_set_uri(request, newURI.get());
+    } else if (const char* suffix = g_strrstr(requestURI, "/remove-this/javascript-after-redirection.js")) {
+        // Redirected from /redirected.js, redirectResponse should be nullptr.
+        g_assert(WEBKIT_IS_URI_RESPONSE(redirectResponse));
+        g_assert(g_str_has_suffix(webkit_uri_response_get_uri(redirectResponse), "/redirected.js"));
+
+        GUniquePtr<char> prefix(g_strndup(requestURI, strlen(requestURI) - strlen(suffix)));
+        GUniquePtr<char> newURI(g_strdup_printf("%s/javascript-after-redirection.js", prefix.get()));
+        webkit_uri_request_set_uri(request, newURI.get());
+    } else if (g_str_has_suffix(requestURI, "/redirected.js")) {
+        // Original request, redirectResponse should be nullptr.
+        g_assert(!redirectResponse);
     } else if (g_str_has_suffix(requestURI, "/add-do-not-track-header")) {
         SoupMessageHeaders* headers = webkit_uri_request_get_http_headers(request);