Skip to content

fix: csp nonce injection when no closing tag (#16281) #16282

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.

Sign up for GitHub

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 3 commits into from
Mar 31, 2024
Merged

fix: csp nonce injection when no closing tag (#16281) #16282

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5fa777
fix: csp nonce injection when no closing tag (#16281)
gregtwallace Mar 29, 2024
67c7bd9
fix: csp nonce injection when no closing tag (#16281) (pt. 2)
gregtwallace Mar 29, 2024
ac56128
chore: update
sapphi-red Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/vite/src/node/plugins/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,8 +1189,15 @@ export function injectNonceAttributeTagHook(
parseRelAttr(attr.value).some((a) => processRelType.has(a)),
))
) {
// if the closing of the start tag includes a `/`, the offset should be 2 so the nonce
// is appended prior to the `/`
const appendOffset =
html.charAt(node.sourceCodeLocation!.startTag!.endOffset - 2) === '/'
? 2
: 1

s.appendRight(
node.sourceCodeLocation!.startTag!.endOffset - 1,
node.sourceCodeLocation!.startTag!.endOffset - appendOffset,
` nonce="${nonce}"`,
)
}
Expand Down