Sanitation fix from Gogs #1461
Merged
Sanitation fix from Gogs #1461
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tboerger
approved these changes
Apr 7, 2017
|
LGTM |
tboerger
added
lgtm/need 1
appleboy
approved these changes
Apr 7, 2017
|
LGTM |
tboerger
added
lgtm/done
appleboy
suggested changes
Apr 7, 2017
modules/markdown/sanitizer.go
Outdated
|
|
||
| "github.com/microcosm-cc/bluemonday" | ||
|
|
||
| "github.com/gogits/gogs/modules/setting" |
There was a problem hiding this comment.
actually "code.gitea.io/gitea/modules/setting"
lunny
requested changes
Apr 7, 2017
modules/markdown/sanitizer_test.go
Outdated
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/smartystreets/goconvey/convey" |
There was a problem hiding this comment.
goconvey has been removed before. I think change this test file to github.com/stretchr/testify is better
|
I'm getting nil-panics in some tests 🙄 |
|
|
lunny
reviewed
Apr 11, 2017
modules/markdown/sanitizer.go
Outdated
| @@ -48,10 +48,19 @@ func NewSanitizer() { | |||
|
|
|||
| // Sanitize takes a string that contains a HTML fragment or document and applies policy whitelist. | |||
| func Sanitize(s string) string { | |||
| if sanitizer == nil { | |||
lunny
reviewed
Apr 11, 2017
modules/markdown/sanitizer.go
Outdated
|
|
||
| "github.com/microcosm-cc/bluemonday" | ||
|
|
||
| "code.gitea.io/gitea/modules/setting" |
There was a problem hiding this comment.
merge the gitea internal packages.
lunny
reviewed
Apr 11, 2017
|
|
||
| // Sanitize takes a string that contains a HTML fragment or document and applies policy whitelist. | ||
| func Sanitize(s string) string { | ||
| if sanitizer.policy == nil { |
There was a problem hiding this comment.
how about
func init() {
NewSanitizer(0
}?
There was a problem hiding this comment.
We don't wanna initialize it unless we need to.
There was a problem hiding this comment.
It uses sync.Once so there's no race-condition that I can see...
lunny
approved these changes
Apr 13, 2017
appleboy
approved these changes
Apr 13, 2017
|
let L-G-T-M work |
|
@bkcsoft could you send a backport to v1.1.1? |
lunny
added a commit
to lunny/gitea
that referenced
this pull request
Apr 19, 2017
lunny
added a commit
that referenced
this pull request
Apr 19, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.