diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-05-06 20:45:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-06 20:45:22 +0200 |
commit | 5390888b97ecbd4135049c0b4a2ae0b103052a4a (patch) | |
tree | f3ddb622b21bd336384972e5461402d247478f85 /dom/base | |
parent | 61394bf4ff79650ee4b3f3951331c8a8775de6e3 (diff) | |
parent | 26a032c080c91ee9da347893362d5b08bc759c10 (diff) | |
download | UXP-5390888b97ecbd4135049c0b4a2ae0b103052a4a.tar UXP-5390888b97ecbd4135049c0b4a2ae0b103052a4a.tar.gz UXP-5390888b97ecbd4135049c0b4a2ae0b103052a4a.tar.lz UXP-5390888b97ecbd4135049c0b4a2ae0b103052a4a.tar.xz UXP-5390888b97ecbd4135049c0b4a2ae0b103052a4a.zip |
Merge pull request #335 from janekptacijarabaci/security_blocking_data_3
moebius#231: Consider blocking top level window data: URIs (tests)
Diffstat (limited to 'dom/base')
-rw-r--r-- | dom/base/test/file_ipc_messagemanager_blob.html | 1 | ||||
-rw-r--r-- | dom/base/test/mochitest.ini | 1 | ||||
-rw-r--r-- | dom/base/test/test_ipc_messagemanager_blob.html | 3 | ||||
-rw-r--r-- | dom/base/test/test_x-frame-options.html | 6 |
4 files changed, 8 insertions, 3 deletions
diff --git a/dom/base/test/file_ipc_messagemanager_blob.html b/dom/base/test/file_ipc_messagemanager_blob.html new file mode 100644 index 000000000..dbdd64a34 --- /dev/null +++ b/dom/base/test/file_ipc_messagemanager_blob.html @@ -0,0 +1 @@ +<!DOCTYPE HTML><html><body></body></html> diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index ddfd57443..b3b804ce4 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -676,6 +676,7 @@ skip-if = (toolkit == 'android') # Android: Bug 775227 [test_intersectionobservers.html] skip-if = true # Track Bug 1320704 [test_ipc_messagemanager_blob.html] +support-files = file_ipc_messagemanager_blob.html [test_link_prefetch.html] skip-if = !e10s # Track Bug 1281415 [test_link_stylesheet.html] diff --git a/dom/base/test/test_ipc_messagemanager_blob.html b/dom/base/test/test_ipc_messagemanager_blob.html index 74eab2945..77d6c767f 100644 --- a/dom/base/test/test_ipc_messagemanager_blob.html +++ b/dom/base/test/test_ipc_messagemanager_blob.html @@ -14,8 +14,7 @@ SimpleTest.waitForExplicitFinish(); - const childFrameURL = - "data:text/html,<!DOCTYPE HTML><html><body></body></html>"; + const childFrameURL = "file_ipc_messagemanager_blob.html"; function childFrameScript() { "use strict"; diff --git a/dom/base/test/test_x-frame-options.html b/dom/base/test/test_x-frame-options.html index 8e24d8a78..a0c7acdc3 100644 --- a/dom/base/test/test_x-frame-options.html +++ b/dom/base/test/test_x-frame-options.html @@ -147,7 +147,11 @@ var testFrameInDataURI = function() { SimpleTest.waitForExplicitFinish(); // load the test harness -document.getElementById("harness").src = "file_x-frame-options_main.html"; +SpecialPowers.pushPrefEnv({ + "set": [["security.data_uri.block_toplevel_data_uri_navigations", false],] +}, function() { + document.getElementById("harness").src = "file_x-frame-options_main.html"; +}); </script> </pre> |