[Curl] Add Timing-Allow-Origin checks for Curl port #5802
Conversation
|
EWS run on current version of this PR (hash 95d6949) |
| @@ -222,6 +226,8 @@ void NetworkDataTaskCurl::curlDidComplete(CurlRequest&, NetworkLoadMetrics&& net | |||
| return; | |||
| } | |||
|
|
|||
| updateNetworkLoadMetrics(networkLoadMetrics); | |||
There was a problem hiding this comment.
Cocoa port is calling checkTAO in willPerformHTTPRedirection and didReceiveResponse.
On the other hand, NetworkDataTaskCurl::updateNetworkLoadMetrics is called in curlDidComplete and curlDidReceiveResponse.
Is this right?
There was a problem hiding this comment.
This is right. Cocoa port store NetworkLoadMetrics in a member variable of the NetworkDataTaskCocoa class.
On the other hand, Curl port does not store it and a new object is spawned every time when called CurlHandle::getNetworkLoadMetrics.
The generated objects are then notified to curlDidReceiveResponse and curlDidComplete. Therefore, NetworkDataTaskCurl::updateNetworkLoadMetrics must be called in both curlDidReceiveResponse and curlDidComplete to update failsTAOCheck in NetworkLoadMetrics.
| FileSystem::PlatformFileHandle m_downloadDestinationFile { FileSystem::invalidPlatformFileHandle }; | ||
|
|
||
| bool m_blockingCookies { false }; | ||
|
|
||
| WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; | ||
| bool m_failsTAOCheck { false }; |
There was a problem hiding this comment.
I'm wondering why only curl port adds m_failsTAOCheck? Cocoa and Soup ports are using m_networkLoadMetrics.failsTAOCheck.
There was a problem hiding this comment.
The answer is similar to the previous question. Curl port does not store NetworkLoadMetrics like Cocoa and SOUP. Therefor, curl port adds m_failsTAOCheck to store results of failsTAOCheck.
https://bugs.webkit.org/show_bug.cgi?id=247048 Reviewed by Fujii Hironori. Add missing TAO checks to Curl backend. * LayoutTests/platform/wincairo/TestExpectations: * Source/WebCore/platform/network/curl/CurlResourceHandleDelegate.cpp: (WebCore::CurlResourceHandleDelegate::curlDidReceiveResponse): (WebCore::CurlResourceHandleDelegate::curlDidComplete): (WebCore::CurlResourceHandleDelegate::updateNetworkLoadMetrics): * Source/WebCore/platform/network/curl/CurlResourceHandleDelegate.h: * Source/WebKit/NetworkProcess/NetworkDataTask.cpp: (WebKit::NetworkDataTask::create): * Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp: (WebKit::NetworkDataTaskCurl::NetworkDataTaskCurl): (WebKit::NetworkDataTaskCurl::curlDidReceiveResponse): (WebKit::NetworkDataTaskCurl::curlDidComplete): (WebKit::NetworkDataTaskCurl::updateNetworkLoadMetrics): * Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h: Canonical link: https://commits.webkit.org/256044@main
webkit-commit-queue
force-pushed
the
eng/bug247048
branch
from
95d6949
to
3f6d008
Compare
|
Committed 256044@main (3f6d008): https://commits.webkit.org/256044@main Reviewed commits have been landed. Closing PR #5802 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
3f6d008
95d6949
🧪 api-mac