Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(888)

Issue 91353002: CSP 1.1: Implement the 'frame-ancestors' directive. (Closed)

Created:
7 years ago by Mike West
Modified:
6 years, 11 months ago
CC:
blink-reviews, gavinp+loader_chromium.org
Visibility:
Public.

Description

CSP 1.1: Implement the 'frame-ancestors' directive. As defined at [1]. This patch will have no web-visible impact, as the directive remains trapped behind the runtime flag that's governing all CSP 1.1 hotness. [1]: http://w3c.github.io/webappsec/specs/content-security-policy/csp-specification.dev.html#frame-ancestors BUG=129139, 335489 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=165629

Patch Set 1 #

Patch Set 2 : Rework. #

Patch Set 3 : Ugh. #

Total comments: 6

Patch Set 4 : Tests. #

Patch Set 5 : Rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1223 lines, -0 lines) Patch
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block.html View 1 2 3 1 chunk +16 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow-expected.txt View 1 2 3 1 chunk +28 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow.html View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow-expected.txt View 1 2 3 1 chunk +28 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow-expected.txt View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block-expected.txt View 1 2 3 1 chunk +24 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block.html View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block-expected.txt View 1 2 3 1 chunk +13 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow.html View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow-expected.txt View 1 2 3 1 chunk +16 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block.html View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block-expected.txt View 1 2 3 1 chunk +13 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin.html View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin-expected.txt View 1 2 3 1 chunk +17 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin-expected.txt View 1 2 3 1 chunk +16 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow-expected.txt View 1 2 3 1 chunk +16 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block.html View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block-expected.txt View 1 2 3 1 chunk +16 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors.pl View 1 2 3 1 chunk +15 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-ancestors-test.js View 1 2 3 1 chunk +113 lines, -0 lines 0 comments Download
A LayoutTests/http/tests/security/contentSecurityPolicy/resources/frame-in-frame.pl View 1 2 3 1 chunk +19 lines, -0 lines 0 comments Download
M Source/core/frame/ContentSecurityPolicy.h View 1 2 3 4 1 chunk +2 lines, -0 lines 0 comments Download
M Source/core/frame/ContentSecurityPolicy.cpp View 1 2 3 4 12 chunks +51 lines, -0 lines 0 comments Download
M Source/core/loader/FrameLoader.cpp View 1 2 3 2 chunks +21 lines, -0 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
Mike West
Hello Nate, Adam, and Jochen! This patch implements the Content Security Policy version of X-Frame-Options. ...
6 years, 11 months ago (2014-01-17 14:15:39 UTC) #1
abarth-chromium
Seems reasonable, but we should have japhet take a look.
6 years, 11 months ago (2014-01-18 08:48:25 UTC) #2
Nate Chapin
LGTM with nits/questions. I only skimmed the ContentSecurityPolicy.cpp changes, since both abarth and jochen are ...
6 years, 11 months ago (2014-01-21 18:24:22 UTC) #3
Nate Chapin
On 2014/01/17 14:15:39, Mike West wrote: > Hello Nate, Adam, and Jochen! > > This ...
6 years, 11 months ago (2014-01-21 18:27:46 UTC) #4
Mike West
Thanks for taking a look japhet. I've added a bunch of tests, and I think ...
6 years, 11 months ago (2014-01-22 10:08:46 UTC) #5
Nate Chapin
Thanks! FrameLoader bits LGTM
6 years, 11 months ago (2014-01-22 17:33:58 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkwst@chromium.org/91353002/190001
6 years, 11 months ago (2014-01-23 09:56:29 UTC) #7
commit-bot: I haz the power
6 years, 11 months ago (2014-01-23 11:17:38 UTC) #8
Message was sent while issue was closed.
Change committed as 165629

Powered by Google App Engine
This is Rietveld 408576698