Diff
Modified: trunk/Source/WebKit2/ChangeLog (195542 => 195543)
--- trunk/Source/WebKit2/ChangeLog 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-25 18:41:27 UTC (rev 195543)
@@ -1,3 +1,29 @@
+2016-01-25 Daniel Bates <[email protected]>
+
+ WebKitTestRunner: Credential cache is not cleared between tests
+ https://bugs.webkit.org/show_bug.cgi?id=153407
+ <rdar://problem/24280834>
+
+ Reviewed by Brady Eidson.
+
+ Add SPI to call NetworkStorageSession::switchToNewTestingSession() to create a new testing session.
+ The new testing session will have an empty credential cache.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::switchToNewTestingSession): Added.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in: Added message SwitchToNewTestingSession().
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextResetTestingNetworkSession): Added.
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::resetTestingNetworkSession): Added.
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::switchToNewTestingSession): Added.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in: Added message SwitchToNewTestingSession().
+
2016-01-22 Ryosuke Niwa <[email protected]>
document.createElement should be able to create a custom element
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (195542 => 195543)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-01-25 18:41:27 UTC (rev 195543)
@@ -255,6 +255,11 @@
#endif
}
+void NetworkProcess::switchToNewTestingSession()
+{
+ NetworkStorageSession::switchToNewTestingSession();
+}
+
void NetworkProcess::ensurePrivateBrowsingSession(SessionID sessionID)
{
RemoteNetworkingContext::ensurePrivateBrowsingSession(sessionID);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (195542 => 195543)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-01-25 18:41:27 UTC (rev 195543)
@@ -146,6 +146,8 @@
void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
+ void switchToNewTestingSession();
+
// FIXME: This should take a session ID so we can identify which disk cache to delete.
void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (195542 => 195543)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-01-25 18:41:27 UTC (rev 195543)
@@ -32,6 +32,8 @@
UserPreferredLanguagesChanged(Vector<String> languages)
#endif
+ SwitchToNewTestingSession()
+
EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (195542 => 195543)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-01-25 18:41:27 UTC (rev 195543)
@@ -538,6 +538,11 @@
toImpl(context)->useTestingNetworkSession();
}
+void WKContextResetTestingNetworkSession(WKContextRef context)
+{
+ toImpl(context)->resetTestingNetworkSession();
+}
+
WKDictionaryRef WKContextCopyPlugInAutoStartOriginHashes(WKContextRef contextRef)
{
return toAPI(toImpl(contextRef)->plugInAutoStartOriginHashes().leakRef());
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (195542 => 195543)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2016-01-25 18:41:27 UTC (rev 195543)
@@ -82,6 +82,9 @@
// Test only. Should be called before any secondary processes are started.
WK_EXPORT void WKContextUseTestingNetworkSession(WKContextRef context);
+// Test only. Should be called before running a test.
+WK_EXPORT void WKContextResetTestingNetworkSession(WKContextRef context);
+
typedef void (*WKContextInvalidMessageFunction)(WKStringRef messageName);
WK_EXPORT void WKContextSetInvalidMessageFunction(WKContextInvalidMessageFunction invalidMessageFunction);
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (195542 => 195543)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-01-25 18:41:27 UTC (rev 195543)
@@ -1073,6 +1073,18 @@
m_shouldUseTestingNetworkSession = true;
}
+void WebProcessPool::resetTestingNetworkSession()
+{
+ ASSERT(!m_processes.isEmpty());
+ ASSERT(m_networkProcess);
+
+ if (!m_shouldUseTestingNetworkSession || !m_networkProcess || m_processes.isEmpty())
+ return;
+
+ sendToAllProcesses(Messages::WebProcess::SwitchToNewTestingSession());
+ m_networkProcess->send(Messages::NetworkProcess::SwitchToNewTestingSession(), 0);
+}
+
void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
{
if (m_networkProcess)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (195542 => 195543)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-01-25 18:41:27 UTC (rev 195543)
@@ -239,6 +239,7 @@
void setCookieStorageDirectory(const String& dir) { m_overrideCookieStorageDirectory = dir; }
void useTestingNetworkSession();
+ void resetTestingNetworkSession();
bool isUsingTestingNetworkSession() const { return m_shouldUseTestingNetworkSession; }
void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (195542 => 195543)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-01-25 18:41:27 UTC (rev 195543)
@@ -498,6 +498,11 @@
}
}
+void WebProcess::switchToNewTestingSession()
+{
+ NetworkStorageSession::switchToNewTestingSession();
+}
+
WebPage* WebProcess::focusedWebPage() const
{
for (auto& page : m_pageMap.values()) {
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (195542 => 195543)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-01-25 18:41:27 UTC (rev 195543)
@@ -210,6 +210,8 @@
void initializeWebProcess(WebProcessCreationParameters&&);
void platformInitializeWebProcess(WebProcessCreationParameters&&);
+ void switchToNewTestingSession();
+
void platformTerminate();
void registerURLSchemeAsEmptyDocument(const String&);
void registerURLSchemeAsSecure(const String&) const;
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (195542 => 195543)
--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-01-25 18:41:27 UTC (rev 195543)
@@ -45,6 +45,8 @@
UserPreferredLanguagesChanged(Vector<String> languages)
FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
+ SwitchToNewTestingSession()
+
// Legacy private browsing session is per process. Individual pages or page groups may use the private session or the default one as appropriate.
EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
Modified: trunk/Tools/ChangeLog (195542 => 195543)
--- trunk/Tools/ChangeLog 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Tools/ChangeLog 2016-01-25 18:41:27 UTC (rev 195543)
@@ -1,3 +1,15 @@
+2016-01-25 Daniel Bates <[email protected]>
+
+ WebKitTestRunner: Credential cache is not cleared between tests
+ https://bugs.webkit.org/show_bug.cgi?id=153407
+ <rdar://problem/24280834>
+
+ Reviewed by Brady Eidson.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues): Reset testing network session
+ to clear cached credentials.
+
2016-01-24 Dan Bernstein <[email protected]>
Added project.xcworkspace and xcuserdata to this project’s svn:ignore.
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (195542 => 195543)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-01-25 18:38:41 UTC (rev 195542)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-01-25 18:41:27 UTC (rev 195543)
@@ -714,6 +714,8 @@
WKContextSetCacheModel(TestController::singleton().context(), kWKCacheModelDocumentBrowser);
+ WKContextResetTestingNetworkSession(TestController::singleton().context());
+
// FIXME: This function should also ensure that there is only one page open.
// Reset the EventSender for each test.
