Changeset 246143 in webkit

Timestamp:

Jun 5, 2019 8:55:13 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Report all request headers to web inspector.
​https://bugs.webkit.org/show_bug.cgi?id=191653

Patch by Takashi Komori <​Takashi.Komori@sony.com> on 2019-06-05
Reviewed by Fujii Hironori.

Source/WebCore:

Test: http/tests/inspector/network/resource-request-headers.html

• platform/network/curl/CurlContext.cpp:

(WebCore::CurlHandle::setDebugCallbackFunction):

• platform/network/curl/CurlContext.h:
• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::setupTransfer):
(WebCore::CurlRequest::didReceiveDebugInfo):
(WebCore::CurlRequest::updateNetworkLoadMetrics):
(WebCore::CurlRequest::didReceiveDebugInfoCallback):

• platform/network/curl/CurlRequest.h:

LayoutTests:

• platform/wincairo/TestExpectations:
• platform/wincairo/http/tests/inspector/network/resource-request-headers-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wincairo/TestExpectations (modified) (1 diff)
• LayoutTests/platform/wincairo/http/tests/inspector (added)
• LayoutTests/platform/wincairo/http/tests/inspector/network (added)
• LayoutTests/platform/wincairo/http/tests/inspector/network/resource-request-headers-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/curl/CurlContext.cpp (modified) (1 diff)
• Source/WebCore/platform/network/curl/CurlContext.h (modified) (1 diff)
• Source/WebCore/platform/network/curl/CurlRequest.cpp (modified) (4 diffs)
• Source/WebCore/platform/network/curl/CurlRequest.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-05  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] Report all request headers to web inspector.
+        https://bugs.webkit.org/show_bug.cgi?id=191653
+
+        Reviewed by Fujii Hironori.
+
+        * platform/wincairo/TestExpectations:
+        * platform/wincairo/http/tests/inspector/network/resource-request-headers-expected.txt: Added.
+
 2019-06-05  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/platform/wincairo/TestExpectations

@@ -892 +892 @@
 http/tests/images [ Skip ]
 http/tests/incremental [ Skip ]
+
 http/tests/inspector [ Skip ]
+http/tests/inspector/network/resource-request-headers.html [ Pass ]
+
 http/tests/loading [ Skip ]
 http/tests/local/blob [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-05  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] Report all request headers to web inspector.
+        https://bugs.webkit.org/show_bug.cgi?id=191653
+
+        Reviewed by Fujii Hironori.
+
+        Test: http/tests/inspector/network/resource-request-headers.html
+
+        * platform/network/curl/CurlContext.cpp:
+        (WebCore::CurlHandle::setDebugCallbackFunction):
+        * platform/network/curl/CurlContext.h:
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::setupTransfer):
+        (WebCore::CurlRequest::didReceiveDebugInfo):
+        (WebCore::CurlRequest::updateNetworkLoadMetrics):
+        (WebCore::CurlRequest::didReceiveDebugInfoCallback):
+        * platform/network/curl/CurlRequest.h:
+
 2019-06-05  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CurlContext.cpp

@@ -639 +639 @@
 }
 
+void CurlHandle::setDebugCallbackFunction(curl_debug_callback callbackFunc, void* userData)
+{
+    curl_easy_setopt(m_handle, CURLOPT_DEBUGFUNCTION, callbackFunc);
+    curl_easy_setopt(m_handle, CURLOPT_DEBUGDATA, userData);
+    curl_easy_setopt(m_handle, CURLOPT_VERBOSE, 1L);
+}
+
 void CurlHandle::enableConnectionOnly()
 {

trunk/Source/WebCore/platform/network/curl/CurlContext.h

@@ -274 +274 @@
     void setReadCallbackFunction(curl_read_callback, void*);
     void setSslCtxCallbackFunction(curl_ssl_ctx_callback, void*);
+    void setDebugCallbackFunction(curl_debug_callback, void*);
 
     // Status

trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp

@@ -235 +235 @@
     m_curlHandle->setWriteCallbackFunction(didReceiveDataCallback, this);
 
+    if (m_captureExtraMetrics)
+        m_curlHandle->setDebugCallbackFunction(didReceiveDebugInfoCallback, this);
+
     m_curlHandle->setTimeout(timeoutInterval());
 
@@ -490 +493 @@
     m_multipartHandle = nullptr;
     m_curlHandle = nullptr;
+}
+
+int CurlRequest::didReceiveDebugInfo(curl_infotype type, char* data, size_t size)
+{
+    if (!data)
+        return 0;
+
+    if (type == CURLINFO_HEADER_OUT) {
+        String requestHeader(data, size);
+        auto headerFields = requestHeader.split("\r\n");
+        // Remove the request line
+        if (headerFields.size())
+            headerFields.remove(0);
+
+        for (auto& header : headerFields) {
+            auto pos = header.find(":");
+            if (pos != notFound) {
+                auto key = header.left(pos).stripWhiteSpace();
+                auto value = header.substring(pos + 1).stripWhiteSpace();
+                m_requestHeaders.add(key, value);
+            }
+        }
+    }
+
+    return 0;
 }
 
@@ -697 +725 @@
         if (m_captureExtraMetrics) {
             m_curlHandle->addExtraNetworkLoadMetrics(m_networkLoadMetrics);
-            m_networkLoadMetrics.requestHeaders = m_request.httpHeaderFields();
+            m_networkLoadMetrics.requestHeaders = m_requestHeaders;
             m_networkLoadMetrics.responseBodyDecodedSize = m_totalReceivedSize;
         }
@@ -767 +795 @@
 }
 
+int CurlRequest::didReceiveDebugInfoCallback(CURL*, curl_infotype type, char* data, size_t size, void* userData)
+{
+    return static_cast<CurlRequest*>(userData)->didReceiveDebugInfo(type, data, size);
+}
+
 }
 

trunk/Source/WebCore/platform/network/curl/CurlRequest.h

@@ -135 +135 @@
     void invokeCancel();
 
+    int didReceiveDebugInfo(curl_infotype, char*, size_t);
+
     // For setup 
     void appendAcceptLanguageHeader(HTTPHeaderMap&);
@@ -164 +166 @@
     static size_t didReceiveHeaderCallback(char*, size_t, size_t, void*);
     static size_t didReceiveDataCallback(char*, size_t, size_t, void*);
+    static int didReceiveDebugInfoCallback(CURL*, curl_infotype, char*, size_t, void*);
 
 
@@ -212 +215 @@
     bool m_captureExtraMetrics;
     NetworkLoadMetrics m_networkLoadMetrics;
+    HTTPHeaderMap m_requestHeaders;
     MonotonicTime m_requestStartTime { MonotonicTime::nan() };
     MonotonicTime m_performStartTime;