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

Issue 561153002: Mixed Content: Migrate ResourceFetcher to the static mixed content checker. (Closed)

Created:
6 years, 3 months ago by Mike West
Modified:
6 years, 3 months ago
CC:
blink-reviews, Nate Chapin, gavinp+loader_chromium.org, nasko
Project:
blink
Visibility:
Public.

Description

Mixed Content: Migrate ResourceFetcher to the static mixed content checker. This patch begins using the static version of the mixed content checker which was introduced in https://codereview.chromium.org/537983002/. It also takes the opportunity to rework the error message to use the new type information we've now passed into the checker. This patch only touches the ResourceFetcher usage; future patches will clean up the other points in the code where we grab a MixedContentChecker from the loader, and eventually remove the object creation entirely. This will make the site isolation folks happy. BUG=411184 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181817

Patch Set 1 : Rebase. #

Patch Set 2 : Dropping ResourceFetcher::checkInsecureContent #

Total comments: 2

Patch Set 3 : Fixing comment and test. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+153 lines, -192 lines) Patch
M LayoutTests/http/tests/security/mixedContent/insecure-audio-video-in-main-frame-expected.txt View 1 chunk +2 lines, -4 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-css-resources-expected.txt View 1 chunk +3 lines, -6 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-empty-srcset-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-eventsource-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-font-in-main-frame-expected.txt View 1 chunk +2 lines, -4 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-frame-in-data-iframe-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-allowed-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-picture-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-srcset-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-sync-post-xhr-allowed-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-sync-post-xhr-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-texttrack-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt View 1 chunk +2 lines, -4 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/laxChecking/insecure-sync-post-xhr-allowed-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/laxChecking/insecure-sync-post-xhr-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/laxChecking/insecure-xhr-in-main-frame-expected.txt View 1 chunk +2 lines, -4 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt View 1 chunk +0 lines, -2 lines 0 comments Download
M LayoutTests/http/tests/serviceworker/fetch-mixed-content-expected.txt View 1 2 1 chunk +4 lines, -8 lines 0 comments Download
M Source/core/fetch/ResourceFetcher.h View 1 1 chunk +0 lines, -1 line 0 comments Download
M Source/core/fetch/ResourceFetcher.cpp View 1 2 2 chunks +5 lines, -87 lines 0 comments Download
M Source/core/loader/MixedContentChecker.h View 1 chunk +2 lines, -0 lines 0 comments Download
M Source/core/loader/MixedContentChecker.cpp View 3 chunks +104 lines, -18 lines 0 comments Download

Messages

Total messages: 11 (3 generated)
Mike West
+nasko@: FYI. Remember how I said we could get rid of the MixedContentChecker on FrameLoader? ...
6 years, 3 months ago (2014-09-11 08:54:06 UTC) #2
Mike West
Would one of you fine folks mind taking a look at this patch? (I'm running ...
6 years, 3 months ago (2014-09-11 09:09:03 UTC) #4
sof
https://codereview.chromium.org/561153002/diff/40001/Source/core/fetch/ResourceFetcher.cpp File Source/core/fetch/ResourceFetcher.cpp (left): https://codereview.chromium.org/561153002/diff/40001/Source/core/fetch/ResourceFetcher.cpp#oldcode629 Source/core/fetch/ResourceFetcher.cpp:629: // If we're loading the main resource of a ...
6 years, 3 months ago (2014-09-11 09:34:43 UTC) #5
Mike West
https://codereview.chromium.org/561153002/diff/40001/Source/core/fetch/ResourceFetcher.cpp File Source/core/fetch/ResourceFetcher.cpp (left): https://codereview.chromium.org/561153002/diff/40001/Source/core/fetch/ResourceFetcher.cpp#oldcode629 Source/core/fetch/ResourceFetcher.cpp:629: // If we're loading the main resource of a ...
6 years, 3 months ago (2014-09-11 09:49:36 UTC) #6
Mike West
Fixed the comment and a failing test. Mind taking another look?
6 years, 3 months ago (2014-09-11 11:34:02 UTC) #7
sof
On 2014/09/11 09:49:36, Mike West wrote: > https://codereview.chromium.org/561153002/diff/40001/Source/core/fetch/ResourceFetcher.cpp > File Source/core/fetch/ResourceFetcher.cpp (left): > > https://codereview.chromium.org/561153002/diff/40001/Source/core/fetch/ResourceFetcher.cpp#oldcode629 ...
6 years, 3 months ago (2014-09-11 11:35:27 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patchset/561153002/60001
6 years, 3 months ago (2014-09-11 11:40:56 UTC) #10
commit-bot: I haz the power
6 years, 3 months ago (2014-09-11 13:07:12 UTC) #11
Message was sent while issue was closed.
Committed patchset #3 (id:60001) as 181817

Powered by Google App Engine
This is Rietveld 408576698