Changeset 249135 in webkit

Timestamp:

Aug 27, 2019, 1:42:06 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Origin header not included in WebSocket handshake request when using platform WebSocket API
​https://bugs.webkit.org/show_bug.cgi?id=200535

Reviewed by Youenn Fablet.

Source/WebCore:

Add Origin HTTP header to the WebSocket handshake request.

• Modules/websockets/ThreadableWebSocketChannel.cpp:

(WebCore::ThreadableWebSocketChannel::webSocketConnectRequest):

LayoutTests:

Rebaseline tests that are passing now for GTK and WPE.

• platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-expected.txt: Added.
• platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt:
• platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt:
• platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-expected.txt: Added.
• platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt:
• platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-expected.txt (added)
• LayoutTests/platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt (modified) (1 diff)
• LayoutTests/platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt (modified) (1 diff)
• LayoutTests/platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-expected.txt (added)
• LayoutTests/platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt (modified) (1 diff)
• LayoutTests/platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Origin header not included in WebSocket handshake request when using platform WebSocket API
+        https://bugs.webkit.org/show_bug.cgi?id=200535
+
+        Reviewed by Youenn Fablet.
+
+        Rebaseline tests that are passing now for GTK and WPE.
+
+        * platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-expected.txt: Added.
+        * platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt:
+        * platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt:
+        * platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-expected.txt: Added.
+        * platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt:
+        * platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt:
+
 2019-08-26  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt

@@ -1 +1 @@
 
-FAIL origin set in a Worker assert_unreached: Reached unreachable code
+PASS origin set in a Worker 
 

trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt

@@ -1 +1 @@
 
-Harness Error (TIMEOUT), message = null
+PASS WebSockets: proper first line 
 
-TIMEOUT WebSockets: proper first line Test timed out
-

trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker-expected.txt

@@ -1 +1 @@
 
-FAIL origin set in a Worker assert_unreached: Reached unreachable code
+PASS origin set in a Worker 
 

trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/websockets/opening-handshake/005-expected.txt

@@ -1 +1 @@
 
-Harness Error (TIMEOUT), message = null
+PASS WebSockets: proper first line 
 
-TIMEOUT WebSockets: proper first line Test timed out
-

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Origin header not included in WebSocket handshake request when using platform WebSocket API
+        https://bugs.webkit.org/show_bug.cgi?id=200535
+
+        Reviewed by Youenn Fablet.
+
+        Add Origin HTTP header to the WebSocket handshake request.
+
+        * Modules/websockets/ThreadableWebSocketChannel.cpp:
+        (WebCore::ThreadableWebSocketChannel::webSocketConnectRequest):
+
 2019-08-27  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp

@@ -111 +111 @@
     request.setDomainForCachePartition(document.domainForCachePartition());
     request.setAllowCookies(validatedURL->areCookiesAllowed);
+    request.setHTTPHeaderField(HTTPHeaderName::Origin, document.securityOrigin().toString());
 
     // Add no-cache headers to avoid compatibility issue.