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

Issue 1970893002: Fix checking of iframe contents in SSLUITest.TestUnsafeContents. (Closed)

Created:
4 years, 7 months ago by meacer
Modified:
4 years, 7 months ago
Reviewers:
estark
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix checking of iframe contents in SSLUITest.TestUnsafeContents. This test attempts to check if iframe contents served over bad SSL are blocked, but it has several problems: - The page iframed in the test (bad_iframe.html) doesn't actually attempt to open a popup. - Even if it did, it wouldn't be able to because it doesn't run inside a user gesture. - The test uses IsShowingWebContentsModalDialog function to check if the popup opened, but that function doesn't work properly. This CL adds popup code to bad_iframe.html, allows popups without a user gesture and properly checks if the popup opened or was blocked. It also adds a sanity check to make sure subresources served over good SSL aren't blocked. BUG=611162 Committed: https://crrev.com/416ca89721fe8b3f3559d121d0025b0df5bcbb44 Cr-Commit-Position: refs/heads/master@{#393394}

Patch Set 1 #

Total comments: 6

Patch Set 2 : estark comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+73 lines, -47 lines) Patch
M chrome/browser/ssl/ssl_browser_tests.cc View 1 2 chunks +66 lines, -45 lines 0 comments Download
M chrome/test/data/ssl/bad_iframe.html View 1 chunk +6 lines, -1 line 0 comments Download
M chrome/test/data/ssl/page_with_unsafe_contents.html View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 13 (7 generated)
meacer
4 years, 7 months ago (2016-05-11 20:08:40 UTC) #4
estark
lgtm with a couple nits https://codereview.chromium.org/1970893002/diff/1/chrome/browser/ssl/ssl_browser_tests.cc File chrome/browser/ssl/ssl_browser_tests.cc (right): https://codereview.chromium.org/1970893002/diff/1/chrome/browser/ssl/ssl_browser_tests.cc#newcode1576 chrome/browser/ssl/ssl_browser_tests.cc:1576: int img_width; nit: initialize ...
4 years, 7 months ago (2016-05-12 19:53:21 UTC) #5
meacer
Thanks! https://codereview.chromium.org/1970893002/diff/1/chrome/browser/ssl/ssl_browser_tests.cc File chrome/browser/ssl/ssl_browser_tests.cc (right): https://codereview.chromium.org/1970893002/diff/1/chrome/browser/ssl/ssl_browser_tests.cc#newcode1576 chrome/browser/ssl/ssl_browser_tests.cc:1576: int img_width; On 2016/05/12 19:53:21, estark wrote: > ...
4 years, 7 months ago (2016-05-12 22:23:34 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1970893002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1970893002/20001
4 years, 7 months ago (2016-05-12 22:24:05 UTC) #9
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 7 months ago (2016-05-12 23:24:53 UTC) #11
commit-bot: I haz the power
4 years, 7 months ago (2016-05-12 23:27:45 UTC) #13
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/416ca89721fe8b3f3559d121d0025b0df5bcbb44
Cr-Commit-Position: refs/heads/master@{#393394}

Powered by Google App Engine
This is Rietveld 408576698