Attachment 341556 Details for Bug 186082 – Patch

[patch] Patch

bug-186082-20180529212323.patch (text/plain), 10.19 KB, created by youenn fablet on 2018-05-29 21:23:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-05-29 21:23:24 PDT

Size: 10.19 KB

patch

obsolete

>Subversion Revision: 232263
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 63de2d4d654307d67d2dd5e56674177a75425d35..960240abc14efd2a24e8fa10d35a1cfc1d97a647 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-29  Youenn Fablet  <youenn@apple.com>
>+
>+        Rename FromOrigin runtime flag to CrossOriginResourcePolicy and enable it by default
>+        https://bugs.webkit.org/show_bug.cgi?id=186082
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No change of behavior.
>+
>+        * page/RuntimeEnabledFeatures.h:
>+        (WebCore::RuntimeEnabledFeatures::setCrossOriginResourcePolicyEnabled):
>+        (WebCore::RuntimeEnabledFeatures::crossOriginResourcePolicyEnabled const):
>+        (WebCore::RuntimeEnabledFeatures::setFromOriginResponseHeaderEnabled): Deleted.
>+        (WebCore::RuntimeEnabledFeatures::fromOriginResponseHeaderEnabled const): Deleted.
>+
> 2018-05-29  Youenn Fablet  <youenn@apple.com>
> 
>         Rename CrossOriginResourcePolicy same to same-origin
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 92cff2282de7f2f145ae6c023fa3595ee0f920e1..185006659141ac746c33b4a40ee01286f7254fb8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-05-29  Youenn Fablet  <youenn@apple.com>
>+
>+        Rename FromOrigin runtime flag to CrossOriginResourcePolicy and enable it by default
>+        https://bugs.webkit.org/show_bug.cgi?id=186082
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
>+        (WebKit::NetworkResourceLoadParameters::encode const):
>+        (WebKit::NetworkResourceLoadParameters::decode):
>+        * NetworkProcess/NetworkResourceLoadParameters.h:
>+        * Shared/WebPreferences.yaml:
>+        * UIProcess/API/C/WKPreferences.cpp:
>+        (WKPreferencesSetCrossOriginResourcePolicyEnabled):
>+        (WKPreferencesGetCrossOriginResourcePolicyEnabled):
>+        (WKPreferencesSetFromOriginResponseHeaderEnabled): Deleted.
>+        (WKPreferencesGetFromOriginResponseHeaderEnabled): Deleted.
>+        * UIProcess/API/C/WKPreferencesRef.h:
>+        * WebProcess/Network/WebLoaderStrategy.cpp:
>+        (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
>+
> 2018-05-29  Youenn Fablet  <youenn@apple.com>
> 
>         Rename CrossOriginResourcePolicy same to same-origin
>diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h
>index 6cc92e09036c7b96b4e39768cae636fa708a9b46..6a687fe3655f2cd3ec05e24820cfe6185fe6e437 100644
>--- a/Source/WebCore/page/RuntimeEnabledFeatures.h
>+++ b/Source/WebCore/page/RuntimeEnabledFeatures.h
>@@ -250,8 +250,8 @@ public:
>     void setRestrictedHTTPResponseAccess(bool isEnabled) { m_isRestrictedHTTPResponseAccess = isEnabled; }
>     bool restrictedHTTPResponseAccess() const { return m_isRestrictedHTTPResponseAccess; }
> 
>-    void setFromOriginResponseHeaderEnabled(bool isEnabled) { m_fromOriginResponseHeaderEnabled = isEnabled; }
>-    bool fromOriginResponseHeaderEnabled() const { return m_fromOriginResponseHeaderEnabled; }
>+    void setCrossOriginResourcePolicyEnabled(bool isEnabled) { m_crossOriginResourcePolicyEnabled = isEnabled; }
>+    bool crossOriginResourcePolicyEnabled() const { return m_crossOriginResourcePolicyEnabled; }
>     
>     void setWebGLCompressedTextureASTCSupportEnabled(bool isEnabled) { m_isWebGLCompressedTextureASTCSupportEnabled = isEnabled; }
>     bool webGLCompressedTextureASTCSupportEnabled() const { return m_isWebGLCompressedTextureASTCSupportEnabled; }
>@@ -399,7 +399,7 @@ private:
> 
>     bool m_isRestrictedHTTPResponseAccess { true };
> 
>-    bool m_fromOriginResponseHeaderEnabled { false };
>+    bool m_crossOriginResourcePolicyEnabled { true };
> 
>     bool m_isWebGLCompressedTextureASTCSupportEnabled { false };
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>index 86b7b50788d125c20672beb8a1bf392d26407689..198a46f69300d83678d13a6ac2efd17966706c2a 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>@@ -97,7 +97,7 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
> 
>     encoder.encodeEnum(preflightPolicy);
> 
>-    encoder << shouldEnableFromOriginResponseHeader;
>+    encoder << shouldEnableCrossOriginResourcePolicy;
> 
>     encoder << frameAncestorOrigins;
> 
>@@ -205,11 +205,11 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc
>     if (!decoder.decodeEnum(result.preflightPolicy))
>         return false;
> 
>-    std::optional<bool> shouldEnableFromOriginResponseHeader;
>-    decoder >> shouldEnableFromOriginResponseHeader;
>-    if (!shouldEnableFromOriginResponseHeader)
>+    std::optional<bool> shouldEnableCrossOriginResourcePolicy;
>+    decoder >> shouldEnableCrossOriginResourcePolicy;
>+    if (!shouldEnableCrossOriginResourcePolicy)
>         return false;
>-    result.shouldEnableFromOriginResponseHeader = *shouldEnableFromOriginResponseHeader;
>+    result.shouldEnableCrossOriginResourcePolicy = *shouldEnableCrossOriginResourcePolicy;
> 
>     if (!decoder.decode(result.frameAncestorOrigins))
>         return false;
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
>index 75a917e727dbcdf64d5b3a0926090baae42e41f8..d63738aeec8a3535d09610369e786491b1e9d2f9 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
>@@ -61,7 +61,7 @@ public:
>     WebCore::HTTPHeaderMap originalRequestHeaders;
>     bool shouldRestrictHTTPResponseAccess { false };
>     WebCore::PreflightPolicy preflightPolicy { WebCore::PreflightPolicy::Consider };
>-    bool shouldEnableFromOriginResponseHeader { false };
>+    bool shouldEnableCrossOriginResourcePolicy { false };
>     Vector<RefPtr<WebCore::SecurityOrigin>> frameAncestorOrigins;
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 5d33ad1ffa3a3c3cf18a7b29203ab31e1ac17422..d1349d2658e9809c35c21bb2694bf5c864d3dfad 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -1253,11 +1253,11 @@ RestrictedHTTPResponseAccess:
>     category: experimental
>     webcoreBinding: RuntimeEnabledFeatures
> 
>-FromOriginResponseHeaderEnabled:
>+CrossOriginResourcePolicyEnabled:
>     type: bool
>-    defaultValue: false
>-    humanReadableName: "From-Origin Response Header"
>-    humanReadableDescription: "Support for the From-Origin Response Header"
>+    defaultValue: true
>+    humanReadableName: "Cross-Origin-Resource-Policy Response Header"
>+    humanReadableDescription: "Support for the Cross-Origin-Resource-Policy Response Header"
>     category: experimental
>     webcoreBinding: RuntimeEnabledFeatures
> 
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>index fc1d7fa491cbe5c8296a967400e4149ce9c93810..455c2742bcd376ef156b4202f43098d151c9e705 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>@@ -1974,14 +1974,14 @@ bool WKPreferencesGetAllowCrossOriginSubresourcesToAskForCredentials(WKPreferenc
>     return toImpl(preferencesRef)->allowCrossOriginSubresourcesToAskForCredentials();
> }
> 
>-void WKPreferencesSetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef, bool flag)
>+void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool flag)
> {
>-    toImpl(preferencesRef)->setFromOriginResponseHeaderEnabled(flag);
>+    toImpl(preferencesRef)->setCrossOriginResourcePolicyEnabled(flag);
> }
> 
>-bool WKPreferencesGetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef)
>+bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef)
> {
>-    return toImpl(preferencesRef)->fromOriginResponseHeaderEnabled();
>+    return toImpl(preferencesRef)->crossOriginResourcePolicyEnabled();
> }
> 
> void WKPreferencesSetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef, bool flag)
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h b/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>index 789efb075a95ebcf4d1146ebfa80c095bd142794..1bb09847edb80b57a2992a8dfee69f455d244803 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>@@ -320,8 +320,8 @@ WK_EXPORT bool WKPreferencesGetRestrictedHTTPResponseAccess(WKPreferencesRef pre
> WK_EXPORT void WKPreferencesSetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef, bool allow);
> 
> // Defaults to false.
>-WK_EXPORT bool WKPreferencesGetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef);
>-WK_EXPORT void WKPreferencesSetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef, bool allow);
>+WK_EXPORT bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef);
>+WK_EXPORT void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool allow);
> 
> #ifdef __cplusplus
> }
>diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>index 7ea96042773b93ac6905b88f342b584cff4f0a31..097b8bbd3ecf4551f671eb3a847ebf3e920e0ea6 100644
>--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>@@ -327,7 +327,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
> 
>     loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate;
> 
>-    loadParameters.shouldEnableFromOriginResponseHeader = RuntimeEnabledFeatures::sharedFeatures().fromOriginResponseHeaderEnabled() && !loadParameters.isMainFrameNavigation;
>+    loadParameters.shouldEnableCrossOriginResourcePolicy = RuntimeEnabledFeatures::sharedFeatures().crossOriginResourcePolicyEnabled() && !loadParameters.isMainFrameNavigation;
> 
>     if (resourceLoader.options().mode == FetchOptions::Mode::Navigate) {
>         Vector<RefPtr<SecurityOrigin>> frameAncestorOrigins;

Actions: View | Formatted Diff | Diff

Attachments on bug 186082: 341556