Changeset 267693 in webkit

Timestamp:

Sep 28, 2020, 1:18:13 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r267620 - [SOUP] Slack.com is not working, new messages do not load due to WebSocket authentication failure issue
​https://bugs.webkit.org/show_bug.cgi?id=149551

Reviewed by Michael Catanzaro.

The problem is that we are not including all the cookies in the web socket request. There are two cookies with
the Lax same-site policy set, that are not included for the websocket request.

• Modules/websockets/ThreadableWebSocketChannel.cpp:

(WebCore::ThreadableWebSocketChannel::webSocketConnectRequest): Add same site information to WebSocket requests.

Location:

releases/WebKitGTK/webkit-2.30/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/websockets/ThreadableWebSocketChannel.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Slack.com is not working, new messages do not load due to WebSocket authentication failure issue
+        https://bugs.webkit.org/show_bug.cgi?id=149551
+
+        Reviewed by Michael Catanzaro.
+
+        The problem is that we are not including all the cookies in the web socket request. There are two cookies with
+        the Lax same-site policy set, that are not included for the websocket request.
+
+        * Modules/websockets/ThreadableWebSocketChannel.cpp:
+        (WebCore::ThreadableWebSocketChannel::webSocketConnectRequest): Add same site information to WebSocket requests.
+
 2020-09-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp

@@ -34 +34 @@
 #include "ContentRuleListResults.h"
 #include "Document.h"
+#include "FrameLoader.h"
 #include "HTTPHeaderValues.h"
 #include "Page.h"
@@ -116 +117 @@
     request.setFirstPartyForCookies(document.firstPartyForCookies());
     request.setHTTPHeaderField(HTTPHeaderName::Origin, document.securityOrigin().toString());
+    FrameLoader::addSameSiteInfoToRequestIfNeeded(request, &document);
 
     // Add no-cache headers to avoid compatibility issue.