Browse Source

Custom URL-Schemas for Markdown

tags/v1.2.0-rc1
Kim "BKC" Carlbäcker 9 years ago
parent
commit
e60ea6741c
4 changed files with 6 additions and 10 deletions
  1. +3
    -9
      modules/base/markdown.go
  2. +1
    -0
      modules/base/tool.go
  3. +1
    -0
      modules/setting/setting.go
  4. +1
    -1
      modules/template/template.go

+ 3
- 9
modules/base/markdown.go View File

@@ -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
}



+ 1
- 0
modules/base/tool.go View File

@@ -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
}



+ 1
- 0
modules/setting/setting.go View File

@@ -117,6 +117,7 @@ var (
// Markdown sttings
Markdown struct {
EnableHardLineBreak bool
CustomURLSchemes []string `ini:"CUSTOM_URL_SCHEMES"`
}

// Picture settings


+ 1
- 1
modules/template/template.go View File

@@ -105,7 +105,7 @@ func Safe(raw string) template.HTML {
}

func Str2html(raw string) template.HTML {
return template.HTML(base.Sanitizer.Sanitize(raw))
return template.HTML(base.BuildSanitizer().Sanitize(raw))
}

func Range(l int) []int {


Loading…
Cancel
Save