Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 3007 #3028

Merged
merged 7 commits into from
Jul 27, 2019
Merged

Fix 3007 #3028

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29ea1ca
fix code fences never sanitized
amedora May 24, 2019
1ff179a
fix mermaid xss
amedora May 24, 2019
1e317c4
Revert "fix mermaid xss"
amedora May 28, 2019
169763b
configuable mermaid HTML label
amedora May 29, 2019
696fcf6
add locales for mermaid configuration
amedora May 29, 2019
a0d2b19
Merge branch 'master' into fix-3007
amedora Jul 22, 2019
9b231aa
Merge branch 'master' into fix-3007
amedora Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion browser/components/MarkdownPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ export default class MarkdownPreview extends React.Component {
_.forEach(
this.refs.root.contentWindow.document.querySelectorAll('.mermaid'),
el => {
mermaidRender(el, htmlTextHelper.decodeEntities(el.innerHTML), theme)
mermaidRender(el, htmlTextHelper.encodeEntities(el.innerHTML), theme)
amedora marked this conversation as resolved.
Show resolved Hide resolved
}
)

Expand Down
2 changes: 1 addition & 1 deletion browser/lib/markdown-it-sanitize-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function sanitizePlugin (md, options) {
options
)
}
if (state.tokens[tokenIdx].type === '_fence') {
if (state.tokens[tokenIdx].type.match(/.*_fence$/)) {
// escapeHtmlCharacters has better performance
state.tokens[tokenIdx].content = escapeHtmlCharacters(
state.tokens[tokenIdx].content,
Expand Down