Diff
Modified: tags/Safari-605.1.19/LayoutTests/ChangeLog (226428 => 226429)
--- tags/Safari-605.1.19/LayoutTests/ChangeLog 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/LayoutTests/ChangeLog 2018-01-05 00:18:19 UTC (rev 226429)
@@ -1,3 +1,28 @@
+2018-01-04 Jason Marcell <[email protected]>
+
+ Cherry-pick r226389. rdar://problem/36289544
+
+ 2018-01-03 John Wilander <[email protected]>
+
+ Storage Access API: Refactor XPC for access removal to go straight from the web process to the network process
+ https://bugs.webkit.org/show_bug.cgi?id=181270
+ <rdar://problem/36289544>
+
+ Reviewed by Alex Christensen.
+
+ This change refactors how the web process tells the network process
+ to remove storage access. Previously, this was done over the UI process
+ just like requests for storage access. But since no further reasoning
+ is needed, the message should go straight from the web process to the
+ network process for performance reasons and to minimize the risk of a
+ race.
+
+ As a consequence, the XPC code for storage access removal in the UI
+ process is deleted.
+
+ * platform/mac-wk2/TestExpectations:
+ Re-enables the test for this code path.
+
2018-01-03 Carlos Garcia Campos <[email protected]>
[GTK] Crash destroying WebCore::FileMonitor
Modified: tags/Safari-605.1.19/LayoutTests/platform/mac-wk2/TestExpectations (226428 => 226429)
--- tags/Safari-605.1.19/LayoutTests/platform/mac-wk2/TestExpectations 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/LayoutTests/platform/mac-wk2/TestExpectations 2018-01-05 00:18:19 UTC (rev 226429)
@@ -759,6 +759,7 @@
[ HighSierra+ ] http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe.html [ Pass ]
[ HighSierra+ ] http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-nested-iframe.html [ Pass ]
[ HighSierra+ ] http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-recent-user-interaction.html [ Pass ]
+[ HighSierra+ ] http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-and-try-access-from-right-frame.html [ Pass ]
[ HighSierra+ ] http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-but-try-access-from-wrong-frame.html [ Pass ]
[ HighSierra+ ] http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction.html [ Pass ]
[ HighSierra+ ] http/tests/storageAccess/request-storage-access-top-frame.html [ Pass ]
Modified: tags/Safari-605.1.19/Source/WebCore/ChangeLog (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebCore/ChangeLog 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebCore/ChangeLog 2018-01-05 00:18:19 UTC (rev 226429)
@@ -1,3 +1,34 @@
+2018-01-04 Jason Marcell <[email protected]>
+
+ Cherry-pick r226389. rdar://problem/36289544
+
+ 2018-01-03 John Wilander <[email protected]>
+
+ Storage Access API: Refactor XPC for access removal to go straight from the web process to the network process
+ https://bugs.webkit.org/show_bug.cgi?id=181270
+ <rdar://problem/36289544>
+
+ Reviewed by Alex Christensen.
+
+ No new tests. Existing test re-enabled.
+
+ This change refactors how the web process tells the network process
+ to remove storage access. Previously, this was done over the UI process
+ just like requests for storage access. But since no further reasoning
+ is needed, the message should go straight from the web process to the
+ network process for performance reasons and to minimize the risk of a
+ race.
+
+ As a consequence, the XPC code for storage access removal in the UI
+ process is deleted.
+
+ * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+ (WebCore::NetworkStorageSession::cookieStoragePartition const):
+ Removes the storageAccessAPIEnabled check since the flag
+ doesn't get propagated when the network process is created.
+ Figuring this out will take some work which is unnecessary
+ when we already gate access to the feature in Document.idl.
+
2018-01-03 Philippe Normand <[email protected]>
[GStreamer] The bus synchronous handler should be in the base player class
Modified: tags/Safari-605.1.19/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -196,7 +196,7 @@
if (firstPartyDomain == resourceDomain)
return emptyString();
- if (storageAccessAPIEnabled && frameID && pageID && isStorageAccessGranted(resourceDomain, firstPartyDomain, frameID.value(), pageID.value()))
+ if (frameID && pageID && isStorageAccessGranted(resourceDomain, firstPartyDomain, frameID.value(), pageID.value()))
return emptyString();
return firstPartyDomain;
Modified: tags/Safari-605.1.19/Source/WebKit/ChangeLog (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/ChangeLog 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/ChangeLog 2018-01-05 00:18:19 UTC (rev 226429)
@@ -1,3 +1,49 @@
+2018-01-04 Jason Marcell <[email protected]>
+
+ Cherry-pick r226389. rdar://problem/36289544
+
+ 2018-01-03 John Wilander <[email protected]>
+
+ Storage Access API: Refactor XPC for access removal to go straight from the web process to the network process
+ https://bugs.webkit.org/show_bug.cgi?id=181270
+ <rdar://problem/36289544>
+
+ Reviewed by Alex Christensen.
+
+ This change refactors how the web process tells the network process
+ to remove storage access. Previously, this was done over the UI process
+ just like requests for storage access. But since no further reasoning
+ is needed, the message should go straight from the web process to the
+ network process for performance reasons and to minimize the risk of a
+ race.
+
+ As a consequence, the XPC code for storage access removal in the UI
+ process is deleted.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::removeStorageAccess):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::removeStorageAccess): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::removeStorageAccess): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestStorageAccess):
+ (WebKit::WebPageProxy::removeStorageAccess): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::requestStorageAccess):
+ (WebKit::WebsiteDataStore::removeStorageAccess): Deleted.
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::detachedFromParent2):
+ (WebKit::WebFrameLoaderClient::dispatchWillChangeDocument):
+
2018-01-03 Carlos Garcia Campos <[email protected]>
Unreviewed. Really fix plugin process after r226327.
Modified: tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -471,4 +471,15 @@
NetworkProcess::singleton().addWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
}
+void NetworkConnectionToWebProcess::removeStorageAccess(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID)
+{
+#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+ storageSession(sessionID).removeStorageAccess(frameID, pageID);
+#else
+ UNUSED_PARAM(sessionID);
+ UNUSED_PARAM(frameID);
+ UNUSED_PARAM(pageID);
+#endif
+}
+
} // namespace WebKit
Modified: tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-01-05 00:18:19 UTC (rev 226429)
@@ -133,6 +133,8 @@
CacheStorageEngineConnection& cacheStorageConnection();
+ void removeStorageAccess(PAL::SessionID, uint64_t frameID, uint64_t pageID);
+
Ref<IPC::Connection> m_connection;
HashMap<uint64_t, RefPtr<NetworkSocketStream>> m_networkSocketStreams;
Modified: tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2018-01-05 00:18:19 UTC (rev 226429)
@@ -57,4 +57,6 @@
CreateSocketStream(WebCore::URL url, PAL::SessionID sessionID, String cachePartition, uint64_t identifier)
EnsureLegacyPrivateBrowsingSession()
+
+ RemoveStorageAccess(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID);
}
Modified: tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -360,14 +360,6 @@
parentProcessConnection()->send(Messages::NetworkProcessProxy::StorageAccessRequestResult(isStorageGranted, contextId), 0);
}
-void NetworkProcess::removeStorageAccess(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID)
-{
- if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
- networkStorageSession->removeStorageAccess(frameID, pageID);
- else
- ASSERT_NOT_REACHED();
-}
-
void NetworkProcess::removePrevalentDomains(PAL::SessionID sessionID, const Vector<String>& domains)
{
if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
Modified: tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-01-05 00:18:19 UTC (rev 226429)
@@ -140,7 +140,6 @@
void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, bool shouldClearFirst);
void hasStorageAccessForPrevalentDomains(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId);
void updateStorageAccessForPrevalentDomains(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, bool value, uint64_t contextId);
- void removeStorageAccess(PAL::SessionID, uint64_t frameID, uint64_t pageID);
void removePrevalentDomains(PAL::SessionID, const Vector<String>& domains);
#endif
Modified: tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2018-01-05 00:18:19 UTC (rev 226429)
@@ -85,7 +85,6 @@
UpdatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, Vector<String> domainsToPartition, Vector<String> domainsToBlock, Vector<String> domainsToNeitherPartitionNorBlock, bool shouldClearFirst)
HasStorageAccessForPrevalentDomains(PAL::SessionID sessionID, String resourceDomain, String firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId)
UpdateStorageAccessForPrevalentDomains(PAL::SessionID sessionID, String resourceDomain, String firstPartyDomain, uint64_t frameID, uint64_t pageID, bool shouldGrantAccess, uint64_t contextId)
- RemoveStorageAccess(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID);
RemovePrevalentDomains(PAL::SessionID sessionID, Vector<String> domainsWithInteraction);
#endif
}
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -424,11 +424,6 @@
send(Messages::NetworkProcess::UpdateStorageAccessForPrevalentDomains(sessionID, resourceDomain, firstPartyDomain, frameID, pageID, value, contextId), 0);
}
-void NetworkProcessProxy::removeStorageAccess(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID)
-{
- send(Messages::NetworkProcess::RemoveStorageAccess(sessionID, frameID, pageID), 0);
-}
-
void NetworkProcessProxy::storageAccessRequestResult(bool wasGranted, uint64_t contextId)
{
auto callback = m_storageAccessResponseCallbackMap.take(contextId);
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2018-01-05 00:18:19 UTC (rev 226429)
@@ -80,7 +80,6 @@
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
void hasStorageAccessForPrevalentDomains(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& callback);
void updateStorageAccessForPrevalentDomains(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, bool value, CompletionHandler<void(bool)>&& callback);
- void removeStorageAccess(PAL::SessionID, uint64_t frameID, uint64_t pageID);
#endif
void processReadyToSuspend();
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -7197,12 +7197,6 @@
m_process->send(Messages::WebPage::StorageAccessResponse(wasGranted, webProcessContextId), m_pageID);
});
}
-
-void WebPageProxy::removeStorageAccess(uint64_t frameID, uint64_t pageID)
-{
- ASSERT(pageID == m_pageID);
- m_websiteDataStore->removeStorageAccess(frameID, pageID);
-}
#endif
#if PLATFORM(COCOA)
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.h (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.h 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.h 2018-01-05 00:18:19 UTC (rev 226429)
@@ -1247,7 +1247,6 @@
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, uint64_t webProcessContextId);
void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, uint64_t webProcessContextId);
- void removeStorageAccess(uint64_t frameID, uint64_t pageID);
#endif
#if ENABLE(ATTACHMENT_ELEMENT)
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.messages.in (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-01-05 00:18:19 UTC (rev 226429)
@@ -505,7 +505,6 @@
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
HasStorageAccess(String subFrameHost, String topFrameHost, uint64_t frameID, uint64_t pageID, uint64_t contextID)
RequestStorageAccess(String subFrameHost, String topFrameHost, uint64_t frameID, uint64_t pageID, uint64_t contextID)
- RemoveStorageAccess(uint64_t frameID, uint64_t pageID)
#endif
#if ENABLE(ATTACHMENT_ELEMENT)
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -1213,12 +1213,6 @@
m_resourceLoadStatistics->requestStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, WTFMove(callback));
}
-
-void WebsiteDataStore::removeStorageAccess(uint64_t frameID, uint64_t pageID)
-{
- for (auto& processPool : processPools())
- processPool->networkProcess()->removeStorageAccess(m_sessionID, frameID, pageID);
-}
#endif
void WebsiteDataStore::networkProcessDidCrash()
Modified: tags/Safari-605.1.19/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2018-01-05 00:18:19 UTC (rev 226429)
@@ -123,7 +123,6 @@
void removePrevalentDomains(const Vector<String>& domains);
void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&& callback);
void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&& callback);
- void removeStorageAccess(uint64_t frameID, uint64_t pageID);
#endif
void networkProcessDidCrash();
void resolveDirectoriesIfNecessary();
Modified: tags/Safari-605.1.19/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (226428 => 226429)
--- tags/Safari-605.1.19/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-01-05 00:17:06 UTC (rev 226428)
+++ tags/Safari-605.1.19/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-01-05 00:18:19 UTC (rev 226429)
@@ -36,6 +36,8 @@
#include "InjectedBundleDOMWindowExtension.h"
#include "InjectedBundleNavigationAction.h"
#include "NavigationActionData.h"
+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
#include "PluginView.h"
#include "UserData.h"
#include "WKBundleAPICast.h"
@@ -168,7 +170,7 @@
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
if (m_hasFrameSpecificStorageAccess) {
- webPage->send(Messages::WebPageProxy::RemoveStorageAccess(frameID().value(), pageID().value()));
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveStorageAccess(sessionID(), frameID().value(), pageID().value()), 0);
m_hasFrameSpecificStorageAccess = false;
}
#endif
@@ -390,7 +392,7 @@
return;
if (m_hasFrameSpecificStorageAccess) {
- webPage->send(Messages::WebPageProxy::RemoveStorageAccess(frameID().value(), pageID().value()));
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveStorageAccess(sessionID(), frameID().value(), pageID().value()), 0);
m_hasFrameSpecificStorageAccess = false;
}
#endif
