Fix relative markdown links with anchors (#4058)
* Replace '%28' with '#' Add test case Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use ResolveReference instead of strings.Replace Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
		
							parent
							
								
									f86f56e19c
								
							
						
					
					
						commit
						2139c152cb
					
				
					 2 changed files with 18 additions and 6 deletions
				
			
		|  | @ -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
 | ||||
|  |  | |||
|  | @ -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...)) | ||||
| 	} | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue