Fix NPE in fuzzer (#16680)
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>
This commit is contained in:
parent
2289580bb7
commit
5fbccad906
3 changed files with 20 additions and 1 deletions
|
@ -781,7 +781,7 @@ func fullIssuePatternProcessor(ctx *RenderContext, node *html.Node) {
|
||||||
|
|
||||||
// extract repo and org name from matched link like
|
// extract repo and org name from matched link like
|
||||||
// http://localhost:3000/gituser/myrepo/issues/1
|
// http://localhost:3000/gituser/myrepo/issues/1
|
||||||
linkParts := strings.Split(path.Clean(link), "/")
|
linkParts := strings.Split(link, "/")
|
||||||
matchOrg := linkParts[len(linkParts)-4]
|
matchOrg := linkParts[len(linkParts)-4]
|
||||||
matchRepo := linkParts[len(linkParts)-3]
|
matchRepo := linkParts[len(linkParts)-3]
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
package markup_test
|
package markup_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
@ -526,3 +527,18 @@ func BenchmarkEmojiPostprocess(b *testing.B) {
|
||||||
assert.NoError(b, err)
|
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)
|
||||||
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ import (
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/markup"
|
"code.gitea.io/gitea/modules/markup"
|
||||||
"code.gitea.io/gitea/modules/markup/markdown"
|
"code.gitea.io/gitea/modules/markup/markdown"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Contains fuzzing functions executed by
|
// Contains fuzzing functions executed by
|
||||||
|
@ -32,6 +33,7 @@ var (
|
||||||
)
|
)
|
||||||
|
|
||||||
func FuzzMarkdownRenderRaw(data []byte) int {
|
func FuzzMarkdownRenderRaw(data []byte) int {
|
||||||
|
setting.AppURL = "http://localhost:3000/"
|
||||||
err := markdown.RenderRaw(&renderContext, bytes.NewReader(data), io.Discard)
|
err := markdown.RenderRaw(&renderContext, bytes.NewReader(data), io.Discard)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0
|
return 0
|
||||||
|
@ -40,6 +42,7 @@ func FuzzMarkdownRenderRaw(data []byte) int {
|
||||||
}
|
}
|
||||||
|
|
||||||
func FuzzMarkupPostProcess(data []byte) int {
|
func FuzzMarkupPostProcess(data []byte) int {
|
||||||
|
setting.AppURL = "http://localhost:3000/"
|
||||||
err := markup.PostProcess(&renderContext, bytes.NewReader(data), io.Discard)
|
err := markup.PostProcess(&renderContext, bytes.NewReader(data), io.Discard)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0
|
return 0
|
||||||
|
|
Loading…
Reference in a new issue