From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- .../frame-ancestors-from-serviceworker.https.html.ini | 4 +++- .../frame-ancestors-nested-cross-in-cross-self-block.html.ini | 4 ---- .../frame-ancestors-nested-cross-in-same-self-block.html.ini | 4 ---- .../frame-ancestors-nested-same-in-cross-self-block.html.ini | 4 ---- .../inside-worker/sharedworker-script-src.sub.html.ini | 5 +++-- 5 files changed, 6 insertions(+), 15 deletions(-) (limited to 'testing/web-platform/meta/content-security-policy') diff --git a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini index 1f3b994d86..a2ac0c2800 100644 --- a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini +++ b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html.ini @@ -1,9 +1,11 @@ [frame-ancestors-from-serviceworker.https.html] expected: - if (os == "linux") and asan and not fission: [OK, CRASH] + if (os == "win") and not debug and (processor == "x86_64"): [OK, TIMEOUT] + if (os == "linux") and not fission and not debug: [OK, CRASH] if (os == "mac") and not debug: [OK, TIMEOUT] if (os == "android") and not debug: [OK, TIMEOUT] [A 'frame-ancestors' CSP directive set from a serviceworker response with a value 'none' should block rendering.] expected: + if (os == "win") and not debug and (processor == "x86_64"): [PASS, NOTRUN] if (os == "mac") and not debug: [PASS, TIMEOUT] if (os == "android") and not debug: [PASS, TIMEOUT] diff --git a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini index b7c2b0bb97..878248f99d 100644 --- a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini +++ b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html.ini @@ -2,7 +2,3 @@ expected: if (os == "mac") and not debug: [OK, TIMEOUT] if (os == "android") and not debug: [OK, TIMEOUT] - [A 'frame-ancestors' CSP directive with a value 'same' should block render in same-origin nested frames.] - expected: - if (os == "mac") and not debug: [PASS, NOTRUN] - if (os == "android") and not debug: [PASS, NOTRUN] diff --git a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html.ini b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html.ini index c4bc352850..6383173f21 100644 --- a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html.ini +++ b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html.ini @@ -2,7 +2,3 @@ expected: if (os == "mac") and not debug: [OK, TIMEOUT] if (os == "android") and not debug: [OK, TIMEOUT] - [A 'frame-ancestors' CSP directive with a value 'same' should block render in same-origin nested frames.] - expected: - if (os == "mac") and not debug: [PASS, NOTRUN] - if (os == "android") and not debug: [PASS, NOTRUN] diff --git a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini index 8f9dab50d1..98321b223f 100644 --- a/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini +++ b/testing/web-platform/meta/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html.ini @@ -2,7 +2,3 @@ expected: if (os == "mac") and not debug: [OK, TIMEOUT] if (os == "android") and not debug: [OK, TIMEOUT] - [A 'frame-ancestors' CSP directive with a value 'same' should block render in same-origin nested frames.] - expected: - if (os == "mac") and not debug: [PASS, NOTRUN] - if (os == "android") and not debug: [PASS, NOTRUN] diff --git a/testing/web-platform/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini b/testing/web-platform/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini index 0ad2e3eba5..6df007a640 100644 --- a/testing/web-platform/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini +++ b/testing/web-platform/meta/content-security-policy/inside-worker/sharedworker-script-src.sub.html.ini @@ -1,3 +1,4 @@ [sharedworker-script-src.sub.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] + [Reports are sent for http: with default-src 'self'] + expected: + if (processor == "x86") and debug: [PASS, FAIL] -- cgit v1.2.3