Skip to content

Commit 12fb320

Browse files
zeripathSysoev, Vladimir
authored and
Sysoev, Vladimir
committed
Correctly escape within tribute.js (go-gitea#20831)
When writing html in tribute.js ensure that strings are properly escaped. Signed-off-by: Andrew Thornton <art27@cantab.net> Signed-off-by: Andrew Thornton <art27@cantab.net>
1 parent ca6b4a6 commit 12fb320

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

web_src/js/features/tribute.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {emojiKeys, emojiHTML, emojiString} from './emoji.js';
22
import {uniq} from '../utils.js';
3+
import {htmlEscape} from 'escape-goat';
34

45
function makeCollections({mentions, emoji}) {
56
const collections = [];
@@ -24,7 +25,7 @@ function makeCollections({mentions, emoji}) {
2425
return emojiString(item.original);
2526
},
2627
menuItemTemplate: (item) => {
27-
return `<div class="tribute-item">${emojiHTML(item.original)}<span>${item.original}</span></div>`;
28+
return `<div class="tribute-item">${emojiHTML(item.original)}<span>${htmlEscape(item.original)}</span></div>`;
2829
}
2930
});
3031
}
@@ -36,9 +37,9 @@ function makeCollections({mentions, emoji}) {
3637
menuItemTemplate: (item) => {
3738
return `
3839
<div class="tribute-item">
39-
<img src="${item.original.avatar}"/>
40-
<span class="name">${item.original.name}</span>
41-
${item.original.fullname && item.original.fullname !== '' ? `<span class="fullname">${item.original.fullname}</span>` : ''}
40+
<img src="${htmlEscape(item.original.avatar)}"/>
41+
<span class="name">${htmlEscape(item.original.name)}</span>
42+
${item.original.fullname && item.original.fullname !== '' ? `<span class="fullname">${htmlEscape(item.original.fullname)}</span>` : ''}
4243
</div>
4344
`;
4445
}

0 commit comments

Comments
 (0)