Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-30 09:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): avoid recursion when interpolating env (#8014)

Browse Source
This commit is contained in:
pooya parsa 2020-09-09 08:50:27 +00:00 committed by GitHub
parent a3d836401c
commit 4de44e6c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/config/src/load.js
View File

@ -153,7 +153,7 @@ function expand (target, source = {}, parse = v => v) {
return source[key] !== undefined ? source[key] : target[key] return source[key] !== undefined ? source[key] : target[key]
} }
function interpolate (value) { function interpolate (value, parents = []) {
if (typeof value !== 'string') { if (typeof value !== 'string') {
return value return value
} }
@ -171,10 +171,16 @@ function expand (target, source = {}, parse = v => v) {
const key = parts[2] const key = parts[2]
replacePart = parts[0].substring(prefix.length) replacePart = parts[0].substring(prefix.length)
// Avoid recursion
if (parents.includes(key)) {
consola.warn(`Please avoid recursive environment variables ( loop: ${parents.join(' > ')} > ${key} )`)
return ''
}
value = getValue(key) value = getValue(key)
// Resolve recursive interpolations // Resolve recursive interpolations
value = interpolate(value) value = interpolate(value, [...parents, key])
} }
return value !== undefined ? newValue.replace(replacePart, value) : newValue return value !== undefined ? newValue.replace(replacePart, value) : newValue

3
test/fixtures/runtime-config/.env vendored
View File

@ -2,4 +2,7 @@ BASE_URL=/api
PUBLIC_URL=https://google.com PUBLIC_URL=https://google.com
SERVER_BASE_URL SERVER_BASE_URL
API_SECRET=1234 API_SECRET=1234
A=$B
B=$C
C=$A
TOKEN=$2yr$10$tN3JmuvXZKGwi0l38A.SxUVemGrFJiyLunyqkOqOTE7LHsrSwMEmEB TOKEN=$2yr$10$tN3JmuvXZKGwi0l38A.SxUVemGrFJiyLunyqkOqOTE7LHsrSwMEmEB

3
test/fixtures/runtime-config/nuxt.config.js vendored
View File

@ -6,7 +6,8 @@ export default {
}, },
privateRuntimeConfig: { privateRuntimeConfig: {
baseURL: '${PUBLIC_URL}${BASE_URL}', baseURL: '${PUBLIC_URL}${BASE_URL}',
API_SECRET: '' API_SECRET: '',
FOO: '123/${FOO}'
}, },
serverMiddleware: [ serverMiddleware: [
(req, _, next) => { (req, _, next) => {