A platform for community discussion. Free, open, simple.
FIX: Emoji deny list with regex metacharacters crashes cooking (#40155)
Alan Guo Xiang Tan4f17eef31009
diff --git a/frontend/discourse-markdown-it/src/features/emoji.js b/frontend/discourse-markdown-it/src/features/emoji.jsindex 517ffb5ea7c..2d3e8a053fc 100644--- a/frontend/discourse-markdown-it/src/features/emoji.js+++ b/frontend/discourse-markdown-it/src/features/emoji.js@@ -228,9 +228,9 @@ function applyEmoji(// prevent denied emoji and aliases from being renderedif (content && emojiDenyList?.length > 0) {emojiDenyList.forEach((emoji) => {- if (content.match(emoji)) {- const regex = new RegExp(`:${emoji}:`, "g");- content = content.replace(regex, "");+ const token = `:${emoji}:`;+ if (content.includes(token)) {+ content = content.replaceAll(token, "");}});}diff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rbindex 2b239e4265b..49aeb542315 100644--- a/spec/lib/pretty_text_spec.rb+++ b/spec/lib/pretty_text_spec.rb@@ -1630,6 +1630,13 @@ RSpec.describe PrettyText doexpect(PrettyText.cook("💣")).to match(/\:bomb\:/)end+ it "renders a denied emoji name as plain text when the name contains regex metacharacters" do+ SiteSetting.emoji_deny_list = "+1"+ Emoji.clear_cache++ expect(PrettyText.cook(":+1: hello")).to eq("<p>:+1: hello</p>")+ end+it "does not replace left right arrow" doexpect(PrettyText.cook("↔")).to eq("<p>↔</p>")end