Changeset 187084 in webkit

Timestamp:

Jul 20, 2015 9:38:11 PM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187047. rdar://problem/20860410

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/PluginModuleInfo.h (modified) (1 diff)
• UIProcess/API/C/WKAPICast.h (modified) (3 diffs)
• UIProcess/API/C/WKPluginLoadPolicy.h (modified) (1 diff)
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-20  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187047. rdar://problem/20860410
+
+    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.
+
 2015-07-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h

@@ -44 +44 @@
     // The plug-in should be blocked from being instantiated.
     // Note that the plug-in will still be seen by e.g. navigator.plugins
-    PluginModuleBlocked,
+    PluginModuleBlockedForSecurity,
+    PluginModuleBlockedForCompatibility,
 };
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/C/WKAPICast.h

@@ -470 +470 @@
     case PluginModuleLoadUnsandboxed:
         return kWKPluginLoadPolicyLoadUnsandboxed;
-    case PluginModuleBlocked:
+    case PluginModuleBlockedForSecurity:
         return kWKPluginLoadPolicyBlocked;
+    case PluginModuleBlockedForCompatibility:
+        return kWKPluginLoadPolicyBlockedForCompatibility;
     }
     
@@ -503 +505 @@
         return PluginModuleLoadNormally;
     case kWKPluginLoadPolicyBlocked:
-        return PluginModuleBlocked;
+        return PluginModuleBlockedForSecurity;
+    case kWKPluginLoadPolicyBlockedForCompatibility:
+        return PluginModuleBlockedForCompatibility;
     case kWKPluginLoadPolicyLoadUnsandboxed:
         return PluginModuleLoadUnsandboxed;
@@ -509 +513 @@
     
     ASSERT_NOT_REACHED();
-    return PluginModuleBlocked;
+    return PluginModuleBlockedForSecurity;
 }
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h

@@ -38 +38 @@
     kWKPluginLoadPolicyInactive,
     kWKPluginLoadPolicyLoadUnsandboxed,
+    kWKPluginLoadPolicyBlockedForCompatibility,
 };
 typedef uint32_t WKPluginLoadPolicy;

branches/safari-601.1-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

@@ -76 +76 @@
 static bool shouldBlockPlugin(const PluginModuleInfo& plugin)
 {
-    return PluginInfoStore::defaultLoadPolicyForPlugin(plugin) == PluginModuleBlocked;
+    PluginModuleLoadPolicy loadPolicy = PluginInfoStore::defaultLoadPolicyForPlugin(plugin);
+    return (loadPolicy == PluginModuleBlockedForSecurity) || (loadPolicy == PluginModuleBlockedForCompatibility);
 }
 
@@ -108 +109 @@
 }
 
+inline PluginModuleLoadPolicy WKPlugInModuleLoadPolicyToPluginModuleLoadPolicy(WKPlugInModuleLoadPolicy wksiPolicy)
+{
+
+    switch (wksiPolicy) {
+        case WKPlugInModuleLoadPolicyLoadNormally:
+            return PluginModuleLoadNormally;
+        case WKPlugInModuleLoadPolicyLoadUnsandboxed:
+            return PluginModuleLoadUnsandboxed;
+        case WKPlugInModuleLoadPolicyBlockedForSecurity:
+            return PluginModuleBlockedForSecurity;
+        case WKPlugInModuleLoadPolicyBlockedForCompatibility:
+            return PluginModuleBlockedForCompatibility;
+    }
+
+    ASSERT_NOT_REACHED();
+    return PluginModuleBlockedForSecurity;
+}
+
 PluginModuleLoadPolicy PluginInfoStore::defaultLoadPolicyForPlugin(const PluginModuleInfo& plugin)
 {
-    if (WKShouldBlockPlugin(plugin.bundleIdentifier, plugin.versionString))
-        return PluginModuleBlocked;
-
-    return PluginModuleLoadNormally;
+    return WKPlugInModuleLoadPolicyToPluginModuleLoadPolicy(WKLoadPolicyForPluginVersion(plugin.bundleIdentifier, plugin.versionString));
 }
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1888 +1888 @@
         break;
 
-    case PluginModuleBlocked:
+    case PluginModuleBlockedForSecurity:
+    case PluginModuleBlockedForCompatibility:
         pluginProcessToken = 0;
         return;

branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -711 +711 @@
         return nullptr;
 
-    bool isBlockedPlugin = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy) == PluginModuleBlocked;
+    PluginModuleLoadPolicy loadPolicy = static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy);
+    bool isBlockedPlugin = (loadPolicy == PluginModuleBlockedForSecurity) || (loadPolicy == PluginModuleBlockedForCompatibility);
 
     if (isBlockedPlugin || !pluginProcessToken) {
@@ -4244 +4245 @@
         return false;
 
-    return pluginLoadPolicy != PluginModuleBlocked && pluginProcessToken;
+    bool isBlockedPlugin = (pluginLoadPolicy == PluginModuleBlockedForSecurity) || (pluginLoadPolicy == PluginModuleBlockedForCompatibility);
+    return !isBlockedPlugin && pluginProcessToken;
 #else
     UNUSED_PARAM(response);