test(csp): add regression tests for pushDirective duplication (#16594)#16595
Merged
matthewp merged 5 commits intowithastro:mainfrom May 4, 2026
Merged
Conversation
🦋 Changeset detectedLatest commit: 13d4045 The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
matthewp
approved these changes
May 4, 2026
Merged
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.
Changes
pushDirectivein the CSP runtime duplicating the new directive once per existing non-matching directive.elsebranch inside the loop pushednewDirectiveon every non-match instead of once after the loop. Replaced thededuplicatedflag with amatchedflag and moved thenewDirectivepush outside the loop, guarded by!matched.Before:
pushDirective(["img-src 'self'", "style-src 'self'"], "script-src 'self'")→["img-src 'self'", "script-src 'self'", "style-src 'self'", "script-src 'self'"](duplicated + interleaved)After: →
["img-src 'self'", "style-src 'self'", "script-src 'self'"]Also fixes Mode 2: a directive that merges with a later existing entry no longer leaves an unmerged copy in front of the merged result.
Testing
regression: issue #16594suite inpackages/astro/test/units/csp/runtime.test.tscovering:Mapcount.Set-based name uniqueness.csp/runtime.test.tspass locally (node --test test/units/csp/runtime.test.ts).Docs
No docs change required —
pushDirectiveis internal CSP runtime; publicinsertDirective()semantics are unchanged (this restores them to the documented behavior).