diff options
author | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
commit | 9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f (patch) | |
tree | 831e0ae1649d6135429def03688bc93ff7c86b03 /dom/security | |
parent | 42f895f27f239e973c9c06241f7a58da7381353c (diff) | |
parent | f624bd1375655dea196cdcb70a9860bc5817df49 (diff) | |
download | UXP-RC_20200924.tar UXP-RC_20200924.tar.gz UXP-RC_20200924.tar.lz UXP-RC_20200924.tar.xz UXP-RC_20200924.zip |
Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924
Diffstat (limited to 'dom/security')
-rw-r--r-- | dom/security/test/csp/file_bug1312272.html | 13 | ||||
-rw-r--r-- | dom/security/test/csp/file_strict_dynamic_script_events_xbl.html | 14 | ||||
-rw-r--r-- | dom/security/test/csp/test_strict_dynamic.html | 7 |
3 files changed, 0 insertions, 34 deletions
diff --git a/dom/security/test/csp/file_bug1312272.html b/dom/security/test/csp/file_bug1312272.html deleted file mode 100644 index 18e0e5589..000000000 --- a/dom/security/test/csp/file_bug1312272.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE HTML> -<!-- Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ --> -<html> -<head> - <meta charset="utf-8"> - <title>marquee inline script tests for Bug 1312272</title> -</head> -<body> -<marquee id="m" onstart="parent.postMessage('csp-violation-marquee-onstart', '*')">bug 1312272</marquee> -<script src="file_bug1312272.js"></script> -</body> -</html> diff --git a/dom/security/test/csp/file_strict_dynamic_script_events_xbl.html b/dom/security/test/csp/file_strict_dynamic_script_events_xbl.html deleted file mode 100644 index 701ef3226..000000000 --- a/dom/security/test/csp/file_strict_dynamic_script_events_xbl.html +++ /dev/null @@ -1,14 +0,0 @@ -<!DOCTYPE HTML> -<html> -<head> - <title>Bug 1316826 - 'strict-dynamic' blocking DOM event handlers</title> -</head> -<body> -<div id="testdiv">blocked</div> - -<marquee onstart='document.getElementById("testdiv").innerHTML = "allowed";'> - Bug 1316826 -</marquee> - -</body> -</html> diff --git a/dom/security/test/csp/test_strict_dynamic.html b/dom/security/test/csp/test_strict_dynamic.html index 00e75143f..8f1b53f31 100644 --- a/dom/security/test/csp/test_strict_dynamic.html +++ b/dom/security/test/csp/test_strict_dynamic.html @@ -79,13 +79,6 @@ var tests = [ policy: "script-src 'strict-dynamic' 'nonce-foo'" }, { - // marquee is a special snowflake. Extra test for xbl things. - desc: "strict-dynamic with DOM events should be blocked (XBL)", - result: "blocked", - file: "file_strict_dynamic_script_events_xbl.html", - policy: "script-src 'strict-dynamic' 'nonce-foo'" - }, - { desc: "strict-dynamic with JS URLs should be blocked", result: "blocked", file: "file_strict_dynamic_js_url.html", |