<!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>[170733] 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/170733">170733</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 15:54:32 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre> Restrict network process sandbox
https://bugs.webkit.org/show_bug.cgi?id=134360
Reviewed by Sam Weinig.
Add more restrictions to the network process sandbox.
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
Always use the cache directory provided in the initialization parameters,
and make sure we consume the cookie directory extension.
* Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
Make the sandbox profile much more restrictive.
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
The network process now requires an extension to access
its cookie storage.
* Shared/mac/SandboxUtilities.cpp:
(WebKit::pathForProcessContainer):
* Shared/mac/SandboxUtilities.h:
We need to be able to get hold of our container so
that we can get the correct cookie storage directory.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::ensureNetworkProcess):
We have to pass in the an extension for the cookie storage directory when
initalising the network process
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultCookieStorageDirectory):
Make sure we provide the correct location on IOS
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Consume the cookie storage extension</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2ResourcesSandboxProfilesioscomappleWebKitNetworkingsb">trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxUtilitiescpp">trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxUtilitiesh">trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.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 (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-06-28 Oliver Hunt <oliver@apple.com>
+
+ Restrict network process sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=134360
+
+ Reviewed by Sam Weinig.
+
+ Add more restrictions to the network process sandbox.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ Always use the cache directory provided in the initialization parameters,
+ and make sure we consume the cookie directory extension.
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
+ Make the sandbox profile much more restrictive.
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ The network process now requires an extension to access
+ its cookie storage.
+ * Shared/mac/SandboxUtilities.cpp:
+ (WebKit::pathForProcessContainer):
+ * Shared/mac/SandboxUtilities.h:
+ We need to be able to get hold of our container so
+ that we can get the correct cookie storage directory.
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::ensureNetworkProcess):
+ We have to pass in the an extension for the cookie storage directory when
+ initalising the network process
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultCookieStorageDirectory):
+ Make sure we provide the correct location on IOS
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ Consume the cookie storage extension
+
</ins><span class="cx"> 2014-07-02 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> URTBF after r170725.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -60,24 +60,23 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><ins>+ SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
+ m_diskCacheDirectory = parameters.diskCacheDirectory;
+
+ if (!m_diskCacheDirectory.isNull()) {
+ SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (!parameters.uiProcessBundleIdentifier.isNull()) {
</del><span class="cx"> [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
</span><span class="cx"> _initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
</span><span class="cx"> diskCapacity:parameters.nsURLCacheDiskCapacity
</span><span class="cx"> relativePath:parameters.uiProcessBundleIdentifier]).get()];
</span><del>- }
</del><span class="cx"> #else
</span><del>- m_diskCacheDirectory = parameters.diskCacheDirectory;
-
- if (!m_diskCacheDirectory.isNull()) {
- SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</del><span class="cx"> [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
</span><span class="cx"> initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
</span><span class="cx"> diskCapacity:parameters.nsURLCacheDiskCapacity
</span><span class="cx"> diskPath:parameters.diskCacheDirectory]).get()];
</span><del>- }
</del><span class="cx"> #endif
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
</span></span></pre></div>
<a id="trunkSourceWebKit2ResourcesSandboxProfilesioscomappleWebKitNetworkingsb"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -22,7 +22,48 @@
</span><span class="cx"> ; THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> (version 1)
</span><del>-(allow default)
</del><ins>+(deny default (with partial-symbolication))
+(allow system-audit file-read-metadata)
</ins><span class="cx">
</span><span class="cx"> (import "common.sb")
</span><span class="cx"> (import "removed-dev-nodes.sb")
</span><ins>+
+;; Access CFNetwork shared cookies
+;; This is too generous -- <rdar://problem/17496756>
+(apple-cookie-access 'with-read-write)
+
+;; Sandbox extensions
+(allow file-read* (container-subpath "Library/")
+ (extension "com.apple.webkit.read"))
+
+;; Access to client's cache folder & re-vending to CFNetwork.
+(allow file-read* file-write* (require-all (container-subpath "Library/")
+ (extension "com.apple.nsurlstorage.extension-cache")))
+(allow file-issue-extension (require-all ((container-subpath "Library/")
+ (extension-class "com.apple.nsurlstorage.extension-cache")))
+
+;; App sandbox extensions
+(allow file-read* file-write* (require-all (container-subpath "Library/")
+ (extension "com.apple.app-sandbox.read-write")))
+
+;; Access to own cache & temp folders.
+(allow file-read* file-write* (require-all (container-subpath "")
+ (extension "com.apple.webkit.read-write")))
+
+;; IOKit user clients
+(allow iokit-open
+ (iokit-user-client-class "RootDomainUserClient"))
+
+;; Various services required by CFNetwork and other frameworks
+(allow mach-lookup
+ (global-name "com.apple.PowerManagement.control"))
+
+(network-client)
+
+;; Security framework
+(allow mach-lookup
+ (global-name "com.apple.ocspd")
+ (global-name "com.apple.securityd"))
+
+(deny file-write-create
+ (vnode-type SYMLINK))
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> encoder.encodeEnum(cacheModel);
</span><span class="cx"> encoder << diskCacheDirectory;
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><ins>+ encoder << cookieStorageDirectory;
+ encoder << cookieStorageDirectoryExtensionHandle;
</ins><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> encoder << urlSchemesRegisteredForCustomProtocols;
</span><span class="lines">@@ -73,6 +75,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.diskCacheDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.cookieStorageDirectory))
+ return false;
+ if (!decoder.decode(result.cookieStorageDirectoryExtensionHandle))
+ return false;
</ins><span class="cx"> if (!decoder.decode(result.shouldUseTestingNetworkSession))
</span><span class="cx"> return false;
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -56,6 +56,9 @@
</span><span class="cx"> String diskCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
</span><span class="cx">
</span><ins>+ String cookieStorageDirectory;
+ SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
+
</ins><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "SandboxUtilities.h"
</span><span class="cx">
</span><span class="cx"> #include <array>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> #if __has_include(<sandbox/private.h>)
</span><span class="cx"> #import <sandbox/private.h>
</span><span class="lines">@@ -67,4 +68,13 @@
</span><span class="cx"> return hasContainer;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String pathForProcessContainer()
+{
+ std::array<char, MAXPATHLEN> path;
+ path[0] = 0;
+ sandbox_container_path_for_pid(getpid(), path.data(), path.size());
+
+ return String::fromUTF8(path.data());
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -27,12 +27,16 @@
</span><span class="cx"> #define SandboxUtilities_h
</span><span class="cx">
</span><span class="cx"> #include <sys/types.h>
</span><ins>+#include <wtf/Forward.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> bool processIsSandboxed(pid_t);
</span><span class="cx"> bool processHasContainer();
</span><span class="cx">
</span><ins>+// Returns an empty string if the process is not in a container.
+String pathForProcessContainer();
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // SandboxUtilities_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -411,6 +411,10 @@
</span><span class="cx"> if (!parameters.diskCacheDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><ins>+ parameters.cookieStorageDirectory = cookieStorageDirectory();
+ if (!parameters.cookieStorageDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
+
</ins><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> // Add any platform specific parameters
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #import "WebContext.h"
</span><span class="cx">
</span><span class="cx"> #import "PluginProcessManager.h"
</span><ins>+#import "SandboxUtilities.h"
</ins><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="lines">@@ -269,8 +270,17 @@
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultCookieStorageDirectory() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ String path = pathForProcessContainer();
+ if (path.isEmpty())
+ path = NSHomeDirectory();
+
+ path = path + "/Library/Cookies";
+ return stringByResolvingSymlinksInPath(path);
+#else
</ins><span class="cx"> notImplemented();
</span><span class="cx"> return [@"" stringByStandardizingPath];
</span><ins>+#endif
</ins><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 (170732 => 170733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-07-02 22:52:41 UTC (rev 170732)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-07-02 22:54:32 UTC (rev 170733)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</span><ins>+ SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</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>