serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-14 14:56:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

caddyfile: Stricter parsing, error for brace on new line (#5505)

Browse source
This commit is contained in:
Francis Lavoie 2023-04-20 14:43:51 -04:00 committed by GitHub
parent c6ac350a3b
commit 53b6fab125
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 533 additions and 521 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
caddyconfig/caddyfile/parse.go
View file

@ -520,6 +520,9 @@ func (p *parser) directive() error {
if !p.isNextOnNewLine() && p.Token().wasQuoted == 0 { if !p.isNextOnNewLine() && p.Token().wasQuoted == 0 {
return p.Err("Unexpected next token after '{' on same line") return p.Err("Unexpected next token after '{' on same line")
} }
if p.isNewLine() {
return p.Err("Unexpected '{' on a new line; did you mean to place the '{' on the previous line?")
}
} else if p.Val() == "{}" { } else if p.Val() == "{}" {
if p.isNextOnNewLine() && p.Token().wasQuoted == 0 { if p.isNextOnNewLine() && p.Token().wasQuoted == 0 {
return p.Err("Unexpected '{}' at end of line") return p.Err("Unexpected '{}' at end of line")

8
caddyconfig/caddyfile/parse_test.go
View file

@ -293,6 +293,14 @@ func TestParseOneAndImport(t *testing.T) {
// Unexpected next token after '{' on same line // Unexpected next token after '{' on same line
{`localhost {`localhost
dir1 { a b }`, true, []string{"localhost"}, []int{}}, dir1 { a b }`, true, []string{"localhost"}, []int{}},
// Unexpected '{' on a new line
{`localhost
dir1
{
a b
}`, true, []string{"localhost"}, []int{}},
// Workaround with quotes // Workaround with quotes
{`localhost {`localhost
dir1 "{" a b "}"`, false, []string{"localhost"}, []int{5}}, dir1 "{" a b "}"`, false, []string{"localhost"}, []int{5}},

1041
modules/caddyhttp/reverseproxy/caddyfile.go
View file

File diff suppressed because it is too large Load diff

1
modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go
View file

@ -373,6 +373,7 @@ func parsePHPFastCGI(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error
// the rest of the config is specified by the user // the rest of the config is specified by the user
// using the reverse_proxy directive syntax // using the reverse_proxy directive syntax
dispenser.Next() // consume the directive name
err = rpHandler.UnmarshalCaddyfile(dispenser) err = rpHandler.UnmarshalCaddyfile(dispenser)
if err != nil { if err != nil {
return nil, err return nil, err

1
modules/caddyhttp/reverseproxy/forwardauth/caddyfile.go
View file

@ -216,6 +216,7 @@ func parseCaddyfile(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
// the rest of the config is specified by the user // the rest of the config is specified by the user
// using the reverse_proxy directive syntax // using the reverse_proxy directive syntax
dispenser.Next() // consume the directive name
err = rpHandler.UnmarshalCaddyfile(dispenser) err = rpHandler.UnmarshalCaddyfile(dispenser)
if err != nil { if err != nil {
return nil, err return nil, err