<!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>[186613] branches/safari-600.8-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/186613">186613</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 14:01:59 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186505">r186505</a>. rdar://problem/21707923</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6008branchLayoutTestsChangeLog">branches/safari-600.8-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebCoreChangeLog">branches/safari-600.8-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebCoreModuleswebsocketsWebSocketcpp">branches/safari-600.8-branch/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#branchessafari6008branchSourceWebCoreplatformSchemeRegistrycpp">branches/safari-600.8-branch/Source/WebCore/platform/SchemeRegistry.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6008branchLayoutTestshttptestssecuritymixedContentresourcesframewithinsecurewebsockethtml">branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html</a></li>
<li>branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/</li>
<li><a href="#branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketiniframeexpectedtxt">branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt</a></li>
<li><a href="#branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketiniframehtml">branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html</a></li>
<li><a href="#branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketinmainframeexpectedtxt">branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt</a></li>
<li><a href="#branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketinmainframehtml">branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6008branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186612 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-09 21:01:54 UTC (rev 186612)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-07-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186505. rdar://problem/21707923
+
+ 2015-07-08 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r185848. rdar://problem/21708274
+
+ 2015-06-22 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ Web sockets should be treated as active mixed content
+ https://bugs.webkit.org/show_bug.cgi?id=140624
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html: Added.
+ * http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt: Added.
+ * http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html: Added.
+ * http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt: Added.
+ * http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html: Added.
+
+2015-07-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186504. rdar://problem/21707900
</span><span class="cx">
</span><span class="cx"> 2015-07-07 Matthew Hanson <matthew_hanson@apple.com>
</span></span></pre></div>
<a id="branchessafari6008branchLayoutTestshttptestssecuritymixedContentresourcesframewithinsecurewebsockethtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html (0 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<script src="../../../../../js-test-resources/js-test-pre.js"></script>
+<script>
+window.jsTestIsAsync = true;
+
+function onSocketOpened() {
+ alert("WebSocket connection opened.");
+ finishJSTest();
+}
+
+function onSocketError() {
+ alert("WebSocket connection failed.");
+ finishJSTest();
+}
+
+function onSocketClosed() {
+ alert("WebSocket closed.");
+ finishJSTest();
+}
+
+try {
+ var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/echo");
+ ws.onopen = onSocketOpened;
+ ws.onerror = onSocketError;
+ ws.onclose = onSocketClosed;
+} catch (e) {
+ alert("Test failed: exception thrown");
+ finishJSTest();
+}
+</script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketiniframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt (0 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+CONSOLE MESSAGE: line 21: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-websocket.html was not allowed to run insecure content from ws://127.0.0.1:8880/websocket/tests/hybi/echo.
+
+ALERT: WebSocket connection failed.
+This test loads an iframe that creates an insecure WebSocket connection. We should block the connection and trigger a mixed content callback because the main frame is HTTPS, but the data sent over the socket could be recorded or controlled by an attacker.
+
+
</ins></span></pre></div>
<a id="branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketiniframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html (0 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<p>This test loads an iframe that creates an insecure WebSocket connection. We
+should block the connection and trigger a mixed content callback because the
+main frame is HTTPS, but the data sent over the socket could be recorded or
+controlled by an attacker.</p>
+<iframe src="https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-websocket.html"/>
</ins></span></pre></div>
<a id="branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketinmainframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt (0 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 21: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-websocket.html was not allowed to run insecure content from ws://127.0.0.1:8880/websocket/tests/hybi/echo.
+
+ALERT: WebSocket connection failed.
+This test opens a window that connects to an insecure ws:// WebSocket. We should block the connection and trigger a mixed content callback because the main frame is HTTPS, but the data sent over the socket could be recorded or controlled by an attacker.
</ins></span></pre></div>
<a id="branchessafari6008branchLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketinmainframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html (0 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
+}
+
+window.addEventListener("message", function (e) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+
+</script>
+<p>This test opens a window that connects to an insecure ws:// WebSocket. We
+should block the connection and trigger a mixed content callback because the
+main frame is HTTPS, but the data sent over the socket could be recorded or
+controlled by an attacker.</p>
+<script>
+onload = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-websocket.html");
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6008branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186612 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-09 21:01:54 UTC (rev 186612)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-07-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186505. rdar://problem/21707923
+
+ 2015-07-08 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r185848. rdar://problem/21708274
+
+ 2015-06-22 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ Web sockets should be treated as active mixed content
+ https://bugs.webkit.org/show_bug.cgi?id=140624
+
+ Reviewed by Sam Weinig.
+
+ Tests: http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html
+ http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::connect): Block ws:// WebSocket connections from https:// pages, and
+ emit the onerror event after doing so.
+ * platform/SchemeRegistry.cpp:
+ (WebCore::secureSchemes): Add wss:// to the list of secure schemes.
+
+2015-07-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186504. rdar://problem/21707900
</span><span class="cx">
</span><span class="cx"> 2015-07-07 Matthew Hanson <matthew_hanson@apple.com>
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/Modules/websockets/WebSocket.cpp (186612 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-07-09 21:01:54 UTC (rev 186612)
+++ branches/safari-600.8-branch/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -278,6 +279,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (scriptExecutionContext()->isDocument()) {
+ Document& document = toDocument(*scriptExecutionContext());
+ if (!document.frame()->loader().mixedContentChecker().canRunInsecureContent(document.securityOrigin(), m_url)) {
+ // Balanced by the call to ActiveDOMObject::unsetPendingActivity() in WebSocket::stop().
+ ActiveDOMObject::setPendingActivity(this);
+ // We must block this connection. Instead of throwing an exception, we indicate this
+ // using the error event. But since this code executes as part of the WebSocket's
+ // constructor, we have to wait until the constructor has completed before firing the
+ // event; otherwise, users can't connect to the event.
+ RunLoop::main().dispatch([this]() {
+ dispatchEvent(Event::create(eventNames().errorEvent, false, false));
+ stop();
+ });
+ return;
+ }
+ }
+
</ins><span class="cx"> String protocolString;
</span><span class="cx"> if (!protocols.isEmpty())
</span><span class="cx"> protocolString = joinStrings(protocols, subProtocolSeperator());
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebCoreplatformSchemeRegistrycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/platform/SchemeRegistry.cpp (186612 => 186613)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/platform/SchemeRegistry.cpp 2015-07-09 21:01:54 UTC (rev 186612)
+++ branches/safari-600.8-branch/Source/WebCore/platform/SchemeRegistry.cpp 2015-07-09 21:01:59 UTC (rev 186613)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> secureSchemes.add("https");
</span><span class="cx"> secureSchemes.add("about");
</span><span class="cx"> secureSchemes.add("data");
</span><ins>+ secureSchemes.add("wss");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return secureSchemes;
</span></span></pre>
</div>
</div>
</body>
</html>