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

Issue 304093003: Support recovery from SSL errors for new WebSocket implementation (Closed)

Created:
6 years, 6 months ago by Adam Rice
Modified:
6 years, 6 months ago
CC:
chromium-reviews, darin-cc_chromium.org, cbentzel+watch_chromium.org, jam
Base URL:
http://git.chromium.org/chromium/src.git@master-for-pool-throttling
Visibility:
Public.

Description

Support recovery from SSL errors. Previously, the new WebSocket implementation was unable to handle sites with self-signed certificates and other cases where the user had overridden certificate errors. Add code to support this case. This requires adding infrastructure to pass the SSL error back up to the content layer which knows how to handle it. It also requires that the ID of the frame be known, so an extra parameter has been added to the WebSocketHostMsg_AddChannelRequest IPC message. BUG=364361 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275066

Patch Set 1 #

Patch Set 2 : Chromium style fixes. #

Patch Set 3 : Add missing log messages. #

Patch Set 4 : Add tests for WebSocketDispatcherHost and WebSocketChannel #

Patch Set 5 : Add SSL tests. #

Patch Set 6 : Rebase. #

Patch Set 7 : Fix the SelfSignedCertificateSuccess test. #

Patch Set 8 : Use the real render frame ID. #

Patch Set 9 : clang compile fix. Also lint & format cleanups. #

Total comments: 2

Patch Set 10 : Add DCHECKs to websocket_host.cc #

Total comments: 8

Patch Set 11 : Fixes from tyoshino review. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+430 lines, -47 lines) Patch
M content/browser/renderer_host/websocket_dispatcher_host.h View 1 chunk +2 lines, -0 lines 0 comments Download
M content/browser/renderer_host/websocket_dispatcher_host_unittest.cc View 1 2 3 4 chunks +12 lines, -3 lines 0 comments Download
M content/browser/renderer_host/websocket_host.h View 2 chunks +9 lines, -2 lines 0 comments Download
M content/browser/renderer_host/websocket_host.cc View 1 2 3 4 5 6 7 8 9 8 chunks +107 lines, -12 lines 0 comments Download
M content/child/websocket_bridge.cc View 1 2 3 4 5 6 7 1 chunk +2 lines, -5 lines 0 comments Download
M content/common/websocket_messages.h View 1 chunk +3 lines, -2 lines 0 comments Download
M net/websockets/websocket_channel.h View 1 chunk +9 lines, -0 lines 0 comments Download
M net/websockets/websocket_channel.cc View 2 chunks +17 lines, -0 lines 0 comments Download
M net/websockets/websocket_channel_test.cc View 1 2 3 8 chunks +55 lines, -1 line 0 comments Download
M net/websockets/websocket_event_interface.h View 2 chunks +29 lines, -0 lines 0 comments Download
M net/websockets/websocket_handshake_stream_create_helper_test.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M net/websockets/websocket_stream.h View 1 2 3 2 chunks +10 lines, -0 lines 0 comments Download
M net/websockets/websocket_stream.cc View 1 2 3 4 5 6 7 8 9 10 5 chunks +57 lines, -2 lines 0 comments Download
M net/websockets/websocket_stream_test.cc View 1 2 3 4 5 6 7 8 9 10 8 chunks +67 lines, -4 lines 0 comments Download
M net/websockets/websocket_test_util.h View 1 2 3 4 5 6 7 8 9 10 3 chunks +25 lines, -9 lines 0 comments Download
M net/websockets/websocket_test_util.cc View 1 2 3 4 5 6 4 chunks +21 lines, -7 lines 0 comments Download

Messages

Total messages: 16 (0 generated)
Adam Rice
6 years, 6 months ago (2014-06-02 13:28:42 UTC) #1
yhirano
lgtm https://codereview.chromium.org/304093003/diff/160001/content/browser/renderer_host/websocket_host.cc File content/browser/renderer_host/websocket_host.cc (right): https://codereview.chromium.org/304093003/diff/160001/content/browser/renderer_host/websocket_host.cc#newcode355 content/browser/renderer_host/websocket_host.cc:355: DCHECK(!channel_)
6 years, 6 months ago (2014-06-03 05:44:51 UTC) #2
Adam Rice
https://codereview.chromium.org/304093003/diff/160001/content/browser/renderer_host/websocket_host.cc File content/browser/renderer_host/websocket_host.cc (right): https://codereview.chromium.org/304093003/diff/160001/content/browser/renderer_host/websocket_host.cc#newcode355 content/browser/renderer_host/websocket_host.cc:355: On 2014/06/03 05:44:51, yhirano wrote: > DCHECK(!channel_) Done. I ...
6 years, 6 months ago (2014-06-03 06:36:50 UTC) #3
tyoshino (SeeGerritForStatus)
almost lg https://codereview.chromium.org/304093003/diff/180001/net/websockets/websocket_stream.cc File net/websockets/websocket_stream.cc (right): https://codereview.chromium.org/304093003/diff/180001/net/websockets/websocket_stream.cc#newcode46 net/websockets/websocket_stream.cc:46: virtual void OnReceivedRedirect(URLRequest* request, write a comment ...
6 years, 6 months ago (2014-06-03 12:11:59 UTC) #4
Adam Rice
https://codereview.chromium.org/304093003/diff/180001/net/websockets/websocket_stream.cc File net/websockets/websocket_stream.cc (right): https://codereview.chromium.org/304093003/diff/180001/net/websockets/websocket_stream.cc#newcode46 net/websockets/websocket_stream.cc:46: virtual void OnReceivedRedirect(URLRequest* request, On 2014/06/03 12:11:59, tyoshino wrote: ...
6 years, 6 months ago (2014-06-03 12:59:50 UTC) #5
Adam Rice
+tsepez for websocket_messages.h review.
6 years, 6 months ago (2014-06-04 01:21:15 UTC) #6
tyoshino (SeeGerritForStatus)
lgtm
6 years, 6 months ago (2014-06-04 04:47:27 UTC) #7
Tom Sepez
Messages LGTM.
6 years, 6 months ago (2014-06-04 19:57:27 UTC) #8
Adam Rice
The CQ bit was checked by ricea@chromium.org
6 years, 6 months ago (2014-06-05 02:38:17 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ricea@chromium.org/304093003/200001
6 years, 6 months ago (2014-06-05 02:41:29 UTC) #10
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: android_chromium_gn_compile_rel on tryserver.chromium ...
6 years, 6 months ago (2014-06-05 06:42:00 UTC) #11
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-05 06:46:43 UTC) #12
commit-bot: I haz the power
Try jobs failed on following builders: android_chromium_gn_compile_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_compile_rel/builds/10875)
6 years, 6 months ago (2014-06-05 06:46:43 UTC) #13
Adam Rice
The CQ bit was checked by ricea@chromium.org
6 years, 6 months ago (2014-06-05 11:03:46 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ricea@chromium.org/304093003/200001
6 years, 6 months ago (2014-06-05 11:05:12 UTC) #15
commit-bot: I haz the power
6 years, 6 months ago (2014-06-05 11:11:17 UTC) #16
Message was sent while issue was closed.
Change committed as 275066

Powered by Google App Engine
This is Rietveld 408576698