Escape keys/values when rendering JSON objects #1498
Merged
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
yurishkuro
requested review from
everett980,
rubenvp8510 and
tiffon
as code owners
yurishkuro
commented
Jun 13, 2023
| }) | ||
|
|
||
| return forEach(keys, '{', '}', function (key) { | ||
| return '<span ' + style('json-markup-key') + '>"' + escape(key) + '":</span> ' + visit(obj[key]) |
There was a problem hiding this comment.
Change here: s/key/escape(key)/
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/jsonMarkup.js
Fixed
Show fixed
Hide fixed
packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/jsonMarkup.js
Fixed
Show fixed
Hide fixed
Signed-off-by: Yuri Shkuro <ysh@meta.com>
Signed-off-by: Yuri Shkuro <ysh@meta.com>
Signed-off-by: Yuri Shkuro <ysh@meta.com>
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #1498 +/- ##
==========================================
+ Coverage 95.59% 95.60% +0.01%
==========================================
Files 244 245 +1
Lines 7665 7712 +47
Branches 2014 2028 +14
==========================================
+ Hits 7327 7373 +46
- Misses 338 339 +1
☔ View full report in Codecov by Sentry. |
yurishkuro
changed the title
Signed-off-by: Yuri Shkuro <ysh@meta.com>
yurishkuro
commented
Jun 14, 2023
| if (Array.isArray(doc)) return 'array'; | ||
| if (typeof doc === 'string' && /^https?:/.test(doc)) { | ||
| try { | ||
| const u = new URL(doc); |
There was a problem hiding this comment.
added validation of URL string
yurishkuro
commented
Jun 14, 2023
| '<span ' + | ||
| style('json-markup-string') + | ||
| '>"<a href="' + | ||
| (url.href) + |
There was a problem hiding this comment.
use safe URL value only
yurishkuro
commented
Jun 14, 2023
| }); | ||
|
|
||
| return forEach(keys, '{', '}', function (key) { | ||
| return '<span ' + style('json-markup-key') + '>"' + escape(key) + '":</span> ' + visit(obj[key]); |
There was a problem hiding this comment.
replaced key with escape(key)
yurishkuro
changed the title
Signed-off-by: Yuri Shkuro <ysh@meta.com>
Signed-off-by: Yuri Shkuro <ysh@meta.com>
Signed-off-by: Yuri Shkuro <ysh@meta.com>
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.
The json-markup library does not properly escape the keys. Not clear if it is maintained or not, last changes were several years ago. Since it's just a single file, copy it directly and fix in place:
<a href="...">datetype which will never be in the JSON that we obtain from span tags via JSON.parse()Add tests: