Fail metrics parsing on unescaped quotes (#3409)

Before this change Fields() method on a metric parsed from a line with
unescaped quotes could panic. This change makes such line unparseable.

Fixes #3326
This commit is contained in:
faye-sama
2017-11-13 23:06:47 +00:00
committed by Daniel Nelson
parent cbd346117a
commit a411306fba
2 changed files with 27 additions and 7 deletions

View File

@@ -326,7 +326,9 @@ func scanTagsValue(buf []byte, i int) (int, int, error) {
func scanFields(buf []byte, i int) (int, []byte, error) {
start := skipWhitespace(buf, i)
i = start
quoted := false
// track how many '"" we've seen since last '='
quotes := 0
// tracks how many '=' we've seen
equals := 0
@@ -350,13 +352,17 @@ func scanFields(buf []byte, i int) (int, []byte, error) {
// Only quote values in the field value since quotes are not significant
// in the field key
if buf[i] == '"' && equals > commas {
quoted = !quoted
i++
quotes++
if quotes > 2 {
break
}
continue
}
// If we see an =, ensure that there is at least on char before and after it
if buf[i] == '=' && !quoted {
if buf[i] == '=' && quotes != 1 {
quotes = 0
equals++
// check for "... =123" but allow "a\ =123"
@@ -398,19 +404,19 @@ func scanFields(buf []byte, i int) (int, []byte, error) {
}
}
if buf[i] == ',' && !quoted {
if buf[i] == ',' && quotes != 1 {
commas++
}
// reached end of block?
if buf[i] == ' ' && !quoted {
if buf[i] == ' ' && quotes != 1 {
break
}
i++
}
if quoted {
return i, buf[start:i], makeError("unbalanced quotes", buf, i)
if quotes != 0 && quotes != 2 {
return i, buf[start:i], makeError("unescaped/ublanaced quotes", buf, i)
}
// check that all field sections had key and values (e.g. prevent "a=1,b"