Changeset 75557 in webkit

Timestamp:

Jan 11, 2011 2:53:39 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-01-11 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Introduce the notion of a "display-isolated" URL scheme for use by
Chrome-internal URLs
​https://bugs.webkit.org/show_bug.cgi?id=50182

This patch actually makes the display-isolated schemes display
isolated. The behavior should be the same as the previous iteration of
this patch, but re-organized a bit because reading the access white
list is expensive.

• page/SecurityOrigin.cpp: (WebCore::SecurityOrigin::isAccessToURLWhiteListed): (WebCore::SecurityOrigin::canDisplay):
• page/SecurityOrigin.h:
• platform/SchemeRegistry.cpp:
• platform/SchemeRegistry.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/SecurityOrigin.cpp (modified) (1 diff)
• page/SecurityOrigin.h (modified) (1 diff)
• platform/SchemeRegistry.cpp (modified) (1 diff)
• platform/SchemeRegistry.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-11  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Introduce the notion of a "display-isolated" URL scheme for use by
+        Chrome-internal URLs
+        https://bugs.webkit.org/show_bug.cgi?id=50182
+
+        This patch actually makes the display-isolated schemes display
+        isolated.  The behavior should be the same as the previous iteration of
+        this patch, but re-organized a bit because reading the access white
+        list is expensive.
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::isAccessToURLWhiteListed):
+        (WebCore::SecurityOrigin::canDisplay):
+        * page/SecurityOrigin.h:
+        * platform/SchemeRegistry.cpp:
+        * platform/SchemeRegistry.h:
+
 2011-01-11  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -300 +300 @@
     return false;
 }
-  
+
+bool SecurityOrigin::isAccessToURLWhiteListed(const KURL& url) const
+{
+    RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url);
+    return isAccessWhiteListed(targetOrigin.get());
+}
+
 bool SecurityOrigin::canDisplay(const KURL& url) const
 {
+    String protocol = url.protocol().lower();
+
 #if ENABLE(BLOB)
     // FIXME: We should generalize this check.
-    if (url.protocolIs(BlobURL::blobProtocol()))
+    if (protocol == BlobURL::blobProtocol())
         return canRequest(url);
 #endif
 
-    if (!restrictAccessToLocal())
-        return true;
-
-    // FIXME: I suspect this check is incorrect because url has not necessarily
-    //        been canonicalized.
-    if (!SchemeRegistry::deprecatedShouldTreatURLAsLocal(url.string()))
-        return true;
-
-    RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url);
-    if (isAccessWhiteListed(targetOrigin.get()))
-        return true;
-
-    return canLoadLocalResources();
+    if (SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated(protocol))
+        return m_protocol == protocol || isAccessToURLWhiteListed(url);
+
+    if (restrictAccessToLocal() && SchemeRegistry::shouldTreatURLSchemeAsLocal(protocol))
+        return canLoadLocalResources() || isAccessToURLWhiteListed(url);
+
+    return true;
 }
 

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -194 +194 @@
     explicit SecurityOrigin(const SecurityOrigin*);
 
-    bool passesFileCheck(const SecurityOrigin* other) const;
-
-    bool isAccessWhiteListed(const SecurityOrigin* targetOrigin) const;
+    // FIXME: Rename this function to something more semantic.
+    bool passesFileCheck(const SecurityOrigin*) const;
+
+    bool isAccessWhiteListed(const SecurityOrigin*) const;
+    bool isAccessToURLWhiteListed(const KURL&) const;
 
     SandboxFlags m_sandboxFlags;

trunk/Source/WebCore/platform/SchemeRegistry.cpp

@@ -108 +108 @@
 }
 
-bool SchemeRegistry::deprecatedShouldTreatURLAsLocal(const String& url)
-{
-    // This avoids an allocation of another String and the HashSet contains()
-    // call for the file: and http: schemes.
-    if (url.length() >= 5) {
-        const UChar* s = url.characters();
-        if (s[0] == 'h' && s[1] == 't' && s[2] == 't' && s[3] == 'p' && s[4] == ':')
-            return false;
-        if (s[0] == 'f' && s[1] == 'i' && s[2] == 'l' && s[3] == 'e' && s[4] == ':')
-            return true;
-    }
-
-    size_t loc = url.find(':');
-    if (loc == notFound)
-        return false;
-
-    String scheme = url.left(loc);
-    return localURLSchemes().contains(scheme);
-}
-
 bool SchemeRegistry::shouldTreatURLSchemeAsLocal(const String& scheme)
 {

trunk/Source/WebCore/platform/SchemeRegistry.h

@@ -42 +42 @@
 
     static bool shouldTreatURLSchemeAsLocal(const String&);
-    static bool deprecatedShouldTreatURLAsLocal(const String&);
 
     // Secure schemes do not trigger mixed content warnings. For example,