LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-and-x-frame-options.pl - Issue 1326823003: CSP: 'frame-ancestors' should override 'x-frame-options'.

Unified Diff: LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-and-x-frame-options.pl

Issue 1326823003: CSP: 'frame-ancestors' should override 'x-frame-options'. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-overrides-xfo.html ('k') | Source/core/frame/csp/CSPDirectiveList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-and-x-frame-options.pl

diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors.pl b/LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-and-x-frame-options.pl

similarity index 73%

copy from LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors.pl

copy to LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-and-x-frame-options.pl

index 808008590665e3def4e951833241acfbeab8eeb8..74b317741201efba87dedb8cb0dd5cf8bee80198 100755

--- a/LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors.pl

+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-and-x-frame-options.pl

@@ -5,11 +5,12 @@ use CGI;

my $cgi = new CGI;

print "Content-Type: text/html; charset=UTF-8\n";

-print "Content-Security-Policy: frame-ancestors " . $cgi->param("policy") . "\n\n";

+print "Content-Security-Policy: frame-ancestors " . $cgi->param("policy") . "\n";

+print "X-Frame-Options: " . $cgi->param("xfo") . "\n\n";

estark 2015/09/08 18:15:47 Confusion: when $cgi->param("xfo") is empty, how d

estark 2015/09/08 18:18:20 Oh wait, duh, it will only hit the ASSERT_NOT_REAC

print "<!DOCTYPE html>\n";

print "<html>\n";

print "<body>\n";

-print " <p>This is an IFrame sending a Content Security Policy header containing \"frame-ancestors " . $cgi->param("policy") . "\".</p>\n";

+print " <p>This is an IFrame sending a Content Security Policy header containing \"frame-ancestors " . $cgi->param("policy") . "\" and \"X-Frame-Options: " . $cgi->param("xfo") . "\".</p>\n";

print "</body>\n";

print "</html>\n";