<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187047] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187047">187047</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-20 16:45:41 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support blocking a plug-in for non-security reasons
https://bugs.webkit.org/show_bug.cgi?id=145009
Patch by Gordon Sheridan <gordon_sheridan@apple.com> on 2015-07-20
Reviewed by Anders Carlsson.
* Shared/Plugins/PluginModuleInfo.h:
Replace PluginModuleBlocked with separate enum values for blocking for security and compatibility.
* UIProcess/API/C/WKAPICast.h:
(WebKit::toWKPluginLoadPolicy):
Modify to handle change to PluginModuleBlocked enum.
(WebKit::toPluginModuleLoadPolicy):
Ditto.
* UIProcess/API/C/WKPluginLoadPolicy.h:
Added enum value for blocking a plugin for compatibility reasons.
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
(WebKit::shouldBlockPlugin):
Check load policy for both reasons a plugin may be blocked.
(WebKit::WKPlugInModuleLoadPolicyToPluginModuleLoadPolicy):
Added function to convert between load policy enum types.
(WebKit::PluginInfoStore::defaultLoadPolicyForPlugin):
Modified to call WKLoadPolicyForPluginVersion() which can distinguish between blocked for security or compatibility.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::findPlugin):
Updated to recognize both PluginModuleBlocked enum values that indicate a plugin is blocked.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::createPlugin):
Ditto.
(WebKit::WebPage::canPluginHandleResponse):
Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginModuleInfoh">trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPluginLoadPolicyh">trunk/Source/WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginInfoStoreMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-07-20 Gordon Sheridan <gordon_sheridan@apple.com>
+
+ Support blocking a plug-in for non-security reasons
+ https://bugs.webkit.org/show_bug.cgi?id=145009
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/Plugins/PluginModuleInfo.h:
+ Replace PluginModuleBlocked with separate enum values for blocking for security and compatibility.
+
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toWKPluginLoadPolicy):
+ Modify to handle change to PluginModuleBlocked enum.
+
+ (WebKit::toPluginModuleLoadPolicy):
+ Ditto.
+
+ * UIProcess/API/C/WKPluginLoadPolicy.h:
+ Added enum value for blocking a plugin for compatibility reasons.
+
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::shouldBlockPlugin):
+ Check load policy for both reasons a plugin may be blocked.
+
+ (WebKit::WKPlugInModuleLoadPolicyToPluginModuleLoadPolicy):
+ Added function to convert between load policy enum types.
+
+ (WebKit::PluginInfoStore::defaultLoadPolicyForPlugin):
+ Modified to call WKLoadPolicyForPluginVersion() which can distinguish between blocked for security or compatibility.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::findPlugin):
+ Updated to recognize both PluginModuleBlocked enum values that indicate a plugin is blocked.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::createPlugin):
+ Ditto.
+
+ (WebKit::WebPage::canPluginHandleResponse):
+ Ditto.
+
</ins><span class="cx"> 2015-07-20 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> NSURLCache fallback does not work on iOS due to sandboxing
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginModuleInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -43,7 +43,8 @@
</span><span class="cx">
</span><span class="cx"> // The plug-in should be blocked from being instantiated.
</span><span class="cx"> // Note that the plug-in will still be seen by e.g. navigator.plugins
</span><del>- PluginModuleBlocked,
</del><ins>+ PluginModuleBlockedForSecurity,
+ PluginModuleBlockedForCompatibility,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct PluginModuleInfo {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -469,8 +469,10 @@
</span><span class="cx"> return kWKPluginLoadPolicyLoadNormally;
</span><span class="cx"> case PluginModuleLoadUnsandboxed:
</span><span class="cx"> return kWKPluginLoadPolicyLoadUnsandboxed;
</span><del>- case PluginModuleBlocked:
</del><ins>+ case PluginModuleBlockedForSecurity:
</ins><span class="cx"> return kWKPluginLoadPolicyBlocked;
</span><ins>+ case PluginModuleBlockedForCompatibility:
+ return kWKPluginLoadPolicyBlockedForCompatibility;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -502,13 +504,15 @@
</span><span class="cx"> case kWKPluginLoadPolicyLoadNormally:
</span><span class="cx"> return PluginModuleLoadNormally;
</span><span class="cx"> case kWKPluginLoadPolicyBlocked:
</span><del>- return PluginModuleBlocked;
</del><ins>+ return PluginModuleBlockedForSecurity;
+ case kWKPluginLoadPolicyBlockedForCompatibility:
+ return PluginModuleBlockedForCompatibility;
</ins><span class="cx"> case kWKPluginLoadPolicyLoadUnsandboxed:
</span><span class="cx"> return PluginModuleLoadUnsandboxed;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return PluginModuleBlocked;
</del><ins>+ return PluginModuleBlockedForSecurity;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline WebCore::PluginLoadClientPolicy toPluginLoadClientPolicy(WKPluginLoadClientPolicy pluginLoadClientPolicy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPluginLoadPolicyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> kWKPluginLoadPolicyBlocked,
</span><span class="cx"> kWKPluginLoadPolicyInactive,
</span><span class="cx"> kWKPluginLoadPolicyLoadUnsandboxed,
</span><ins>+ kWKPluginLoadPolicyBlockedForCompatibility,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKPluginLoadPolicy;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginInfoStoreMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -75,7 +75,8 @@
</span><span class="cx">
</span><span class="cx"> static bool shouldBlockPlugin(const PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><del>- return PluginInfoStore::defaultLoadPolicyForPlugin(plugin) == PluginModuleBlocked;
</del><ins>+ PluginModuleLoadPolicy loadPolicy = PluginInfoStore::defaultLoadPolicyForPlugin(plugin);
+ return (loadPolicy == PluginModuleBlockedForSecurity) || (loadPolicy == PluginModuleBlockedForCompatibility);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& alreadyLoadedPlugins, const PluginModuleInfo& plugin)
</span><span class="lines">@@ -107,14 +108,29 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PluginModuleLoadPolicy PluginInfoStore::defaultLoadPolicyForPlugin(const PluginModuleInfo& plugin)
</del><ins>+inline PluginModuleLoadPolicy WKPlugInModuleLoadPolicyToPluginModuleLoadPolicy(WKPlugInModuleLoadPolicy wksiPolicy)
</ins><span class="cx"> {
</span><del>- if (WKShouldBlockPlugin(plugin.bundleIdentifier, plugin.versionString))
- return PluginModuleBlocked;
</del><span class="cx">
</span><del>- return PluginModuleLoadNormally;
</del><ins>+ switch (wksiPolicy) {
+ case WKPlugInModuleLoadPolicyLoadNormally:
+ return PluginModuleLoadNormally;
+ case WKPlugInModuleLoadPolicyLoadUnsandboxed:
+ return PluginModuleLoadUnsandboxed;
+ case WKPlugInModuleLoadPolicyBlockedForSecurity:
+ return PluginModuleBlockedForSecurity;
+ case WKPlugInModuleLoadPolicyBlockedForCompatibility:
+ return PluginModuleBlockedForCompatibility;
+ }
+
+ ASSERT_NOT_REACHED();
+ return PluginModuleBlockedForSecurity;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+PluginModuleLoadPolicy PluginInfoStore::defaultLoadPolicyForPlugin(const PluginModuleInfo& plugin)
+{
+ return WKPlugInModuleLoadPolicyToPluginModuleLoadPolicy(WKLoadPolicyForPluginVersion(plugin.bundleIdentifier, plugin.versionString));
+}
+
</ins><span class="cx"> PluginModuleInfo PluginInfoStore::findPluginWithBundleIdentifier(const String& bundleIdentifier)
</span><span class="cx"> {
</span><span class="cx"> loadPluginsIfNecessary();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -1887,7 +1887,8 @@
</span><span class="cx"> pluginProcessSandboxPolicy = PluginProcessSandboxPolicyUnsandboxed;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case PluginModuleBlocked:
</del><ins>+ case PluginModuleBlockedForSecurity:
+ case PluginModuleBlockedForCompatibility:
</ins><span class="cx"> pluginProcessToken = 0;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (187046 => 187047)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-20 23:35:51 UTC (rev 187046)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-20 23:45:41 UTC (rev 187047)
</span><span class="lines">@@ -710,7 +710,8 @@
</span><span class="cx"> if (!sendSync(Messages::WebPageProxy::FindPlugin(parameters.mimeType, static_cast<uint32_t>(processType), parameters.url.string(), frameURLString, pageURLString, allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription)))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- bool isBlockedPlugin = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy) == PluginModuleBlocked;
</del><ins>+ PluginModuleLoadPolicy loadPolicy = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy);
+ bool isBlockedPlugin = (loadPolicy == PluginModuleBlockedForSecurity) || (loadPolicy == PluginModuleBlockedForCompatibility);
</ins><span class="cx">
</span><span class="cx"> if (isBlockedPlugin || !pluginProcessToken) {
</span><span class="cx"> #if ENABLE(PDFKIT_PLUGIN)
</span><span class="lines">@@ -4244,7 +4245,8 @@
</span><span class="cx"> if (!sendSync(Messages::WebPageProxy::FindPlugin(response.mimeType(), PluginProcessTypeNormal, response.url().string(), response.url().string(), response.url().string(), allowOnlyApplicationPlugins), Messages::WebPageProxy::FindPlugin::Reply(pluginProcessToken, newMIMEType, pluginLoadPolicy, unavailabilityDescription)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return pluginLoadPolicy != PluginModuleBlocked && pluginProcessToken;
</del><ins>+ bool isBlockedPlugin = (pluginLoadPolicy == PluginModuleBlockedForSecurity) || (pluginLoadPolicy == PluginModuleBlockedForCompatibility);
+ return !isBlockedPlugin && pluginProcessToken;
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(response);
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>