OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

caddyfile: Fix case where heredoc marker is empty after newline (#5769) 

Fixes `panic: runtime error: slice bounds out of range [:3] with capacity 2`

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
This commit is contained in:
Francis Lavoie 2023-08-23 23:27:57 -04:00 committed by GitHub
parent 888c6d7e93
commit 7103ea096f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caddyconfig/caddyfile/lexer.go
View File

@ -154,6 +154,10 @@ func (l *lexer) next() (bool, error) {
// we reset the val because the heredoc is syntax we don't // we reset the val because the heredoc is syntax we don't
// want to keep. // want to keep.
if ch == '\n' { if ch == '\n' {
if len(val) == 2 {
return false, fmt.Errorf("missing opening heredoc marker on line #%d; must contain only alpha-numeric characters, dashes and underscores; got empty string", l.line)
}
// check if there's too many < // check if there's too many <
if string(val[:3]) == "<<<" { if string(val[:3]) == "<<<" {
return false, fmt.Errorf("too many '<' for heredoc on line #%d; only use two, for example <<END", l.line) return false, fmt.Errorf("too many '<' for heredoc on line #%d; only use two, for example <<END", l.line)

5
caddyconfig/caddyfile/lexer_test.go
View File

@ -409,6 +409,11 @@ EOF same-line-arg
}, },
}, },
}, },
{
input: []byte("not-a-heredoc <<\n"),
expectErr: true,
errorMessage: "missing opening heredoc marker on line #1; must contain only alpha-numeric characters, dashes and underscores; got empty string",
},
{ {
input: []byte(`heredoc <<<EOF input: []byte(`heredoc <<<EOF
content content