Skip to content

Support CDO.allowed_iframe_ancestors configuration to whitelist allowed domains - #5009

Merged
philbogle merged 2 commits into
stagingfrom
iframe_domain_whitelist
Nov 1, 2015
Merged

Support CDO.allowed_iframe_ancestors configuration to whitelist allowed domains#5009
philbogle merged 2 commits into
stagingfrom
iframe_domain_whitelist

Conversation

@philbogle

Copy link
Copy Markdown
Contributor

This PR allows Code.org dashboard pages to be syndicated to a whitelisted set of syndication partners.

If the CDO.allowed_iframe_ancestors configuration variable is defined, the default SAMEORIGIN policy is replaced with one that allows iframing by the specified the specified source list plus 'self' (as described in http://w3c.github.io/webappsec-csp/#source-lists).

@trevorb

trevorb commented Nov 1, 2015

Copy link
Copy Markdown

Looks reasonable to me. I hadn't heard they replaced x-frame-options so this is a pleasant surprise.

philbogle added a commit that referenced this pull request Nov 1, 2015
Support CDO.allowed_iframe_ancestors configuration to whitelist allowed domains
@philbogle
philbogle merged commit 1e44018 into staging Nov 1, 2015
@philbogle

Copy link
Copy Markdown
Contributor Author

There is a better place to do this in lib/cdo/rack/upgrade_insecure_requests; will revert this change and do this there.

deploy-code-org added a commit that referenced this pull request Nov 2, 2015
f4cecc7 Merge pull request #4994 from code-dot-org/level-15-instructions (Brad Buchanan)
b14b8b1 Merge pull request #5015 from code-dot-org/revert-5009-iframe_domain_whitelist (philbogle)
c928a7c Revert "Support CDO.allowed_iframe_ancestors configuration to whitelist allowed domains" (philbogle)
1e44018 Merge pull request #5009 from code-dot-org/iframe_domain_whitelist (philbogle)
7804029 Update environment.rb (philbogle)
ebbc090 Set Content-Security-Policy to whitelist allowed domains (Phil Bogle)
3894748 Merge pull request #5008 from code-dot-org/dynamic-config-env (Trevor Berg)
@philbogle
philbogle deleted the iframe_domain_whitelist branch December 15, 2015 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants