[HTTP] Fix CSP config merge behaviour #177728
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
jloleysens
added
Team:Core
|
Pinging @elastic/kibana-security (Team:Security) |
|
Pinging @elastic/kibana-core (Team:Core) |
jloleysens
commented
Feb 23, 2024
Comment on lines
+73
to
+76
| const config = otherConfigs.reduce<CspConfigType>( | ||
| (acc, conf) => deepmerge(acc, conf), | ||
| firstConfig | ||
| ); |
There was a problem hiding this comment.
array values were clobbering each other instead of merging (which is the normal behaviour of lodash merge).
packages/core/http/core-http-server-internal/src/csp/csp_directives.ts
Outdated
Show resolved
Hide resolved
jloleysens
commented
Feb 23, 2024
| }; | ||
| const directives = CspDirectives.fromConfig(config, additionalConfig1, additionalConfig2); | ||
| expect(directives.getCspHeader()).toEqual( | ||
| `script-src 'report-sample' 'self' cdn.host.test; worker-src 'report-sample' 'self' blob: cdn.host.test; style-src 'report-sample' 'self' 'unsafe-inline' cdn.host.test; connect-src 'self' *.foo.bar cdn.host.test; font-src 'self' cdn.host.test; frame-src 'self' cdn.host.test; img-src 'self' *.foo.bar cdn.host.test` |
There was a problem hiding this comment.
Tested this here
jloleysens
changed the title
|
Related #177732 |
|
@elasticmachine merge upstream |
💚 Build Succeeded
Metrics [docs]
History
To update your PR or re-run it, just comment with: cc @jloleysens |
semd
pushed a commit
to semd/kibana
that referenced
this pull request
Mar 4, 2024
fkanout
pushed a commit
to fkanout/kibana
that referenced
this pull request
Mar 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Bug in CSP config merging behaviour
While testing the new
server.cdn.urlconfiguration I noticed that this causes a regression due to how the CSP configs are merged. Right now ifserver.cdn.urlis configured you cannot setcsp.*because the CDN's configuration will clobber any values configured there.