TextPanel: Sanitize after markdown has been rendered to html #46166
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
ashharrison90
added
type/bug
area/panel/text
add to changelog
backport v8.4.x
ashharrison90
requested review from
joshhunt and
JoaoSilvaGrafana
and removed request for
a team
joshhunt
reviewed
Mar 3, 2022
| @@ -27,7 +27,7 @@ e2e.scenario({ | |||
| `Server:pipe = A'A"A|BB\\B|CCC`, | |||
| `Server:distributed = A'A"A,Server=BB\\B,Server=CCC`, | |||
| `Server:csv = A'A"A,BB\\B,CCC`, | |||
| `Server:html = A'A"A, BB\\B, CCC`, | |||
| `Server:html = A'A"A, BB\\B, CCC`, | |||
There was a problem hiding this comment.
Why do we expect this to change?
There was a problem hiding this comment.
i think the old expectation is actually showing the bug 🤔
the variable value is defined as A'A"A,BB\B,CCC
the markdown in the text panel of that test is defined as:
* `Server:html` = `${Server:html}`
so when interpolated, we should have (step 1)
* `Server:html` = `A'A"A,BB\B,CCC`
and when converted to html it should be (step 2):
Server:html = A'A"A, BB\B, CCChowever with the old code, we sanitize the markdown string itself in step 1, giving:
* `Server:html` = `A'A"A,BB\B,CCC`
which leads to the html:
Server:html=A'A"A,BB\B,CCC
torkelo
approved these changes
Mar 3, 2022
ryantxu
approved these changes
Mar 3, 2022
grafanabot
pushed a commit
that referenced
this pull request
Mar 3, 2022
* Sanitize after markdown has been rendered to html * Update e2e test (cherry picked from commit b1125c0)
ashharrison90
added a commit
that referenced
this pull request
Mar 3, 2022
alexweav
pushed a commit
that referenced
this pull request
Mar 3, 2022
* Sanitize after markdown has been rendered to html * Update e2e test
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.
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes https://github.com/grafana/support-escalations/issues/2017
Special notes for your reviewer:
i'm pretty sure this is still as secure, but would appreciate 👀 from someone from a security perspective 😄