Changeset 57238 in webkit

Timestamp:

Apr 7, 2010 3:59:29 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-07 Erik Arvidsson <​arv@chromium.org>

Reviewed by Adam Barth.

Allow white listing access from origin to local origin.
​https://bugs.webkit.org/show_bug.cgi?id=37228

This makes it possible to load a local resource from a non local
origin if the access has previously been white listed by calling
SecurityOrigin::whiteListAccessFromOrigin.

• http/tests/security/local-image-from-remote-whitelisted-expected.txt: Added.
• http/tests/security/local-image-from-remote-whitelisted.html: Added.

2010-04-07 Erik Arvidsson <​arv@chromium.org>

Reviewed by Adam Barth.

Allow white listing access from origin to local origin.
​https://bugs.webkit.org/show_bug.cgi?id=37228

This makes it possible to load a local resource from a non local
origin if the access has previously been white listed by calling
SecurityOrigin::whiteListAccessFromOrigin.

Test: http/tests/security/local-image-from-remote-whitelisted.html

• page/OriginAccessEntry.cpp: (WebCore::OriginAccessEntry::OriginAccessEntry): Removed assert that only the http and https protocol are valid.
• page/SecurityOrigin.cpp: (WebCore::SecurityOrigin::canRequest): Use isAccessWhiteListed (WebCore::SecurityOrigin::isAccessWhiteListed): Extracted code that goes through the originAccessMap to do the origin matching. (WebCore::SecurityOrigin::canLoad): Check if access has been white listed.
• page/SecurityOrigin.h: Add private function isAccessWhiteListed

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/local-image-from-remote-whitelisted-expected.txt (added)
• LayoutTests/http/tests/security/local-image-from-remote-whitelisted.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/OriginAccessEntry.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (3 diffs)
• WebCore/page/SecurityOrigin.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-07  Erik Arvidsson  <arv@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Allow white listing access from origin to local origin.
+        https://bugs.webkit.org/show_bug.cgi?id=37228
+
+        This makes it possible to load a local resource from a non local
+        origin if the access has previously been white listed by calling
+        SecurityOrigin::whiteListAccessFromOrigin.
+
+        * http/tests/security/local-image-from-remote-whitelisted-expected.txt: Added.
+        * http/tests/security/local-image-from-remote-whitelisted.html: Added.
+
 2010-04-07  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-07  Erik Arvidsson  <arv@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Allow white listing access from origin to local origin.
+        https://bugs.webkit.org/show_bug.cgi?id=37228
+
+        This makes it possible to load a local resource from a non local
+        origin if the access has previously been white listed by calling
+        SecurityOrigin::whiteListAccessFromOrigin.
+
+        Test: http/tests/security/local-image-from-remote-whitelisted.html
+
+        * page/OriginAccessEntry.cpp:
+        (WebCore::OriginAccessEntry::OriginAccessEntry): Removed assert that only the http and https protocol are valid.
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::canRequest): Use isAccessWhiteListed
+        (WebCore::SecurityOrigin::isAccessWhiteListed): Extracted code that goes through the originAccessMap to do the origin matching.
+        (WebCore::SecurityOrigin::canLoad): Check if access has been white listed.
+        * page/SecurityOrigin.h: Add private function isAccessWhiteListed
+
 2010-04-07  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebCore/page/OriginAccessEntry.cpp

@@ -41 +41 @@
     , m_subdomainSettings(subdomainSetting)
 {
-    ASSERT(m_protocol == "http" || m_protocol == "https");
     ASSERT(subdomainSetting == AllowSubdomains || subdomainSetting == DisallowSubdomains);
 

trunk/WebCore/page/SecurityOrigin.cpp

@@ -262 +262 @@
         return true;
 
-    if (OriginAccessWhiteList* list = originAccessMap().get(toString())) {
-        for (size_t i = 0; i < list->size(); ++i) {
-            if (list->at(i).matchesOrigin(*targetOrigin))
-                return true;
-        }
-    }
+    if (isAccessWhiteListed(targetOrigin.get()))
+        return true;
 
     return false;
@@ -289 +285 @@
 }
 
+bool SecurityOrigin::isAccessWhiteListed(const SecurityOrigin* targetOrigin) const
+{
+    if (OriginAccessWhiteList* list = originAccessMap().get(toString())) {
+        for (size_t i = 0; i < list->size();  ++i) {
+           if (list->at(i).matchesOrigin(*targetOrigin))
+               return true;
+       }
+    }
+    return false;
+}
+  
 bool SecurityOrigin::canLoad(const KURL& url, const String& referrer, Document* document)
 {
@@ -294 +301 @@
         return true;
 
-    // If we were provided a document, we let its local file policy dictate the result,
-    // otherwise we allow local loads only if the supplied referrer is also local.
-    if (document)
-        return document->securityOrigin()->canLoadLocalResources();
+    // If we were provided a document, we first check if the access has been white listed.
+    // Then we let its local file police dictate the result.
+    // Otherwise we allow local loads only if the supplied referrer is also local.
+    if (document) {
+        SecurityOrigin* documentOrigin = document->securityOrigin();
+        RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url);
+        if (documentOrigin->isAccessWhiteListed(targetOrigin.get()))
+            return true;
+        return documentOrigin->canLoadLocalResources();
+    }
     if (!referrer.isEmpty())
         return shouldTreatURLAsLocal(referrer);

trunk/WebCore/page/SecurityOrigin.h

@@ -204 +204 @@
     bool passesFileCheck(const SecurityOrigin* other) const;
 
+    bool isAccessWhiteListed(const SecurityOrigin* targetOrigin) const;
+
     SandboxFlags m_sandboxFlags;
     String m_protocol;