<!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>[193363] trunk</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/193363">193363</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 12:06:17 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow JavaScript to iterate over plugins for local files
https://bugs.webkit.org/show_bug.cgi?id=151783
<rdar://problem/23692113>
Source/WebCore:
Reviewed by Alexey Proskuryakov.
Test: http/tests/plugins/plugin-javascript-access.html
plugins/plugin-javascript-access.html
* page/Page.cpp:
(WebCore::Page::showAllPlugins): True if we set the debugging flag to show
all plugins, or if the document's origin is from a local file.
* page/Page.h:
LayoutTests:
Modify the existing 'local file' plugin tests so that they don't turn on the debugging
flag to allow iterating over all plugins. Then create a new HTTP test (based on the
existing plugin-javascript-access test) to make sure that plugin iteration is blocked
for non-local-file access.
Reviewed by Alexey Proskuryakov.
* http/tests/plugins/plugin-javascript-access-expected.txt: Added.
* http/tests/plugins/plugin-javascript-access.html: Added.
* plugins/plugin-javascript-access.html: Remove unneeded 'internals.setShowAllPlugins' call.
* plugins/script-tests/navigator-mimeTypes-length.js: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestspluginspluginjavascriptaccesshtml">trunk/LayoutTests/plugins/plugin-javascript-access.html</a></li>
<li><a href="#trunkLayoutTestspluginsscripttestsnavigatormimeTypeslengthjs">trunk/LayoutTests/plugins/script-tests/navigator-mimeTypes-length.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestspluginspluginjavascriptaccessexpectedtxt">trunk/LayoutTests/http/tests/plugins/plugin-javascript-access-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspluginspluginjavascriptaccesshtml">trunk/LayoutTests/http/tests/plugins/plugin-javascript-access.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193362 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-03 20:01:57 UTC (rev 193362)
+++ trunk/LayoutTests/ChangeLog 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-03 Brent Fulgham <bfulgham@apple.com>
+
+ Allow JavaScript to iterate over plugins for local files
+ https://bugs.webkit.org/show_bug.cgi?id=151783
+ <rdar://problem/23692113>
+
+ Modify the existing 'local file' plugin tests so that they don't turn on the debugging
+ flag to allow iterating over all plugins. Then create a new HTTP test (based on the
+ existing plugin-javascript-access test) to make sure that plugin iteration is blocked
+ for non-local-file access.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/tests/plugins/plugin-javascript-access-expected.txt: Added.
+ * http/tests/plugins/plugin-javascript-access.html: Added.
+ * plugins/plugin-javascript-access.html: Remove unneeded 'internals.setShowAllPlugins' call.
+ * plugins/script-tests/navigator-mimeTypes-length.js: Ditto.
+
</ins><span class="cx"> 2015-12-03 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: storage/indexeddb/cursor-skip-deleted.html fails.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspluginspluginjavascriptaccessexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/plugins/plugin-javascript-access-expected.txt (0 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/plugins/plugin-javascript-access-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/plugins/plugin-javascript-access-expected.txt 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Test 1: A non-local file should not be able to iterate over the plugins.
+
+PASS! (Could not find the netscape test plugin on a non-local file!)
+
+Test 2: Confirm the plugin is present.
+
+Name: WebKit Test PlugIn
+
+Description: Simple Netscape plug-in that handles test content for WebKit
+
+Filename: TestNetscapePlugIn.plugin
+
+Mime Types:
+
+Type: application/x-webkit-test-netscape
+
+Description: test netscape content
+
+Suffixes: testnetscape
+
+
+Plugin.item() works.
+
+Plugin.namedItem() works.
+
+Type: image/png
+
+Description: PNG image
+
+Suffixes: png
+
+
+Plugin.item() works.
+
+Plugin.namedItem() works.
+
+PluginArray.item() works.
+
+PluginArray.namedItem() works.
+
+PASS! (Found the netscape test plugin on a non-local file!)
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestspluginspluginjavascriptaccesshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/plugins/plugin-javascript-access.html (0 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/plugins/plugin-javascript-access.html (rev 0)
+++ trunk/LayoutTests/http/tests/plugins/plugin-javascript-access.html 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <title>Installed Plug-ins</title>
+</head>
+<body>
+<script type="application/x-javascript">
+function checkForTestPlugin() {
+ for (var i = 0; i < navigator.plugins.length; i++) {
+ var plugin = navigator.plugins[i];
+
+ // We can only guarantee that the Test PlugIn is installed.
+ if (plugin.name != "WebKit Test PlugIn")
+ continue;
+
+ document.writeln("<p>Name: " + plugin.name + "<\/p>");
+ document.writeln("<p>Description: " + plugin.description + "<\/p>");
+ document.writeln("<p>Filename: " + plugin.filename + "<\/p>");
+
+ document.writeln("<p>Mime Types:<\/p>");
+ for (var mi = 0; mi != plugin.length; ++mi) {
+ document.writeln("<p>Type: " + plugin[mi].type + "<\/p>");
+ document.writeln("<p>Description: " + plugin[mi].description + "<\/p>");
+ document.writeln("<p>Suffixes: " + plugin[mi].suffixes + "<\/p>");
+ document.writeln("<br>");
+
+ if (plugin.item(mi).type == plugin[mi].type)
+ document.writeln("<p>Plugin.item() works.<\/p>");
+ else
+ document.writeln("<p>FAIL. Plugin.item() does not work.<\/p>");
+
+ if (plugin.namedItem(plugin[mi].type).type == plugin[mi].type)
+ document.writeln("<p>Plugin.namedItem() works.<\/p>");
+ else
+ document.writeln("<p>FAIL. Plugin.namedItem() does not work.<\/p>");
+ }
+
+ if (navigator.plugins.item(i).name == plugin.name)
+ document.writeln("<p>PluginArray.item() works.<\/p>");
+ else
+ document.writeln("<p>FAIL. PluginArray.item() does not work.<\/p>");
+
+ if (navigator.plugins.namedItem(plugin.name).name == plugin.name)
+ document.writeln("<p>PluginArray.namedItem() works.<\/p>");
+ else
+ document.writeln("<p>FAIL. PluginArray.namedItem() does not work.<\/p>");
+
+ return true;
+ }
+
+ return false;
+}
+
+if (window.testRunner)
+ testRunner.dumpAsText()
+
+navigator.plugins.refresh(false); // Supposedly helps if new plug-ins were added.
+
+// A non-local file should not be allowed to iterate over the installed plugins.
+document.writeln("<p>Test 1: A non-local file should not be able to iterate over the plugins.<\/p>");
+if (checkForTestPlugin())
+ document.writeln("<p>FAILURE! (Found the netscape test plugin on a non-local file!)<\/p>");
+else
+ document.writeln("<p>PASS! (Could not find the netscape test plugin on a non-local file!)<\/p>");
+
+// Activate our debugging code to show all plugins to confirm we do have the test plugin.
+document.writeln("<p>Test 2: Confirm the plugin is present.<\/p>");
+if (window.internals)
+ internals.setShowAllPlugins(true);
+
+if (checkForTestPlugin())
+ document.writeln("<p>PASS! (Found the netscape test plugin on a non-local file!)<\/p>");
+else
+ document.writeln("<p>FAILURE! (Could not find netscape test plugin on a non-local file!)<\/p>");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestspluginspluginjavascriptaccesshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/plugin-javascript-access.html (193362 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/plugin-javascript-access.html 2015-12-03 20:01:57 UTC (rev 193362)
+++ trunk/LayoutTests/plugins/plugin-javascript-access.html 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -8,9 +8,6 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText()
</span><span class="cx">
</span><del>-if (window.internals)
- internals.setShowAllPlugins(true);
-
</del><span class="cx"> navigator.plugins.refresh(false); // Supposedly helps if new plug-ins were added.
</span><span class="cx">
</span><span class="cx"> var foundTestPlugin = false;
</span></span></pre></div>
<a id="trunkLayoutTestspluginsscripttestsnavigatormimeTypeslengthjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/script-tests/navigator-mimeTypes-length.js (193362 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/script-tests/navigator-mimeTypes-length.js 2015-12-03 20:01:57 UTC (rev 193362)
+++ trunk/LayoutTests/plugins/script-tests/navigator-mimeTypes-length.js 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -2,9 +2,6 @@
</span><span class="cx"> "Test for bug 10038: REGRESSION: Length of navigator.mimeTypes collection returns number of installed plugins, not number of registered mime types."
</span><span class="cx"> );
</span><span class="cx">
</span><del>-if (window.internals)
- internals.setShowAllPlugins(true);
-
</del><span class="cx"> var numberOfMimeTypes = 0;
</span><span class="cx"> for (var i = 0; i < navigator.plugins.length; ++i) {
</span><span class="cx"> var plugin = navigator.plugins[i];
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193362 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-03 20:01:57 UTC (rev 193362)
+++ trunk/Source/WebCore/ChangeLog 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-03 Brent Fulgham <bfulgham@apple.com>
+
+ Allow JavaScript to iterate over plugins for local files
+ https://bugs.webkit.org/show_bug.cgi?id=151783
+ <rdar://problem/23692113>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Test: http/tests/plugins/plugin-javascript-access.html
+ plugins/plugin-javascript-access.html
+
+ * page/Page.cpp:
+ (WebCore::Page::showAllPlugins): True if we set the debugging flag to show
+ all plugins, or if the document's origin is from a local file.
+ * page/Page.h:
+
</ins><span class="cx"> 2015-12-03 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build-fix; missing include.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (193362 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-12-03 20:01:57 UTC (rev 193362)
+++ trunk/Source/WebCore/page/Page.cpp 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ContextMenuClient.h"
</span><span class="cx"> #include "ContextMenuController.h"
</span><span class="cx"> #include "DatabaseProvider.h"
</span><ins>+#include "DocumentLoader.h"
</ins><span class="cx"> #include "DocumentMarkerController.h"
</span><span class="cx"> #include "DragController.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="lines">@@ -519,6 +520,11 @@
</span><span class="cx"> return *m_pluginData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Page::showAllPlugins() const
+{
+ return m_showAllPlugins || mainFrame().loader().documentLoader()->url().isLocalFile();
+}
+
</ins><span class="cx"> inline MediaCanStartListener* Page::takeAnyMediaCanStartListener()
</span><span class="cx"> {
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (193362 => 193363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-12-03 20:01:57 UTC (rev 193362)
+++ trunk/Source/WebCore/page/Page.h 2015-12-03 20:06:17 UTC (rev 193363)
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setShowAllPlugins(bool showAll) { m_showAllPlugins = showAll; }
</span><del>- bool showAllPlugins() const { return m_showAllPlugins; }
</del><ins>+ bool showAllPlugins() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span></span></pre>
</div>
</div>
</body>
</html>