path: root/www/waterfox/files/patch-bug1387811

commit a1341ccf6d63
Author: Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
Date:   Sun Aug 6 11:37:09 2017 +0200

    Bug 1387811 - Follow up for Test within Bug 1381761: CSP JSON is never null, hence it's better to check actual contents of JSON for testing. r=dveditz
---
 dom/security/test/csp/file_data_csp_inheritance.html | 6 ++++--
 dom/security/test/csp/test_data_csp_inheritance.html | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git dom/security/test/csp/file_data_csp_inheritance.html dom/security/test/csp/file_data_csp_inheritance.html
index 299c30255aa6..cbb4865343db 100644
--- dom/security/test/csp/file_data_csp_inheritance.html
+++ dom/security/test/csp/file_data_csp_inheritance.html
@@ -13,8 +13,10 @@
   var frame = document.getElementById("dataFrame");
   var principal = SpecialPowers.wrap(frame.contentDocument).nodePrincipal;
   var cspJSON = principal.cspJSON;
-  var result = principal.cspJSON ? "dataInheritsCSP" : "dataDoesNotInheritCSP";
-  window.parent.postMessage({result}, "*");
+  var cspOBJ = JSON.parse(principal.cspJSON);
+  // make sure we got >>one<< policy
+  var policies = cspOBJ["csp-policies"];
+  window.parent.postMessage({result: policies.length}, "*");
 </script>
 
 </body>
diff --git dom/security/test/csp/test_data_csp_inheritance.html dom/security/test/csp/test_data_csp_inheritance.html
index 3afc4f7c02bc..bde2f5617e65 100644
--- dom/security/test/csp/test_data_csp_inheritance.html
+++ dom/security/test/csp/test_data_csp_inheritance.html
@@ -22,7 +22,9 @@ SimpleTest.waitForExplicitFinish();
 window.addEventListener("message", receiveMessage);
 function receiveMessage(event) {
   window.removeEventListener("message", receiveMessage);
-  is(event.data.result, "dataInheritsCSP",
+  // toplevel CSP should apply to data: URI iframe hence resulting
+  // in 1 applied policy.
+  is(event.data.result, 1,
      "data: URI iframe inherits CSP from including context");
   SimpleTest.finish();
 }