Fix NPE in fuzzer (#16680) (#16682)

The fuzzer found an issue with the issue pattern processor where there is a spurious
path.Clean which does not need to be there. This PR also sets the default AppURL for
the fuzzer too.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
release/v1.15
6543 2021-08-13 07:51:13 +02:00 committed by GitHub
parent e483ec8b0d
commit d2d99a25b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions

View File

@ -778,7 +778,7 @@ func fullIssuePatternProcessor(ctx *RenderContext, node *html.Node) {
// extract repo and org name from matched link like
// http://localhost:3000/gituser/myrepo/issues/1
linkParts := strings.Split(path.Clean(link), "/")
linkParts := strings.Split(link, "/")
matchOrg := linkParts[len(linkParts)-4]
matchRepo := linkParts[len(linkParts)-3]

View File

@ -5,6 +5,7 @@
package markup_test
import (
"io"
"strings"
"testing"
@ -526,3 +527,18 @@ func BenchmarkEmojiPostprocess(b *testing.B) {
assert.NoError(b, err)
}
}
func TestFuzz(t *testing.T) {
s := "t/l/issues/8#/../../a"
renderContext := RenderContext{
URLPrefix: "https://example.com/go-gitea/gitea",
Metas: map[string]string{
"user": "go-gitea",
"repo": "gitea",
},
}
err := PostProcess(&renderContext, strings.NewReader(s), io.Discard)
assert.NoError(t, err)
}

View File

@ -12,6 +12,7 @@ import (
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
)
// Contains fuzzing functions executed by
@ -32,6 +33,7 @@ var (
)
func FuzzMarkdownRenderRaw(data []byte) int {
setting.AppURL = "http://localhost:3000/"
err := markdown.RenderRaw(&renderContext, bytes.NewReader(data), io.Discard)
if err != nil {
return 0
@ -40,6 +42,7 @@ func FuzzMarkdownRenderRaw(data []byte) int {
}
func FuzzMarkupPostProcess(data []byte) int {
setting.AppURL = "http://localhost:3000/"
err := markup.PostProcess(&renderContext, bytes.NewReader(data), io.Discard)
if err != nil {
return 0