From ff4662be92b10ec00cc749e73c26b12e2560e44b Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 21 Jul 2024 01:02:31 +0200 Subject: [PATCH] [v7.0/forgejo] Don't panic on empty blockquote - On a empty blockquote the callout feature would panic, as it expects to always have at least one child. - This panic cannot result in a DoS, because any panic that happens while rendering any markdown input will be recovered gracefully. - Adds a simple condition to avoid this panic. (cherry picked from commit efd63ec1d8c6df180f2d894fa82c53da9d1874f1) --- modules/markup/markdown/callout/github.go | 4 ++++ modules/markup/markdown/callout/github_legacy.go | 4 ++++ modules/markup/markdown/markdown_test.go | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/modules/markup/markdown/callout/github.go b/modules/markup/markdown/callout/github.go index 443f6fe2a3..debad42b83 100644 --- a/modules/markup/markdown/callout/github.go +++ b/modules/markup/markdown/callout/github.go @@ -36,6 +36,10 @@ func (g *GitHubCalloutTransformer) Transform(node *ast.Document, reader text.Rea switch v := n.(type) { case *ast.Blockquote: + if v.ChildCount() == 0 { + return ast.WalkContinue, nil + } + // We only want attention blockquotes when the AST looks like: // Text: "[" // Text: "!TYPE" diff --git a/modules/markup/markdown/callout/github_legacy.go b/modules/markup/markdown/callout/github_legacy.go index ce86c10356..eee788e271 100644 --- a/modules/markup/markdown/callout/github_legacy.go +++ b/modules/markup/markdown/callout/github_legacy.go @@ -25,6 +25,10 @@ func (g *GitHubLegacyCalloutTransformer) Transform(node *ast.Document, reader te switch v := n.(type) { case *ast.Blockquote: + if v.ChildCount() == 0 { + return ast.WalkContinue, nil + } + // The first paragraph contains the callout type. firstParagraph := v.FirstChild() if firstParagraph.ChildCount() < 1 { diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index 5d33d89748..37d4d9bec4 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -1212,3 +1212,17 @@ func TestCustomMarkdownURL(t *testing.T) { test("[test](abp)", `

test

`) } + +func TestCallout(t *testing.T) { + setting.AppURL = AppURL + + test := func(input, expected string) { + buffer, err := markdown.RenderString(&markup.RenderContext{ + Ctx: git.DefaultContext, + }, input) + assert.NoError(t, err) + assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) + } + + test(">\n0", "
\n
\n

0

") +}