<!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>[210714] branches/safari-603-branch/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/210714">210714</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 22:10:43 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210683">r210683</a>. rdar://problem/11187315</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm">branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebPasteboardProxycpp">branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebPasteboardProxyh">branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebPasteboardProxymessagesin">branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebProcessProxycpp">branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210713 => 210714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:10:40 UTC (rev 210713)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:10:43 UTC (rev 210714)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210683. rdar://problem/11187315
+
+ 2017-01-12 Megan Gardner <megan_gardner@apple.com>
+
+ Double Check URLs on UI side before putting in pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=166945
+ <rdar://problem/11187315>
+
+ Reviewed by Tim Horton.
+
+ Check URLs sent from the web process before putting the on pasteboard.
+
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+ (WebKit::WebPasteboardProxy::setPasteboardPathnamesForType):
+ Add a check to make sure the URLs we've received are valid and not compromising to the user's system.
+
+ * UIProcess/WebPasteboardProxy.cpp:
+ (WebKit::WebPasteboardProxy::addWebProcessProxy):
+ Keep track of the webProcesses associated with the pasteboard proxies specifically, so that we can
+ use it to check the URLs before putting them on pasteboard.
+ (WebKit::WebPasteboardProxy::removeWebProcessProxy):
+ Remove dead webProcesses.
+
+ * UIProcess/WebPasteboardProxy.h:
+ * UIProcess/WebPasteboardProxy.messages.in:
+ Allow for the connection to be passed in, so that we can determine which webProcess we need to
+ check the URLs of.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::~WebProcessProxy):
+ Make sure to remove WebProcessProxys from the list stored in WebPasteboardProxy
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210666. rdar://problem/28904157
</span><span class="cx">
</span><span class="cx"> 2017-01-12 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (210713 => 210714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2017-01-13 06:10:40 UTC (rev 210713)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2017-01-13 06:10:43 UTC (rev 210714)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebPasteboardProxy.h"
</span><ins>+#import "WebProcessProxy.h"
</ins><span class="cx">
</span><span class="cx"> #import <WebCore/Color.h>
</span><span class="cx"> #import <WebCore/PlatformPasteboard.h>
</span><span class="lines">@@ -98,9 +99,23 @@
</span><span class="cx"> newChangeCount = PlatformPasteboard(pasteboardName).setTypes(pasteboardTypes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::setPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount)
</del><ins>+void WebPasteboardProxy::setPasteboardPathnamesForType(IPC::Connection& connection, const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount)
</ins><span class="cx"> {
</span><del>- newChangeCount = PlatformPasteboard(pasteboardName).setPathnamesForType(pathnames, pasteboardType);
</del><ins>+ for (auto* webProcessProxy : m_webProcessProxyList) {
+ if (webProcessProxy->connection() != &connection)
+ continue;
+
+ for (const auto& pathname : pathnames) {
+ if (!webProcessProxy->checkURLReceivedFromWebProcess(pathname)) {
+ connection.markCurrentlyDispatchedMessageAsInvalid();
+ newChangeCount = 0;
+ return;
+ }
+ }
+ newChangeCount = PlatformPasteboard(pasteboardName).setPathnamesForType(pathnames, pasteboardType);
+ return;
+ }
+ newChangeCount = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPasteboardProxy::setPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, const String& string, uint64_t& newChangeCount)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebPasteboardProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp (210713 => 210714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp 2017-01-13 06:10:40 UTC (rev 210713)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp 2017-01-13 06:10:43 UTC (rev 210714)
</span><span class="lines">@@ -52,6 +52,12 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Can we handle all of these on a background queue?
</span><span class="cx"> webProcessProxy.addMessageReceiver(Messages::WebPasteboardProxy::messageReceiverName(), *this);
</span><ins>+ m_webProcessProxyList.add(&webProcessProxy);
</ins><span class="cx"> }
</span><ins>+
+void WebPasteboardProxy::removeWebProcessProxy(WebProcessProxy& webProcessProxy)
+{
+ m_webProcessProxyList.remove(&webProcessProxy);
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebPasteboardProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.h (210713 => 210714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2017-01-13 06:10:40 UTC (rev 210713)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2017-01-13 06:10:43 UTC (rev 210714)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "SharedMemory.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> static WebPasteboardProxy& singleton();
</span><span class="cx">
</span><span class="cx"> void addWebProcessProxy(WebProcessProxy&);
</span><ins>+ void removeWebProcessProxy(WebProcessProxy&);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void setPrimarySelectionOwner(WebFrameProxy*);
</span><span class="lines">@@ -59,6 +61,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebPasteboardProxy();
</span><ins>+
+ typedef HashSet<WebProcessProxy*> WebProcessProxyList;
</ins><span class="cx">
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
</span><span class="lines">@@ -84,7 +88,7 @@
</span><span class="cx"> void getPasteboardURL(const String& pasteboardName, WTF::String&);
</span><span class="cx"> void addPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount);
</span><span class="cx"> void setPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount);
</span><del>- void setPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount);
</del><ins>+ void setPasteboardPathnamesForType(IPC::Connection&, const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount);
</ins><span class="cx"> void setPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, const String&, uint64_t& newChangeCount);
</span><span class="cx"> void setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle&, uint64_t size, uint64_t& newChangeCount);
</span><span class="cx"> #endif
</span><span class="lines">@@ -95,6 +99,8 @@
</span><span class="cx"> WebFrameProxy* m_primarySelectionOwner { nullptr };
</span><span class="cx"> WebFrameProxy* m_frameWritingToClipboard { nullptr };
</span><span class="cx"> #endif // PLATFORM(GTK)
</span><ins>+
+ WebProcessProxyList m_webProcessProxyList;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebPasteboardProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in (210713 => 210714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in 2017-01-13 06:10:40 UTC (rev 210713)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in 2017-01-13 06:10:43 UTC (rev 210714)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> GetPasteboardURL(String pasteboardName) -> (String urlString)
</span><span class="cx"> AddPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
</span><span class="cx"> SetPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
</span><del>- SetPasteboardPathnamesForType(String pasteboardName, String pasteboardType, Vector<String> pathnames) -> (uint64_t changeCount)
</del><ins>+ SetPasteboardPathnamesForType(String pasteboardName, String pasteboardType, Vector<String> pathnames) -> (uint64_t changeCount) WantsConnection
</ins><span class="cx"> SetPasteboardStringForType(String pasteboardName, String pasteboardType, String string) -> (uint64_t changeCount)
</span><span class="cx"> SetPasteboardBufferForType(String pasteboardName, String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size) -> (uint64_t changeCount)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (210713 => 210714)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-01-13 06:10:40 UTC (rev 210713)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-01-13 06:10:43 UTC (rev 210714)
</span><span class="lines">@@ -109,6 +109,8 @@
</span><span class="cx"> WebProcessProxy::~WebProcessProxy()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageURLRetainCountMap.isEmpty());
</span><ins>+
+ WebPasteboardProxy::singleton().removeWebProcessProxy(*this);
</ins><span class="cx">
</span><span class="cx"> if (m_webConnection)
</span><span class="cx"> m_webConnection->invalidate();
</span></span></pre>
</div>
</div>
</body>
</html>