Skip to content

Commit

Permalink
fix: prevent greedy parsing in raw element parser (#702)
Browse files Browse the repository at this point in the history
  • Loading branch information
deej-io authored May 3, 2024
1 parent d120e33 commit fe1f70e
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
8 changes: 7 additions & 1 deletion parser/v2/raw.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,17 @@ func (p rawElementParser) Parse(pi *parse.Input) (n Node, ok bool, err error) {

// Element name.
var e RawElement
if e.Name, ok, err = parse.String(p.name).Parse(pi); err != nil || !ok {
if e.Name, ok, err = elementNameParser.Parse(pi); err != nil || !ok {
pi.Seek(start)
return
}

if e.Name != p.name {
pi.Seek(start)
ok = false
return
}

if e.Attributes, ok, err = (attributesParser{}).Parse(pi); err != nil || !ok {
pi.Seek(start)
return
Expand Down
33 changes: 33 additions & 0 deletions parser/v2/raw_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,36 @@ func TestRawElementParser(t *testing.T) {
})
}
}

func TestRawElementParserIsNotGreedy(t *testing.T) {
var tests = []struct {
name string
input string
expected RawElement
}{
{
name: "styles tag",
input: `<styles></styles>`,
},
{
name: "scripts tag",
input: `<scripts></scripts>`,
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
input := parse.NewInput(tt.input)
actual, ok, err := rawElements.Parse(input)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if ok {
t.Fatalf("unexpected success for input %q", tt.input)
}
if actual != nil {
t.Fatalf("expected nil Node got %v", actual)
}
})
}
}

0 comments on commit fe1f70e

Please sign in to comment.