Skip to content

A platform for community discussion. Free, open, simple.

FIX: Restrict chat message flags to enabled and applicable types (#44349)

Gabriel Grubbae0a26c7cabab
diff --git a/app/models/flag.rb b/app/models/flag.rb
index d5a1c6333e0..12fe73b36b8 100644
--- a/app/models/flag.rb
+++ b/app/models/flag.rb
@@ -8,6 +8,7 @@ class Flag < ActiveRecord::Base
scope :enabled, -> { where(enabled: true) }
scope :system, -> { where("id < 1000") }
scope :custom, -> { where("id >= 1000") }
+ scope :applicable_to, ->(type) { where("? = ANY(applies_to)", type) }
before_save :set_position
before_save :set_name_key
diff --git a/plugins/chat/app/services/chat/flag_message.rb b/plugins/chat/app/services/chat/flag_message.rb
index 6c6aa84bb0b..83c0f63dadd 100644
--- a/plugins/chat/app/services/chat/flag_message.rb
+++ b/plugins/chat/app/services/chat/flag_message.rb
@@ -38,7 +38,10 @@ module Chat
validates :message_id, presence: true
validates :channel_id, presence: true
- validates :flag_type_id, inclusion: { in: -> { ::ReviewableScore.types.values } }
+ validates :flag_type_id,
+ inclusion: {
+ in: -> { Flag.enabled.applicable_to("Chat::Message").ids },
+ }
end
model :message
diff --git a/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb
index 6c4a43e4a76..02c750774a5 100644
--- a/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb
@@ -66,6 +66,39 @@ RSpec.describe Chat::Api::ChannelsMessagesFlagsController do
end
end
+ context "when flag type is disabled or unavailable for chat messages" do
+ fab!(:disabled_chat_flag) { Fabricate(:flag, enabled: false, applies_to: ["Chat::Message"]) }
+ fab!(:non_chat_flag) { Fabricate(:flag, applies_to: ["Post"]) }
+
+ before do
+ current_user.change_trust_level!(TrustLevel[4])
+ SiteSetting.chat_auto_silence_from_flags_duration = 1
+ end
+
+ it "rejects disabled, internal, and non-chat flags without creating moderation records" do
+ [
+ disabled_chat_flag.id,
+ ReviewableScore.types[:needs_approval],
+ non_chat_flag.id,
+ ].each do |flag_type_id|
+ reviewable_count = Reviewable.count
+ reviewable_score_count = ReviewableScore.count
+ silenced_till = message_1.user.reload.silenced_till
+
+ post "/chat/api/channels/#{message_1.chat_channel.id}/messages/#{message_1.id}/flags",
+ params: {
+ flag_type_id: flag_type_id,
+ }
+
+ expect(Reviewable.count).to eq(reviewable_count)
+ expect(ReviewableScore.count).to eq(reviewable_score_count)
+ expect(message_1.user.reload.silenced_till).to eq(silenced_till)
+ expect(response.status).to eq(400)
+ expect(response.parsed_body).to include("failed" => "FAILED")
+ end
+ end
+ end
+
context "when user can't flag message" do
before { UserSilencer.new(current_user).silence }
diff --git a/plugins/chat/spec/services/chat/flag_message_spec.rb b/plugins/chat/spec/services/chat/flag_message_spec.rb
index 02d1c763221..cdbcefffc28 100644
--- a/plugins/chat/spec/services/chat/flag_message_spec.rb
+++ b/plugins/chat/spec/services/chat/flag_message_spec.rb
@@ -6,7 +6,9 @@ RSpec.describe Chat::FlagMessage do
it { is_expected.to validate_presence_of(:message_id) }
it do
- is_expected.to validate_inclusion_of(:flag_type_id).in_array(ReviewableScore.types.values)
+ eligible_flag_type_ids = Flag.enabled.applicable_to("Chat::Message").ids
+
+ is_expected.to validate_inclusion_of(:flag_type_id).in_array(eligible_flag_type_ids)
end
end