diff --git a/modules/markdown/markdown.go b/modules/markdown/markdown.go
index 1f890cc82..9773e8c2f 100644
--- a/modules/markdown/markdown.go
+++ b/modules/markdown/markdown.go
@@ -14,13 +14,14 @@ import (
"regexp"
"strings"
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/markup"
+ "code.gitea.io/gitea/modules/setting"
+
"github.com/Unknwon/com"
"github.com/russross/blackfriday"
"golang.org/x/net/html"
-
- "code.gitea.io/gitea/modules/base"
- "code.gitea.io/gitea/modules/markup"
- "code.gitea.io/gitea/modules/setting"
)
// Issue name styles
@@ -213,36 +214,17 @@ func cutoutVerbosePrefix(prefix string) string {
}
// URLJoin joins url components, like path.Join, but preserving contents
-func URLJoin(elem ...string) string {
- res := ""
- last := len(elem) - 1
- for i, item := range elem {
- res += item
- if i != last && !strings.HasSuffix(res, "/") {
- res += "/"
- }
+func URLJoin(base string, elems ...string) string {
+ u, err := url.Parse(base)
+ if err != nil {
+ log.Error(4, "URLJoin: Invalid base URL %s", base)
+ return ""
}
- cwdIndex := strings.Index(res, "/./")
- for cwdIndex != -1 {
- res = strings.Replace(res, "/./", "/", 1)
- cwdIndex = strings.Index(res, "/./")
- }
- upIndex := strings.Index(res, "/..")
- for upIndex != -1 {
- res = strings.Replace(res, "/..", "", 1)
- prevStart := -1
- for i := upIndex - 1; i >= 0; i-- {
- if res[i] == '/' {
- prevStart = i
- break
- }
- }
- if prevStart != -1 {
- res = res[:prevStart] + res[upIndex:]
- }
- upIndex = strings.Index(res, "/..")
- }
- return res
+ joinArgs := make([]string, 0, len(elems)+1)
+ joinArgs = append(joinArgs, u.Path)
+ joinArgs = append(joinArgs, elems...)
+ u.Path = path.Join(joinArgs...)
+ return u.String()
}
// RenderIssueIndexPattern renders issue indexes to corresponding links.
diff --git a/modules/markdown/markdown_test.go b/modules/markdown/markdown_test.go
index e6bc3683c..c622009e8 100644
--- a/modules/markdown/markdown_test.go
+++ b/modules/markdown/markdown_test.go
@@ -59,6 +59,31 @@ func testRenderIssueIndexPattern(t *testing.T, input, expected string, metas map
string(RenderIssueIndexPattern([]byte(input), AppSubURL, metas)))
}
+func TestURLJoin(t *testing.T) {
+ type test struct {
+ Expected string
+ Base string
+ Elements []string
+ }
+ newTest := func(expected, base string, elements ...string) test {
+ return test{Expected: expected, Base: base, Elements: elements}
+ }
+ for _, test := range []test{
+ newTest("https://try.gitea.io/a/b/c",
+ "https://try.gitea.io", "a/b", "c"),
+ newTest("https://try.gitea.io/a/b/c",
+ "https://try.gitea.io/", "/a/b/", "/c/"),
+ newTest("https://try.gitea.io/a/c",
+ "https://try.gitea.io/", "/a/./b/", "../c/"),
+ newTest("a/b/c",
+ "a", "b/c/"),
+ newTest("a/b/d",
+ "a/", "b/c/", "/../d/"),
+ } {
+ assert.Equal(t, test.Expected, URLJoin(test.Base, test.Elements...))
+ }
+}
+
func TestRender_IssueIndexPattern(t *testing.T) {
// numeric: render inputs without valid mentions
test := func(s string) {
@@ -641,8 +666,8 @@ func testAnswers(baseURLContent, baseURLImages string) []string {
`Wiki! Enjoy :)
Ideas and codes
@@ -650,8 +675,8 @@ func testAnswers(baseURLContent, baseURLImages string) []string {
`,
`What is Wine Staging?
@@ -665,15 +690,15 @@ func testAnswers(baseURLContent, baseURLImages string) []string {
@@ -682,9 +707,9 @@ func testAnswers(baseURLContent, baseURLImages string) []string {
- Package your libGDX application
-
+
- Perform a test run by hitting the Run! button.
-
+
`,
}
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index af87e9c43..cb928b283 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -18,7 +18,7 @@
-
+
