mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 22:01:14 +08:00
FIX: Add validation to disallow censored words in topic title.
This commit is contained in:
@ -54,6 +54,7 @@ class Topic < ActiveRecord::Base
|
|||||||
validates :title, :if => Proc.new { |t| t.new_record? || t.title_changed? },
|
validates :title, :if => Proc.new { |t| t.new_record? || t.title_changed? },
|
||||||
:presence => true,
|
:presence => true,
|
||||||
:topic_title_length => true,
|
:topic_title_length => true,
|
||||||
|
:censored_words => true,
|
||||||
:quality_title => { :unless => :private_message? },
|
:quality_title => { :unless => :private_message? },
|
||||||
:unique_among => { :unless => Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
|
:unique_among => { :unless => Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
|
||||||
:message => :has_already_been_used,
|
:message => :has_already_been_used,
|
||||||
|
@ -95,6 +95,8 @@ en:
|
|||||||
inclusion: is not included in the list
|
inclusion: is not included in the list
|
||||||
invalid: is invalid
|
invalid: is invalid
|
||||||
is_invalid: "seems unclear, is it a complete sentence?"
|
is_invalid: "seems unclear, is it a complete sentence?"
|
||||||
|
contains_censored_words: "includes one or more of the censored words: %{censored_words}"
|
||||||
|
matches_censored_pattern: "matches the following censored Regex: %{censored_pattern}"
|
||||||
less_than: must be less than %{count}
|
less_than: must be less than %{count}
|
||||||
less_than_or_equal_to: must be less than or equal to %{count}
|
less_than_or_equal_to: must be less than or equal to %{count}
|
||||||
not_a_number: is not a number
|
not_a_number: is not a number
|
||||||
|
15
lib/validators/censored_words_validator.rb
Normal file
15
lib/validators/censored_words_validator.rb
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
class CensoredWordsValidator < ActiveModel::EachValidator
|
||||||
|
def validate_each(record, attribute, value)
|
||||||
|
if value =~ /#{SiteSetting.censored_words}/i
|
||||||
|
record.errors.add(
|
||||||
|
attribute, :contains_censored_words,
|
||||||
|
censored_words: SiteSetting.censored_words
|
||||||
|
)
|
||||||
|
elsif value =~ /#{SiteSetting.censored_pattern}/i
|
||||||
|
record.errors.add(
|
||||||
|
attribute, :matches_censored_pattern,
|
||||||
|
censored_pattern: SiteSetting.censored_pattern
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -4,12 +4,54 @@ require 'rails_helper'
|
|||||||
require_dependency 'post_destroyer'
|
require_dependency 'post_destroyer'
|
||||||
|
|
||||||
describe Topic do
|
describe Topic do
|
||||||
|
|
||||||
let(:now) { Time.zone.local(2013,11,20,8,0) }
|
let(:now) { Time.zone.local(2013,11,20,8,0) }
|
||||||
let(:user) { Fabricate(:user) }
|
let(:user) { Fabricate(:user) }
|
||||||
|
|
||||||
|
context 'validations' do
|
||||||
|
let(:topic) { Fabricate.build(:topic) }
|
||||||
|
|
||||||
|
context "#title" do
|
||||||
it { is_expected.to validate_presence_of :title }
|
it { is_expected.to validate_presence_of :title }
|
||||||
|
|
||||||
|
describe 'censored words' do
|
||||||
|
site_setting(:censored_words, 'pineapple|pen')
|
||||||
|
site_setting(:censored_pattern, 'orange.*')
|
||||||
|
|
||||||
|
describe 'when title contains censored words' do
|
||||||
|
it 'should not be valid' do
|
||||||
|
topic.title = 'I have a Pineapple'
|
||||||
|
|
||||||
|
expect(topic).to_not be_valid
|
||||||
|
|
||||||
|
expect(topic.errors.full_messages.first).to include(I18n.t(
|
||||||
|
'errors.messages.contains_censored_words', censored_words: SiteSetting.censored_words
|
||||||
|
))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when title matches censored pattern' do
|
||||||
|
it 'should not be valid' do
|
||||||
|
topic.title = 'I have orangEjuice'
|
||||||
|
|
||||||
|
expect(topic).to_not be_valid
|
||||||
|
|
||||||
|
expect(topic.errors.full_messages.first).to include(I18n.t(
|
||||||
|
'errors.messages.matches_censored_pattern', censored_pattern: SiteSetting.censored_pattern
|
||||||
|
))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when title does not contain censored words' do
|
||||||
|
it 'should be valid' do
|
||||||
|
topic.title = 'The cake is a lie'
|
||||||
|
|
||||||
|
expect(topic).to be_valid
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
it { is_expected.to rate_limit }
|
it { is_expected.to rate_limit }
|
||||||
|
|
||||||
context '#visible_post_types' do
|
context '#visible_post_types' do
|
||||||
|
Reference in New Issue
Block a user