Title: [259070] trunk/LayoutTests
Revision
259070
Author
commit-qu...@webkit.org
Date
2020-03-26 13:27:23 -0700 (Thu, 26 Mar 2020)

Log Message

[ iOS ] http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html is flaky failing
https://bugs.webkit.org/show_bug.cgi?id=206763

Patch by Alex Christensen <achristen...@webkit.org> on 2020-03-26
Reviewed by Youenn Fablet.

* http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html:
* http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-data-url-iframe.html:
* platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (259069 => 259070)


--- trunk/LayoutTests/ChangeLog	2020-03-26 20:27:02 UTC (rev 259069)
+++ trunk/LayoutTests/ChangeLog	2020-03-26 20:27:23 UTC (rev 259070)
@@ -1,3 +1,14 @@
+2020-03-26  Alex Christensen  <achristen...@webkit.org>
+
+        [ iOS ] http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html is flaky failing
+        https://bugs.webkit.org/show_bug.cgi?id=206763
+
+        Reviewed by Youenn Fablet.
+
+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html:
+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-data-url-iframe.html:
+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt:
+
 2020-03-26  Chris Dumez  <cdu...@apple.com>
 
         REGRESSION: ASSERTION FAILED: m_wrapper on storage/indexeddb/modern/abort-requests tests

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt (259069 => 259070)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt	2020-03-26 20:27:02 UTC (rev 259069)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt	2020-03-26 20:27:23 UTC (rev 259070)
@@ -1,14 +1,14 @@
+main frame - didFinishDocumentLoadForFrame
 main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishLoadForFrame
 main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
 frame "<!--frame1-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
 frame "<!--frame1-->" - didCommitLoadForFrame
 frame "<!--frame1-->" - didFinishDocumentLoadForFrame
 frame "<!--frame1-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
 frame "<!--frame1-->" - didFinishLoadForFrame
 main frame - didFinishLoadForFrame
 This test opens a window and loads an insecure iframe using a data URL. We should *not* trigger a mixed content block because the data URL cannot be corrupted by an active network attacker.

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html (259069 => 259070)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html	2020-03-26 20:27:02 UTC (rev 259069)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame.html	2020-03-26 20:27:23 UTC (rev 259070)
@@ -18,13 +18,15 @@
 }, false);
 </script>
 </head>
-<body>
+<body _onload_='runtest()'>
 <p>This test opens a window and loads an insecure iframe using a data URL.  We should *not*
 trigger a mixed content block because the data URL cannot be corrupted by an active network
 attacker.</p>
 <pre id="console"></pre>
 <script>
+function runtest() {
     window.open("https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-data-url-iframe.html");
+}
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-data-url-iframe.html (259069 => 259070)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-data-url-iframe.html	2020-03-26 20:27:02 UTC (rev 259069)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-data-url-iframe.html	2020-03-26 20:27:23 UTC (rev 259070)
@@ -2,14 +2,16 @@
 <html>
 <head>
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-</head>
-<body>
 <script>
 function frameLoaded() {
     if (window.opener)
         window.opener.postMessage("PASS did load data URL iframe.", "*");
 }
+function addiframe() {
+    document.write("<iframe _onload_='frameLoaded()' src=''></iframe>");
+}
 </script>
-<iframe _onload_="frameLoaded()" src="" is a boring HTML document."></iframe>
+</head>
+<body _onload_='addiframe()'>
 </body>
 </html>

Modified: trunk/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt (259069 => 259070)


--- trunk/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt	2020-03-26 20:27:02 UTC (rev 259069)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt	2020-03-26 20:27:23 UTC (rev 259070)
@@ -4,11 +4,11 @@
 main frame - didStartProvisionalLoadForFrame
 main frame - didCommitLoadForFrame
 main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
 frame "<!--frame1-->" - didStartProvisionalLoadForFrame
 frame "<!--frame1-->" - didCommitLoadForFrame
 frame "<!--frame1-->" - didFinishDocumentLoadForFrame
 frame "<!--frame1-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
 frame "<!--frame1-->" - didFinishLoadForFrame
 main frame - didFinishLoadForFrame
 This test opens a window and loads an insecure iframe using a data URL. We should *not* trigger a mixed content block because the data URL cannot be corrupted by an active network attacker.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to