Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Issue 2102993002: Fix WebSocket to set first party for cookies (Closed)

Created:
4 years, 5 months ago by tyoshino (SeeGerritForStatus)
Modified:
4 years, 5 months ago
Reviewers:
Mike West, yhirano
CC:
blink-reviews, blink-reviews-api_chromium.org, cbentzel+watch_chromium.org, chromium-reviews, darin-cc_chromium.org, dglazkov+blink, haraken, jam, tyoshino+watch_chromium.org, yhirano+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix WebSocket to set first party for cookies BUG=618962 R=mkwst,yhirano Committed: https://crrev.com/8572d57f3e17612ce57406b6cbc15704b67901e9 Cr-Commit-Position: refs/heads/master@{#405057}

Patch Set 1 : a #

Total comments: 17

Patch Set 2 : a #

Patch Set 3 : Addressed #7 #

Patch Set 4 : Re-added renamed layout test files #

Patch Set 5 : Rebase #

Patch Set 6 : a #

Patch Set 7 : a #

Total comments: 2

Patch Set 8 : a #

Patch Set 9 : Added TODO for mkwst #

Total comments: 4

Patch Set 10 : Rebase #

Patch Set 11 : Fixed argument #

Patch Set 12 : Use promise_test. test case fixes #

Patch Set 13 : Rebase #

Patch Set 14 : Rebase #

Patch Set 15 : Fixed test expectation for cookie-ws-to-ws.html #

Patch Set 16 : Update testRunner calls to setBlockThirdPartyCookies() #

Unified diffs Side-by-side diffs Delta from patch set Stats (+529 lines, -192 lines) Patch
M content/browser/renderer_host/websocket_dispatcher_host_unittest.cc View 1 2 3 4 5 6 chunks +68 lines, -44 lines 0 comments Download
M content/browser/renderer_host/websocket_host.h View 1 2 3 4 2 chunks +4 lines, -5 lines 0 comments Download
M content/browser/renderer_host/websocket_host.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 4 chunks +20 lines, -16 lines 0 comments Download
M content/child/websocket_bridge.h View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M content/child/websocket_bridge.cc View 1 2 3 4 2 chunks +10 lines, -2 lines 0 comments Download
M content/common/websocket_messages.h View 1 2 3 4 2 chunks +11 lines, -6 lines 0 comments Download
M net/websockets/websocket_channel.h View 1 2 3 4 4 chunks +4 lines, -0 lines 0 comments Download
M net/websockets/websocket_channel.cc View 1 2 3 4 4 chunks +10 lines, -5 lines 0 comments Download
M net/websockets/websocket_channel_test.cc View 1 2 3 4 8 chunks +13 lines, -2 lines 0 comments Download
M net/websockets/websocket_end_to_end_test.cc View 1 2 3 4 1 chunk +2 lines, -1 line 0 comments Download
M net/websockets/websocket_stream.h View 1 2 3 4 2 chunks +2 lines, -0 lines 0 comments Download
M net/websockets/websocket_stream.cc View 1 2 3 4 5 chunks +11 lines, -4 lines 0 comments Download
M net/websockets/websocket_stream_cookie_test.cc View 1 2 3 4 6 chunks +8 lines, -3 lines 0 comments Download
M net/websockets/websocket_stream_create_test_base.h View 1 2 3 4 2 chunks +4 lines, -1 line 0 comments Download
M net/websockets/websocket_stream_create_test_base.cc View 1 2 3 4 2 chunks +5 lines, -4 lines 0 comments Download
M net/websockets/websocket_stream_test.cc View 1 2 3 4 5 6 7 8 9 51 chunks +102 lines, -79 lines 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +32 lines, -0 lines 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/resources/set-cookie.html View 1 2 3 1 chunk +31 lines, -0 lines 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/third-party-cookie-accepted.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +31 lines, -0 lines 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/third-party-cookie-blocked.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +28 lines, -0 lines 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/third-party-cookie-blocked-on-cross-origin-websocket.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +24 lines, -0 lines 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/third-party-cookie-blocked-on-same-origin-websocket.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +24 lines, -0 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/websocket/cookie-ws-to-ws.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/websocket/cookie-ws-to-ws-expected.txt View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/websocket/extensions.html View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
A third_party/WebKit/LayoutTests/http/tests/websocket/resources/cookie-test-util.js View 1 chunk +25 lines, -0 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/websocket/resources/get-request-header.js View 1 2 3 4 5 6 7 1 chunk +12 lines, -7 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/websocket/set-cookie_wsh.py View 1 2 3 4 5 6 7 8 9 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/cookie-ws-to-ws.js View 1 2 3 4 5 6 7 8 9 1 chunk +2 lines, -2 lines 0 comments Download
M third_party/WebKit/Source/core/dom/Document.cpp View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp View 1 2 3 4 2 chunks +2 lines, -3 lines 0 comments Download
M third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp View 1 2 3 4 4 chunks +32 lines, -4 lines 0 comments Download
M third_party/WebKit/public/platform/modules/websockets/WebSocketHandle.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 66 (28 generated)
tyoshino (SeeGerritForStatus)
mkwst: Please review Blink side code.
4 years, 5 months ago (2016-06-28 07:33:53 UTC) #6
Mike West
Blink code looks pretty good. A few notes inline. https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc File net/websockets/websocket_stream.cc (right): https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc#newcode105 net/websockets/websocket_stream.cc:105: ...
4 years, 5 months ago (2016-06-28 11:25:37 UTC) #7
tyoshino (SeeGerritForStatus)
Tests are not yet fixed. Publishing replies for impl comments. https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc File net/websockets/websocket_stream.cc (right): https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc#newcode105 ...
4 years, 5 months ago (2016-06-30 08:24:13 UTC) #8
tyoshino (SeeGerritForStatus)
https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc File net/websockets/websocket_stream.cc (right): https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc#newcode105 net/websockets/websocket_stream.cc:105: url_request_->set_first_party_for_cookies(first_party_for_cookies); On 2016/06/30 08:24:13, tyoshino wrote: > On 2016/06/28 ...
4 years, 5 months ago (2016-06-30 08:28:23 UTC) #9
tyoshino (SeeGerritForStatus)
https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc File net/websockets/websocket_stream.cc (right): https://codereview.chromium.org/2102993002/diff/60001/net/websockets/websocket_stream.cc#newcode361 net/websockets/websocket_stream.cc:361: socket_url, url_request_context, origin, GURL("http://example.com/"), On 2016/06/28 11:25:37, Mike West ...
4 years, 5 months ago (2016-07-04 08:13:42 UTC) #10
tyoshino (SeeGerritForStatus)
I've renamed the layout test files to be more descriptive and clear.
4 years, 5 months ago (2016-07-04 08:14:06 UTC) #11
tyoshino (SeeGerritForStatus)
+yhirano
4 years, 5 months ago (2016-07-04 08:17:02 UTC) #13
Mike West
On 2016/06/30 at 08:28:23, tyoshino wrote: > > OK. My understanding is that so far ...
4 years, 5 months ago (2016-07-04 08:23:41 UTC) #14
tyoshino (SeeGerritForStatus)
On 2016/07/04 08:23:41, Mike West wrote: > On 2016/06/30 at 08:28:23, tyoshino wrote: > > ...
4 years, 5 months ago (2016-07-04 08:52:26 UTC) #15
yhirano
Can you rebase the patch set?
4 years, 5 months ago (2016-07-04 09:48:10 UTC) #16
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/160001
4 years, 5 months ago (2016-07-04 15:02:36 UTC) #18
tyoshino (SeeGerritForStatus)
On 2016/07/04 09:48:10, yhirano wrote: > Can you rebase the patch set? Done
4 years, 5 months ago (2016-07-04 15:03:42 UTC) #19
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/249874)
4 years, 5 months ago (2016-07-04 16:30:17 UTC) #21
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/180001
4 years, 5 months ago (2016-07-05 07:42:10 UTC) #23
tyoshino (SeeGerritForStatus)
Fixed layout test failures. mkwst: http/tests/websocket/construct-in-detached-frame.html failed due to crash in Document::firstPartyForCookies(). I've changed it ...
4 years, 5 months ago (2016-07-05 07:43:48 UTC) #24
Mike West
Changes to Document LGTM % a nit if the bots are happy. https://codereview.chromium.org/2102993002/diff/180001/third_party/WebKit/Source/core/dom/Document.cpp File third_party/WebKit/Source/core/dom/Document.cpp ...
4 years, 5 months ago (2016-07-05 08:45:10 UTC) #25
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/250117)
4 years, 5 months ago (2016-07-05 09:10:38 UTC) #27
tyoshino (SeeGerritForStatus)
https://codereview.chromium.org/2102993002/diff/180001/third_party/WebKit/Source/core/dom/Document.cpp File third_party/WebKit/Source/core/dom/Document.cpp (right): https://codereview.chromium.org/2102993002/diff/180001/third_party/WebKit/Source/core/dom/Document.cpp#newcode4172 third_party/WebKit/Source/core/dom/Document.cpp:4172: } On 2016/07/05 08:45:10, Mike West wrote: > Nit: ...
4 years, 5 months ago (2016-07-05 14:41:27 UTC) #28
tyoshino (SeeGerritForStatus)
On 2016/07/05 08:45:10, Mike West wrote: > Changes to Document LGTM % a nit if ...
4 years, 5 months ago (2016-07-05 14:43:11 UTC) #29
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/220001
4 years, 5 months ago (2016-07-05 14:43:42 UTC) #31
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 5 months ago (2016-07-05 16:08:54 UTC) #33
tyoshino (SeeGerritForStatus)
On 2016/07/05 14:43:11, tyoshino wrote: > On 2016/07/05 08:45:10, Mike West wrote: > > Changes ...
4 years, 5 months ago (2016-07-06 04:37:45 UTC) #34
yhirano
can we have tests in net_unittests? https://codereview.chromium.org/2102993002/diff/220001/third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html File third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html (right): https://codereview.chromium.org/2102993002/diff/220001/third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html#newcode14 third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html:14: async_test(t => { ...
4 years, 5 months ago (2016-07-06 11:19:08 UTC) #36
tyoshino (SeeGerritForStatus)
On 2016/07/06 11:19:08, yhirano wrote: > can we have tests in net_unittests? WebSocketChannel::SendAddChannelRequestWithSuppliedCreator() is tested. ...
4 years, 5 months ago (2016-07-07 07:00:36 UTC) #37
tyoshino (SeeGerritForStatus)
https://codereview.chromium.org/2102993002/diff/220001/third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html File third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html (right): https://codereview.chromium.org/2102993002/diff/220001/third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html#newcode14 third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/first-party-cookie-accepted.html:14: async_test(t => { On 2016/07/06 11:19:08, yhirano wrote: > ...
4 years, 5 months ago (2016-07-07 07:00:45 UTC) #38
yhirano
lgtm
4 years, 5 months ago (2016-07-07 10:40:52 UTC) #39
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/300001
4 years, 5 months ago (2016-07-08 08:13:08 UTC) #42
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/252028)
4 years, 5 months ago (2016-07-08 10:03:36 UTC) #44
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/340001
4 years, 5 months ago (2016-07-12 07:12:49 UTC) #47
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/260819)
4 years, 5 months ago (2016-07-12 08:44:56 UTC) #49
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/340001
4 years, 5 months ago (2016-07-12 09:04:41 UTC) #51
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/253929)
4 years, 5 months ago (2016-07-12 10:14:20 UTC) #53
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/360001
4 years, 5 months ago (2016-07-12 10:21:51 UTC) #57
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_asan_rel_ng/builds/191231)
4 years, 5 months ago (2016-07-12 14:25:56 UTC) #59
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2102993002/360001
4 years, 5 months ago (2016-07-13 05:05:08 UTC) #61
commit-bot: I haz the power
Committed patchset #16 (id:360001)
4 years, 5 months ago (2016-07-13 06:30:05 UTC) #63
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-07-13 06:30:09 UTC) #64
commit-bot: I haz the power
4 years, 5 months ago (2016-07-13 06:31:20 UTC) #66
Message was sent while issue was closed.
Patchset 16 (id:??) landed as
https://crrev.com/8572d57f3e17612ce57406b6cbc15704b67901e9
Cr-Commit-Position: refs/heads/master@{#405057}

Powered by Google App Engine
This is Rietveld 408576698