<!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>[191211] 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/191211">191211</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 14:25:52 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hide all plugin names except Flash, Java, and QuickTime
https://bugs.webkit.org/show_bug.cgi?id=149014
Reviewed by Darin Adler.
Source/WebCore:
Revise plugin interface so that sites cannot iterate over all plugins to obtain
a list of installed plugins for fingerprinting purposes. Sites need to ask for
specific plugins by name, rather than iterating and comparing to avoid making
this information accessible for fingerprinting purposes.
* plugins/DOMPluginArray.cpp:
(WebCore::DOMPluginArray::length): Only return length of the plugins we are
allowing to be seen.
(WebCore::DOMPluginArray::item): Only iterate through the plugins we are
allowing to be seen.
* plugins/PluginData.cpp:
(WebCore::PluginData::publiclyVisiblePlugins): Added.
* plugins/PluginData.h:
LayoutTests:
Update tests to notify internals that all plugins should be shown, not
just the publicly available ones.
* plugins/plugin-javascript-access.html:
* plugins/script-tests/navigator-mimeTypes-length.js:</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="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepluginsDOMPluginArraycpp">trunk/Source/WebCore/plugins/DOMPluginArray.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginDatacpp">trunk/Source/WebCore/plugins/PluginData.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginDatah">trunk/Source/WebCore/plugins/PluginData.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/LayoutTests/ChangeLog 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-16 Brent Fulgham <bfulgham@apple.com>
+
+ Hide all plugin names except Flash, Java, and QuickTime
+ https://bugs.webkit.org/show_bug.cgi?id=149014
+
+ Reviewed by Darin Adler.
+
+ Update tests to notify internals that all plugins should be shown, not
+ just the publicly available ones.
+
+ * plugins/plugin-javascript-access.html:
+ * plugins/script-tests/navigator-mimeTypes-length.js:
+
</ins><span class="cx"> 2015-10-16 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r191175): Still crashing when clicking back button on netflix.com
</span></span></pre></div>
<a id="trunkLayoutTestspluginspluginjavascriptaccesshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/plugin-javascript-access.html (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/plugin-javascript-access.html 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/LayoutTests/plugins/plugin-javascript-access.html 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -8,6 +8,9 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText()
</span><span class="cx">
</span><ins>+if (window.internals)
+ internals.setShowAllPlugins(true);
+
</ins><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 (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/script-tests/navigator-mimeTypes-length.js 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/LayoutTests/plugins/script-tests/navigator-mimeTypes-length.js 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -2,6 +2,9 @@
</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><ins>+if (window.internals)
+ internals.setShowAllPlugins(true);
+
</ins><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 (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/ChangeLog 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-10-16 Brent Fulgham <bfulgham@apple.com>
+
+ Hide all plugin names except Flash, Java, and QuickTime
+ https://bugs.webkit.org/show_bug.cgi?id=149014
+
+ Reviewed by Darin Adler.
+
+ Revise plugin interface so that sites cannot iterate over all plugins to obtain
+ a list of installed plugins for fingerprinting purposes. Sites need to ask for
+ specific plugins by name, rather than iterating and comparing to avoid making
+ this information accessible for fingerprinting purposes.
+
+ * plugins/DOMPluginArray.cpp:
+ (WebCore::DOMPluginArray::length): Only return length of the plugins we are
+ allowing to be seen.
+ (WebCore::DOMPluginArray::item): Only iterate through the plugins we are
+ allowing to be seen.
+ * plugins/PluginData.cpp:
+ (WebCore::PluginData::publiclyVisiblePlugins): Added.
+ * plugins/PluginData.h:
+
</ins><span class="cx"> 2015-10-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> "enum class" some IDB enums.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/page/Page.h 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -471,6 +471,9 @@
</span><span class="cx"> IDBClient::IDBConnectionToServer& idbConnection();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void setShowAllPlugins(bool showAll) { m_showAllPlugins = showAll; }
+ bool showAllPlugins() const { return m_showAllPlugins; }
+
</ins><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span><span class="cx">
</span><span class="lines">@@ -634,6 +637,7 @@
</span><span class="cx"> MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
</span><span class="cx">
</span><span class="cx"> bool m_allowsMediaDocumentInlinePlayback { false };
</span><ins>+ bool m_showAllPlugins { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline PageGroup& Page::group()
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMPluginArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMPluginArray.cpp (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMPluginArray.cpp 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/plugins/DOMPluginArray.cpp 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> if (!data)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return data->webVisiblePlugins().size();
</del><ins>+ return data->publiclyVisiblePlugins().size();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DOMPlugin> DOMPluginArray::item(unsigned index)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> if (!data)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- const Vector<PluginInfo>& plugins = data->webVisiblePlugins();
</del><ins>+ const Vector<PluginInfo>& plugins = data->publiclyVisiblePlugins();
</ins><span class="cx"> if (index >= plugins.size())
</span><span class="cx"> return nullptr;
</span><span class="cx"> return DOMPlugin::create(data, m_frame, plugins[index]);
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginData.cpp (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginData.cpp 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/plugins/PluginData.cpp 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginData.h"
</span><span class="cx">
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "PluginStrategy.h"
</span><span class="cx">
</span><span class="lines">@@ -44,6 +45,36 @@
</span><span class="cx"> return plugins;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldBePubliclyVisible(const PluginInfo& plugin)
+{
+ // For practical website compatibility, there are a few plugins that need to be
+ // visible. We are matching the set of plugins that Mozilla has been using since
+ // there is a good track record that this does not harm compatibility.
+ return plugin.name.containsIgnoringASCIICase("Shockwave")
+ || plugin.name.containsIgnoringASCIICase("QuickTime")
+ || plugin.name.containsIgnoringASCIICase("Java");
+}
+
+Vector<PluginInfo> PluginData::publiclyVisiblePlugins() const
+{
+ if (m_page->showAllPlugins())
+ return webVisiblePlugins();
+
+ Vector<PluginInfo> allPlugins;
+ platformStrategies()->pluginStrategy()->getWebVisiblePluginInfo(m_page, allPlugins);
+
+ Vector<PluginInfo> plugins;
+ for (auto&& plugin : allPlugins) {
+ if (shouldBePubliclyVisible(plugin))
+ plugins.append(WTF::move(plugin));
+ }
+
+ std::sort(plugins.begin(), plugins.end(), [](const PluginInfo& a, const PluginInfo& b) {
+ return codePointCompareLessThan(a.name, b.name);
+ });
+ return plugins;
+}
+
</ins><span class="cx"> void PluginData::getWebVisibleMimesAndPluginIndices(Vector<MimeClassInfo>& mimes, Vector<size_t>& mimePluginIndices) const
</span><span class="cx"> {
</span><span class="cx"> getMimesAndPluginIndiciesForPlugins(webVisiblePlugins(), mimes, mimePluginIndices);
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginData.h (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginData.h 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/plugins/PluginData.h 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><ins>+ Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx">
</span><span class="cx"> This library is free software; you can redistribute it and/or
</span><span class="cx"> modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -89,6 +90,7 @@
</span><span class="cx">
</span><span class="cx"> const Vector<PluginInfo>& plugins() const { return m_plugins; }
</span><span class="cx"> Vector<PluginInfo> webVisiblePlugins() const;
</span><ins>+ Vector<PluginInfo> publiclyVisiblePlugins() const;
</ins><span class="cx"> WEBCORE_EXPORT void getWebVisibleMimesAndPluginIndices(Vector<MimeClassInfo>&, Vector<size_t>&) const;
</span><span class="cx">
</span><span class="cx"> enum AllowedPluginTypes {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -385,6 +385,8 @@
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> MockContentFilterSettings::reset();
</span><span class="cx"> #endif
</span><ins>+
+ page->setShowAllPlugins(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Internals::Internals(Document* document)
</span><span class="lines">@@ -3148,4 +3150,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void Internals::setShowAllPlugins(bool show)
+{
+ Document* document = contextDocument();
+ if (!document)
+ return;
+
+ Page* page = document->page();
+ if (!page)
+ return;
+
+ page->setShowAllPlugins(show);
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/testing/Internals.h 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -436,6 +436,7 @@
</span><span class="cx"> String getCurrentMediaControlsStatusForElement(HTMLMediaElement*);
</span><span class="cx">
</span><span class="cx"> String userVisibleString(const DOMURL*);
</span><ins>+ void setShowAllPlugins(bool);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document*);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (191210 => 191211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-10-16 21:10:58 UTC (rev 191210)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-10-16 21:25:52 UTC (rev 191211)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -406,4 +406,6 @@
</span><span class="cx"> [Conditional=VIDEO] DOMString getCurrentMediaControlsStatusForElement(HTMLMediaElement element);
</span><span class="cx">
</span><span class="cx"> DOMString userVisibleString(DOMURL url);
</span><ins>+
+ void setShowAllPlugins(boolean showAll);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>