gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

[fiixed] infinite loop in config parser for include with quote and double quote

Browse Source 
Signed-off-by: Matthias Hanel <mh@synadia.com>
This commit is contained in:
Matthias Hanel
2021-01-08 13:17:19 -05:00
parent c5c8e385ab
commit fc667aaafd
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/lex.go
View File

@@ -413,6 +413,8 @@ func lexIncludeQuotedString(lx *lexer) stateFn {
lx.next()
lx.ignore()
return lx.pop()
case r == eof:
return lx.errorf("Unexpected EOF in quoted include")
}
return lexIncludeQuotedString
}
@@ -429,6 +431,8 @@ func lexIncludeDubQuotedString(lx *lexer) stateFn {
lx.next()
lx.ignore()
return lx.pop()
case r == eof:
return lx.errorf("Unexpected EOF in double quoted include")
}
return lexIncludeDubQuotedString
}

10
conf/parse_test.go
View File

@@ -385,9 +385,11 @@ func TestIncludeVariablesWithChecks(t *testing.T) {
}
func TestParserNoInfiniteLoop(t *testing.T) {
if _, err := Parse(`A@@Føøøø?˛ø:{øøøø˙˙`); err == nil {
t.Fatal("expected an error")
} else if !strings.Contains(err.Error(), "Unexpected EOF") {
t.Fatal("expected unexpected eof error")
for _, test := range []string{`A@@Føøøø?˛ø:{øøøø˙˙`, `include "9/<2F>`} {
if _, err := Parse(test); err == nil {
t.Fatal("expected an error")
} else if !strings.Contains(err.Error(), "Unexpected EOF") {
t.Fatal("expected unexpected eof error")
}
}
}