serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-26 13:43:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: Support ' quotes in envfile parsing (#5437)

Browse source
This commit is contained in:
Matt Holt 2023-04-10 13:55:45 -06:00 committed by GitHub
parent ff35ba9ec3
commit 205b142614
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/main.go
View file

@ -374,18 +374,19 @@ func parseEnvFile(envInput io.Reader) (map[string]string, error) {
} }
// quoted value: support newlines // quoted value: support newlines
if strings.HasPrefix(val, `"`) { if strings.HasPrefix(val, `"`) || strings.HasPrefix(val, "'") {
for !(strings.HasSuffix(line, `"`) && !strings.HasSuffix(line, `\"`)) { quote := string(val[0])
val = strings.ReplaceAll(val, `\"`, `"`) for !(strings.HasSuffix(line, quote) && !strings.HasSuffix(line, `\`+quote)) {
val = strings.ReplaceAll(val, `\`+quote, quote)
if !scanner.Scan() { if !scanner.Scan() {
break break
} }
lineNumber++ lineNumber++
line = strings.ReplaceAll(scanner.Text(), `\"`, `"`) line = strings.ReplaceAll(scanner.Text(), `\`+quote, quote)
val += "\n" + line val += "\n" + line
} }
val = strings.TrimPrefix(val, `"`) val = strings.TrimPrefix(val, quote)
val = strings.TrimSuffix(val, `"`) val = strings.TrimSuffix(val, quote)
} }
envMap[key] = val envMap[key] = val