Skip to content
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

fix: add style nonce to comply with content security policy (fix #11862) #11864

Closed
wants to merge 4 commits into from
Closed

fix: add style nonce to comply with content security policy (fix #11862) #11864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ac038f
fix: add style nonce to comply with content security policy
justin-tay Jan 31, 2023
64ac967
fix: cache cspNonce
justin-tay Mar 21, 2023
c219633
fix: use nonce attribute
justin-tay Oct 31, 2023
1ba2d95
fix: test
justin-tay Oct 31, 2023
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
10 changes: 10 additions & 0 deletions packages/vite/src/client/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ if ('document' in globalThis) {
// all css imports should be inserted at the same position
// because after build it will be a single css file
let lastInsertedStyle: HTMLStyleElement | undefined
let cspNonce: string | undefined | null = undefined

export function updateStyle(id: string, content: string): void {
let style = sheetsMap.get(id)
Expand All @@ -404,6 +405,15 @@ export function updateStyle(id: string, content: string): void {
style.setAttribute('data-vite-dev-id', id)
style.textContent = content

if (cspNonce === undefined) {
cspNonce =
document.querySelector<HTMLMetaElement>('meta[property=csp-nonce]')
?.nonce ?? null
}
if (cspNonce) {
style.setAttribute('nonce', cspNonce)
}

if (!lastInsertedStyle) {
document.head.appendChild(style)

Expand Down
6 changes: 6 additions & 0 deletions playground/css/__tests__/css.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
getBg,
getColor,
isBuild,
isServe,
page,
removeFile,
serverLogs,
Expand Down Expand Up @@ -508,3 +509,8 @@ test('async css order with css modules', async () => {
test('@import scss', async () => {
expect(await getColor('.at-import-scss')).toBe('red')
})

test.runIf(isServe)('style csp nonce', async () => {
const cspNonce = await page.getAttribute('style', 'nonce')
expect(cspNonce).toBe('random')
})
2 changes: 2 additions & 0 deletions playground/css/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<meta property="csp-nonce" nonce="random" />

<link rel="stylesheet" href="./linked.css" />

<div class="wrapper">
Expand Down