<!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>[171462] 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/171462">171462</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-23 01:23:28 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171356">r171356</a>. <rdar://problem/17654369></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="#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="#branchessafari6001branchSourceWebKit2UIProcesseflWebContextEflcpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessgtkWebContextGtkcpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</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 (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171356
+
+ 2014-07-22 Oliver Hunt <oliver@apple.com>
+
+ Provide networking process with access to its HSTS db
+ https://bugs.webkit.org/show_bug.cgi?id=135121
+ <rdar://17654369>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add an extension parameter to pass the hsts database file.
+ This requires us to create the Caches/com.apple.WebKit.Networking
+ directory in the UI process, as the network sandbox
+ does not allow it to create the containing directory.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::ensureNetworkProcess):
+ (WebKit::WebContext::networkingHSTSDatabasePath):
+ * UIProcess/WebContext.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath):
+
+2014-07-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171352
</span><span class="cx">
</span><span class="cx"> 2014-07-22 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 (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><ins>+#if PLATFORM(IOS)
+ SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
+#endif
</ins><span class="cx"> m_diskCacheDirectory = parameters.diskCacheDirectory;
</span><span class="cx">
</span><span class="cx"> if (!m_diskCacheDirectory.isNull()) {
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><span class="cx"> encoder << cookieStorageDirectoryExtensionHandle;
</span><ins>+#if PLATFORM(IOS)
+ encoder << hstsDatabasePath;
+ encoder << hstsDatabasePathExtensionHandle;
+#endif
</ins><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> encoder << urlSchemesRegisteredForCustomProtocols;
</span><span class="lines">@@ -79,6 +83,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.cookieStorageDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+#if PLATFORM(IOS)
+ if (!decoder.decode(result.hstsDatabasePath))
+ return false;
+ if (!decoder.decode(result.hstsDatabasePathExtensionHandle))
+ return false;
+#endif
</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="branchessafari6001branchSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -59,6 +59,11 @@
</span><span class="cx"> String cookieStorageDirectory;
</span><span class="cx"> SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</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"> #if ENABLE(CUSTOM_PROTOCOLS)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -420,6 +420,12 @@
</span><span class="cx"> if (!parameters.cookieStorageDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ parameters.hstsDatabasePath = networkingHSTSDatabasePath();
+ 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"> // Add any platform specific parameters
</span><span class="lines">@@ -1208,6 +1214,11 @@
</span><span class="cx"> return platformDefaultOpenGLCacheDirectory();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::networkingHSTSDatabasePath() const
+{
+ return platformDefaultNetworkingHSTSDatabasePath();
+}
+
</ins><span class="cx"> String WebContext::mediaCacheDirectory() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_overrideMediaCacheDirectory.isEmpty())
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -427,6 +427,9 @@
</span><span class="cx"> String openGLCacheDirectory() const;
</span><span class="cx"> String platformDefaultOpenGLCacheDirectory() const;
</span><span class="cx">
</span><ins>+ String networkingHSTSDatabasePath() const;
+ String platformDefaultNetworkingHSTSDatabasePath() const;
+
</ins><span class="cx"> String mediaCacheDirectory() const;
</span><span class="cx"> String platformMediaCacheDirectory() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcesseflWebContextEflcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformMediaCacheDirectory() const
</del><ins>+String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -160,6 +160,12 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
+{
+ notImplemented();
+ return String();
+}
+
</ins><span class="cx"> void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> m_ignoreTLSErrors = ignoreTLSErrors;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm (171461 => 171462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-23 08:20:39 UTC (rev 171461)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-23 08:23:28 UTC (rev 171462)
</span><span class="lines">@@ -299,6 +299,30 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
+{
+#if PLATFORM(IOS)
+ String path = pathForProcessContainer();
+ if (path.isEmpty())
+ path = NSHomeDirectory();
+
+ path = path + "/Library/Caches/com.apple.WebKit.Networking/";
+ 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";
+#else
+ notImplemented();
+ return [@"" stringByStandardizingPath];
+#endif
+}
+
</ins><span class="cx"> String WebContext::platformMediaCacheDirectory() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>