github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-28 08:16:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: censored regex words were replacing other text that shouldn't be censored

Browse Source
This commit is contained in:
Neil Lalonde 2018-01-24 12:33:38 -05:00
parent 594efa37b6
commit dc97239040
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/pretty-text/censored-words.js.es6
View File

@ -36,13 +36,14 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter, watc
try {
let m = censorRegexp.exec(text);
const fourCharReplacement = new Array(5).join(replacementLetter);
while (m && m[0]) {
if (m[0].length > original.length) { return original; } // regex is dangerous
const replacement = new Array(m[0].length+1).join(replacementLetter);
if (watchedWordsRegularExpressions) {
text = text.replace(new RegExp(`(${escapeRegexp(m[0])})(?![^\\(]*\\))`, "ig"), replacement);
text = text.replace(censorRegexp, fourCharReplacement);
} else {
const replacement = new Array(m[0].length+1).join(replacementLetter);
text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
}
m = censorRegexp.exec(text);

13
test/javascripts/lib/pretty-text-test.js.es6
View File

@ -617,7 +617,18 @@ QUnit.test("censoring", assert => {
},
censoredWords: 'xyz*|plee+ase'
},
"<p>Pleased to meet you, but ■■■■■■■■■ call me later, ■■■123</p>",
"<p>Pleased to meet you, but ■■■■ call me later, ■■■■123</p>",
"supports words as regular expressions");
assert.cookedOptions(
"Meet downtown in your town at the townhouse on Main St.",
{ siteSettings: {
watched_words_regular_expressions: true,
censored_pattern: null
},
censoredWords: '\\btown\\b'
},
"<p>Meet downtown in your ■■■■ at the townhouse on Main St.</p>",
"supports words as regular expressions");
});