From 8a3422c9488ce79e305973d29a01811762e35465 Mon Sep 17 00:00:00 2001 From: "jcampan@chromium.org" Date: Wed, 24 Sep 2008 17:42:42 +0000 Subject: This CL adds new UI tests for the SSL UI. Some more info: SSL UI Tests: Added new tests for redirects and frames. Also improved the mixed-content test to exercise the "block mixed-contents" preference and the show info-bar. Automation: For the new UI tests, added methods to tab_proxy and browser_proxy. The ones of most interest are GetLastNavigatinTime and WaitForNavigation that ensures we wait for a navigation to occur or have occured when taking actions that asynchronously trigger navigations. Resource loading: Added a flag to the response we get when loading a resource that indicates whether that resource was filtered (blocked or altered) by the security peer. We use this flag to notify back the browser when we report a load has been committed. This is so the SSL manager knows a frame has been filtered (in which case we have no cert info but should not consider that as unsafe). BUG=2004 Review URL: http://codereview.chromium.org/3165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2553 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/data/ssl/bad_iframe.html | 9 ++++---- chrome/test/data/ssl/frame_left.html | 7 ++++++ chrome/test/data/ssl/frame_right.html | 3 +++ chrome/test/data/ssl/page_with_mixed_contents.html | 10 +++++++-- chrome/test/data/ssl/top_frame.html | 25 ++++++++++++++++++++++ 5 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 chrome/test/data/ssl/frame_left.html create mode 100644 chrome/test/data/ssl/frame_right.html create mode 100644 chrome/test/data/ssl/top_frame.html (limited to 'chrome/test/data/ssl') diff --git a/chrome/test/data/ssl/bad_iframe.html b/chrome/test/data/ssl/bad_iframe.html index 53eff7e..b20481c 100644 --- a/chrome/test/data/ssl/bad_iframe.html +++ b/chrome/test/data/ssl/bad_iframe.html @@ -1,10 +1,9 @@ - - +

Evil IFrame

+
This frame is loaded over insecure HTTPS. +
+ diff --git a/chrome/test/data/ssl/frame_left.html b/chrome/test/data/ssl/frame_left.html new file mode 100644 index 0000000..128d69e --- /dev/null +++ b/chrome/test/data/ssl/frame_left.html @@ -0,0 +1,7 @@ + + +Good HTTPS page
+Bad HTTPS page
+HTTP page
+ + diff --git a/chrome/test/data/ssl/frame_right.html b/chrome/test/data/ssl/frame_right.html new file mode 100644 index 0000000..d49d61d9 --- /dev/null +++ b/chrome/test/data/ssl/frame_right.html @@ -0,0 +1,3 @@ + +This is the content frame. + diff --git a/chrome/test/data/ssl/page_with_mixed_contents.html b/chrome/test/data/ssl/page_with_mixed_contents.html index 2bf9bb24..b19730a 100644 --- a/chrome/test/data/ssl/page_with_mixed_contents.html +++ b/chrome/test/data/ssl/page_with_mixed_contents.html @@ -1,9 +1,15 @@ -Page with mixed contents +Page with mixed contents + + This page contains an image which is served over an http connection, causing mixed contents (when this page is loaded over https).
- + diff --git a/chrome/test/data/ssl/top_frame.html b/chrome/test/data/ssl/top_frame.html new file mode 100644 index 0000000..ac5c144 --- /dev/null +++ b/chrome/test/data/ssl/top_frame.html @@ -0,0 +1,25 @@ + + This is a test page with frames + + + + + + + -- cgit v1.1