Changeset 260511 in webkit

Timestamp:

Apr 22, 2020 8:37:29 AM (4 years ago)

Author:

Chris Dumez

Message:

Unreviewed, reverting r259116.

Broke login flow on some apple-internal sites
(rdar://problem/61905262)

Reverted changeset:

"Move applyUserAgentIfNeeded calls to a more central place"
​https://bugs.webkit.org/show_bug.cgi?id=209587
​https://trac.webkit.org/changeset/259116

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/appcache/ApplicationCacheGroup.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)
• loader/cache/CachedResourceLoader.h (modified) (1 diff)
• loader/cache/CachedResourceRequest.cpp (modified) (3 diffs)
• loader/cache/CachedResourceRequest.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-22  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, reverting r259116.
+
+        Broke login flow on some apple-internal sites
+        (rdar://problem/61905262)
+
+        Reverted changeset:
+
+        "Move applyUserAgentIfNeeded calls to a more central place"
+        https://bugs.webkit.org/show_bug.cgi?id=209587
+        https://trac.webkit.org/changeset/259116
+
 2020-04-22  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2963 +2963 @@
         request.setPriority(m_overrideResourceLoadPriorityForTesting.value());
 
+    applyUserAgentIfNeeded(request);
+
     // Only set fallback array if it's still empty (later attempts may be incorrect, see bug 117818).
     if (request.responseContentDispositionEncodingFallbackArray().isEmpty()) {

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -464 +464 @@
 {
     ResourceRequest request { WTFMove(url) };
+    m_frame->loader().applyUserAgentIfNeeded(request);
     request.setHTTPHeaderField(HTTPHeaderName::CacheControl, HTTPHeaderValues::maxAge0());
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -735 +735 @@
 }
 
-void CachedResourceLoader::updateHTTPRequestHeaders(FrameLoader& frameLoader, CachedResource::Type type, CachedResourceRequest& request)
+void CachedResourceLoader::updateHTTPRequestHeaders(CachedResource::Type type, CachedResourceRequest& request)
 {
     // Implementing steps 7 to 12 of https://fetch.spec.whatwg.org/#http-network-or-cache-fetch
 
     // FIXME: We should reconcile handling of MainResource with other resources.
-    if (type != CachedResource::Type::MainResource)
-        request.updateReferrerAndOriginHeaders(frameLoader);
-    request.updateUserAgentHeader(frameLoader);
+    if (type != CachedResource::Type::MainResource) {
+        // In some cases we may try to load resources in frameless documents. Such loads always fail.
+        // FIXME: We shouldn't need to do the check on frame.
+        if (auto* frame = this->frame())
+            request.updateReferrerOriginAndUserAgentHeaders(frame->loader());
+    }
 
     request.updateAccordingCacheMode();
@@ -907 +910 @@
 
     if (request.resourceRequest().url().protocolIsInHTTPFamily())
-        updateHTTPRequestHeaders(frame.loader(), type, request);
+        updateHTTPRequestHeaders(type, request);
 
     auto& memoryCache = MemoryCache::singleton();

trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

@@ -176 +176 @@
 
     void prepareFetch(CachedResource::Type, CachedResourceRequest&);
-    void updateHTTPRequestHeaders(FrameLoader&, CachedResource::Type, CachedResourceRequest&);
+    void updateHTTPRequestHeaders(CachedResource::Type, CachedResourceRequest&);
 
     bool canRequest(CachedResource::Type, const URL&, const CachedResourceRequest&, ForPreload);

trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp

@@ -222 +222 @@
 }
 
-void CachedResourceRequest::updateReferrerAndOriginHeaders(FrameLoader& frameLoader)
+void CachedResourceRequest::updateReferrerOriginAndUserAgentHeaders(FrameLoader& frameLoader)
 {
     // Implementing step 9 to 11 of https://fetch.spec.whatwg.org/#http-network-or-cache-fetch as of 16 March 2018
@@ -229 +229 @@
         outgoingReferrer = m_resourceRequest.httpReferrer();
     updateRequestReferrer(m_resourceRequest, m_options.referrerPolicy, outgoingReferrer);
+    frameLoader.applyUserAgentIfNeeded(m_resourceRequest);
 
     if (doesRequestNeedHTTPOriginHeader(m_resourceRequest)) {
@@ -237 +238 @@
 }
 
-void CachedResourceRequest::updateUserAgentHeader(FrameLoader& frameLoader)
-{
-    frameLoader.applyUserAgentIfNeeded(m_resourceRequest);
-}
-
 bool isRequestCrossOrigin(SecurityOrigin* origin, const URL& requestURL, const ResourceLoaderOptions& options)
 {

trunk/Source/WebCore/loader/cache/CachedResourceRequest.h

@@ -79 +79 @@
 
     void updateReferrerPolicy(ReferrerPolicy);
-    void updateReferrerAndOriginHeaders(FrameLoader&);
-    void updateUserAgentHeader(FrameLoader&);
+    void updateReferrerOriginAndUserAgentHeaders(FrameLoader&);
     void upgradeInsecureRequestIfNeeded(Document&);
     void setAcceptHeaderIfNone(CachedResource::Type);