<!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>[171943] trunk/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/171943">171943</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-08-01 12:19:22 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Various frameworks may want to use the container temp directory, so our current restrictions are too tight
https://bugs.webkit.org/show_bug.cgi?id=135518
<rdar://17869279>
Reviewed by Anders Carlsson.
We don't (and can't) have complete knowledge of what different frameworks
will want to use the container temporary directory for, and so our
current attempt to heavily restrict access is simply too tight.
This patch recognises this by simply giving read-write access to the
entire NSTemporary() directory (e.g. $container/tmp in the general case),
rather than the single sub directory we wishfully thought that we would
be able to get away with.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::mediaCacheDirectory): Deleted.
* UIProcess/WebContext.h:
* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::containerTemporaryDirectory):
(WebKit::WebContext::platformMediaCacheDirectory): Deleted.
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::containerTemporaryDirectory):
(WebKit::WebContext::platformMediaCacheDirectory): Deleted.
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::containerTemporaryDirectory):
(WebKit::WebContext::platformMediaCacheDirectory): Deleted.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebContextEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-08-01 Oliver Hunt <oliver@apple.com>
+
+ Various frameworks may want to use the container temp directory, so our current restrictions are too tight
+ https://bugs.webkit.org/show_bug.cgi?id=135518
+ <rdar://17869279>
+
+ Reviewed by Anders Carlsson.
+
+ We don't (and can't) have complete knowledge of what different frameworks
+ will want to use the container temporary directory for, and so our
+ current attempt to heavily restrict access is simply too tight.
+
+ This patch recognises this by simply giving read-write access to the
+ entire NSTemporary() directory (e.g. $container/tmp in the general case),
+ rather than the single sub directory we wishfully thought that we would
+ be able to get away with.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createNewWebProcess):
+ (WebKit::WebContext::mediaCacheDirectory): Deleted.
+ * UIProcess/WebContext.h:
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::containerTemporaryDirectory):
+ (WebKit::WebContext::platformMediaCacheDirectory): Deleted.
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::containerTemporaryDirectory):
+ (WebKit::WebContext::platformMediaCacheDirectory): Deleted.
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::containerTemporaryDirectory):
+ (WebKit::WebContext::platformMediaCacheDirectory): Deleted.
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-08-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/17862013> REGRESSION (r169357): Disabling "allow plug-ins" doesn't stick on quit/relaunch
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> encoder << cookieStorageDirectoryExtensionHandle;
</span><span class="cx"> encoder << openGLCacheDirectory;
</span><span class="cx"> encoder << openGLCacheDirectoryExtensionHandle;
</span><del>- encoder << mediaCacheDirectory;
- encoder << mediaCacheDirectoryExtensionHandle;
</del><ins>+ encoder << containerTemporaryDirectory;
+ encoder << containerTemporaryDirectoryExtensionHandle;
</ins><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> encoder << urlSchemesRegistererdAsEmptyDocument;
</span><span class="cx"> encoder << urlSchemesRegisteredAsSecure;
</span><span class="lines">@@ -168,9 +168,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.openGLCacheDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.mediaCacheDirectory))
</del><ins>+ if (!decoder.decode(parameters.containerTemporaryDirectory))
</ins><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.mediaCacheDirectoryExtensionHandle))
</del><ins>+ if (!decoder.decode(parameters.containerTemporaryDirectoryExtensionHandle))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldUseTestingNetworkSession))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx"> SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</span><span class="cx"> String openGLCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle openGLCacheDirectoryExtensionHandle;
</span><del>- String mediaCacheDirectory;
- SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
</del><ins>+ String containerTemporaryDirectory;
+ SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;
</ins><span class="cx">
</span><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -621,9 +621,9 @@
</span><span class="cx"> if (!parameters.openGLCacheDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.openGLCacheDirectory, parameters.openGLCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- parameters.mediaCacheDirectory = mediaCacheDirectory();
- if (!parameters.mediaCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.mediaCacheDirectory, parameters.mediaCacheDirectoryExtensionHandle);
</del><ins>+ parameters.containerTemporaryDirectory = containerTemporaryDirectory();
+ if (!parameters.containerTemporaryDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(parameters.containerTemporaryDirectory, parameters.containerTemporaryDirectoryExtensionHandle);
</ins><span class="cx">
</span><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="lines">@@ -1223,14 +1223,6 @@
</span><span class="cx"> return platformDefaultNetworkingHSTSDatabasePath();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::mediaCacheDirectory() const
-{
- if (!m_overrideMediaCacheDirectory.isEmpty())
- return m_overrideMediaCacheDirectory;
-
- return platformMediaCacheDirectory();
-}
-
</del><span class="cx"> void WebContext::useTestingNetworkSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.isEmpty());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -433,8 +433,7 @@
</span><span class="cx"> String networkingHSTSDatabasePath() const;
</span><span class="cx"> String platformDefaultNetworkingHSTSDatabasePath() const;
</span><span class="cx">
</span><del>- String mediaCacheDirectory() const;
- String platformMediaCacheDirectory() const;
</del><ins>+ String containerTemporaryDirectory() const;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void registerNotificationObservers();
</span><span class="lines">@@ -532,7 +531,6 @@
</span><span class="cx"> String m_overrideDiskCacheDirectory;
</span><span class="cx"> String m_overrideCookieStorageDirectory;
</span><span class="cx"> String m_overrideOpenGLCacheDirectory;
</span><del>- String m_overrideMediaCacheDirectory;
</del><span class="cx">
</span><span class="cx"> String m_webSQLDatabaseDirectory;
</span><span class="cx"> String m_indexedDBDatabaseDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebContextEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformMediaCacheDirectory() const
</del><ins>+String WebContext::containerTemporaryDirectory() const
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformMediaCacheDirectory() const
</del><ins>+String WebContext::containerTemporaryDirectory() const
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -323,16 +323,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformMediaCacheDirectory() const
</del><ins>+String WebContext::containerTemporaryDirectory() const
</ins><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> String path = NSTemporaryDirectory();
</span><del>- path = path + "/MediaCache";
</del><span class="cx"> return stringByResolvingSymlinksInPath(path);
</span><del>-#else
- notImplemented();
- return [@"" stringByStandardizingPath];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultWebSQLDatabaseDirectory()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (171942 => 171943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-08-01 19:19:14 UTC (rev 171942)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-08-01 19:19:22 UTC (rev 171943)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.openGLCacheDirectoryExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.mediaCacheDirectoryExtensionHandle);
</del><ins>+ SandboxExtension::consumePermanently(parameters.containerTemporaryDirectoryExtensionHandle);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // When the network process is enabled, each web process wants a stand-alone
</span></span></pre>
</div>
</div>
</body>
</html>