From 742e26f5a5dab8768558231cb88801911b9abaa7 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 11 May 2020 00:14:49 +0100 Subject: Prevent 500 with badly formed task list (#11328) Fix #11317 Signed-off-by: Andrew Thornton --- modules/markup/markdown/goldmark.go | 38 ++++++++++++++++++-------------- modules/markup/markdown/markdown_test.go | 8 +++---- modules/markup/sanitizer.go | 2 +- 3 files changed, 27 insertions(+), 21 deletions(-) (limited to 'modules/markup') diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index 6a40a86836..bf02a22d5e 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -125,24 +125,30 @@ func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc pa } v.Destination = link case *ast.List: - if v.HasChildren() && v.FirstChild().HasChildren() && v.FirstChild().FirstChild().HasChildren() { - if _, ok := v.FirstChild().FirstChild().FirstChild().(*east.TaskCheckBox); ok { - v.SetAttributeString("class", []byte("task-list")) - children := make([]ast.Node, 0, v.ChildCount()) - child := v.FirstChild() - for child != nil { - children = append(children, child) - child = child.NextSibling() + if v.HasChildren() { + children := make([]ast.Node, 0, v.ChildCount()) + child := v.FirstChild() + for child != nil { + children = append(children, child) + child = child.NextSibling() + } + v.RemoveChildren(v) + + for _, child := range children { + listItem := child.(*ast.ListItem) + if !child.HasChildren() || !child.FirstChild().HasChildren() { + v.AppendChild(v, child) + continue } - v.RemoveChildren(v) - - for _, child := range children { - listItem := child.(*ast.ListItem) - newChild := NewTaskCheckBoxListItem(listItem) - taskCheckBox := child.FirstChild().FirstChild().(*east.TaskCheckBox) - newChild.IsChecked = taskCheckBox.IsChecked - v.AppendChild(v, newChild) + taskCheckBox, ok := child.FirstChild().FirstChild().(*east.TaskCheckBox) + if !ok { + v.AppendChild(v, child) + continue } + newChild := NewTaskCheckBoxListItem(listItem) + newChild.IsChecked = taskCheckBox.IsChecked + newChild.SetAttributeString("class", []byte("task-list-item")) + v.AppendChild(v, newChild) } } } diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index b9946d7d23..7f27a43a7d 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -141,10 +141,10 @@ func testAnswers(baseURLContent, baseURLImages string) []string {

More tests

(from https://www.markdownguide.org/extended-syntax/)

Checkboxes

-