diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 17:42:42 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 17:42:42 +0000 |
| commit | 8a3422c9488ce79e305973d29a01811762e35465 (patch) | |
| tree | 7fc94cb7aa013f7bb2afaf4100b1a8f45208cc00 /chrome/test/data/ssl | |
| parent | 5eb64653873981c7dbf693a9aba7c7da011b14a3 (diff) | |
| download | chromium_src-8a3422c9488ce79e305973d29a01811762e35465.zip chromium_src-8a3422c9488ce79e305973d29a01811762e35465.tar.gz chromium_src-8a3422c9488ce79e305973d29a01811762e35465.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/data/ssl')
| -rw-r--r-- | chrome/test/data/ssl/bad_iframe.html | 9 | ||||
| -rw-r--r-- | chrome/test/data/ssl/frame_left.html | 7 | ||||
| -rw-r--r-- | chrome/test/data/ssl/frame_right.html | 3 | ||||
| -rw-r--r-- | chrome/test/data/ssl/page_with_mixed_contents.html | 10 | ||||
| -rw-r--r-- | chrome/test/data/ssl/top_frame.html | 25 |
5 files changed, 47 insertions, 7 deletions
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 @@ <html> -<script> - window.open('google.html', name, - "status = 1, height = 300, width = 300, resizable = 0" ); -</script> - +<body> <H1>Evil IFrame</H1> +<div id="evilDiv"> This frame is loaded over insecure HTTPS. +</div> +</body> </html> 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 @@ +<html> +<body> +<a id="goodHTTPSLink" href="https://127.0.0.1:9443/files/ssl/google.html" TARGET="contentFrame">Good HTTPS page</a><br> +<a id="badHTTPSLink" href="https://127.0.0.1:9666/files/ssl/bad_iframe.html" TARGET="contentFrame">Bad HTTPS page</a><br> +<a id="HTTPLink" href="http://127.0.0.1:1337/files/ssl/google.html" TARGET="contentFrame">HTTP page</a><br> +</body> +</html> 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 @@ +<html> +This is the content frame. +</html> 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 @@ <html> -<head><title>Page with mixed contents</title></head> +<head><title>Page with mixed contents</title> +<script> + function ImageWidth() { + return document.getElementById("bad_image").width; + } +</script> +</head> <body> This page contains an image which is served over an http connection, causing mixed contents (when this page is loaded over https).<br> -<img src="http://localhost:1337/files/ssl/google_files/logo.gif"/> +<img id="bad_image" src="http://localhost:1337/files/ssl/google_files/logo.gif"/> </body> </html> 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 @@ +<html> + <head><title>This is a test page with frames</title> + <script> + function simulateClick(target) { + var evt = document.createEvent("MouseEvents"); + evt.initMouseEvent("click", true, true, window, + 0, 0, 0, 0, 0, false, false, + false, false, 0, null); + + return target.dispatchEvent(evt); + } + + function clickLink(linkID) { + target = frames['navFrame'].document.getElementById(linkID); + if (target == null) + alert("clickLink failed for id=" + linkID); + return simulateClick(target); + } + </script> + </head> + <frameset cols="25%,75%"> + <frame src="frame_left.html" name="navFrame"> + <frame src="frame_right.html" name="contentFrame"> + </frameset> +</html> |