<!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>[194946] 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/194946">194946</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-12 17:41:41 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194704">r194704</a>. rdar://problem/24043057</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsinspectorinspectortestjs">branches/safari-601-branch/LayoutTests/http/tests/inspector/inspector-test.js</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectornetworkclientblockedloadhtml">branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredebuggerDebuggercpp">branches/safari-601-branch/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsinspectordebuggercspexceptionsexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordebuggercspexceptionshtml">branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordebuggerresourcescspexceptioniframehtml">branches/safari-601-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.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 (194945 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-13 01:41:37 UTC (rev 194945)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194704. rdar://problem/24043057
+
+ 2016-01-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH Attempting to pause on CSP violation not inside of script
+ https://bugs.webkit.org/show_bug.cgi?id=152825
+ <rdar://problem/24021276>
+
+ Reviewed by Timothy Hatcher.
+
+ * http/tests/inspector/resources/inspector-test.js:
+ (TestPage.reportUncaughtException):
+ Allow a test to continue after uncaught exceptions.
+
+ * inspector/debugger/csp-exceptions-expected.txt: Added.
+ * inspector/debugger/csp-exceptions.html: Added.
+ * inspector/debugger/resources/csp-exception-iframe.html: Added.
+ Test a CSP exception that causes a pause and one outside of
+ script that does not pause (and does not crash).
+
+2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194910. rdar://problem/24101255
</span><span class="cx">
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsinspectorinspectortestjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/http/tests/inspector/inspector-test.js (194945 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/inspector/inspector-test.js 2016-01-13 01:41:37 UTC (rev 194945)
+++ branches/safari-601-branch/LayoutTests/http/tests/inspector/inspector-test.js 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TestPage.allowUncaughtExceptions = false;
</ins><span class="cx"> InspectorTestProxy.needToSanitizeUncaughtExceptionURLs = false;
</span><span class="cx">
</span><span class="cx"> InspectorTestProxy.reportUncaughtException = function(message, url, lineNumber)
</span><span class="lines">@@ -159,7 +160,9 @@
</span><span class="cx">
</span><span class="cx"> var result = "Uncaught exception in test page: " + message + " [" + url + ":" + lineNumber + "]";
</span><span class="cx"> InspectorTestProxy.addResult(result);
</span><del>- InspectorTestProxy.completeTest();
</del><ins>+
+ if (!TestPage.allowUncaughtExceptions)
+ TestPage.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Catch syntax errors, type errors, and other exceptions. Run this before loading other files.
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordebuggercspexceptionsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt (0 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+CONSOLE MESSAGE: line 11: EvalError: Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: "script-src 'self' 'unsafe-inline'".
+
+CONSOLE MESSAGE: line 7: Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'none'".
+
+Test for the CSP exception handling when pause on all exceptions is enabled.
+
+
+== Running test suite: PauseOnCSPExceptionDoesNotCrash
+-- Running test case: TriggerCSPExceptionInsideOfScript
+PASS: CSP Exception caused by script evaluation should pause.
+Uncaught exception in test page: EvalError: Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: "script-src 'self' 'unsafe-inline'".
+ [csp-exceptions.html:11]
+
+-- Running test case: TriggerCSPExceptionOutsideOfScript
+PASS: CSP Exception caused outside of script evaluation should not pause.
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordebuggercspexceptionshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions.html (0 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/csp-exceptions.html 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+TestPage.allowUncaughtExceptions = true;
+TestPage.needToSanitizeUncaughtExceptionURLs = true;
+
+function triggerCSPExceptionInsideScript() {
+ eval("console.log('CSP should prevent this')");
+}
+
+function triggerCSPExceptionOutsideScript() {
+ let iframe = document.createElement("iframe");
+ iframe.src = "resources/csp-exception-iframe.html";
+ document.body.appendChild(iframe);
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("PauseOnCSPExceptionDoesNotCrash");
+
+ suite.addTestCase({
+ name: "TriggerCSPExceptionInsideOfScript",
+ description: "Trigger a CSP Exception inside of script should pause.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("setTimeout(triggerCSPExceptionInsideScript)");
+ WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
+ InspectorTest.pass("CSP Exception caused by script evaluation should pause.");
+ WebInspector.debuggerManager.resume();
+ });
+ WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Resumed, (event) => {
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "TriggerCSPExceptionOutsideOfScript",
+ description: "Trigger a CSP Exception outside of script should not pause or crash.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("setTimeout(triggerCSPExceptionOutsideScript)");
+ let tempPauseFailListener = WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
+ InspectorTest.fail("CSP Exception caused outside of script evaluation should not pause, but did.");
+ WebInspector.debuggerManager.resume();
+ reject();
+ });
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+ WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.Paused, tempPauseFailListener, null);
+ InspectorTest.pass("CSP Exception caused outside of script evaluation should not pause.");
+ resolve();
+ });
+ }
+ });
+
+ DebuggerAgent.setPauseOnExceptions("all");
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Test for the CSP exception handling when pause on all exceptions is enabled.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordebuggerresourcescspexceptioniframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html (0 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Security-Policy" content="script-src 'none'">
+</head>
+<body>
+<script>console.log("CSP should prevent this");</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectornetworkclientblockedloadhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html (194945 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html 2016-01-13 01:41:37 UTC (rev 194945)
+++ branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
</span><span class="cx"> InspectorTest.expectThat(resource.url === "", "Request url should be rewritten to the null string.");
</span><span class="cx"> resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFail, (event) => {
</span><del>- InspectorTest.expectThat(true, "Resource load should fail.");
</del><ins>+ InspectorTest.pass("Resource load should fail.");
</ins><span class="cx"> resolve();
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (194945 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2016-01-13 01:41:37 UTC (rev 194945)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194704. rdar://problem/24043057
+
+ 2016-01-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH Attempting to pause on CSP violation not inside of script
+ https://bugs.webkit.org/show_bug.cgi?id=152825
+ <rdar://problem/24021276>
+
+ Reviewed by Timothy Hatcher.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::breakProgram):
+ We cannot pause if we are not evaluating JavaScript, so bail.
+
+2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194908. rdar://problem/24101253
</span><span class="cx">
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/debugger/Debugger.cpp (194945 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/debugger/Debugger.cpp 2016-01-13 01:41:37 UTC (rev 194945)
+++ branches/safari-601-branch/Source/JavaScriptCore/debugger/Debugger.cpp 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -585,10 +585,12 @@
</span><span class="cx"> if (m_isPaused)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!m_vm->topCallFrame)
+ return;
+
</ins><span class="cx"> m_pauseOnNextStatement = true;
</span><span class="cx"> setSteppingMode(SteppingModeEnabled);
</span><span class="cx"> m_currentCallFrame = m_vm->topCallFrame;
</span><del>- ASSERT(m_currentCallFrame);
</del><span class="cx"> pauseIfNeeded(m_currentCallFrame);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (194945 => 194946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:37 UTC (rev 194945)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:41 UTC (rev 194946)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194704. rdar://problem/24043057
+
+ 2016-01-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH Attempting to pause on CSP violation not inside of script
+ https://bugs.webkit.org/show_bug.cgi?id=152825
+ <rdar://problem/24021276>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Test/TestHarness.js:
+ (TestHarness.prototype.expectThat):
+ (TestHarness.prototype.pass):
+ (TestHarness.prototype.fail):
+ Add a simple way to output a standard pass/fail message. These are
+ often nicer than expectThat(true, ...) or assert(false, ...).
+
+2016-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194602. rdar://problem/24101260
</span><span class="cx">
</span><span class="cx"> 2016-01-05 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre>
</div>
</div>
</body>
</html>