Custom URL-Schemas for Markdown

2 files changed, 4 insertions, 9 deletions

diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index 0ef379b8ed..62db945a53 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -29,16 +29,10 @@ func isalnum(c byte) bool {
 	return (c >= '0' && c <= '9') || isletter(c)
 }
 
-var validLinks = [][]byte{[]byte("http://"), []byte("https://"), []byte("ftp://"), []byte("mailto://")}
+var validLinksPattern = regexp.MustCompile(`^[a-z][\w-]+://`)
 
 func isLink(link []byte) bool {
-	for _, prefix := range validLinks {
-		if len(link) > len(prefix) && bytes.Equal(bytes.ToLower(link[:len(prefix)]), prefix) && isalnum(link[len(prefix)]) {
-			return true
-		}
-	}
-
-	return false
+	return validLinksPattern.Match(link)
 }
 
 func IsMarkdownFile(name string) bool {
@@ -346,7 +340,7 @@ OUTER_LOOP:
 func RenderMarkdown(rawBytes []byte, urlPrefix string, metas map[string]string) []byte {
 	result := RenderRawMarkdown(rawBytes, urlPrefix)
 	result = PostProcessMarkdown(result, urlPrefix, metas)
-	result = Sanitizer.SanitizeBytes(result)
+	result = BuildSanitizer().SanitizeBytes(result)
 	return result
 }
 
diff --git a/modules/base/tool.go b/modules/base/tool.go
index f98ae28b93..5280fef203 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -37,6 +37,7 @@ func BuildSanitizer() (p *bluemonday.Policy) {
 
 	p.AllowAttrs("type").Matching(regexp.MustCompile(`^checkbox$`)).OnElements("input")
 	p.AllowAttrs("checked", "disabled").OnElements("input")
+	p.AllowURLSchemes(setting.Markdown.CustomURLSchemes...)
 	return p
 }