<!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>[171026] tags/Safari-538.46.1/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/171026">171026</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-07-12 12:10:07 -0700 (Sat, 12 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171024">r171024</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538461SourceWebKit2ChangeLog">tags/Safari-538.46.1/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari538461SourceWebKit2ResourcesSandboxProfilesioscomappleWebKitWebContentsb">tags/Safari-538.46.1/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb</a></li>
<li><a href="#tagsSafari538461SourceWebKit2SharedWebProcessCreationParameterscpp">tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#tagsSafari538461SourceWebKit2SharedWebProcessCreationParametersh">tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#tagsSafari538461SourceWebKit2UIProcessWebContextcpp">tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#tagsSafari538461SourceWebKit2UIProcessWebContexth">tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#tagsSafari538461SourceWebKit2UIProcessmacWebContextMacmm">tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#tagsSafari538461SourceWebKit2WebProcesscocoaWebProcessCocoamm">tags/Safari-538.46.1/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538461SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/ChangeLog (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/ChangeLog 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/ChangeLog 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-07-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171024
+
+ 2014-07-12 Oliver Hunt <oliver@apple.com>
+
+ Extend WebContent sandbox to allow some extra access for frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=134844
+
+ Reviewed by Sam Weinig.
+
+ Open up the webcontent sandbox a bit so that some external frameworks
+ can work correctly.
+
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createNewWebProcess):
+ (WebKit::WebContext::mediaCacheDirectory):
+ * UIProcess/WebContext.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformMediaCacheDirectory):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
+2014-07-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r171023
</span><span class="cx">
</span><span class="cx"> 2014-07-12 Oliver Hunt <oliver@apple.com>
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2ResourcesSandboxProfilesioscomappleWebKitWebContentsb"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -85,5 +85,9 @@
</span><span class="cx"> (allow mach-lookup
</span><span class="cx"> (global-name "com.apple.webinspector"))
</span><span class="cx">
</span><ins>+;; Various services required by CFNetwork and other frameworks
+(allow mach-lookup
+ (global-name "com.apple.PowerManagement.control"))
+
</ins><span class="cx"> (deny file-write-create (vnode-type SYMLINK))
</span><span class="cx"> (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> encoder << cookieStorageDirectoryExtensionHandle;
</span><span class="cx"> encoder << openGLCacheDirectory;
</span><span class="cx"> encoder << openGLCacheDirectoryExtensionHandle;
</span><ins>+ encoder << mediaCacheDirectory;
+ encoder << mediaCacheDirectoryExtensionHandle;
</ins><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> encoder << urlSchemesRegistererdAsEmptyDocument;
</span><span class="cx"> encoder << urlSchemesRegisteredAsSecure;
</span><span class="lines">@@ -166,6 +168,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.openGLCacheDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.mediaCacheDirectory))
+ return false;
+ if (!decoder.decode(parameters.mediaCacheDirectoryExtensionHandle))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.shouldUseTestingNetworkSession))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegistererdAsEmptyDocument))
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.h (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</span><span class="cx"> String openGLCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle openGLCacheDirectoryExtensionHandle;
</span><ins>+ String mediaCacheDirectory;
+ SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
</ins><span class="cx">
</span><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.cpp (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -594,6 +594,10 @@
</span><span class="cx"> if (!parameters.openGLCacheDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.openGLCacheDirectory, parameters.openGLCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><ins>+ parameters.mediaCacheDirectory = mediaCacheDirectory();
+ if (!parameters.mediaCacheDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(parameters.mediaCacheDirectory, parameters.mediaCacheDirectoryExtensionHandle);
+
</ins><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> parameters.cacheModel = m_cacheModel;
</span><span class="lines">@@ -1187,6 +1191,14 @@
</span><span class="cx"> return platformDefaultOpenGLCacheDirectory();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::mediaCacheDirectory() const
+{
+ if (!m_overrideMediaCacheDirectory.isEmpty())
+ return m_overrideMediaCacheDirectory;
+
+ return platformMediaCacheDirectory();
+}
+
</ins><span class="cx"> void WebContext::useTestingNetworkSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.isEmpty());
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.h (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.h 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/UIProcess/WebContext.h 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -426,6 +426,9 @@
</span><span class="cx"> String openGLCacheDirectory() const;
</span><span class="cx"> String platformDefaultOpenGLCacheDirectory() const;
</span><span class="cx">
</span><ins>+ String mediaCacheDirectory() const;
+ String platformMediaCacheDirectory() const;
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void registerNotificationObservers();
</span><span class="cx"> void unregisterNotificationObservers();
</span><span class="lines">@@ -522,6 +525,7 @@
</span><span class="cx"> String m_overrideDiskCacheDirectory;
</span><span class="cx"> String m_overrideCookieStorageDirectory;
</span><span class="cx"> String m_overrideOpenGLCacheDirectory;
</span><ins>+ String m_overrideMediaCacheDirectory;
</ins><span class="cx">
</span><span class="cx"> String m_webSQLDatabaseDirectory;
</span><span class="cx"> String m_indexedDBDatabaseDirectory;
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -303,6 +303,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::platformMediaCacheDirectory() const
+{
+#if PLATFORM(IOS)
+ String path = NSTemporaryDirectory();
+ path = path + "/MediaCache";
+ return stringByResolvingSymlinksInPath(path);
+#else
+ notImplemented();
+ return [@"" stringByStandardizingPath];
+#endif
+}
+
</ins><span class="cx"> String WebContext::platformDefaultWebSQLDatabaseDirectory()
</span><span class="cx"> {
</span><span class="cx"> NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
</span></span></pre></div>
<a id="tagsSafari538461SourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.46.1/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (171025 => 171026)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.46.1/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-07-12 19:02:47 UTC (rev 171025)
+++ tags/Safari-538.46.1/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-07-12 19:10:07 UTC (rev 171026)
</span><span class="lines">@@ -169,6 +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><ins>+ SandboxExtension::consumePermanently(parameters.mediaCacheDirectoryExtensionHandle);
</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>