<!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>[172105] branches/safari-600.1-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/172105">172105</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-05 16:32:32 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172031">r172031</a>. <rdar://problem/17864079></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ResourcesSandboxProfilesioscomappleWebKitNetworkingsb">branches/safari-600.1-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebContextcpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebContexth">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessmacWebContextMacmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2014-08-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172031
+
+ 2014-08-05 Oliver Hunt <oliver@apple.com>
+
+ SSO expects to be able to walk parent application's bundle
+ https://bugs.webkit.org/show_bug.cgi?id=135581
+ <rdar://problem/17864079>
+
+ Reviewed by Alexey Proskuryakov.
+
+ SSO expects to be able to walk the parent application's
+ bundle looking for Info plists. To allow this to actually
+ work we provide an extension from the ui process that
+ covers the bundle directory, and then in the profile
+ restrict access to the ability to read directories and
+ files named Info.plist.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::ensureNetworkProcess):
+ (WebKit::WebContext::parentBundleDirectory):
+ * UIProcess/WebContext.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::parentBundleDirectory):
+
+2014-08-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172016
</span><span class="cx">
</span><span class="cx"> 2014-08-04 Benjamin Poulain <bpoulain@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
</span><ins>+ SandboxExtension::consumePermanently(parameters.parentBundleDirectoryExtensionHandle);
</ins><span class="cx"> #endif
</span><span class="cx"> m_diskCacheDirectory = parameters.diskCacheDirectory;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ResourcesSandboxProfilesioscomappleWebKitNetworkingsb"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> (import "removed-dev-nodes.sb")
</span><span class="cx">
</span><span class="cx"> ;; Access to client's cache folder & re-vending to CFNetwork.
</span><del>-;; FIXME: Remove the webkti specific extension classes <rdar://problem/17755931>
</del><ins>+;; FIXME: Remove the webkit specific extension classes <rdar://problem/17755931>
</ins><span class="cx"> (allow file-issue-extension (require-all
</span><span class="cx"> (extension "com.apple.app-sandbox.read-write")
</span><span class="cx"> (extension-class "com.apple.nsurlstorage.extension-cache")))
</span><span class="lines">@@ -38,6 +38,27 @@
</span><span class="cx"> (allow file-read* file-write* (extension "com.apple.app-sandbox.read-write"))
</span><span class="cx"> (allow file-read* (extension "com.apple.app-sandbox.read"))
</span><span class="cx">
</span><ins>+;; FIXME: <rdar://problem/17909681> SSO expects to be able to walk the parent
+;; bundle to find Info plists, so we jump through a few hoops here to provide
+;; enough access to make it possible.
+
+;; Disallow networking process from reading any bundles, even with the read extension
+(deny file-read* (subpath "/Applications") (extension "com.apple.app-sandbox.read"))
+(deny file-read* (subpath "/private/var/mobile/Containers/Bundle/Application") (extension "com.apple.app-sandbox.read"))
+
+;; Allow the networking process to read directories inside the bundle directories
+;; that we may have killed off above
+(allow file-read*
+ (require-all
+ (extension "com.apple.app-sandbox.read")
+ (vnode-type DIRECTORY)))
+
+;; Allow the networking process to read the Info.plist files
+(allow file-read*
+ (require-all
+ (extension "com.apple.app-sandbox.read")
+ (regex #"/Info\.plist$")))
+
</ins><span class="cx"> ;; IOKit user clients
</span><span class="cx"> (allow iokit-open
</span><span class="cx"> (iokit-user-client-class "RootDomainUserClient"))
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << hstsDatabasePath;
</span><span class="cx"> encoder << hstsDatabasePathExtensionHandle;
</span><ins>+ encoder << parentBundleDirectory;
+ encoder << parentBundleDirectoryExtensionHandle;
</ins><span class="cx"> #endif
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="lines">@@ -88,6 +90,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.hstsDatabasePathExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.parentBundleDirectory))
+ return false;
+ if (!decoder.decode(result.parentBundleDirectoryExtensionHandle))
+ return false;
</ins><span class="cx"> #endif
</span><span class="cx"> if (!decoder.decode(result.shouldUseTestingNetworkSession))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -63,6 +63,9 @@
</span><span class="cx"> // FIXME: Remove this once <rdar://problem/17726660> is fixed.
</span><span class="cx"> String hstsDatabasePath;
</span><span class="cx"> SandboxExtension::Handle hstsDatabasePathExtensionHandle;
</span><ins>+
+ String parentBundleDirectory;
+ SandboxExtension::Handle parentBundleDirectoryExtensionHandle;
</ins><span class="cx"> #endif
</span><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -428,6 +428,10 @@
</span><span class="cx"> parameters.hstsDatabasePath = networkingHSTSDatabasePath();
</span><span class="cx"> if (!parameters.hstsDatabasePath.isEmpty())
</span><span class="cx"> SandboxExtension::createHandle(parameters.hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</span><ins>+
+ parameters.parentBundleDirectory = parentBundleDirectory();
+ if (!parameters.parentBundleDirectory.isEmpty())
+ SandboxExtension::createHandle(parameters.parentBundleDirectory, SandboxExtension::ReadOnly, parameters.parentBundleDirectoryExtensionHandle);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -431,6 +431,10 @@
</span><span class="cx"> String networkingHSTSDatabasePath() const;
</span><span class="cx"> String platformDefaultNetworkingHSTSDatabasePath() const;
</span><span class="cx">
</span><ins>+#if PLTFORM(IOS)
+ String parentBundleDirectory() const;
+#endif
+
</ins><span class="cx"> String containerTemporaryDirectory() const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm (172104 => 172105)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-05 23:32:24 UTC (rev 172104)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-05 23:32:32 UTC (rev 172105)
</span><span class="lines">@@ -323,6 +323,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+String WebContext::parentBundleDirectory() const
+{
+ return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
+}
+#endif
+
</ins><span class="cx"> String WebContext::containerTemporaryDirectory() const
</span><span class="cx"> {
</span><span class="cx"> String path = NSTemporaryDirectory();
</span></span></pre>
</div>
</div>
</body>
</html>