Repository navigation
Conversation
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Empty-value handling and mixed reporting modes can silently remove enforced security restrictions.
4 open issues
What changed in this PR
Normalizes Content Security Policy values to address keyword quoting, empty entries, and numeric-key type errors.
Changes:
- Splits configured strings and normalizes header keys.
- Adds regression tests for normalization and sandbox flags.
- Documents the fix in the changelog.
Base branch is unspecified; develop compatibility rules were assumed. Validation used targeted code inspection; automated tests remain for CI.
| File | Description |
|---|---|
| user_guide_src/source/changelogs/v4.7.6.rst | Documents the normalization fix. |
| tests/system/HTTP/ContentSecurityPolicyTest.php | Adds normalization regression tests. |
| system/HTTP/ContentSecurityPolicy.php | Changes option normalization and header generation. |
Review effort: Balanced
|
|
||
| $this->{$target} = []; | ||
|
|
||
| if ($targetValue !== '') { |
Comment on lines
+899
to
+901
| if ($option === '' && $target !== 'sandbox') { | ||
| continue; | ||
| } |
Comment on lines
+906
to
+908
| if ($target === 'sandbox' && count($this->{$target}) > 1 && isset($this->{$target}[''])) { | ||
| unset($this->{$target}['']); | ||
| } |
Comment on lines
+1038
to
+1040
| if ($valueStr === '') { | ||
| return; | ||
| } |
This branch has not been deployed
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
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.

Description
Fixed
ContentSecurityPolicy::addOption()andaddToHeader()converting string values directly into array keys, which created invalid entries for empty strings, prevented keyword quoting for space-separated lists, and caused a fatalTypeErrorin PHP 8 strict mode when numeric strings were converted to integer array keys.Checklist: