<!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>[203165] trunk</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/203165">203165</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-07-13 10:25:28 -0700 (Wed, 13 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK1][iOS] Crash when WebSocket attempts to dispatch a mixed content blocker event
https://bugs.webkit.org/show_bug.cgi?id=159680
<rdar://problem/22102028>
Reviewed by Zalan Bujtas.
Source/WebCore:
WK1 on iOS should not use RunLoop::main(). Instead, it should be dispatching events
on the WebThread.
Test: http/tests/ssl/mixedContent/insecure-websocket.html
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::connect): Do not use RunLoop::main() when we should be using
the WebThread.
LayoutTests:
* http/tests/ssl/mixedContent: Added.
* http/tests/ssl/mixedContent/insecure-websocket-expected.txt: Added.
* http/tests/ssl/mixedContent/insecure-websocket.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/ssl/mixedContent/</li>
<li><a href="#trunkLayoutTestshttptestssslmixedContentinsecurewebsocketexpectedtxt">trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssslmixedContentinsecurewebsockethtml">trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203164 => 203165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-13 16:30:38 UTC (rev 203164)
+++ trunk/LayoutTests/ChangeLog 2016-07-13 17:25:28 UTC (rev 203165)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-13 Brent Fulgham <bfulgham@apple.com>
+
+ [WK1][iOS] Crash when WebSocket attempts to dispatch a mixed content blocker event
+ https://bugs.webkit.org/show_bug.cgi?id=159680
+ <rdar://problem/22102028>
+
+ Reviewed by Zalan Bujtas.
+
+ * http/tests/ssl/mixedContent: Added.
+ * http/tests/ssl/mixedContent/insecure-websocket-expected.txt: Added.
+ * http/tests/ssl/mixedContent/insecure-websocket.html: Added.
+
</ins><span class="cx"> 2016-07-13 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Refresh WPT tests up to c875b42
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssslmixedContentinsecurewebsocketexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket-expected.txt (0 => 203165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket-expected.txt 2016-07-13 17:25:28 UTC (rev 203165)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+CONSOLE MESSAGE: line 32: [blocked] The page at https://127.0.0.1:8443/ssl/mixedContent/insecure-websocket.html was not allowed to run insecure content from ws://127.0.0.1:8880/websocket/tests/hybi/echo.
+
+Test that we do not crash when handling mixed content events.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+Running Test
+PASSED. Socket was not created.
+This test 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="trunkLayoutTestshttptestssslmixedContentinsecurewebsockethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket.html (0 => 203165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket.html (rev 0)
+++ trunk/LayoutTests/http/tests/ssl/mixedContent/insecure-websocket.html 2016-07-13 17:25:28 UTC (rev 203165)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="/js-test-resources/js-test-pre.js"></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ function addConsoleMessage(message) {
+ var console = document.getElementById('console');
+ console.innerHTML += "<br/>" + message;
+ }
+
+ function onSocketOpened() {
+ addConsoleMessage("FAILED: WebSocket connection opened.");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function onSocketError(event) {
+ addConsoleMessage("PASSED. Socket was not created.");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function runTest() {
+ addConsoleMessage("Running Test");
+ window.onerror = onSocketError;
+ try {
+ ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/echo");
+ ws.onopen = onSocketOpened;
+ ws.onerror = onSocketError;
+ } catch (e) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ }
+ </script>
+</head>
+<body onload="runTest()">
+ <script>
+ description('Test that we do not crash when handling mixed content events.');
+ </script>
+
+ <p>This test 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>
+
+ <div id='console'></div>
+
+ <script src="/js-test-resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203164 => 203165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-13 16:30:38 UTC (rev 203164)
+++ trunk/Source/WebCore/ChangeLog 2016-07-13 17:25:28 UTC (rev 203165)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-13 Brent Fulgham <bfulgham@apple.com>
+
+ [WK1][iOS] Crash when WebSocket attempts to dispatch a mixed content blocker event
+ https://bugs.webkit.org/show_bug.cgi?id=159680
+ <rdar://problem/22102028>
+
+ Reviewed by Zalan Bujtas.
+
+ WK1 on iOS should not use RunLoop::main(). Instead, it should be dispatching events
+ on the WebThread.
+
+ Test: http/tests/ssl/mixedContent/insecure-websocket.html
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::connect): Do not use RunLoop::main() when we should be using
+ the WebThread.
+
</ins><span class="cx"> 2016-07-13 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> The display property of many MathML elements can not be overriden by page authors
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (203164 => 203165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-07-13 16:30:38 UTC (rev 203164)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-07-13 17:25:28 UTC (rev 203165)
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if USE(WEB_THREAD)
+#include "WebCoreThreadRun.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> const size_t maxReasonSizeInBytes = 123;
</span><span class="lines">@@ -292,10 +296,21 @@
</span><span class="cx"> // using the error event. But since this code executes as part of the WebSocket's
</span><span class="cx"> // constructor, we have to wait until the constructor has completed before firing the
</span><span class="cx"> // event; otherwise, users can't connect to the event.
</span><ins>+#if USE(WEB_THREAD)
+ ref();
+ dispatch_async(dispatch_get_main_queue(), ^{
+ WebThreadRun(^{
+ dispatchOrQueueErrorEvent();
+ stop();
+ deref();
+ });
+ });
+#else
</ins><span class="cx"> RunLoop::main().dispatch([this, protectedThis = Ref<WebSocket>(*this)]() {
</span><span class="cx"> dispatchOrQueueErrorEvent();
</span><span class="cx"> stop();
</span><span class="cx"> });
</span><ins>+#endif
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>