diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 18:16:04 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 18:16:04 +0000 |
| commit | 863e1409a83ec7b3849754c1dbf365d44505a147 (patch) | |
| tree | 950fc60afa379c1b53786d73ce2ad33ed6d10431 /webkit | |
| parent | a60c7ac21e326e6a9587ae6d114f3bb2eecaf2b2 (diff) | |
| download | chromium_src-863e1409a83ec7b3849754c1dbf365d44505a147.zip chromium_src-863e1409a83ec7b3849754c1dbf365d44505a147.tar.gz chromium_src-863e1409a83ec7b3849754c1dbf365d44505a147.tar.bz2 | |
Re-baseline XFrameOptions tests.
It looks to me like we could use to modify our willSendRequest implementation
to add in a "main document URL" report for greatest parity with WebKit's
results, but in the meantime we can use our current message.
BUG=9962
TEST=covered by layout tests
Review URL: http://codereview.chromium.org/66040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
7 files changed, 76 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt new file mode 100644 index 0000000..c9fa8e3 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt @@ -0,0 +1,10 @@ +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi - willSendRequest <WebRequest URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi"> +<unknown> - didFinishLoading +There should be no content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- + diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt new file mode 100644 index 0000000..491fed8 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt @@ -0,0 +1,12 @@ +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html"> +<unknown> - didFinishLoading +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didFailLoadingWithError <WebError code -3, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html"> +about:blank - willSendRequest <WebRequest URL "about:blank"> +There should be no content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- + diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt new file mode 100644 index 0000000..e73ce5f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt @@ -0,0 +1,12 @@ +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html"> +<unknown> - didFinishLoading +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didFailLoadingWithError <WebError code -3, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html"> +about:blank - willSendRequest <WebRequest URL "about:blank"> +There should be no content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- + diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt new file mode 100644 index 0000000..56bd4cb --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt @@ -0,0 +1,10 @@ +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html"> +<unknown> - didFinishLoading +There should be content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- +PASS: This should show up as the parent is in the same origin. diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt new file mode 100644 index 0000000..a6c9685 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt @@ -0,0 +1,12 @@ +http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - willSendRequest <WebRequest URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html"> +<unknown> - didFinishLoading +http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didFailLoadingWithError <WebError code -3, failing URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html"> +about:blank - willSendRequest <WebRequest URL "about:blank"> +There should be no content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- + diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt new file mode 100644 index 0000000..43575f4 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt @@ -0,0 +1,10 @@ +http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <WebRequest URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi"> +<unknown> - didFinishLoading +There should be content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- +PASS: This should show up as the parent is in the same origin. diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt new file mode 100644 index 0000000..bccc14c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt @@ -0,0 +1,10 @@ +http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <WebRequest URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi"> +<unknown> - didFinishLoading +There should be no content in the iframe below + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- + |