Title: [294592] trunk/Source/WebKit
- Revision
- 294592
- Author
- commit-qu...@webkit.org
- Date
- 2022-05-20 17:02:11 -0700 (Fri, 20 May 2022)
Log Message
Unreviewed, reverting r294371.
https://bugs.webkit.org/show_bug.cgi?id=240740
Introduced page load regression
Reverted changeset:
"Private relay should fail closed for third party loads if the main resource was loaded over private relay"
https://bugs.webkit.org/show_bug.cgi?id=240483
https://commits.webkit.org/r294371
Canonical link: https://commits.webkit.org/250825@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp (294591 => 294592)
--- trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2022-05-20 23:42:42 UTC (rev 294591)
+++ trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2022-05-21 00:02:11 UTC (rev 294592)
@@ -75,8 +75,6 @@
m_loadInformation = NetworkTransactionInformation { NetworkTransactionInformation::Type::Preflight, loadParameters.request, { }, { } };
loadParameters.webPageProxyID = m_parameters.webPageProxyID;
- loadParameters.topOrigin = m_parameters.topOrigin;
- loadParameters.sourceOrigin = m_parameters.sourceOrigin.ptr();
if (auto* networkSession = m_networkProcess->networkSession(m_parameters.sessionID)) {
m_task = NetworkDataTask::create(*networkSession, *this, WTFMove(loadParameters));
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (294591 => 294592)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2022-05-20 23:42:42 UTC (rev 294591)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2022-05-21 00:02:11 UTC (rev 294592)
@@ -67,7 +67,6 @@
parameters.contentSniffingPolicy = ContentSniffingPolicy::DoNotSniffContent;
parameters.contentEncodingSniffingPolicy = ContentEncodingSniffingPolicy::Sniff;
parameters.request = m_originalRequest;
- parameters.topOrigin = SecurityOrigin::create(m_originalRequest.firstPartyForCookies());
parameters.isNavigatingToAppBoundDomain = isNavigatingToAppBoundDomain;
m_networkLoad = makeUnique<NetworkLoad>(*this, nullptr, WTFMove(parameters), *networkSession);
m_networkLoad->startWithScheduling();
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (294591 => 294592)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-05-20 23:42:42 UTC (rev 294591)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-05-21 00:02:11 UTC (rev 294592)
@@ -340,14 +340,6 @@
RetainPtr<NSURLRequest> nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
- if (parameters.isMainFrameNavigation
- || parameters.hadMainFrameMainResourcePrivateRelayed
- || !parameters.topOrigin
- || request.url().host() == parameters.topOrigin->host()) {
- if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
- [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
- }
-
#if ENABLE(APP_PRIVACY_REPORT)
mutableRequest.get().attribution = request.isAppInitiated() ? NSURLRequestAttributionDeveloper : NSURLRequestAttributionUser;
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (294591 => 294592)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-05-20 23:42:42 UTC (rev 294591)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-05-21 00:02:11 UTC (rev 294592)
@@ -936,9 +936,7 @@
NSURLSessionTaskTransactionMetrics *metrics = taskMetrics.transactionMetrics.lastObject;
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
- auto privateRelayed = metrics._privacyStance == nw_connection_privacy_stance_direct
- || metrics._privacyStance == nw_connection_privacy_stance_not_eligible
- ? PrivateRelayed::No : PrivateRelayed::Yes;
+ auto privateRelayed = metrics._privacyStance == nw_connection_privacy_stance_direct ? PrivateRelayed::No : PrivateRelayed::Yes;
#else
auto privateRelayed = PrivateRelayed::No;
#endif
@@ -1714,17 +1712,6 @@
appPrivacyReportTestingData().didLoadAppInitiatedRequest(nsRequest.get().attribution == NSURLRequestAttributionDeveloper);
#endif
- // FIXME: This function can make up to 3 copies of a request.
- // Reduce that to one if the protocol is null, the request isn't app initiated,
- // or the main frame main resource was private relayed, then set all properties
- // on the one copy.
- if (hadMainFrameMainResourcePrivateRelayed || request.url().host() == clientOrigin.topOrigin.host) {
- RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
- if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
- [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
- nsRequest = WTFMove(mutableRequest);
- }
-
auto& sessionSet = sessionSetForPage(webPageProxyID);
RetainPtr<NSURLSessionWebSocketTask> task = [sessionSet.sessionWithCredentialStorage.session webSocketTaskWithRequest:nsRequest.get()];
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (294591 => 294592)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2022-05-20 23:42:42 UTC (rev 294591)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2022-05-21 00:02:11 UTC (rev 294592)
@@ -830,8 +830,6 @@
return;
}
- NetworkResourceLoadParameters parameters;
-
if (auto* document = webPage.mainFrame()->document()) {
if (shouldPreconnectAsFirstParty == ShouldPreconnectAsFirstParty::Yes)
request.setFirstPartyForCookies(request.url());
@@ -839,10 +837,9 @@
request.setFirstPartyForCookies(document->firstPartyForCookies());
if (auto* loader = document->loader())
request.setIsAppInitiated(loader->lastNavigationWasAppInitiated());
- parameters.topOrigin = &document->topOrigin();
- parameters.sourceOrigin = &document->securityOrigin();
}
+ NetworkResourceLoadParameters parameters;
parameters.request = WTFMove(request);
if (parameters.request.httpUserAgent().isEmpty()) {
// FIXME: we add user-agent to the preconnect request because otherwise the preconnect
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
