markup: escape short wiki link (#4091)

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 4f9d02a8ffcc504669d7d470f1e73640ed99accb..a4ef86de227ea5e80ccb3d5e8e3d2afc213ad032 100644 (file)
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -469,6 +469,9 @@ func shortLinkProcessorFull(ctx *postProcessCtx, node *html.Node, noLink bool) {
                } else {
                        link = strings.Replace(link, " ", "-", -1)
                }
+               if !strings.Contains(link, "/") {
+                       link = url.PathEscape(link)
+               }
        }
        urlPrefix := ctx.urlPrefix
        if image {

diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index fc11532d1ea142aa95cc80012aa9b65545eaf9ce..bf7606e1da4144f840aff89097b1cef1a1d576df 100644 (file)
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -82,12 +82,18 @@ func TestRender_ShortLinks(t *testing.T) {
        rawtree := util.URLJoin(AppSubURL, "raw", "master")
        url := util.URLJoin(tree, "Link")
        otherURL := util.URLJoin(tree, "Other-Link")
+       encodedURL := util.URLJoin(tree, "Link%3F")
        imgurl := util.URLJoin(rawtree, "Link.jpg")
        otherImgurl := util.URLJoin(rawtree, "Link+Other.jpg")
+       encodedImgurl := util.URLJoin(rawtree, "Link+%23.jpg")
+       notencodedImgurl := util.URLJoin(rawtree, "some", "path", "Link+#.jpg")
        urlWiki := util.URLJoin(AppSubURL, "wiki", "Link")
        otherURLWiki := util.URLJoin(AppSubURL, "wiki", "Other-Link")
+       encodedURLWiki := util.URLJoin(AppSubURL, "wiki", "Link%3F")
        imgurlWiki := util.URLJoin(AppSubURL, "wiki", "raw", "Link.jpg")
        otherImgurlWiki := util.URLJoin(AppSubURL, "wiki", "raw", "Link+Other.jpg")
+       encodedImgurlWiki := util.URLJoin(AppSubURL, "wiki", "raw", "Link+%23.jpg")
+       notencodedImgurlWiki := util.URLJoin(AppSubURL, "wiki", "raw", "some", "path", "Link+#.jpg")
        favicon := "http://google.com/favicon.ico"
 
        test(
@@ -134,4 +140,24 @@ func TestRender_ShortLinks(t *testing.T) {
                "[[Link]] [[Other Link]]",
                `<p><a href="`+url+`" rel="nofollow">Link</a> <a href="`+otherURL+`" rel="nofollow">Other Link</a></p>`,
                `<p><a href="`+urlWiki+`" rel="nofollow">Link</a> <a href="`+otherURLWiki+`" rel="nofollow">Other Link</a></p>`)
+       test(
+               "[[Link?]]",
+               `<p><a href="`+encodedURL+`" rel="nofollow">Link?</a></p>`,
+               `<p><a href="`+encodedURLWiki+`" rel="nofollow">Link?</a></p>`)
+       test(
+               "[[Link]] [[Other Link]] [[Link?]]",
+               `<p><a href="`+url+`" rel="nofollow">Link</a> <a href="`+otherURL+`" rel="nofollow">Other Link</a> <a href="`+encodedURL+`" rel="nofollow">Link?</a></p>`,
+               `<p><a href="`+urlWiki+`" rel="nofollow">Link</a> <a href="`+otherURLWiki+`" rel="nofollow">Other Link</a> <a href="`+encodedURLWiki+`" rel="nofollow">Link?</a></p>`)
+       test(
+               "[[Link #.jpg]]",
+               `<p><a href="`+encodedImgurl+`" rel="nofollow"><img src="`+encodedImgurl+`"/></a></p>`,
+               `<p><a href="`+encodedImgurlWiki+`" rel="nofollow"><img src="`+encodedImgurlWiki+`"/></a></p>`)
+       test(
+               "[[Name|Link #.jpg|alt=\"AltName\"|title='Title']]",
+               `<p><a href="`+encodedImgurl+`" rel="nofollow"><img src="`+encodedImgurl+`" title="Title" alt="AltName"/></a></p>`,
+               `<p><a href="`+encodedImgurlWiki+`" rel="nofollow"><img src="`+encodedImgurlWiki+`" title="Title" alt="AltName"/></a></p>`)
+       test(
+               "[[some/path/Link #.jpg]]",
+               `<p><a href="`+notencodedImgurl+`" rel="nofollow"><img src="`+notencodedImgurl+`"/></a></p>`,
+               `<p><a href="`+notencodedImgurlWiki+`" rel="nofollow"><img src="`+notencodedImgurlWiki+`"/></a></p>`)
 }