realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Fix #4081 Check for leading / in base before removing it (#4082)

Browse source
This commit is contained in:
Antoine GIRARD 2018-05-30 15:23:43 +02:00 committed by Lunny Xiao
parent 15f6ec9632
commit 35c3510335
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/util/util.go
View file

@ -72,8 +72,8 @@ func URLJoin(base string, elems ...string) string {
return "" return ""
} }
joinedURL := baseURL.ResolveReference(argURL).String() joinedURL := baseURL.ResolveReference(argURL).String()
if !baseURL.IsAbs() { if !baseURL.IsAbs() && !strings.HasPrefix(base, "/") {
return joinedURL[1:] // Removing leading '/' return joinedURL[1:] // Removing leading '/' if needed
} }
return joinedURL return joinedURL
} }

6
modules/util/util_test.go
View file

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