Skip to content

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

SECURITY: Restrict category-channel chat reviewables to viewers with category access

Krzysztof Kotlareka85b9e471928
diff --git a/plugins/chat/lib/chat/reviewable_extension.rb b/plugins/chat/lib/chat/reviewable_extension.rb
index c856701dbf7..96187653105 100644
--- a/plugins/chat/lib/chat/reviewable_extension.rb
+++ b/plugins/chat/lib/chat/reviewable_extension.rb
@@ -9,6 +9,35 @@ module Chat
class_methods do
def sti_class_mapping = { "ReviewableChatMessage" => Chat::ReviewableMessage }
def polymorphic_class_mapping = { "ChatMessage" => Chat::Message }
+
+ def viewable_by(user, ...)
+ result = super
+ return result if user.blank? || user.admin?
+
+ allowed_category_ids = user.guardian.allowed_category_ids
+ inaccessible_category_condition =
+ if allowed_category_ids.empty?
+ "TRUE"
+ else
+ "chat_channels.chatable_id NOT IN (:allowed_category_ids)"
+ end
+
+ result.where(
+ <<~SQL,
+ NOT EXISTS (
+ SELECT 1
+ FROM chat_messages
+ INNER JOIN chat_channels ON chat_channels.id = chat_messages.chat_channel_id
+ WHERE reviewables.type = :chat_reviewable_type
+ AND chat_messages.id = reviewables.target_id
+ AND chat_channels.chatable_type = 'Category'
+ AND #{inaccessible_category_condition}
+ )
+ SQL
+ chat_reviewable_type: Chat::ReviewableMessage.sti_name,
+ allowed_category_ids:,
+ )
+ end
end
end
end
diff --git a/plugins/chat/spec/requests/reviewables_controller_spec.rb b/plugins/chat/spec/requests/reviewables_controller_spec.rb
index 84f63d2c3f9..c9466927af0 100644
--- a/plugins/chat/spec/requests/reviewables_controller_spec.rb
+++ b/plugins/chat/spec/requests/reviewables_controller_spec.rb
@@ -4,6 +4,17 @@ RSpec.describe ReviewablesController do
fab!(:moderator)
fab!(:message_author) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:flagger) { Fabricate(:user, refresh_auto_groups: true) }
+ fab!(:restricted_group) { Fabricate(:group, users: [flagger]) }
+ fab!(:restricted_category) { Fabricate(:private_category, group: restricted_group) }
+ fab!(:restricted_channel) { Fabricate(:category_channel, chatable: restricted_category) }
+ fab!(:restricted_message) do
+ Fabricate(
+ :chat_message,
+ chat_channel: restricted_channel,
+ user: message_author,
+ message: "restricted category chat content",
+ )
+ end
fab!(:direct_message_channel) do
Fabricate(:direct_message_channel, users: [message_author, flagger])
end
@@ -15,6 +26,94 @@ RSpec.describe ReviewablesController do
end
describe "#index" do
+ it "does not expose flagged messages from category channels a moderator cannot see" do
+ expect(moderator.guardian.can_preview_chat_channel?(restricted_channel)).to eq(false)
+
+ result =
+ Chat::ReviewQueue.new.flag_message(
+ restricted_message,
+ Guardian.new(flagger),
+ ReviewableScore.types[:spam],
+ )
+ expect(result[:success]).to eq(true)
+
+ sign_in(moderator)
+ get "/review.json", params: { type: "Chat::ReviewableMessage" }
+
+ expect(response.status).to eq(200)
+ listed_ids = response.parsed_body["reviewables"].map { |reviewable| reviewable["id"] }
+ expect(listed_ids).not_to include(result[:reviewable].id)
+ expect(response.body).not_to include(restricted_message.message)
+ expect(response.parsed_body["meta"]["unseen_reviewable_count"]).to eq(0)
+ end
+
+ it "shows category-channel reviewables to an authorized moderator and administrator" do
+ result =
+ Chat::ReviewQueue.new.flag_message(
+ restricted_message,
+ Guardian.new(flagger),
+ ReviewableScore.types[:spam],
+ )
+ authorized_moderator = Fabricate(:moderator)
+ admin = Fabricate(:admin)
+ restricted_group.add(authorized_moderator)
+
+ [authorized_moderator, admin].each do |reviewer|
+ expect(reviewer.guardian.can_preview_chat_channel?(restricted_channel)).to eq(true)
+
+ sign_in(reviewer)
+ get "/review.json", params: { type: "Chat::ReviewableMessage" }
+
+ expect(response.status).to eq(200)
+ listed_ids = response.parsed_body["reviewables"].map { |reviewable| reviewable["id"] }
+ expect(listed_ids).to include(result[:reviewable].id)
+ expect(response.body).to include(restricted_message.message)
+ end
+ end
+
+ it "retains direct-message reviewables when a moderator cannot access any categories" do
+ Category.update_all(read_restricted: true)
+ expect(moderator.guardian.allowed_category_ids).to eq([])
+
+ category_result =
+ Chat::ReviewQueue.new.flag_message(
+ restricted_message,
+ Guardian.new(flagger),
+ ReviewableScore.types[:spam],
+ )
+ direct_message =
+ Fabricate(
+ :chat_message,
+ chat_channel: direct_message_channel,
+ user: message_author,
+ message: "direct-message reviewable content",
+ )
+ direct_message_result =
+ Chat::ReviewQueue.new.flag_message(
+ direct_message,
+ Guardian.new(flagger),
+ ReviewableScore.types[:spam],
+ )
+
+ expect(category_result[:success]).to eq(true)
+ expect(direct_message_result[:success]).to eq(true)
+
+ sign_in(moderator)
+ get "/review.json", params: { type: "Chat::ReviewableMessage" }
+
+ expect(response.status).to eq(200)
+ listed_ids = response.parsed_body["reviewables"].map { |reviewable| reviewable["id"] }
+ expect(listed_ids).to include(direct_message_result[:reviewable].id)
+ expect(listed_ids).not_to include(category_result[:reviewable].id)
+ expect(response.body).to include(direct_message.message)
+ expect(response.body).not_to include(restricted_message.message)
+
+ get "/review/#{category_result[:reviewable].id}.json"
+
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(restricted_message.message)
+ end
+
it "does not expose unrelated direct-message last message content to moderators" do
flagged_message_text = "flagged direct message content"
unrelated_last_message_text = "unrelated later direct message secret"