fix(nginx): keep ${var} inside a word when parsing configs (#14455)

This commit is contained in:
Leo Camus
2026-11-19 17:23:27 +08:00
committed by GitHub
parent 52790c0dca
commit 18f446e034
2 changed files with 43 additions and 9 deletions
+9 -9
View File
@@ -195,19 +195,23 @@ func (s *lexer) scanKeyword() flag.Flag {
buf.WriteString(s.readUntil(func(r rune) bool {
return r == '}'
}))
buf.WriteRune(s.read()) //consume latest '}'
} else {
break
prev = s.read() //consume latest '}'
buf.WriteRune(prev)
continue
}
break
}
buf.WriteRune(s.read())
prev = s.read()
buf.WriteRune(prev)
}
return tok.Lit(buf.String())
}
func (s *lexer) scanVariable() flag.Flag {
return s.NewToken(flag.Variable).Lit(s.readUntil(isKeywordTerminator))
tok := s.scanKeyword()
tok.Type = flag.Variable
return tok
}
func (s *lexer) read() rune {
@@ -229,10 +233,6 @@ func isQuote(ch rune) bool {
return ch == '"' || ch == '\'' || ch == '`'
}
func isKeywordTerminator(ch rune) bool {
return isSpace(ch) || isEndOfLine(ch) || ch == '{' || ch == ';'
}
func isSpace(ch rune) bool {
return ch == ' ' || ch == '\t' || isEndOfLine(ch)
}
+34
View File
@@ -0,0 +1,34 @@
package parser
import (
"slices"
"testing"
)
func TestParseBracedVariables(t *testing.T) {
config, err := NewStringParser(`server {
listen 80;
return 301 https://${host}$request_uri;
add_header X-Scheme ${scheme}://${host};
}`).Parse()
if err != nil {
t.Fatal(err)
}
servers := config.FindServers()
if len(servers) != 1 {
t.Fatalf("expected 1 server, got %d", len(servers))
}
tests := map[string][]string{
"return": {"301", "https://${host}$request_uri"},
"add_header": {"X-Scheme", "${scheme}://${host}"},
}
for name, want := range tests {
directives := servers[0].FindDirectives(name)
if len(directives) != 1 {
t.Fatalf("expected 1 %s directive, got %d", name, len(directives))
}
if got := directives[0].GetParameters(); !slices.Equal(got, want) {
t.Fatalf("%s: expected parameters %q, got %q", name, want, got)
}
}
}