Skip to content

Commit

Permalink
fix #1501 ssh hangs caused by #1461 (#1513)
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny authored Apr 19, 2017
1 parent f995bcc commit a2d365c
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions modules/markdown/sanitizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"regexp"
"sync"

"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

"github.com/microcosm-cc/bluemonday"
Expand All @@ -28,7 +27,6 @@ var sanitizer = &Sanitizer{}
// Multiple calls to this function will only create one instance of Sanitizer during
// entire application lifecycle.
func NewSanitizer() {
log.Trace("Markdown: sanitizer initialization requested")
sanitizer.init.Do(func() {
sanitizer.policy = bluemonday.UGCPolicy()
// We only want to allow HighlightJS specific classes for code blocks
Expand All @@ -40,16 +38,12 @@ func NewSanitizer() {

// Custom URL-Schemes
sanitizer.policy.AllowURLSchemes(setting.Markdown.CustomURLSchemes...)

log.Trace("Markdown: sanitizer initialized")
})
}

// Sanitize takes a string that contains a HTML fragment or document and applies policy whitelist.
func Sanitize(s string) string {
if sanitizer.policy == nil {
NewSanitizer()
}
NewSanitizer()
return sanitizer.policy.Sanitize(s)
}

Expand All @@ -59,8 +53,6 @@ func SanitizeBytes(b []byte) []byte {
// nothing to sanitize
return b
}
if sanitizer.policy == nil {
NewSanitizer()
}
NewSanitizer()
return sanitizer.policy.SanitizeBytes(b)
}

0 comments on commit a2d365c

Please sign in to comment.