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

Jump to bottom

refactor(csp): remove unsafe-eval in dev mode #7659

Merged
merged 1 commit into from Jul 2, 2020
Merged

refactor(csp): remove unsafe-eval in dev mode #7659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/server/src/middleware/nuxt.js
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ export default ({ options, nuxt, renderRoute, resources }) => async function nux
const isReportOnly = !!options.render.csp.reportOnly
const cspHeader = isReportOnly ? 'Content-Security-Policy-Report-Only' : 'Content-Security-Policy'

res.setHeader(cspHeader, getCspString({ cspScriptSrcHashes, allowedSources, policies, isDev: options.dev, isReportOnly }))
res.setHeader(cspHeader, getCspString({ cspScriptSrcHashes, allowedSources, policies, isReportOnly }))
}

// Send response
Expand Down Expand Up @@ -126,9 +126,9 @@ const defaultPushAssets = (preloadFiles, shouldPush, publicPath, options) => {
return links
}

const getCspString = ({ cspScriptSrcHashes, allowedSources, policies, isDev, isReportOnly }) => {
const getCspString = ({ cspScriptSrcHashes, allowedSources, policies, isReportOnly }) => {
const joinedHashes = cspScriptSrcHashes.join(' ')
const baseCspStr = `script-src 'self'${isDev ? ' \'unsafe-eval\'' : ''} ${joinedHashes}`
const baseCspStr = `script-src 'self' ${joinedHashes}`
const policyObjectAvailable = typeof policies === 'object' && policies !== null && !Array.isArray(policies)

if (Array.isArray(allowedSources) && allowedSources.length) {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/test/middleware/nuxt.test.js
View file
Open in desktop
Expand Up @@ -265,7 +265,7 @@ describe('server: nuxtMiddleware', () => {
expect(res.setHeader).nthCalledWith(
1,
'Content-Security-Policy-Report-Only',
"script-src 'self' 'unsafe-eval' sha256-hashes /nuxt/*.js /nuxt/images/*"
"script-src 'self' sha256-hashes /nuxt/*.js /nuxt/images/*"
)
})

Expand Down