Changeset 55335 in webkit

Timestamp:

Feb 26, 2010 7:20:22 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-26 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Fisher.

Expose an API for ports to add schemes to the mixed content whitelist
​https://bugs.webkit.org/show_bug.cgi?id=35438

Add a notion of a "secure" scheme that doesn't trigger mixed content
warnings. Let folks register new secure schemes in the same way they
can register "local" schemes.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::isMixedContent):
• page/SecurityOrigin.cpp: (WebCore::secureSchemes): (WebCore::SecurityOrigin::registerURLSchemeAsSecure): (WebCore::SecurityOrigin::shouldTreatURLSchemeAsSecure):
• page/SecurityOrigin.h:

2010-02-26 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Fisher.

Expose an API for ports to add schemes to the mixed content whitelist
​https://bugs.webkit.org/show_bug.cgi?id=35438

Expose registerURLSchemeAsSecure via the WebKit API.

• public/WebSecurityPolicy.h:
• src/WebSecurityPolicy.cpp: (WebKit::WebSecurityPolicy::registerURLSchemeAsSecure):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (2 diffs)
• WebCore/page/SecurityOrigin.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebSecurityPolicy.h (modified) (1 diff)
• WebKit/chromium/src/WebSecurityPolicy.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Fisher.
+
+        Expose an API for ports to add schemes to the mixed content whitelist
+        https://bugs.webkit.org/show_bug.cgi?id=35438
+
+        Add a notion of a "secure" scheme that doesn't trigger mixed content
+        warnings.  Let folks register new secure schemes in the same way they
+        can register "local" schemes.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::isMixedContent):
+        * page/SecurityOrigin.cpp:
+        (WebCore::secureSchemes):
+        (WebCore::SecurityOrigin::registerURLSchemeAsSecure):
+        (WebCore::SecurityOrigin::shouldTreatURLSchemeAsSecure):
+        * page/SecurityOrigin.h:
+
 2010-02-26  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -1401 +1401 @@
         return false;  // We only care about HTTPS security origins.
 
-    if (!url.isValid() || url.protocolIs("https") || url.protocolIs("about") || url.protocolIs("data"))
+    if (!url.isValid() || SecurityOrigin::shouldTreatURLSchemeAsSecure(url.protocol()))
         return false;  // Loading these protocols is secure.
 

trunk/WebCore/page/SecurityOrigin.cpp

@@ -64 +64 @@
 
     return localSchemes;
+}
+
+static URLSchemesMap& secureSchemes()
+{
+    DEFINE_STATIC_LOCAL(URLSchemesMap, secureSchemes, ());
+
+    if (secureSchemes.isEmpty()) {
+        secureSchemes.add("https");
+        secureSchemes.add("about");
+        secureSchemes.add("data");
+    }
+
+    return secureSchemes;
 }
 
@@ -478 +491 @@
 }
 
+void SecurityOrigin::registerURLSchemeAsSecure(const String& scheme)
+{
+    secureSchemes().add(scheme);
+}
+
+bool SecurityOrigin::shouldTreatURLSchemeAsSecure(const String& scheme)
+{
+    return secureSchemes().contains(scheme);
+}
+
 bool SecurityOrigin::shouldHideReferrer(const KURL& url, const String& referrer)
 {

trunk/WebCore/page/SecurityOrigin.h

@@ -175 +175 @@
     static bool shouldTreatURLSchemeAsLocal(const String&);
 
+    // Secure schemes do not trigger mixed content warnings. For example,
+    // https and data are secure schemes because they cannot be corrupted by
+    // active network attackers.
+    static void registerURLSchemeAsSecure(const String&);
+    static bool shouldTreatURLSchemeAsSecure(const String&);
+
     static bool shouldHideReferrer(const KURL&, const String& referrer);
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Fisher.
+
+        Expose an API for ports to add schemes to the mixed content whitelist
+        https://bugs.webkit.org/show_bug.cgi?id=35438
+
+        Expose registerURLSchemeAsSecure via the WebKit API.
+
+        * public/WebSecurityPolicy.h:
+        * src/WebSecurityPolicy.cpp:
+        (WebKit::WebSecurityPolicy::registerURLSchemeAsSecure):
+
 2010-02-26  Brett Wilson  <brettw@chromium.org>
 

trunk/WebKit/chromium/public/WebSecurityPolicy.h

@@ -51 +51 @@
     WEBKIT_API static void registerURLSchemeAsNoAccess(const WebString&);
 
+    // Registers a URL scheme to not generate mixed content warnings when
+    // included by an HTTPS page.
+    WEBKIT_API static void registerURLSchemeAsSecure(const WebString&);
+
     // Support for whitelisting access to origins beyond the same-origin policy.
     WEBKIT_API static void whiteListAccessFromOrigin(

trunk/WebKit/chromium/src/WebSecurityPolicy.cpp

@@ -52 +52 @@
 }
 
+void WebSecurityPolicy::registerURLSchemeAsSecure(const WebString& scheme)
+{
+    SecurityOrigin::registerURLSchemeAsSecure(scheme);
+}
+
 void WebSecurityPolicy::whiteListAccessFromOrigin(const WebURL& sourceOrigin,
     const WebString& destinationProtocol,