[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:46:19 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 195f3684935e01df6feb908efa3056cfc4a85cfc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 16 21:30:06 2009 +0000
2009-10-16 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Insecure plug-ins don't trigger mixed content
https://bugs.webkit.org/show_bug.cgi?id=30431
* http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt: Added.
* http/tests/security/mixedContent/insecure-plugin-in-iframe.html: Added.
* http/tests/security/mixedContent/resources/frame-with-insecure-plugin.html: Added.
2009-10-16 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Insecure plug-ins don't trigger mixed content
https://bugs.webkit.org/show_bug.cgi?id=30431
Added the missing check.
Test: http/tests/security/mixedContent/insecure-plugin-in-iframe.html
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadPlugin):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49700 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 28a096a..2730669 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-16 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Insecure plug-ins don't trigger mixed content
+ https://bugs.webkit.org/show_bug.cgi?id=30431
+
+ * http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt: Added.
+ * http/tests/security/mixedContent/insecure-plugin-in-iframe.html: Added.
+ * http/tests/security/mixedContent/resources/frame-with-insecure-plugin.html: Added.
+
2009-10-16 Yuzo Fujishima <yuzo at google.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt
new file mode 100644
index 0000000..2a6357a
--- /dev/null
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt
@@ -0,0 +1,12 @@
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
+main frame - didHandleOnloadEventsForFrame
+didRunInsecureContent
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+main frame - didFinishLoadForFrame
+This test loads a secure iframe that loads an insecure plugin. We should get a mixed content callback because the insecure plug-in can script the secure origin.
+
+
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html
new file mode 100644
index 0000000..bb94ebb
--- /dev/null
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html
@@ -0,0 +1,14 @@
+<html>
+<body>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpFrameLoadCallbacks();
+}
+</script>
+<p>This test loads a secure iframe that loads an insecure plugin. We should
+get a mixed content callback because the insecure plug-in can script the secure
+origin.</p>
+<iframe src="https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-plugin.html"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-plugin.html b/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-plugin.html
new file mode 100644
index 0000000..95e5535
--- /dev/null
+++ b/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-plugin.html
@@ -0,0 +1,9 @@
+<script>
+window.onload = function() {
+ if (window.opener)
+ window.opener.postMessage('done', '*');
+}
+</script>
+<object name='plugin' type='application/x-webkit-test-netscape'>
+ <param name='movie' value='http://127.0.0.1:8000/security/mixedContent/resources/dummy.swf' />
+</object>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a54e1b..a17988a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-16 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Insecure plug-ins don't trigger mixed content
+ https://bugs.webkit.org/show_bug.cgi?id=30431
+
+ Added the missing check.
+
+ Test: http/tests/security/mixedContent/insecure-plugin-in-iframe.html
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadPlugin):
+
2009-10-16 Andrew Scherkus <scherkus at chromium.org>
Reviewed by Eric Carlson.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index ab2fb37..5c27c85 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1309,6 +1309,8 @@ bool FrameLoader::loadPlugin(RenderPart* renderer, const KURL& url, const String
return false;
}
+ checkIfRunInsecureContent(m_frame->document()->securityOrigin(), url);
+
widget = m_client->createPlugin(IntSize(renderer->contentWidth(), renderer->contentHeight()),
element, url, paramNames, paramValues, mimeType,
m_frame->document()->isPluginDocument() && !m_containsPlugIns);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list