Open markdown image links in new window (#17287)

diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go
index f1c259f82429d97db69ff082edd2913d937cb758..43023220a5646c9ad0033ec78e24299b4994066f 100644 (file)
--- a/modules/markup/markdown/goldmark.go
+++ b/modules/markup/markdown/goldmark.go
@@ -114,6 +114,7 @@ func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc pa
                                wrap := ast.NewLink()
                                wrap.Destination = link
                                wrap.Title = v.Title
+                               wrap.SetAttributeString("target", []byte("_blank"))
 
                                // Duplicate the current image node
                                image := ast.NewImage(ast.NewLink())

diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go
index f22c38953104008c0c25e1d9f34077d32daf77ad..936e4a39fdc5d9649bc9974b54f5987268e5e31a 100644 (file)
--- a/modules/markup/markdown/markdown_test.go
+++ b/modules/markup/markdown/markdown_test.go
@@ -8,6 +8,7 @@ import (
        "strings"
        "testing"
 
+       "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/markup"
        . "code.gitea.io/gitea/modules/markup/markdown"
        "code.gitea.io/gitea/modules/setting"
@@ -94,10 +95,11 @@ func TestRender_Images(t *testing.T) {
        title := "Train"
        href := "https://gitea.io"
        result := util.URLJoin(AppSubURL, url)
+       // hint: With Markdown v2.5.2, there is a new syntax: [link](URL){:target="_blank"} , but we do not support it now
 
        test(
                "!["+title+"]("+url+")",
-               `<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"/></a></p>`)
+               `<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`"/></a></p>`)
 
        test(
                "[["+title+"|"+url+"]]",
@@ -109,7 +111,7 @@ func TestRender_Images(t *testing.T) {
        url = "/../../.images/src/02/train.jpg"
        test(
                "!["+title+"]("+url+")",
-               `<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"/></a></p>`)
+               `<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`"/></a></p>`)
 
        test(
                "[["+title+"|"+url+"]]",
@@ -373,6 +375,7 @@ func TestMarkdownRenderRaw(t *testing.T) {
        }
 
        for _, testcase := range testcases {
+               log.Info("Test markdown render error with fuzzy data: %x, the following errors can be recovered", testcase)
                _, err := RenderRawString(&markup.RenderContext{}, string(testcase))
                assert.NoError(t, err)
        }
@@ -382,8 +385,8 @@ func TestRenderSiblingImages_Issue12925(t *testing.T) {
        testcase := `![image1](/image1)
 ![image2](/image2)
 `
-       expected := `<p><a href="/image1" rel="nofollow"><img src="/image1" alt="image1"></a><br>
-<a href="/image2" rel="nofollow"><img src="/image2" alt="image2"></a></p>
+       expected := `<p><a href="/image1" target="_blank" rel="nofollow noopener"><img src="/image1" alt="image1"></a><br>
+<a href="/image2" target="_blank" rel="nofollow noopener"><img src="/image2" alt="image2"></a></p>
 `
        res, err := RenderRawString(&markup.RenderContext{}, testcase)
        assert.NoError(t, err)