From 38a3b369927bee0d176cafa701610e387b593d4c Mon Sep 17 00:00:00 2001 From: Christoph Kerschbaumer Date: Thu, 3 Aug 2017 10:52:27 +0200 Subject: [PATCH] Bug 1386183 - Test Meta CSP on data: URI iframe to be merged with CSP from including context. r=dveditz --- .../test/csp/file_data_csp_merge.html | 26 ++++++++++++++ dom/security/test/csp/mochitest.ini | 2 ++ .../test/csp/test_data_csp_merge.html | 36 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 dom/security/test/csp/file_data_csp_merge.html create mode 100644 dom/security/test/csp/test_data_csp_merge.html diff --git a/dom/security/test/csp/file_data_csp_merge.html b/dom/security/test/csp/file_data_csp_merge.html new file mode 100644 index 000000000000..e5d34c39f6f6 --- /dev/null +++ b/dom/security/test/csp/file_data_csp_merge.html @@ -0,0 +1,26 @@ + + + + Bug 1386183 - Meta CSP on data: URI iframe should be merged with toplevel CSP + + + + + + + + + + diff --git a/dom/security/test/csp/mochitest.ini b/dom/security/test/csp/mochitest.ini index 7779cfcbc889..ba391ad59799 100644 --- a/dom/security/test/csp/mochitest.ini +++ b/dom/security/test/csp/mochitest.ini @@ -216,6 +216,7 @@ support-files = file_ignore_xfo.html^headers^ file_ro_ignore_xfo.html file_ro_ignore_xfo.html^headers^ + file_data_csp_merge.html [test_base-uri.html] [test_blob_data_schemes.html] @@ -307,3 +308,4 @@ tags = mcb [test_websocket_self.html] skip-if = toolkit == 'android' [test_ignore_xfo.html] +[test_data_csp_merge.html] diff --git a/dom/security/test/csp/test_data_csp_merge.html b/dom/security/test/csp/test_data_csp_merge.html new file mode 100644 index 000000000000..1137d4c5826a --- /dev/null +++ b/dom/security/test/csp/test_data_csp_merge.html @@ -0,0 +1,36 @@ + + + + Bug 1386183 - Meta CSP on data: URI iframe should be merged with toplevel CSP + + + + + + + + + +