<!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>[172240] branches/safari-600.1.4-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/172240">172240</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 13:30:37 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172238">r172238</a>. <rdar://problem/17940220></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60014branchSourceWebKit2ChangeLog">branches/safari-600.1.4-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari60014branchSourceWebKit2SharedWebProcessCreationParameterscpp">branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#branchessafari60014branchSourceWebKit2SharedWebProcessCreationParametersh">branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#branchessafari60014branchSourceWebKit2UIProcessWebContextcpp">branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#branchessafari60014branchSourceWebKit2UIProcessWebContexth">branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#branchessafari60014branchSourceWebKit2UIProcessmacWebContextMacmm">branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#branchessafari60014branchSourceWebKit2WebProcesscocoaWebProcessCocoamm">branches/safari-600.1.4-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60014branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/ChangeLog (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/ChangeLog 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/ChangeLog 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-08-07 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172238. <rdar://problem/17940220>
+
+ 2014-08-07 Oliver Hunt <oliver@apple.com>
+
+ WebContent needs access to HSTS database due to some networking still being performed in process
+ https://bugs.webkit.org/show_bug.cgi?id=135711
+ <rdar://17940220>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Simple patch in the same theme as the equivalent network process
+ extension. Provide an extension that covers the WebContent specific
+ HSTS file and consume it on launch.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createNewWebProcess):
+ * UIProcess/WebContext.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::webContentHSTSDatabasePath):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
+2014-08-07 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r172191. <rdar://problem/17895138>
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Andy Estes <aestes@apple.com>
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -71,6 +71,10 @@
</span><span class="cx"> encoder << openGLCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << containerTemporaryDirectory;
</span><span class="cx"> encoder << containerTemporaryDirectoryExtensionHandle;
</span><ins>+#if PLATFORM(IOS)
+ encoder << hstsDatabasePath;
+ encoder << hstsDatabasePathExtensionHandle;
+#endif
</ins><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> encoder << urlSchemesRegistererdAsEmptyDocument;
</span><span class="cx"> encoder << urlSchemesRegisteredAsSecure;
</span><span class="lines">@@ -172,6 +176,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.containerTemporaryDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+#if PLATFORM(IOS)
+ if (!decoder.decode(parameters.hstsDatabasePath))
+ return false;
+ if (!decoder.decode(parameters.hstsDatabasePathExtensionHandle))
+ return false;
+#endif
</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="branchessafari60014branchSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -77,6 +77,12 @@
</span><span class="cx"> String containerTemporaryDirectory;
</span><span class="cx"> SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ // FIXME: Remove this once <rdar://problem/17726660> is fixed.
+ String hstsDatabasePath;
+ SandboxExtension::Handle hstsDatabasePathExtensionHandle;
+#endif
+
</ins><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> Vector<String> urlSchemesRegistererdAsEmptyDocument;
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.cpp (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -629,6 +629,12 @@
</span><span class="cx"> if (!parameters.containerTemporaryDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.containerTemporaryDirectory, parameters.containerTemporaryDirectoryExtensionHandle);
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ parameters.hstsDatabasePath = webContentHSTSDatabasePath();
+ if (!parameters.hstsDatabasePath.isEmpty())
+ SandboxExtension::createHandle(parameters.hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
+#endif
+
</ins><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> parameters.cacheModel = m_cacheModel;
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.h (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.h 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/WebContext.h 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -433,6 +433,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> String parentBundleDirectory() const;
</span><ins>+ String webContentHSTSDatabasePath() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String containerTemporaryDirectory() const;
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -328,6 +328,26 @@
</span><span class="cx"> {
</span><span class="cx"> return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
</span><span class="cx"> }
</span><ins>+
+String WebContext::webContentHSTSDatabasePath() const
+{
+ String path = pathForProcessContainer();
+ if (path.isEmpty())
+ path = NSHomeDirectory();
+
+ path = path + "/Library/Caches/com.apple.WebKit.WebContent/";
+ path = stringByResolvingSymlinksInPath(path);
+
+ NSError *error = nil;
+ NSString* nsPath = path;
+ if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
+ NSLog(@"could not create \"%@\", error %@", nsPath, error);
+ return String();
+ }
+
+ return path + "/HSTS.plist";
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String WebContext::containerTemporaryDirectory() const
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (172239 => 172240)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-08-07 20:29:44 UTC (rev 172239)
+++ branches/safari-600.1.4-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-08-07 20:30:37 UTC (rev 172240)
</span><span class="lines">@@ -170,7 +170,10 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.openGLCacheDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.containerTemporaryDirectoryExtensionHandle);
</span><ins>+#if PLATFORM(IOS)
+ SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // When the network process is enabled, each web process wants a stand-alone
</span><span class="cx"> // NSURLCache, which it can disable to save memory.
</span></span></pre>
</div>
</div>
</body>
</html>