Chromium Code Reviews
Help | Chromium Project | Sign in
(558)

Issue 2067003: Track "display" and "run" separately for mixed content, and make the latter d... (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
3 years, 11 months ago by Peter Kasting
Modified:
2 years, 11 months ago
Reviewers:
abarth
CC:
chromium-reviews_chromium.org, brettw-cc_chromium.org, amit, ben+cc_chromium.org, PaweĊ‚ Hajdan Jr.
Visibility:
Public.

Description

Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken".

Make the "display" state only affect the current tab (not the entire host).

Fix an SSL browser test by supplying the appropriate SiteInstance*.

Move a test from "disabled" to "flaky" since it at least passes for me.

Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner.

BUG=15072, 18626, 40932, 42758
TEST=Covered by browser tests

Patch Set 1 #

Total comments: 1

Patch Set 2 : '' #

Patch Set 3 : '' #

Patch Set 4 : '' #

Patch Set 5 : '' #

Patch Set 6 : '' #

Patch Set 7 : '' #

Total comments: 5
Unified diffs Side-by-side diffs Delta from patch set Stats (+450 lines, -389 lines) Lint Patch
M chrome/app/generated_resources.grd View 1 chunk +5 lines, -2 lines 0 comments 0 errors Download
M chrome/browser/external_tab_container.cc View 2 chunks +3 lines, -2 lines 0 comments 0 errors Download
M chrome/browser/page_info_model.cc View 1 chunk +3 lines, -2 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_browser_tests.cc View 1 2 3 4 5 6 23 chunks +113 lines, -54 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_host_state.h View 1 2 3 3 chunks +6 lines, -9 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_host_state.cc View 1 2 3 4 5 2 chunks +8 lines, -9 lines 2 comments 0 errors Download
M chrome/browser/ssl/ssl_host_state_unittest.cc View 1 2 3 4 5 2 chunks +13 lines, -13 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_manager.h View 4 chunks +34 lines, -34 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_manager.cc View 5 chunks +125 lines, -124 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy.h View 1 2 3 4 chunks +5 lines, -13 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy.cc View 1 2 3 4 chunks +53 lines, -45 lines 3 comments 0 errors Download
M chrome/browser/ssl/ssl_policy_backend.h View 1 2 3 3 chunks +5 lines, -10 lines 0 comments 0 errors Download
M chrome/browser/ssl/ssl_policy_backend.cc View 1 2 3 4 chunks +8 lines, -15 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/navigation_entry.h View 2 chunks +22 lines, -8 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/navigation_entry_unittest.cc View 1 chunk +9 lines, -5 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/tab_contents.h View 2 chunks +7 lines, -0 lines 0 comments 0 errors Download
M chrome/browser/tab_contents/tab_contents.cc View 3 chunks +7 lines, -1 line 0 comments 0 errors Download
M chrome/browser/toolbar_model.cc View 1 chunk +1 line, -1 line 0 comments 0 errors Download
M chrome/common/notification_type.h View 2 chunks +7 lines, -10 lines 0 comments 0 errors Download
M chrome/test/automation/automation_messages.h View 1 5 chunks +10 lines, -5 lines 0 comments 0 errors Download
A + chrome/test/data/ssl/page_displays_mixed_content.html View 1 chunk +1 line, -1 line 0 comments 0 errors Download
A + chrome/test/data/ssl/page_runs_mixed_content.html View 1 2 0 chunks +-1 lines, --1 lines 0 comments 0 errors Download
D chrome/test/data/ssl/page_with_http_script.html View 1 chunk +0 lines, -8 lines 0 comments 0 errors Download
D chrome/test/data/ssl/page_with_mixed_contents.html View 1 chunk +0 lines, -15 lines 0 comments 0 errors Download
M chrome_frame/chrome_active_document.cc View 3 chunks +6 lines, -4 lines 0 comments 0 errors Download
Commit:

Messages

Total messages: 10
Peter Kasting
3 years, 11 months ago #1
abarth
http://codereview.chromium.org/2067003/diff/1/7 File chrome/browser/ssl/ssl_host_state.h (right): http://codereview.chromium.org/2067003/diff/1/7#newcode31 chrome/browser/ssl/ssl_host_state.h:31: void HostDisplayedInsecureContent(const std::string& host, int pid); I'm not sure ...
3 years, 11 months ago #2
Peter Kasting
New snap up that makes the "display" state tab-scoped as you've requested. In this version, ...
3 years, 11 months ago #3
abarth
We're supposed to treat intranet hosts like did run insecure content.
3 years, 11 months ago #4
abarth
I need to eat lunch, but I'll look after my after-lunch meeting.
3 years, 11 months ago #5
Peter Kasting
On 2010/05/14 19:40:46, abarth wrote: > We're supposed to treat intranet hosts like did run ...
3 years, 11 months ago #6
abarth
LGTM. The changes to SSLManager were a bit hard to follow because you moved a ...
3 years, 11 months ago #7
Peter Kasting
Sorry about moving the stuff in SSLManager around -- I originally rewrote it a bit ...
3 years, 11 months ago #8
abarth
http://codereview.chromium.org/2067003/diff/18002/36013 File chrome/browser/ssl/ssl_policy.cc (right): http://codereview.chromium.org/2067003/diff/18002/36013#newcode173 chrome/browser/ssl/ssl_policy.cc:173: entry->ssl().set_ran_mixed_content(); > I'd be happy to try for consistent ...
3 years, 11 months ago #9
Peter Kasting
3 years, 11 months ago #10
Landed in r47347, closing.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1280:2d3e6564b7b6