-
Notifications
You must be signed in to change notification settings - Fork 269
Support Strict CSP with a nonce #482
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+490
−319
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f15dc2d
Support setting a nonce
dav-is bb98185
Parameter is not required
dav-is fe01906
Update README.md
dav-is 278e5d5
Requested Fixes
dav-is 6f5f14f
Minor fixes
dav-is 368a6e4
use isBrowser :(
dav-is bb588e9
Fix tests, remove useless parameters
dav-is 195bcf1
Merge branch 'master' into csp-nonce
dav-is 0cdda13
Fix docs
giuseppeg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,29 @@ | ||
| import React from 'react' | ||
| import { flush } from './style' | ||
|
|
||
| export default function flushToReact() { | ||
| export default function flushToReact(options = {}) { | ||
| return flush().map(args => { | ||
| const id = args[0] | ||
| const css = args[1] | ||
| return React.createElement('style', { | ||
| id: `__${id}`, | ||
| // Avoid warnings upon render with a key | ||
| key: `__${id}`, | ||
| nonce: options.nonce ? options.nonce : undefined, | ||
| dangerouslySetInnerHTML: { | ||
| __html: css | ||
| } | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| export function flushToHTML() { | ||
| export function flushToHTML(options = {}) { | ||
| return flush().reduce((html, args) => { | ||
| const id = args[0] | ||
| const css = args[1] | ||
| html += `<style id="__${id}">${css}</style>` | ||
| html += `<style id="__${id}"${ | ||
| options.nonce ? ` nonce="${options.nonce}"` : '' | ||
| }>${css}</style>` | ||
| return html | ||
| }, '') | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| export default function withMock(mockFn, testFn) { | ||
| return t => { | ||
| const cleanUp = mockFn(t) | ||
| if (typeof cleanUp !== 'function') { | ||
| throw new TypeError('mockFn should return a cleanup function') | ||
| } | ||
| testFn(t) | ||
| cleanUp(t) | ||
| } | ||
| } | ||
|
|
||
| export function withMockDocument(t) { | ||
| const originalDocument = global.document | ||
| // We need to stub a document in order to simulate the meta tag | ||
| global.document = { | ||
| querySelector(query) { | ||
| t.is(query, 'meta[property="csp-nonce"]') | ||
| return { | ||
| getAttribute(attr) { | ||
| t.is(attr, 'content') | ||
| return 'test-nonce' | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return () => { | ||
| global.document = originalDocument | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should replace
flushwithflushToReact