<!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>[209401] trunk/LayoutTests</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/209401">209401</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-06 09:45:54 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test insecure-xhr-sync-in-main-frame.html fails with CORS error if run before <a href="http://trac.webkit.org/projects/webkit/changeset/203542">r203542</a>
https://bugs.webkit.org/show_bug.cgi?id=165407
Reviewed by Alexey Proskuryakov.
Make the test insecure-xhr-sync-in-main-frame.html demonstrate a mixed content failure
instead of a CORS failure when run before <a href="http://trac.webkit.org/projects/webkit/changeset/203542">r203542</a>.
In <a href="http://trac.webkit.org/projects/webkit/changeset/203542">r203542</a> the test http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame.html
was added to ensure that we block loading insecure data via XHR from an HTTPS page. When
this test is run prior to <a href="http://trac.webkit.org/projects/webkit/changeset/203542">r203542</a> it fails due to a CORS errors as opposed to showing
the intended JavaScript alert failure message. The CORS error is due to loading a
cross-origin resource that did not return an appropriate Access-Control-Allow-Origin header
to allow reading of the response.
* http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame-expected.txt: Update expected result
based on the change below.
* http/tests/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html:
Load a resource that returns "Access-Control-Allow-Origin: *" so that origin (http, 127.0.0.1, 8000)
can read the response returned from origin (https, 127.0.0.1, 8443).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritymixedContentinsecurexhrsyncinmainframeexpectedtxt">trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritymixedContentresourcesinsecurexhrsyncinmainframewindowhtml">trunk/LayoutTests/http/tests/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209400 => 209401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-06 17:42:37 UTC (rev 209400)
+++ trunk/LayoutTests/ChangeLog 2016-12-06 17:45:54 UTC (rev 209401)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-12-06 Daniel Bates <dabates@apple.com>
+
+ Test insecure-xhr-sync-in-main-frame.html fails with CORS error if run before r203542
+ https://bugs.webkit.org/show_bug.cgi?id=165407
+
+ Reviewed by Alexey Proskuryakov.
+
+ Make the test insecure-xhr-sync-in-main-frame.html demonstrate a mixed content failure
+ instead of a CORS failure when run before r203542.
+
+ In r203542 the test http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame.html
+ was added to ensure that we block loading insecure data via XHR from an HTTPS page. When
+ this test is run prior to r203542 it fails due to a CORS errors as opposed to showing
+ the intended JavaScript alert failure message. The CORS error is due to loading a
+ cross-origin resource that did not return an appropriate Access-Control-Allow-Origin header
+ to allow reading of the response.
+
+ * http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame-expected.txt: Update expected result
+ based on the change below.
+ * http/tests/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html:
+ Load a resource that returns "Access-Control-Allow-Origin: *" so that origin (http, 127.0.0.1, 8000)
+ can read the response returned from origin (https, 127.0.0.1, 8443).
+
</ins><span class="cx"> 2016-12-06 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> PDF markup/annotations visible in Mail on macOS but not on iOS
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymixedContentinsecurexhrsyncinmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame-expected.txt (209400 => 209401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame-expected.txt 2016-12-06 17:42:37 UTC (rev 209400)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-sync-in-main-frame-expected.txt 2016-12-06 17:45:54 UTC (rev 209401)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-CONSOLE MESSAGE: line 26: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html was not allowed to run insecure content from http://127.0.0.1:8000/.
</del><ins>+CONSOLE MESSAGE: line 26: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html was not allowed to run insecure content from http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi.
</ins><span class="cx">
</span><span class="cx"> This test opens a HTTPS window that loads insecure data via synchronous XHR. We should trigger a mixed content callback because the main frame in the window is HTTPS but now has insecure data.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymixedContentresourcesinsecurexhrsyncinmainframewindowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html (209400 => 209401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html 2016-12-06 17:42:37 UTC (rev 209400)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/insecure-xhr-sync-in-main-frame-window.html 2016-12-06 17:45:54 UTC (rev 209401)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> }, 2000);
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://127.0.0.1:8000/", false);
</del><ins>+ xhr.open("GET", "http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi", false);
</ins><span class="cx"> } catch (ex) {
</span><span class="cx"> // Firefox raises an exception, which is one way to make this detectable.
</span><span class="cx"> if (window.testRunner)
</span></span></pre>
</div>
</div>
</body>
</html>