Changeset 147165 in webkit

Timestamp:

Mar 28, 2013 2:58:19 PM (11 years ago)

Author:

Nate Chapin

Message:

Source/WebCore: Don't grant local content permissions for appcache loads.
​https://bugs.webkit.org/show_bug.cgi?id=112542

Reviewed by Antti Koivisto.

No new tests, fixing http/tests/appcache/local-content.html

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::DocumentLoader):
(WebCore::DocumentLoader::commitData): Don't grant local load permissions

to all SubstituteData loads, only give them to loads that were SubstituteData
loads at the time of DocumentLoader construction. This constitutes all
SubstituteData loads except those triggered by appcache.

• loader/DocumentLoader.h:
• loader/FrameLoader.cpp:

(WebCore::FrameLoader::didBeginDocument): Move granting local load

permissions for SubstituteData loads to DocumentLoader::commitData().

LayoutTests: Remove expected failure for ​https://bugs.webkit.org/show_bug.cgi?id=112542

Reviewed by Antti Koivisto.

• platform/qt-5.0-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-5.0-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (3 diffs)
• Source/WebCore/loader/DocumentLoader.h (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-28  Nate Chapin  <japhet@chromium.org>
+
+        Remove expected failure for https://bugs.webkit.org/show_bug.cgi?id=112542
+
+        Reviewed by Antti Koivisto.
+
+        * platform/qt-5.0-wk1/TestExpectations:
+
 2013-03-28  Mike West  <mkwst@chromium.org>
 

trunk/LayoutTests/platform/qt-5.0-wk1/TestExpectations

@@ -161 +161 @@
 webkit.org/b/112333 css3/compositing/should-have-compositing-layer.html [ Skip ]
 webkit.org/b/112333 transitions/blendmode-transitions.html  [ Skip ]
-
-# [Qt][WK1] REGRESSION(r145973): http/tests/appcache/local-content.html fails
-webkit.org/b/112542 http/tests/appcache/local-content.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-28  Nate Chapin  <japhet@chromium.org>
+
+        Don't grant local content permissions for appcache loads.
+        https://bugs.webkit.org/show_bug.cgi?id=112542
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, fixing http/tests/appcache/local-content.html
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::DocumentLoader):
+        (WebCore::DocumentLoader::commitData): Don't grant local load permissions
+            to all SubstituteData loads, only give them to loads that were SubstituteData
+            loads at the time of DocumentLoader construction. This constitutes all
+            SubstituteData loads except those triggered by appcache.
+        * loader/DocumentLoader.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::didBeginDocument): Move granting local load
+            permissions for SubstituteData loads to DocumentLoader::commitData().
+
 2013-03-28  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -55 +55 @@
 #include "ResourceBuffer.h"
 #include "SchemeRegistry.h"
+#include "SecurityPolicy.h"
 #include "Settings.h"
 #include "SubresourceLoader.h"
@@ -104 +105 @@
     , m_originalRequestCopy(req)
     , m_request(req)
+    , m_originalSubstituteDataWasValid(substituteData.isValid())
     , m_committed(false)
     , m_isStopping(false)
@@ -760 +762 @@
         m_writer.begin(documentURL(), false);
         m_writer.setDocumentWasLoadedAsPartOfNavigation();
+
+        if (SecurityPolicy::allowSubstituteDataAccessToLocal() && m_originalSubstituteDataWasValid) {
+            // If this document was loaded with substituteData, then the document can
+            // load local resources. See https://bugs.webkit.org/show_bug.cgi?id=16756
+            // and https://bugs.webkit.org/show_bug.cgi?id=19760 for further
+            // discussion.
+            m_frame->document()->securityOrigin()->grantLoadLocalResources();
+        }
 
         if (frameLoader()->stateMachine()->creatingInitialEmptyDocument())

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -344 +344 @@
         ResourceError m_mainDocumentError;    
 
+        bool m_originalSubstituteDataWasValid;
         bool m_committed;
         bool m_isStopping;

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -684 +684 @@
                 m_frame->document()->setContentLanguage(headerContentLanguage);
         }
-
-        if (SecurityPolicy::allowSubstituteDataAccessToLocal() && m_documentLoader->substituteData().isValid()) {
-            // If this document was loaded with substituteData, then the document can
-            // load local resources. See https://bugs.webkit.org/show_bug.cgi?id=16756
-            // and https://bugs.webkit.org/show_bug.cgi?id=19760 for further
-            // discussion.
-            m_frame->document()->securityOrigin()->grantLoadLocalResources();
-        }
     }