Changeset 91044 in webkit

Timestamp:

Jul 14, 2011, 7:16:09 PM (14 years ago)

Author:

abarth@webkit.org

Message:

The beforeload event allows tracking URI changes in a frame
​https://bugs.webkit.org/show_bug.cgi?id=64482

Reviewed by Nate Chapin.

Source/WebCore:

Tests: http/tests/security/beforeload-iframe-client-redirect.html

http/tests/security/beforeload-iframe-server-redirect.html

Only dispatch the beforeload event for a frame if we haven't yet
committed our first real load. The URL that we send to our parent will
be the same URL the parent seens in the src attribute.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadWithDocumentLoader):

LayoutTests:

Test whether the beforeload event is fired for various kinds of redirects.

• http/tests/security/beforeload-iframe-client-redirect-expected.txt: Added.
• http/tests/security/beforeload-iframe-client-redirect.html: Added.
• http/tests/security/beforeload-iframe-server-redirect-expected.txt: Added.
• http/tests/security/beforeload-iframe-server-redirect.html: Added.
• http/tests/security/resources/post-done.html: Added.
• http/tests/security/resources/client-redir.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/beforeload-iframe-client-redirect-expected.txt (added)
• LayoutTests/http/tests/security/beforeload-iframe-client-redirect.html (added)
• LayoutTests/http/tests/security/beforeload-iframe-server-redirect-expected.txt (added)
• LayoutTests/http/tests/security/beforeload-iframe-server-redirect.html (added)
• LayoutTests/http/tests/security/resources/client-redir.html (added)
• LayoutTests/http/tests/security/resources/post-done.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-14  Adam Barth  <abarth@webkit.org>
+
+        The beforeload event allows tracking URI changes in a frame
+        https://bugs.webkit.org/show_bug.cgi?id=64482
+
+        Reviewed by Nate Chapin.
+
+        Test whether the beforeload event is fired for various kinds of redirects.
+
+        * http/tests/security/beforeload-iframe-client-redirect-expected.txt: Added.
+        * http/tests/security/beforeload-iframe-client-redirect.html: Added.
+        * http/tests/security/beforeload-iframe-server-redirect-expected.txt: Added.
+        * http/tests/security/beforeload-iframe-server-redirect.html: Added.
+        * http/tests/security/resources/post-done.html: Added.
+        * http/tests/security/resources/client-redir.html: Added.
+
 2011-07-14  Vincent Scheib  <scheib@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-14  Adam Barth  <abarth@webkit.org>
+
+        The beforeload event allows tracking URI changes in a frame
+        https://bugs.webkit.org/show_bug.cgi?id=64482
+
+        Reviewed by Nate Chapin.
+
+        Tests: http/tests/security/beforeload-iframe-client-redirect.html
+               http/tests/security/beforeload-iframe-server-redirect.html
+
+        Only dispatch the beforeload event for a frame if we haven't yet
+        committed our first real load.  The URL that we send to our parent will
+        be the same URL the parent seens in the src attribute.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadWithDocumentLoader):
+
 2011-07-14  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1354 +1354 @@
 
         if (Element* ownerElement = m_frame->ownerElement()) {
-            if (!ownerElement->dispatchBeforeLoadEvent(loader->request().url().string())) {
+            // We skip dispatching the beforeload event if we've already
+            // committed a real document load because the event would leak
+            // subsequent activity by the frame which the parent frame isn't
+            // supposed to learn. For example, if the child frame navigated to
+            // a new URL, the parent frame shouldn't learn the URL.
+            if (!m_stateMachine.committedFirstRealDocumentLoad()
+                && !ownerElement->dispatchBeforeLoadEvent(loader->request().url().string())) {
                 continueLoadAfterNavigationPolicy(loader->request(), formState, false);
                 return;