<!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>[187556] 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/187556">187556</a></dd>

<dt>Author</dt> <dd>beidson@apple.com</dd>

<dt>Date</dt> <dd>2015-07-29 14:08:30 -0700 (Wed, 29 Jul 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Crash calling webSocket.close() from onError handler for blocked web socket.

&lt;rdar://problem/21771620&gt; and https://bugs.webkit.org/show_bug.cgi?id=147411

Reviewed by Tim Horton.

Source/WebCore:

Tests: http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html

       http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html

This was introduced with http://trac.webkit.org/changeset/185848

* Modules/websockets/WebSocket.cpp:

(WebCore::WebSocket::connect): When blocked because of mixedContent, call dispatchOrQueueErrorEvent().

(WebCore::WebSocket::didReceiveMessageError): Use dispatchOrQueueErrorEvent() instead.

(WebCore::WebSocket::dispatchOrQueueErrorEvent): Dispatch the error event, but don't dispatch one twice!

* Modules/websockets/WebSocket.h:

* Modules/websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::fail): Null-check m_handshake before creating a console message from it.

LayoutTests:

* http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html: Add a call to webSocket.close() inside the onError handler.

* http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt:

* http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritymixedContentresourcesframewithinsecurewebsockethtml">trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketiniframeexpectedtxt">trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketinmainframeexpectedtxt">trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt</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>

<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketh">trunk/Source/WebCore/Modules/websockets/WebSocket.h</a></li>

<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/LayoutTests/ChangeLog        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -1,3 +1,14 @@

</span><ins>+2015-07-29  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        Crash calling webSocket.close() from onError handler for blocked web socket.

+        &lt;rdar://problem/21771620&gt; and https://bugs.webkit.org/show_bug.cgi?id=147411

+

+        Reviewed by Tim Horton.

+

+        * http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html: Add a call to webSocket.close() inside the onError handler.

+        * http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt:

+        * http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt:

+

</ins><span class="cx"> 2015-07-19  Matt Rajca  &lt;mrajca@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Media Session: test 'Transient Solo' interruptions

</span></span></pre></div>

<a id="trunkLayoutTestshttptestssecuritymixedContentresourcesframewithinsecurewebsockethtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -2,6 +2,8 @@

</span><span class="cx"> &lt;script&gt;

</span><span class="cx"> window.jsTestIsAsync = true;

</span><span class="cx"> 

</span><ins>+var ws;

+

</ins><span class="cx"> function onSocketOpened() {

</span><span class="cx">     alert(&quot;WebSocket connection opened.&quot;);

</span><span class="cx">     finishJSTest();

</span><span class="lines">@@ -9,6 +11,7 @@

</span><span class="cx"> 

</span><span class="cx"> function onSocketError() {

</span><span class="cx">     alert(&quot;WebSocket connection failed.&quot;);

</span><ins>+    ws.close();

</ins><span class="cx">     finishJSTest();

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -18,7 +21,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> try {

</span><del>-    var ws = new WebSocket(&quot;ws://127.0.0.1:8880/websocket/tests/hybi/echo&quot;);

</del><ins>+    ws = new WebSocket(&quot;ws://127.0.0.1:8880/websocket/tests/hybi/echo&quot;);

</ins><span class="cx">     ws.onopen = onSocketOpened;

</span><span class="cx">     ws.onerror = onSocketError;

</span><span class="cx">     ws.onclose = onSocketClosed;

</span></span></pre></div>

<a id="trunkLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketiniframeexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -1,6 +1,7 @@

<del>-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.

</del><ins>+CONSOLE MESSAGE: line 24: [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.

</ins><span class="cx"> 

<span class="cx"> ALERT: WebSocket connection failed.

<ins>+CONSOLE MESSAGE: line 14: WebSocket connection failed: WebSocket is closed before the connection is established.

</ins><span class="cx"> 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.

</span><span class="cx"> 

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkLayoutTestshttptestssecuritymixedContentwebsocketinsecurewebsocketinmainframeexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -1,4 +1,5 @@

<del>-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.

</del><ins>+CONSOLE MESSAGE: line 24: [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.

</ins><span class="cx"> 

<span class="cx"> ALERT: WebSocket connection failed.

<ins>+CONSOLE MESSAGE: line 14: WebSocket connection failed: WebSocket is closed before the connection is established.

</ins><span class="cx"> 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.

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/Source/WebCore/ChangeLog        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -1,3 +1,24 @@

</span><ins>+2015-07-29  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        Crash calling webSocket.close() from onError handler for blocked web socket.

+        &lt;rdar://problem/21771620&gt; and https://bugs.webkit.org/show_bug.cgi?id=147411

+

+        Reviewed by Tim Horton.

+

+        Tests: http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html

+               http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html

+

+        This was introduced with http://trac.webkit.org/changeset/185848

+

+        * Modules/websockets/WebSocket.cpp:

+        (WebCore::WebSocket::connect): When blocked because of mixedContent, call dispatchOrQueueErrorEvent().

+        (WebCore::WebSocket::didReceiveMessageError): Use dispatchOrQueueErrorEvent() instead.

+        (WebCore::WebSocket::dispatchOrQueueErrorEvent): Dispatch the error event, but don't dispatch one twice!

+        * Modules/websockets/WebSocket.h:

+

+        * Modules/websockets/WebSocketChannel.cpp:

+        (WebCore::WebSocketChannel::fail): Null-check m_handshake before creating a console message from it.

+

</ins><span class="cx"> 2015-07-29  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Clean up RefPtrCairo.cpp

</span></span></pre></div>

<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -284,12 +284,13 @@

</span><span class="cx">         if (!document.frame()-&gt;loader().mixedContentChecker().canRunInsecureContent(document.securityOrigin(), m_url)) {

<span class="cx">             // Balanced by the call to ActiveDOMObject::unsetPendingActivity() in WebSocket::stop().

</span><span class="cx">             ActiveDOMObject::setPendingActivity(this);

</span><ins>+

</ins><span class="cx">             // We must block this connection. Instead of throwing an exception, we indicate this

</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 class="cx">             // event; otherwise, users can't connect to the event.

</span><span class="cx">             RunLoop::main().dispatch([this]() {

</span><del>-                dispatchEvent(Event::create(eventNames().errorEvent, false, false));

</del><ins>+                dispatchOrQueueErrorEvent();

</ins><span class="cx">                 stop();

</span><span class="cx">             });

</span><span class="cx">             return;

</span><span class="lines">@@ -587,7 +588,7 @@

</span><span class="cx">     LOG(Network, &quot;WebSocket %p didReceiveErrorMessage()&quot;, this);

</span><span class="cx">     m_state = CLOSED;

</span><span class="cx">     ASSERT(scriptExecutionContext());

</span><del>-    dispatchOrQueueEvent(Event::create(eventNames().errorEvent, false, false));

</del><ins>+    dispatchOrQueueErrorEvent();

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void WebSocket::didUpdateBufferedAmount(unsigned long bufferedAmount)

</span><span class="lines">@@ -638,6 +639,15 @@

</span><span class="cx">     return overhead;

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+void WebSocket::dispatchOrQueueErrorEvent()

+{

+    if (m_dispatchedErrorEvent)

+        return;

+

+    m_dispatchedErrorEvent = true;

+    dispatchOrQueueEvent(Event::create(eventNames().errorEvent, false, false));

+}

+

</ins><span class="cx"> void WebSocket::dispatchOrQueueEvent(Ref&lt;Event&gt;&amp;&amp; event)

</span><span class="cx"> {

</span><span class="cx">     if (m_shouldDelayEventFiring)

</span></span></pre></div>

<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -110,6 +110,7 @@

</span><span class="cx">     explicit WebSocket(ScriptExecutionContext&amp;);

</span><span class="cx"> 

</span><span class="cx">     void resumeTimerFired();

</span><ins>+    void dispatchOrQueueErrorEvent();

</ins><span class="cx">     void dispatchOrQueueEvent(Ref&lt;Event&gt;&amp;&amp;);

</span><span class="cx"> 

<span class="cx">     // ActiveDOMObject API.

</span><span class="lines">@@ -143,6 +144,7 @@

</span><span class="cx">     Timer m_resumeTimer;

</span><span class="cx">     bool m_shouldDelayEventFiring { false };

</span><span class="cx">     Deque&lt;Ref&lt;Event&gt;&gt; m_pendingEvents;

</span><ins>+    bool m_dispatchedErrorEvent { false };

</ins><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // namespace WebCore

</span></span></pre></div>

<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (187555 => 187556)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp        2015-07-29 20:30:08 UTC (rev 187555)

+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp        2015-07-29 21:08:30 UTC (rev 187556)

</span><span class="lines">@@ -201,7 +201,14 @@

</span><span class="cx">     ASSERT(!m_suspended);

</span><span class="cx">     if (m_document) {

</span><span class="cx">         InspectorInstrumentation::didReceiveWebSocketFrameError(m_document, m_identifier, reason);

</span><del>-        m_document-&gt;addConsoleMessage(MessageSource::Network, MessageLevel::Error, &quot;WebSocket connection to '&quot; + m_handshake-&gt;url().stringCenterEllipsizedToLength() + &quot;' failed: &quot; + reason);

</del><ins>+

+        String consoleMessage;

+        if (m_handshake)

+            consoleMessage = makeString(&quot;WebSocket connection to '&quot;, m_handshake-&gt;url().stringCenterEllipsizedToLength(), &quot;' failed: &quot;, reason);

+        else

+            consoleMessage = makeString(&quot;WebSocket connection failed: &quot;, reason);

+

+        m_document-&gt;addConsoleMessage(MessageSource::Network, MessageLevel::Error, consoleMessage);

</ins><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx">     // Hybi-10 specification explicitly states we must not continue to handle incoming data

</span><span class="lines">@@ -218,7 +225,8 @@

</span><span class="cx">     if (m_handle &amp;&amp; !m_closed)

<span class="cx">         m_handle-&gt;disconnect(); // Will call didClose().

</span><span class="cx"> 

</span><del>-    ASSERT(m_closed);

</del><ins>+    // We should be closed by now, but if we never got a handshake then we never even opened.

+    ASSERT(m_closed || !m_handshake);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void WebSocketChannel::disconnect()

</span></span></pre>

</div>

</div>

</body>

</html>