<!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>[182815] trunk/Source</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/182815">182815</a></dd>
<dt>Author</dt> <dd>bweinstein@apple.com</dd>
<dt>Date</dt> <dd>2015-04-14 15:56:59 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add SPI to clear HSTS hosts added since a date.
https://bugs.webkit.org/show_bug.cgi?id=143726
and
rdar://problem/16664597
Source/WebCore:
Declare _CFNetworkResetHSTSHostsSinceDate in CFNetworkSPI.h.
Reviewed by Anders Carlsson.
* platform/spi/cf/CFNetworkSPI.h:
Source/WebKit2:
Reviewed by Anders Carlsson.
* UIProcess/API/C/mac/WKContextPrivateMac.h:
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextResetHSTSHostsAddedAfterDate): Call into the WebProcessPool.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::resetHSTSHostsAddedAfterDate): Call CFNetwork SPI to clear HSTS hosts added
after the given date.
* UIProcess/WebProcessPool.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebCore/ChangeLog 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-14 Brian Weinstein <bweinstein@apple.com>
+
+ Add SPI to clear HSTS hosts added since a date.
+ https://bugs.webkit.org/show_bug.cgi?id=143726
+ and
+ rdar://problem/16664597
+
+ Declare _CFNetworkResetHSTSHostsSinceDate in CFNetworkSPI.h.
+
+ Reviewed by Anders Carlsson.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+
</ins><span class="cx"> 2015-04-14 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Time numbers on media controls move as they update on OSX.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -116,4 +116,8 @@
</span><span class="cx"> EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
+EXTERN_C void _CFNetworkResetHSTSHostsSinceDate(CFURLStorageSessionRef, CFDateRef);
+#endif
+
</ins><span class="cx"> #endif // CFNetworkSPI_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-14 Brian Weinstein <bweinstein@apple.com>
+
+ Add SPI to clear HSTS hosts added since a date.
+ https://bugs.webkit.org/show_bug.cgi?id=143726
+ and
+ rdar://problem/16664597
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/C/mac/WKContextPrivateMac.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextResetHSTSHostsAddedAfterDate): Call into the WebProcessPool.
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::resetHSTSHostsAddedAfterDate): Call CFNetwork SPI to clear HSTS hosts added
+ after the given date.
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2015-04-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> More work on making the SharedMemory interface more sane
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextResetHSTSHosts(WKContextRef context);
</span><span class="cx">
</span><ins>+// The time here is relative to the Unix epoch.
+WK_EXPORT void WKContextResetHSTSHostsAddedAfterDate(WKContextRef context, double startDateIntervalSince1970);
+
</ins><span class="cx"> WK_EXPORT void WKContextRegisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme);
</span><span class="cx"> WK_EXPORT void WKContextUnregisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -107,8 +107,11 @@
</span><span class="cx"> return toImpl(context)->resetHSTSHosts();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKContextResetHSTSHostsAddedAfterDate(WKContextRef context, double startDateIntervalSince1970)
+{
+ return toImpl(context)->resetHSTSHostsAddedAfterDate(startDateIntervalSince1970);
+}
</ins><span class="cx">
</span><del>-
</del><span class="cx"> void WKContextRegisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme)
</span><span class="cx"> {
</span><span class="cx"> WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(toWTFString(scheme));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -469,6 +469,15 @@
</span><span class="cx"> _CFNetworkResetHSTSHostsWithSession(privateBrowsingSession());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessPool::resetHSTSHostsAddedAfterDate(double startDateIntervalSince1970)
+{
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
+ NSDate *startDate = [NSDate dateWithTimeIntervalSince1970:startDateIntervalSince1970];
+ _CFNetworkResetHSTSHostsSinceDate(nullptr, (__bridge CFDateRef)startDate);
+ _CFNetworkResetHSTSHostsSinceDate(privateBrowsingSession(), (__bridge CFDateRef)startDate);
+#endif
+}
+
</ins><span class="cx"> int networkProcessLatencyQOS()
</span><span class="cx"> {
</span><span class="cx"> static int qos = [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitNetworkProcessLatencyQOS"];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (182814 => 182815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-04-14 21:55:46 UTC (rev 182814)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-04-14 22:56:59 UTC (rev 182815)
</span><span class="lines">@@ -327,6 +327,7 @@
</span><span class="cx">
</span><span class="cx"> bool isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const;
</span><span class="cx"> void resetHSTSHosts();
</span><ins>+ void resetHSTSHostsAddedAfterDate(double startDateIntervalSince1970);
</ins><span class="cx">
</span><span class="cx"> void registerSchemeForCustomProtocol(const String&);
</span><span class="cx"> void unregisterSchemeForCustomProtocol(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>