<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195718] branches/safari-601-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195718">195718</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 17:34:26 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195477">r195477</a>. rdar://problem/24002217</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLFormElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloaderMixedContentCheckercpp">branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloaderMixedContentCheckerh">branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.h</a></li>
<li><a href="#branchessafari601branchToolsWebEditingTesterWK2WebDocumentControllerm">branches/safari-601-branch/Tools/WebEditingTester/WK2WebDocumentController.m</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminiframeexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminiframehtml">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminmainframeexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminmainframehtml">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentjavascripturlforminmainframeexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentjavascripturlforminmainframehtml">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentresourcesframewithinsecureformhtml">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-form.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestssecuritymixedContentresourcesframewithjavascripturlformhtml">branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-javascript-url-form.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (195717 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-28 01:34:20 UTC (rev 195717)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-01-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r195477. rdar://problem/24002217
+
+ 2016-01-21 Sam Weinig <sam@webkit.org>
+
+ Treat non-https actions on secure pages as mixed content
+ <rdar://problem/23144492>
+ https://bugs.webkit.org/show_bug.cgi?id=153322
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt: Added.
+ * http/tests/security/mixedContent/insecure-form-in-iframe.html: Added.
+ * http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt: Added.
+ * http/tests/security/mixedContent/insecure-form-in-main-frame.html: Added.
+ * http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt: Added.
+ * http/tests/security/mixedContent/javascript-url-form-in-main-frame.html: Added.
+ * http/tests/security/mixedContent/resources/frame-with-insecure-form.html: Added.
+ * http/tests/security/mixedContent/resources/frame-with-javascript-url-form.html: Added.
+
+2016-01-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r195162. rdar://problem/24302736
</span><span class="cx">
</span><span class="cx"> 2016-01-15 Jiewen Tan <jiewen_tan@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminiframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+main frame - didFinishLoadForFrame
+This test loads a secure iframe that has a form with an insecure action. We should *not* get a mixed content callback because the main frame is HTTP and the form doesn't contaminate the child iframe's security origin with mixed content.
+
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminiframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe.html (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe.html 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+}
+</script>
+<p>This test loads a secure iframe that has a form with an insecure action. We should
+*not* get a mixed content callback because the main frame is HTTP and the form
+doesn't contaminate the child iframe's security origin with mixed content.</p>
+<iframe src="https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-form.html"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminmainframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+main frame - didFinishDocumentLoadForFrame
+main frame - didStartProvisionalLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+main frame - didCommitLoadForFrame
+CONSOLE MESSAGE: line 3: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-form.html contains a form which targets an insecure URL http://127.0.0.1:8080/resources/doesnotexist.
+
+didDisplayInsecureContent
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+This test opens a window that has a form with an non-https action. We should trigger a mixed content callback because the main frame in the window is HTTPS but is running insecure content.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentinsecureforminmainframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame.html (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/insecure-form-in-main-frame.html 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
+}
+
+window.addEventListener("message", function (e) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+
+</script>
+<p>This test opens a window that has a form with an non-https action. We should
+trigger a mixed content callback because the main frame in the window is HTTPS
+but is running insecure content.</p>
+<script>
+onload = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-form.html");
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentjavascripturlforminmainframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+main frame - didFinishDocumentLoadForFrame
+main frame - didStartProvisionalLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+This test opens a window that has a form with an action that is a javascript: url. We should *not* trigger a mixed content callback because the javascript: URL cannot be corrupted by active network attackers.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentjavascripturlforminmainframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame.html (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/javascript-url-form-in-main-frame.html 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
+}
+
+window.addEventListener("message", function (e) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+
+</script>
+<p>This test opens a window that has a form with an action that is a javascript: url. We should
+*not* trigger a mixed content callback because the javascript: URL cannot be corrupted
+by active network attackers.</p>
+<script>
+onload = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-javascript-url-form.html");
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentresourcesframewithinsecureformhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-form.html (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-form.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-form.html 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<body onload="loaded()">
+<form action="http://127.0.0.1:8080/resources/doesnotexist"></form>
+<script>
+function loaded() {
+ if (window.opener)
+ window.opener.postMessage('done', '*');
+}
+</script>
+</body>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestssecuritymixedContentresourcesframewithjavascripturlformhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-javascript-url-form.html (0 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-javascript-url-form.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-javascript-url-form.html 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<body onload="loaded()">
+<form action="javascript:void()"></form>
+<script>
+function loaded() {
+ if (window.opener)
+ window.opener.postMessage('done', '*');
+}
+</script>
+</body>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195717 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 01:34:20 UTC (rev 195717)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-01-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r195477. rdar://problem/24002217
+
+ 2016-01-21 Sam Weinig <sam@webkit.org>
+
+ Treat non-https actions on secure pages as mixed content
+ <rdar://problem/23144492>
+ https://bugs.webkit.org/show_bug.cgi?id=153322
+
+ Reviewed by Alexey Proskuryakov.
+
+ Tests: http/tests/security/mixedContent/insecure-form-in-iframe.html
+ http/tests/security/mixedContent/insecure-form-in-main-frame.html
+ http/tests/security/mixedContent/javascript-url-form-in-main-frame.html
+
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::parseAttribute):
+ Check form actions for mixed content.
+
+ * loader/MixedContentChecker.cpp:
+ (WebCore::MixedContentChecker::checkFormForMixedContent):
+ * loader/MixedContentChecker.h:
+ Add new function to check and warn if a form's action is mixed content.
+
+2016-01-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r195162. rdar://problem/24302736
</span><span class="cx">
</span><span class="cx"> 2016-01-15 Jiewen Tan <jiewen_tan@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLFormElement.cpp (195717 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLFormElement.cpp 2016-01-28 01:34:20 UTC (rev 195717)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLFormElement.cpp 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -482,9 +482,16 @@
</span><span class="cx">
</span><span class="cx"> void HTMLFormElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><del>- if (name == actionAttr)
</del><ins>+ if (name == actionAttr) {
</ins><span class="cx"> m_attributes.parseAction(value);
</span><del>- else if (name == targetAttr)
</del><ins>+
+ if (!m_attributes.action().isEmpty()) {
+ if (Frame* f = document().frame()) {
+ Frame& topFrame = f->tree().top();
+ topFrame.loader().mixedContentChecker().checkFormForMixedContent(topFrame.document()->securityOrigin(), document().completeURL(m_attributes.action()));
+ }
+ }
+ } else if (name == targetAttr)
</ins><span class="cx"> m_attributes.setTarget(value);
</span><span class="cx"> else if (name == methodAttr)
</span><span class="cx"> m_attributes.updateMethodType(value);
</span><span class="lines">@@ -497,8 +504,7 @@
</span><span class="cx"> document().registerForPageCacheSuspensionCallbacks(this);
</span><span class="cx"> else
</span><span class="cx"> document().unregisterForPageCacheSuspensionCallbacks(this);
</span><del>- }
- else
</del><ins>+ } else
</ins><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloaderMixedContentCheckercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.cpp (195717 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.cpp 2016-01-28 01:34:20 UTC (rev 195717)
+++ branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.cpp 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -88,6 +88,22 @@
</span><span class="cx"> return allowed;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MixedContentChecker::checkFormForMixedContent(SecurityOrigin* securityOrigin, const URL& url) const
+{
+ // Unconditionally allow javascript: URLs as form actions as some pages do this and it does not introduce
+ // a mixed content issue.
+ if (protocolIsJavaScript(url))
+ return;
+
+ if (!isMixedContent(securityOrigin, url))
+ return;
+
+ String message = makeString("The page at ", m_frame.document()->url().stringCenterEllipsizedToLength(), " contains a form which targets an insecure URL ", url.stringCenterEllipsizedToLength(), ".\n");
+ m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, message);
+
+ client().didDisplayInsecureContent();
+}
+
</ins><span class="cx"> void MixedContentChecker::logWarning(bool allowed, const String& action, const URL& target) const
</span><span class="cx"> {
</span><span class="cx"> const char* errorString = allowed ? " was allowed to " : " was not allowed to ";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloaderMixedContentCheckerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.h (195717 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.h 2016-01-28 01:34:20 UTC (rev 195717)
+++ branches/safari-601-branch/Source/WebCore/loader/MixedContentChecker.h 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx">
</span><span class="cx"> bool canDisplayInsecureContent(SecurityOrigin*, ContentType, const URL&) const;
</span><span class="cx"> bool canRunInsecureContent(SecurityOrigin*, const URL&) const;
</span><ins>+ void checkFormForMixedContent(SecurityOrigin*, const URL&) const;
</ins><span class="cx"> static bool isMixedContent(SecurityOrigin*, const URL&);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari601branchToolsWebEditingTesterWK2WebDocumentControllerm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/WebEditingTester/WK2WebDocumentController.m (195717 => 195718)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/WebEditingTester/WK2WebDocumentController.m 2016-01-28 01:34:20 UTC (rev 195717)
+++ branches/safari-601-branch/Tools/WebEditingTester/WK2WebDocumentController.m 2016-01-28 01:34:26 UTC (rev 195718)
</span><span class="lines">@@ -79,7 +79,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)loadHTMLString:(NSString *)content
</span><span class="cx"> {
</span><del>- [_webView loadHTMLString:content baseURL:nil];
</del><ins>+ NSStringEncoding encoding = NSUnicodeStringEncoding;
+
+ NSData *data = [content dataUsingEncoding:encoding];
+ CFStringEncoding cfEncoding = CFStringConvertNSStringEncodingToEncoding(encoding);
+ NSString *textEncodingName = (__bridge NSString *)CFStringConvertEncodingToIANACharSetName(cfEncoding);
+
+ [_webView _loadData:data MIMEType:@"text/html" characterEncodingName:textEncodingName baseURL:[NSURL URLWithString:@"x-webdoc:/klsadfgjlfsdj/"] userData:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)performTextFinderAction:(id)sender
</span></span></pre>
</div>
</div>
</body>
</html>