Changeset 194367 in webkit

Timestamp:

Dec 22, 2015, 11:37:50 AM (11 years ago)

Author:

Brent Fulgham

Message:

Allow JavaScript to iterate over plugins for local SecurityOrigins
​https://bugs.webkit.org/show_bug.cgi?id=152489

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Instead of calling 'isLocalFile' on the URL, we check the Document's SecurityOrigin. If
no origin exists, we construct a SecurityOrigin from the URL, and check whether it
satisfies 'isLocal'.

• page/Page.cpp:

(WebCore::Page::showAllPlugins): Revised to use SecurityOrigin.

Source/WebKit2:

The 'getWebVisiblePluginInfo' is filtering plugins, even when we want to list
all plugins. To avoid this, we check the Document's SecurityOrigin. If no such
origin exists, we construct a SecurityOrigin from the URL.

If the relevant SecurityOrigin satsifies 'isLocal', we show all plugins.

• WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:

(WebKit::WebPlatformStrategies::getWebVisiblePluginInfo):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-22  Brent Fulgham  <bfulgham@apple.com>
+
+        Allow JavaScript to iterate over plugins for local SecurityOrigins
+        https://bugs.webkit.org/show_bug.cgi?id=152489
+
+        Reviewed by Alexey Proskuryakov.
+
+        Instead of calling 'isLocalFile' on the URL, we check the Document's SecurityOrigin. If
+        no origin exists, we construct a SecurityOrigin from the URL, and check whether it
+        satisfies 'isLocal'.
+
+        * page/Page.cpp:
+        (WebCore::Page::showAllPlugins): Revised to use SecurityOrigin.
+
 2015-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -525 +525 @@
 bool Page::showAllPlugins() const
 {
-    return m_showAllPlugins || mainFrame().loader().documentLoader()->url().isLocalFile();
+    if (m_showAllPlugins)
+        return true;
+
+    if (Document* document = mainFrame().document()) {
+        if (SecurityOrigin* securityOrigin = document->securityOrigin())
+            return securityOrigin->isLocal();
+    }
+
+    return false;
 }
 

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -162 +162 @@
     // The local SecurityOrigin can script any document, navigate to local
     // resources, and can set arbitrary headers on XMLHttpRequests.
-    bool isLocal() const;
+    WEBCORE_EXPORT bool isLocal() const;
 
     // The origin is a globally unique identifier assigned when the Document is

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-12-22  Brent Fulgham  <bfulgham@apple.com>
+
+        Allow JavaScript to iterate over plugins for local SecurityOrigins
+        https://bugs.webkit.org/show_bug.cgi?id=152489
+
+        Reviewed by Alexey Proskuryakov.
+
+        The 'getWebVisiblePluginInfo' is filtering plugins, even when we want to list
+        all plugins. To avoid this, we check the Document's SecurityOrigin. If no such
+        origin exists, we construct a SecurityOrigin from the URL.
+        
+        If the relevant SecurityOrigin satsifies 'isLocal', we show all plugins.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::WebPlatformStrategies::getWebVisiblePluginInfo):
+
 2015-12-21  Hunseop Jeong  <hs85.jeong@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

@@ -49 +49 @@
 #include "WebProcessProxyMessages.h"
 #include <WebCore/Color.h>
+#include <WebCore/Document.h>
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/IDBFactoryBackendInterface.h>
@@ -190 +191 @@
 
 #if PLATFORM(MAC)
+    if (Document* document = page->mainFrame().document()) {
+        if (SecurityOrigin* securityOrigin = document->securityOrigin()) {
+            if (securityOrigin->isLocal())
+                return;
+        }
+    }
+    
     for (int32_t i = plugins.size() - 1; i >= 0; --i) {
         PluginInfo& info = plugins.at(i);