This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
fix(ngCsp): allow CSP to be configurable #12346
Merged
Conversation
This file contains 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
|
@jdalton, @realityking, @lgalfaso and @btford - can you take a look? |
| csp.rules = { | ||
| noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1), | ||
| noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1) | ||
| }; |
There was a problem hiding this comment.
Shouldn't the ngCspAttribute.indexOf checks be looking for > -1 as if they're declared then they're true?
There was a problem hiding this comment.
Checking for !== -1 has the same effect, so this is fine.
There was a problem hiding this comment.
Checking for
!== -1has the same effect, so this is fine.
Doh! I blame it on all the double negatives 😸
|
@petebacondarwin I like it (a lot)! |
| expect(csp()).toBe(true); | ||
| it('should return true when CSP is enabled manually via [data-ng-csp]', function() { | ||
| var spy = mockCspElement('data-ng-csp'); | ||
| expect(csp()).toEqual({ noUnsafeEval: true, noInlineStyle: true }); | ||
| expect(document.querySelector).toHaveBeenCalledWith('[data-ng-csp]'); |
There was a problem hiding this comment.
expect(spy) for consistency ? 😄
There are two different features in Angular that can break CSP rules: use of `eval` to execute a string as JavaScript and dynamic injection of CSS style rules into the DOM. This change allows us to configure which of these features should be turned off to allow a more fine grained set of CSP rules to be supported. Closes angular#11933 Closes angular#8459
There are two different features in Angular that can break CSP rules: use of `eval` to execute a string as JavaScript and dynamic injection of CSS style rules into the DOM. This change allows us to configure which of these features should be turned off to allow a more fine grained set of CSP rules to be supported. Closes angular#11933 Closes angular#8459
petebacondarwin
force-pushed
the
csp-config
branch
from
ae22415
to
e1fd333
Compare
|
I have added a commit with changes thanks to the feedback. |
|
LGTM 👍 |
petebacondarwin
added a commit
that referenced
this pull request
Jul 16, 2015
There are two different features in Angular that can break CSP rules: use of `eval` to execute a string as JavaScript and dynamic injection of CSS style rules into the DOM. This change allows us to configure which of these features should be turned off to allow a more fine grained set of CSP rules to be supported. Closes #11933 Closes #8459 Closes #12346
|
👍 |
netman92
pushed a commit
to netman92/angular.js
that referenced
this pull request
Aug 8, 2015
There are two different features in Angular that can break CSP rules: use of `eval` to execute a string as JavaScript and dynamic injection of CSS style rules into the DOM. This change allows us to configure which of these features should be turned off to allow a more fine grained set of CSP rules to be supported. Closes angular#11933 Closes angular#8459 Closes angular#12346
ggershoni
pushed a commit
to ggershoni/angular.js
that referenced
this pull request
Sep 29, 2015
There are two different features in Angular that can break CSP rules: use of `eval` to execute a string as JavaScript and dynamic injection of CSS style rules into the DOM. This change allows us to configure which of these features should be turned off to allow a more fine grained set of CSP rules to be supported. Closes angular#11933 Closes angular#8459 Closes angular#12346
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 are two different features in Angular that can break CSP rules:
use of
evalto execute a string as JavaScript and dynamic injection ofCSS style rules into the DOM.
This change allows us to configure which of these features should be turned
off to allow a more fine grained set of CSP rules to be supported.
Closes #11933
Closes #8459