<!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>[82042] 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/82042">82042</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2011-03-26 13:32:34 -0700 (Sat, 26 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>2011-03-26  Sam Weinig  <sam@webkit.org>

        Reviewed by Anders Carlsson.

        If a user doesn't have a Database/LocalStorage directory, it can't be created (sandbox violations)
        <rdar://problem/9127411>
        https://bugs.webkit.org/show_bug.cgi?id=57164

        * WebProcess/mac/WebProcessMac.mm:
        (WebKit::appendSandboxParameterPath):
        (WebKit::initializeSandbox):
        Use -[NSString stringByResolvingSymlinksInPath] instead of realpath to ensure we can resolve
        symlinks even if the file/directory doesn't exist yet.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessmacWebProcessMacmm">trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (82041 => 82042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog   2011-03-26 20:20:46 UTC (rev 82041)
+++ trunk/Source/WebKit2/ChangeLog      2011-03-26 20:32:34 UTC (rev 82042)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2011-03-26  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        If a user doesn't have a Database/LocalStorage directory, it can't be created (sandbox violations)
+        <rdar://problem/9127411>
+        https://bugs.webkit.org/show_bug.cgi?id=57164
+
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::appendSandboxParameterPath):
+        (WebKit::initializeSandbox):
+        Use -[NSString stringByResolvingSymlinksInPath] instead of realpath to ensure we can resolve
+        symlinks even if the file/directory doesn't exist yet.
+
</ins><span class="cx"> 2011-03-26  Anders Carlsson  <andersca@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessmacWebProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (82041 => 82042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm     2011-03-26 20:20:46 UTC (rev 82041)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm        2011-03-26 20:32:34 UTC (rev 82042)
</span><span class="lines">@@ -121,16 +121,17 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEB_PROCESS_SANDBOX)
</span><del>-static void appendSandboxParameterPath(Vector<const char*>& vector, const char* name, const char* path)
</del><ins>+static void appendSandboxParameterPath(Vector<const char*>& vector, const char* name, NSString *path)
</ins><span class="cx"> {
</span><del>-    char normalizedPath[PATH_MAX];
-    if (!realpath(path, normalizedPath))
-        normalizedPath[0] = '\0';
-
</del><span class="cx">     vector.append(name);
</span><del>-    vector.append(fastStrDup(normalizedPath));
</del><ins>+    vector.append(fastStrDup([[path stringByResolvingSymlinksInPath] fileSystemRepresentation]));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static void appendSandboxParameterPath(Vector<const char*>& vector, const char* name, const char* path)
+{
+    appendSandboxParameterPath(vector, name, [[NSFileManager defaultManager] stringWithFileSystemRepresentation:path length:strlen(path)]);
+}
+
</ins><span class="cx"> static void appendSandboxParameterConfPath(Vector<const char*>& vector, const char* name, int confID)
</span><span class="cx"> {
</span><span class="cx">     char path[PATH_MAX];
</span><span class="lines">@@ -151,12 +152,12 @@
</span><span class="cx"> 
</span><span class="cx">     Vector<const char*> sandboxParameters;
</span><span class="cx"> 
</span><del>-    appendSandboxParameterPath(sandboxParameters, "HOME_DIR", [NSHomeDirectory() fileSystemRepresentation]);
-    appendSandboxParameterPath(sandboxParameters, "WEBKIT2_FRAMEWORK_DIR", [[[[NSBundle bundleForClass:NSClassFromString(@"WKView")] bundlePath] stringByDeletingLastPathComponent] fileSystemRepresentation]);
</del><ins>+    appendSandboxParameterPath(sandboxParameters, "HOME_DIR", NSHomeDirectory());
+    appendSandboxParameterPath(sandboxParameters, "WEBKIT2_FRAMEWORK_DIR", [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] bundlePath] stringByDeletingLastPathComponent]);
</ins><span class="cx">     appendSandboxParameterConfPath(sandboxParameters, "DARWIN_USER_TEMP_DIR", _CS_DARWIN_USER_TEMP_DIR);
</span><span class="cx">     appendSandboxParameterConfPath(sandboxParameters, "DARWIN_USER_CACHE_DIR", _CS_DARWIN_USER_CACHE_DIR);
</span><del>-    appendSandboxParameterPath(sandboxParameters, "WEBKIT_DATABASE_DIR", [(NSString *)parameters.databaseDirectory fileSystemRepresentation]);
-    appendSandboxParameterPath(sandboxParameters, "WEBKIT_LOCALSTORAGE_DIR", [(NSString *)parameters.localStorageDirectory fileSystemRepresentation]);
</del><ins>+    appendSandboxParameterPath(sandboxParameters, "WEBKIT_DATABASE_DIR", (NSString *)parameters.databaseDirectory);
+    appendSandboxParameterPath(sandboxParameters, "WEBKIT_LOCALSTORAGE_DIR", (NSString *)parameters.localStorageDirectory);
</ins><span class="cx">     appendSandboxParameterPath(sandboxParameters, "NSURL_CACHE_DIR", parameters.nsURLCachePath.data());
</span><span class="cx">     appendSandboxParameterPath(sandboxParameters, "UI_PROCESS_BUNDLE_RESOURCE_DIR", parameters.uiProcessBundleResourcePath.data());
</span><span class="cx">     sandboxParameters.append(static_cast<const char*>(0));
</span></span></pre>
</div>
</div>

</body>
</html>