angler-fishThe Vulnerability History Project

Restricts MHTML loading to top frames.

      Also disabling JavaScript for MHTML documents.
Because JavaScipt is now disabled, MHTML layout tests had to be changed
not to use JavaScript anymore.

BUG=330663
TEST=Run MHTML layout tests.
R=abarth@chromium.org, jschuh@chromium.org

Review URL: https://codereview.chromium.org/161383002

git-svn-id: svn://svn.chromium.org/blink/trunk@169499 bbb929c8-8fbe-4397-9dbb-9b2b20218538
by Beulah the Gnat 2014-03-18 23:22:33 UTC
commit a7bab9d7a104f40cf5c4d54343bba965b03117e1
Chromium Fix CVE-2014-1747
third_party/WebKit/LayoutTests/mhtml/base_url-expected.txt
+1
third_party/WebKit/LayoutTests/mhtml/{page_with_javascript.mht => base_url.mht}
+11 -10
third_party/WebKit/LayoutTests/mhtml/check_domain-expected.txt
+4
third_party/WebKit/LayoutTests/mhtml/check_domain.mht
+45
third_party/WebKit/LayoutTests/mhtml/content_transfer_encoding_none-expected.html
-10
third_party/WebKit/LayoutTests/mhtml/content_transfer_encoding_none-expected.txt
+3
third_party/WebKit/LayoutTests/mhtml/content_transfer_encoding_none.mht
+6 -1
third_party/WebKit/LayoutTests/mhtml/frame_4.html_original
third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary-expected.html
third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary-expected.txt
+5
third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary.mht
+1
third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary2-expected.html
-1
third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary2-expected.txt
+5
third_party/WebKit/LayoutTests/mhtml/mhtml_in_iframe-expected.txt
-8
third_party/WebKit/LayoutTests/mhtml/mhtml_in_iframe.html
-18
third_party/WebKit/LayoutTests/mhtml/multi_frames.html_original
third_party/WebKit/LayoutTests/mhtml/multi_frames_binary-expected.html
-13
third_party/WebKit/LayoutTests/mhtml/multi_frames_binary-expected.txt
+31
third_party/WebKit/LayoutTests/mhtml/multi_frames_binary.mht
third_party/WebKit/LayoutTests/mhtml/multi_frames_ie-expected.html
-13
third_party/WebKit/LayoutTests/mhtml/multi_frames_ie-expected.txt
+31
third_party/WebKit/LayoutTests/mhtml/multi_frames_ie.mht
+13 -3
third_party/WebKit/LayoutTests/mhtml/multi_frames_unmht-expected.html
-13
third_party/WebKit/LayoutTests/mhtml/multi_frames_unmht-expected.txt
+31
third_party/WebKit/LayoutTests/mhtml/multi_frames_unmht.mht
+12 -2
third_party/WebKit/LayoutTests/mhtml/new-image-not-in-archive-expected.txt
+1
third_party/WebKit/LayoutTests/mhtml/new-image-not-in-archive.mht
+19
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js.html_original
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_ie-expected.html
-21
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_ie-expected.txt
+6
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_ie.mht
+11 -4
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_unmht-expected.html
-21
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_unmht-expected.txt
+6
third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_unmht.mht
+8 -3
third_party/WebKit/LayoutTests/mhtml/page_with_image.html_original
third_party/WebKit/LayoutTests/mhtml/page_with_image_ie-expected.html
-7
third_party/WebKit/LayoutTests/mhtml/page_with_image_ie-expected.txt
+3
third_party/WebKit/LayoutTests/mhtml/page_with_image_ie.mht
+9 -1
third_party/WebKit/LayoutTests/mhtml/page_with_image_unmht-expected.html
-8
third_party/WebKit/LayoutTests/mhtml/page_with_image_unmht-expected.txt
+3
third_party/WebKit/LayoutTests/mhtml/page_with_image_unmht.mht
+9 -1
third_party/WebKit/LayoutTests/mhtml/page_with_javascript-expected.html
-9
third_party/WebKit/LayoutTests/mhtml/relative_url-expected.html
-10
third_party/WebKit/LayoutTests/mhtml/relative_url.mht
-42
third_party/WebKit/LayoutTests/mhtml/relaxed-content-type-parameters-expected.html
-10
third_party/WebKit/LayoutTests/mhtml/relaxed-content-type-parameters-expected.txt
+1
third_party/WebKit/LayoutTests/mhtml/relaxed-content-type-parameters.mht
+4
third_party/WebKit/LayoutTests/mhtml/relaxed-content-type-parameters.mhtml_original
third_party/WebKit/LayoutTests/mhtml/resources/frame_0.html
-7
third_party/WebKit/LayoutTests/mhtml/resources/frame_1.html
-7
third_party/WebKit/LayoutTests/mhtml/resources/frame_2.html
-11
third_party/WebKit/LayoutTests/mhtml/resources/frame_4.html
-7
third_party/WebKit/LayoutTests/mhtml/resources/style.css
-138
third_party/WebKit/LayoutTests/mhtml/shared_buffer_bug-expected.html
-9
third_party/WebKit/LayoutTests/mhtml/shared_buffer_bug-expected.txt
+2
third_party/WebKit/LayoutTests/mhtml/shared_buffer_bug.mht
+5
third_party/WebKit/LayoutTests/mhtml/simple_page_ie-expected.html
-9
third_party/WebKit/LayoutTests/mhtml/simple_page_ie-expected.txt
+3
third_party/WebKit/LayoutTests/mhtml/simple_page_ie.mht
+4
third_party/WebKit/LayoutTests/mhtml/simple_page_unmht-expected.html
-9
third_party/WebKit/LayoutTests/mhtml/simple_page_unmht-expected.txt
+3
third_party/WebKit/LayoutTests/mhtml/simple_page_unmht.mht
+4
third_party/WebKit/LayoutTests/mhtml/transfer_encoding_7bit-expected.html
-10
third_party/WebKit/LayoutTests/mhtml/transfer_encoding_7bit-expected.txt
+1
third_party/WebKit/LayoutTests/mhtml/transfer_encoding_7bit.mht
+4
third_party/WebKit/LayoutTests/mhtml/transfer_encoding_8bit-expected.html
-10
third_party/WebKit/LayoutTests/mhtml/transfer_encoding_8bit-expected.txt
+1
third_party/WebKit/LayoutTests/platform/win/mhtml/invalid-bad-boundary-expected.png
third_party/WebKit/LayoutTests/platform/win/mhtml/invalid-bad-boundary2-expected.png
third_party/WebKit/Source/core/loader/DocumentLoader.cpp
-7
third_party/WebKit/Source/web/tests/MHTMLTest.cpp
-121
third_party/WebKit/Source/web/tests/data/mhtml/simple_test.mht
-19
third_party/WebKit/Source/web/web.gypi
-1
expand_less