-
-
Notifications
You must be signed in to change notification settings - Fork 638
Add CSP nonce support for consoleReplay script #2059
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
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
309112f
Add CSP nonce support for consoleReplay script
justin808 82b97fc
Add tests and security documentation for CSP nonce support
justin808 c07b290
Fix Rails version compatibility for content_security_policy_nonce
justin808 1da8f6e
Add nonce sanitization to prevent XSS attacks
justin808 f097076
Add CHANGELOG entry for CSP nonce support
justin808 16cc8e3
Fix double-wrapped script tags in console replay
justin808 c8915f6
Update Pro tests to expect wrapped console scripts
justin808 0740ba6
Fix RuboCop errors in Pro helper spec
justin808 9d204cc
Fix Pro console logging test for new format
justin808 345f8f3
Fix Pro console logging test for second component
justin808 1b8e964
Fix console replay test to handle multiple script tags
justin808 fe863b6
Add unit tests for wrap_console_script_with_nonce method
justin808 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,11 +1,16 @@ | ||
| // eslint-disable-next-line import/prefer-default-export -- only one export for now, but others may be added later | ||
| export function wrapInScriptTags(scriptId: string, scriptBody: string): string { | ||
| export function wrapInScriptTags(scriptId: string, scriptBody: string, nonce?: string): string { | ||
| if (!scriptBody) { | ||
| return ''; | ||
| } | ||
|
|
||
| // Sanitize nonce to prevent attribute injection attacks | ||
| // CSP nonces should be base64 strings, so only allow alphanumeric, +, /, =, -, and _ | ||
| const sanitizedNonce = nonce?.replace(/[^a-zA-Z0-9+/=_-]/g, ''); | ||
| const nonceAttr = sanitizedNonce ? ` nonce="${sanitizedNonce}"` : ''; | ||
|
|
||
| return ` | ||
| <script id="${scriptId}"> | ||
| <script id="${scriptId}"${nonceAttr}> | ||
| ${scriptBody} | ||
| </script>`; | ||
| } |
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.