Changeset 179870 in webkit

Timestamp:

Feb 10, 2015, 8:01:30 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2] Add support for registering url schemes to bypass Content Security Policy.
​https://bugs.webkit.org/show_bug.cgi?id=140736

Patch by Zhuo Li <​zachli@apple.com> on 2015-02-10
Reviewed by Anders Carlsson.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/API/C/WKContext.cpp:

(WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy):

• UIProcess/API/C/WKContextPrivate.h:
• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::registerURLSchemeAsBypassingContentSecurityPolicy):

• UIProcess/WebProcessPool.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::registerURLSchemeAsBypassingContentSecurityPolicy):

• WebProcess/WebProcess.h:
• WebProcess/WebProcess.messages.in:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)
• WebProcess/WebProcess.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-10  Zhuo Li  <zachli@apple.com>
+
+        [WK2] Add support for registering url schemes to bypass Content Security Policy.
+        https://bugs.webkit.org/show_bug.cgi?id=140736
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy):
+        * UIProcess/API/C/WKContextPrivate.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createNewWebProcess):
+        (WebKit::WebProcessPool::registerURLSchemeAsBypassingContentSecurityPolicy):
+        * UIProcess/WebProcessPool.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::registerURLSchemeAsBypassingContentSecurityPolicy):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+
 2015-02-10  Sanghyup Lee  <sh53.lee@samsung.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -83 +83 @@
     encoder << urlSchemesRegistererdAsEmptyDocument;
     encoder << urlSchemesRegisteredAsSecure;
+    encoder << urlSchemesRegisteredAsBypassingContentSecurityPolicy;
     encoder << urlSchemesForWhichDomainRelaxationIsForbidden;
     encoder << urlSchemesRegisteredAsLocal;
@@ -188 +189 @@
     if (!decoder.decode(parameters.urlSchemesRegisteredAsSecure))
         return false;
+    if (!decoder.decode(parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy))
+        return false;
     if (!decoder.decode(parameters.urlSchemesForWhichDomainRelaxationIsForbidden))
         return false;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -90 +90 @@
     Vector<String> urlSchemesRegistererdAsEmptyDocument;
     Vector<String> urlSchemesRegisteredAsSecure;
+    Vector<String> urlSchemesRegisteredAsBypassingContentSecurityPolicy;
     Vector<String> urlSchemesForWhichDomainRelaxationIsForbidden;
     Vector<String> urlSchemesRegisteredAsLocal;

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -380 +380 @@
 }
 
+void WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy(WKContextRef contextRef, WKStringRef urlScheme)
+{
+    toImpl(contextRef)->registerURLSchemeAsBypassingContentSecurityPolicy(toImpl(urlScheme)->string());
+}
+
 void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef contextRef, WKStringRef urlScheme)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h

@@ -53 +53 @@
 WK_EXPORT void WKContextRegisterURLSchemeAsSecure(WKContextRef context, WKStringRef urlScheme);
 
+WK_EXPORT void WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy(WKContextRef context, WKStringRef urlScheme);
+
 WK_EXPORT void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef context, WKStringRef urlScheme);
 

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -638 +638 @@
     copyToVector(m_schemesToRegisterAsEmptyDocument, parameters.urlSchemesRegistererdAsEmptyDocument);
     copyToVector(m_schemesToRegisterAsSecure, parameters.urlSchemesRegisteredAsSecure);
+    copyToVector(m_schemesToRegisterAsBypassingContentSecurityPolicy, parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy);
     copyToVector(m_schemesToSetDomainRelaxationForbiddenFor, parameters.urlSchemesForWhichDomainRelaxationIsForbidden);
     copyToVector(m_schemesToRegisterAsLocal, parameters.urlSchemesRegisteredAsLocal);
@@ -975 +976 @@
 }
 
+void WebProcessPool::registerURLSchemeAsBypassingContentSecurityPolicy(const String& urlScheme)
+{
+    m_schemesToRegisterAsBypassingContentSecurityPolicy.add(urlScheme);
+    sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsBypassingContentSecurityPolicy(urlScheme));
+}
+
 void WebProcessPool::setDomainRelaxationForbiddenForURLScheme(const String& urlScheme)
 {

trunk/Source/WebKit2/UIProcess/WebProcessPool.h

@@ -197 +197 @@
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&);
+    void registerURLSchemeAsBypassingContentSecurityPolicy(const String&);
     void setDomainRelaxationForbiddenForURLScheme(const String&);
     void setCanHandleHTTPSServerTrustEvaluation(bool);
@@ -454 +455 @@
     HashSet<String> m_schemesToRegisterAsEmptyDocument;
     HashSet<String> m_schemesToRegisterAsSecure;
+    HashSet<String> m_schemesToRegisterAsBypassingContentSecurityPolicy;
     HashSet<String> m_schemesToSetDomainRelaxationForbiddenFor;
     HashSet<String> m_schemesToRegisterAsLocal;

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -314 +314 @@
         registerURLSchemeAsSecure(parameters.urlSchemesRegisteredAsSecure[i]);
 
+    for (size_t i = 0; i < parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy.size(); ++i)
+        registerURLSchemeAsBypassingContentSecurityPolicy(parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy[i]);
+
     for (size_t i = 0; i < parameters.urlSchemesForWhichDomainRelaxationIsForbidden.size(); ++i)
         setDomainRelaxationForbiddenForURLScheme(parameters.urlSchemesForWhichDomainRelaxationIsForbidden[i]);
@@ -414 +417 @@
 {
     SchemeRegistry::registerURLSchemeAsSecure(urlScheme);
+}
+
+void WebProcess::registerURLSchemeAsBypassingContentSecurityPolicy(const String& urlScheme) const
+{
+    SchemeRegistry::registerURLSchemeAsBypassingContentSecurityPolicy(urlScheme);
 }
 

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -217 +217 @@
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&) const;
+    void registerURLSchemeAsBypassingContentSecurityPolicy(const String&) const;
     void setDomainRelaxationForbiddenForURLScheme(const String&) const;
     void registerURLSchemeAsLocal(const String&) const;

trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

@@ -31 +31 @@
     RegisterURLSchemeAsEmptyDocument(String scheme)
     RegisterURLSchemeAsSecure(String scheme)
+    RegisterURLSchemeAsBypassingContentSecurityPolicy(String scheme)
     SetDomainRelaxationForbiddenForURLScheme(String scheme)
     RegisterURLSchemeAsLocal(String scheme)