<!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>[195589] trunk</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/195589">195589</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-26 08:08:21 -0800 (Tue, 26 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKitTestRunner: Credential cache is not cleared between tests
https://bugs.webkit.org/show_bug.cgi?id=153407
<rdar://problem/24280834>
Reviewed by Alexey Proskuryakov.
Source/WebKit2:
Expose SPI to call CredentialStorage::clearCredentials() on the default network storage
session to clear cached credentials.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::clearCachedCredentials): Added.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in: Added message ClearCachedCredentials().
* UIProcess/API/C/WKContext.cpp:
(WKContextClearCachedCredentials): Added.
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::clearCachedCredentials): Notify all web processes and the
network process to clear cached credentials.
* UIProcess/WebProcessPool.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::clearCachedCredentials): Clear cached credentials in the default
network storage session.
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in: Added message ClearCachedCredentials().
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues): Call WKContextClearCachedCredentials()
to clear cached credentials.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-01-26 Daniel Bates <dabates@apple.com>
+
+ WebKitTestRunner: Credential cache is not cleared between tests
+ https://bugs.webkit.org/show_bug.cgi?id=153407
+ <rdar://problem/24280834>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Expose SPI to call CredentialStorage::clearCredentials() on the default network storage
+ session to clear cached credentials.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::clearCachedCredentials): Added.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in: Added message ClearCachedCredentials().
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextClearCachedCredentials): Added.
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::clearCachedCredentials): Notify all web processes and the
+ network process to clear cached credentials.
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::clearCachedCredentials): Clear cached credentials in the default
+ network storage session.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in: Added message ClearCachedCredentials().
+
</ins><span class="cx"> 2016-01-26 Mario Sanchez Prada <mario@endlessm.com>
</span><span class="cx">
</span><span class="cx"> [GTK] WebProcess crashes when quickly attempting many DnD operations
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -255,6 +255,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::clearCachedCredentials()
+{
+ NetworkStorageSession::defaultStorageSession().credentialStorage().clearCredentials();
+}
+
</ins><span class="cx"> void NetworkProcess::ensurePrivateBrowsingSession(SessionID sessionID)
</span><span class="cx"> {
</span><span class="cx"> RemoteNetworkingContext::ensurePrivateBrowsingSession(sessionID);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -146,6 +146,8 @@
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
</span><span class="cx">
</span><ins>+ void clearCachedCredentials();
+
</ins><span class="cx"> // FIXME: This should take a session ID so we can identify which disk cache to delete.
</span><span class="cx"> void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> UserPreferredLanguagesChanged(Vector<String> languages)
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ ClearCachedCredentials()
+
</ins><span class="cx"> EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -538,6 +538,11 @@
</span><span class="cx"> toImpl(context)->useTestingNetworkSession();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKContextClearCachedCredentials(WKContextRef context)
+{
+ toImpl(context)->clearCachedCredentials();
+}
+
</ins><span class="cx"> WKDictionaryRef WKContextCopyPlugInAutoStartOriginHashes(WKContextRef contextRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(contextRef)->plugInAutoStartOriginHashes().leakRef());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -82,6 +82,9 @@
</span><span class="cx"> // Test only. Should be called before any secondary processes are started.
</span><span class="cx"> WK_EXPORT void WKContextUseTestingNetworkSession(WKContextRef context);
</span><span class="cx">
</span><ins>+// Test only. Should be called before running a test.
+WK_EXPORT void WKContextClearCachedCredentials(WKContextRef context);
+
</ins><span class="cx"> typedef void (*WKContextInvalidMessageFunction)(WKStringRef messageName);
</span><span class="cx"> WK_EXPORT void WKContextSetInvalidMessageFunction(WKContextInvalidMessageFunction invalidMessageFunction);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -1073,6 +1073,13 @@
</span><span class="cx"> m_shouldUseTestingNetworkSession = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessPool::clearCachedCredentials()
+{
+ sendToAllProcesses(Messages::WebProcess::ClearCachedCredentials());
+ if (m_networkProcess)
+ m_networkProcess->send(Messages::NetworkProcess::ClearCachedCredentials(), 0);
+}
+
</ins><span class="cx"> void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
</span><span class="cx"> {
</span><span class="cx"> if (m_networkProcess)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -241,6 +241,8 @@
</span><span class="cx"> void useTestingNetworkSession();
</span><span class="cx"> bool isUsingTestingNetworkSession() const { return m_shouldUseTestingNetworkSession; }
</span><span class="cx">
</span><ins>+ void clearCachedCredentials();
+
</ins><span class="cx"> void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
</span><span class="cx">
</span><span class="cx"> WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(); // Will return an existing one if limit is met.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -498,6 +498,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::clearCachedCredentials()
+{
+ NetworkStorageSession::defaultStorageSession().credentialStorage().clearCredentials();
+}
+
</ins><span class="cx"> WebPage* WebProcess::focusedWebPage() const
</span><span class="cx"> {
</span><span class="cx"> for (auto& page : m_pageMap.values()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -210,6 +210,8 @@
</span><span class="cx"> void initializeWebProcess(WebProcessCreationParameters&&);
</span><span class="cx"> void platformInitializeWebProcess(WebProcessCreationParameters&&);
</span><span class="cx">
</span><ins>+ void clearCachedCredentials();
+
</ins><span class="cx"> void platformTerminate();
</span><span class="cx"> void registerURLSchemeAsEmptyDocument(const String&);
</span><span class="cx"> void registerURLSchemeAsSecure(const String&) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> UserPreferredLanguagesChanged(Vector<String> languages)
</span><span class="cx"> FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
</span><span class="cx">
</span><ins>+ ClearCachedCredentials()
+
</ins><span class="cx"> // Legacy private browsing session is per process. Individual pages or page groups may use the private session or the default one as appropriate.
</span><span class="cx"> EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Tools/ChangeLog 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-26 Daniel Bates <dabates@apple.com>
+
+ WebKitTestRunner: Credential cache is not cleared between tests
+ https://bugs.webkit.org/show_bug.cgi?id=153407
+ <rdar://problem/24280834>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues): Call WKContextClearCachedCredentials()
+ to clear cached credentials.
+
</ins><span class="cx"> 2016-01-26 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> kill-old-processes: allow to specify on the environment of the bot a list of process that should be killed.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (195588 => 195589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-01-26 16:06:32 UTC (rev 195588)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-01-26 16:08:21 UTC (rev 195589)
</span><span class="lines">@@ -714,6 +714,8 @@
</span><span class="cx">
</span><span class="cx"> WKContextSetCacheModel(TestController::singleton().context(), kWKCacheModelDocumentBrowser);
</span><span class="cx">
</span><ins>+ WKContextClearCachedCredentials(TestController::singleton().context());
+
</ins><span class="cx"> // FIXME: This function should also ensure that there is only one page open.
</span><span class="cx">
</span><span class="cx"> // Reset the EventSender for each test.
</span></span></pre>
</div>
</div>
</body>
</html>