Backed out changeset 06a8a827447d (bug 826805)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 10 Nov 2014 08:17:53 +0100
changeset 226152 cf287850e17c3cb5f1500f963c83b19468167dea
parent 226151 0da722f1ddadae22f43b24ec7049055e104de000
child 226153 961d11a0833313c9b2e760fcc9c05fb24ff2adbf
push id36
push userdburns@mozilla.com
push dateMon, 10 Nov 2014 15:14:02 +0000
bugs826805
milestone36.0a1
backs out06a8a827447d887fe4e269460dc0cd9085e3b7b0
Backed out changeset 06a8a827447d (bug 826805)
dom/base/test/csp/file_csp_allow_https_schemes.html
dom/base/test/csp/mochitest.ini
dom/base/test/csp/test_csp_allow_https_schemes.html
deleted file mode 100644
--- a/dom/base/test/csp/file_csp_allow_https_schemes.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>Bug 826805 - CSP: Allow http and https for scheme-less sources</title>
-  </head>
-  <body>
-  <div id="testdiv">blocked</div>
-  <!--
-    We resue file_csp_path_matching.js which just updates the contents of 'testdiv' to contain allowed.
-    Note, that we are loading the file_csp_path_matchting.js using a scheme of 'https'.
-   -->
-  <script src="https://example.com/tests/dom/base/test/csp/file_csp_path_matching.js#foo"></script>
-</body>
-</html>
--- a/dom/base/test/csp/mochitest.ini
+++ b/dom/base/test/csp/mochitest.ini
@@ -1,15 +1,14 @@
 [DEFAULT]
 support-files =
   file_base-uri.html
   file_connect-src.html
   file_CSP.css
   file_CSP.sjs
-  file_csp_allow_https_schemes.html
   file_CSP_bug663567.xsl
   file_CSP_bug663567_allows.xml
   file_CSP_bug663567_allows.xml^headers^
   file_CSP_bug663567_blocks.xml
   file_CSP_bug663567_blocks.xml^headers^
   file_CSP_bug802872.html
   file_CSP_bug802872.html^headers^
   file_CSP_bug802872.js
@@ -99,17 +98,16 @@ support-files =
   file_multi_policy_injection_bypass.html
   file_multi_policy_injection_bypass.html^headers^
   file_multi_policy_injection_bypass_2.html
   file_multi_policy_injection_bypass_2.html^headers^
 
 [test_base-uri.html]
 [test_connect-src.html]
 [test_CSP.html]
-[test_csp_allow_https_schemes.html]
 [test_CSP_bug663567.html]
 [test_CSP_bug802872.html]
 [test_CSP_bug885433.html]
 [test_CSP_bug888172.html]
 [test_CSP_evalscript.html]
 [test_CSP_frameancestors.html]
 skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' # Times out, not sure why (bug 1008445)
 [test_CSP_inlinescript.html]
deleted file mode 100644
--- a/dom/base/test/csp/test_csp_allow_https_schemes.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Bug 826805 - Allow http and https for scheme-less sources</title>
-  <!-- Including SimpleTest.js so we can use waitForExplicitFinish !-->
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <p id="display"></p>
-  <div id="content" style="visibility: hidden">
-    <iframe style="width:100%;" id="testframe"></iframe>
-  </div>
-
-<script class="testbody" type="text/javascript">
-
-SimpleTest.waitForExplicitFinish();
-
-/* Description of the test:
- * We are loading the following url (including a fragment portion):
- *   https://example.com/tests/dom/base/test/csp/file_csp_path_matching.js#foo
- * using different policies that lack specification of a scheme.
- *
- * Since the file is served over http:, the upgrade to https should be
- * permitted by CSP in case no port is specified.
- */
-
-var policies = [
-  ["allowed", "example.com"],
-  ["allowed", "example.com:443"],
-  ["blocked", "example.com:80"]
-]
-
-var counter = 0;
-var policy;
-
-function loadNextTest() {
-  if (counter == policies.length) {
-    SimpleTest.finish();
-  }
-  else {
-    policy = policies[counter++];
-    var src = "file_csp_testserver.sjs";
-    // append the file that should be served
-    src += "?file=" + escape("tests/dom/base/test/csp/file_csp_allow_https_schemes.html");
-    // append the CSP that should be used to serve the file
-    src += "&csp=" + escape("default-src 'none'; script-src " + policy[1]);
-
-    document.getElementById("testframe").addEventListener("load", test, false);
-    document.getElementById("testframe").src = src;
-  }
-}
-
-function test() {
-  try {
-    document.getElementById("testframe").removeEventListener('load', test, false);
-    var testframe = document.getElementById("testframe");
-    var divcontent = testframe.contentWindow.document.getElementById('testdiv').innerHTML;
-    is(divcontent, policy[0], "should be " + policy[0] + " in test " + (counter - 1) + "!");
-  }
-  catch (e) {
-    ok(false, "ERROR: could not access content in test " + (counter - 1) + "!");
-  }
-  loadNextTest();
-}
-
-loadNextTest();
-
-</script>
-</body>
-</html>