Merge branch 'master' into feature/lfs-http-auth-period-configurable

Author: InonS

modules/util/util.go

@@ -7,6 +7,7 @@ package util
 import (
 	"net/url"
 	"path"
+	"strings"
 
 	"code.gitea.io/gitea/modules/log"
 )
@@ -56,16 +57,25 @@ func Max(a, b int) int {
 
 // URLJoin joins url components, like path.Join, but preserving contents
 func URLJoin(base string, elems ...string) string {
-	u, err := url.Parse(base)
+	if !strings.HasSuffix(base, "/") {
+		base += "/"
+	}
+	baseURL, err := url.Parse(base)
 	if err != nil {
 		log.Error(4, "URLJoin: Invalid base URL %s", base)
 		return ""
 	}
-	joinArgs := make([]string, 0, len(elems)+1)
-	joinArgs = append(joinArgs, u.Path)
-	joinArgs = append(joinArgs, elems...)
-	u.Path = path.Join(joinArgs...)
-	return u.String()
+	joinedPath := path.Join(elems...)
+	argURL, err := url.Parse(joinedPath)
+	if err != nil {
+		log.Error(4, "URLJoin: Invalid arg %s", joinedPath)
+		return ""
+	}
+	joinedURL := baseURL.ResolveReference(argURL).String()
+	if !baseURL.IsAbs() {
+		return joinedURL[1:] // Removing leading '/'
+	}
+	return joinedURL
 }
 
 // Min min of two ints

modules/util/util_test.go

@@ -30,6 +30,8 @@ func TestURLJoin(t *testing.T) {
 			"a", "b/c/"),
 		newTest("a/b/d",
 			"a/", "b/c/", "/../d/"),
+		newTest("https://try.gitea.io/a/b/c#d",
+			"https://try.gitea.io", "a/b", "c#d"),
 	} {
 		assert.Equal(t, test.Expected, URLJoin(test.Base, test.Elements...))
 	}

public/vendor/VERSIONS

@@ -17,9 +17,6 @@ Version: 1.5.9
 File(s): /vendor/plugins/gitgraph/gitgraph.js
 Version: 9b492e8bf1ddf7908a4997b8f83fa38a809a9da3
 
-File(s): /vendor/plugins/autolink/autolink.js
-Version: 741f66f
-
 File(s): /vendor/plugins/vue/vue.min.js
 Version: 2.1.10
 
@@ -50,6 +47,9 @@ Version: 1.10.1
 File(s): /vendor/plugins/pdfjs/
 Version: 1.4.20
 
+File(s): /vendor/plugins/u2f/
+Version: 1.0.8
+
 File(s): /vendor/assets/font-awesome/fonts/
 Version: 4.6.0
 

public/vendor/librejs.html

@@ -45,11 +45,6 @@
           <td><a href="https://github.com/bluef/gitgraph.js/blob/master/LICENSE">BSD 3-Clause</a></td>
           <td><a href="https://github.com/bluef/gitgraph.js">gitgraph.js-latest</a></td>
         </tr>
-        <tr>
-          <td><a href="/vendor/plugins/autolink/autolink.js">autolink.min.js</a></td>
-          <td><a href="https://github.com/egoist/autolink.js/blob/master/LICENSE">Expat</a></td>
-          <td><a href="https://github.com/egoist/autolink.js">autolink.js-latest</a></td>
-        </tr>
         <tr>
           <td><a href="/vendor/plugins/vue/vue.min.js">vue.min.js</a></td>
           <td><a href="https://github.com/vuejs/vue/blob/dev/LICENSE">Expat</a></td>