Skip to content

fix(files): Apply HTML escaping to all user-controlled input before сoncatenating it into HTML #1768

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

Open
JuliaKirschenheuter wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

fix(files): Apply HTML escaping to all user-controlled input before сoncatenating it into HTML #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,9 @@ export const getDefaultSampleNote = () => {
> ` + t('notes', 'Nextcloud, a safe home for all your data') + `
`
}

export const escapeHtml = (str) => {
const element = document.createElement('div')
element.textContent = str
return element.innerHTML
}
6 changes: 5 additions & 1 deletion src/components/EditorMarkdownIt.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import MarkdownIt from 'markdown-it'
import { generateUrl } from '@nextcloud/router'
import { escapeHtml } from '../Util.js'
export default {
name: 'EditorMarkdownIt',
Expand Down Expand Up @@ -145,7 +146,10 @@ export default {
if (download) {
const dlimgpath = generateUrl('svg/core/actions/download?color=ffffff')
return '<div class="download-file"><a href="' + path.replace(/"/g, '&quot;') + '"><div class="download-icon"><img class="download-icon-inner" src="' + dlimgpath + '">' + token.content + '</div></a></div>'
const tokenContent = escapeHtml(token.content)
return '<div class="download-file"><a href="' + path.replace(/"/g, '&quot;') + '"><div class="download-icon"><img class="download-icon-inner" '
+ 'src="' + dlimgpath + '">'
+ tokenContent + '</div></a></div>'
} else {
// pass token to default renderer.
return defaultRender(tokens, idx, options, env, self)
Expand Down
Loading