Added function to escape string in failure message title and descriptions #551
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
knqyf263
reviewed
Jul 6, 2020
pkg/report/writer.go
Outdated
| tmpl, err := template.New("output template").Parse(outputTemplate) | ||
| tmpl, err := template.New("output template").Funcs(template.FuncMap{ | ||
| "escapeString": func(input string) string { | ||
| return html.EscapeString(input) |
There was a problem hiding this comment.
What if we use xml.EscapeText?
https://golang.org/pkg/encoding/xml/#EscapeText
In that case, escapeXML is preferred rather than escapeString.
There was a problem hiding this comment.
@knqyf263 done, updated tests passing
knqyf263
reviewed
Jul 6, 2020
pkg/report/writer.go
Outdated
| @@ -41,7 +43,16 @@ func WriteResults(format string, output io.Writer, results Results, outputTempla | |||
| case "json": | |||
| writer = &JsonWriter{Output: output} | |||
| case "template": | |||
| tmpl, err := template.New("output template").Parse(outputTemplate) | |||
| tmpl, err := template.New("output template").Funcs(template.FuncMap{ | |||
| "escapeString": func(input string) string { | |||
There was a problem hiding this comment.
As I said, I think escapeXML is preferred because we might escape HTML or other formats other than XML.
There was a problem hiding this comment.
@knqyf263 Thanks, check now
knqyf263
approved these changes
Jul 6, 2020
|
@rahul2393 Thanks a lot! |
liamg
pushed a commit
that referenced
this pull request
Jun 7, 2022
…ions (#551) * Added function to escape string in failure message title and descriptions * updated template to use xml.EscapeText * Renamed template function
liamg
pushed a commit
that referenced
this pull request
Jun 7, 2022
* fix: support for helm chart *.tar.gz - add test to validate Signed-off-by: Owen Rumney <[email protected]> * fix: adding missing test tar Signed-off-by: Owen Rumney <[email protected]>
liamg
pushed a commit
that referenced
this pull request
Jun 7, 2022
* fix: support for helm chart *.tar.gz - add test to validate Signed-off-by: Owen Rumney <[email protected]> * fix: adding missing test tar Signed-off-by: Owen Rumney <[email protected]>
josedonizetti
pushed a commit
to josedonizetti/trivy
that referenced
this pull request
Jun 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue
Related: #541