Skip to content

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

SECURITY: Scope PM reviewables to their allowed audience

Alan Guo Xiang Tan1566d04524c0
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 19d3971d893..674063d2540 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -463,18 +463,37 @@ class Reviewable < ActiveRecord::Base
group_ids =
SiteSetting.enable_category_group_moderation? ? user.group_users.pluck(:group_id) : []
- result
- .left_joins(category: :category_moderation_groups)
- .where(
- "(reviewables.reviewable_by_moderator AND :moderator) OR (category_moderation_groups.group_id IN (:group_ids))",
- moderator: user.moderator?,
- group_ids: group_ids,
- )
- .where(
- "reviewables.category_id IS NULL OR reviewables.category_id IN (?)",
- Guardian.new(user).allowed_category_ids,
- )
+ result =
+ result
+ .left_joins(category: :category_moderation_groups)
+ .where(
+ "(reviewables.reviewable_by_moderator AND :moderator) OR (category_moderation_groups.group_id IN (:group_ids))",
+ moderator: user.moderator?,
+ group_ids: group_ids,
+ )
+ .where(
+ "reviewables.category_id IS NULL OR reviewables.category_id IN (?)",
+ Guardian.new(user).allowed_category_ids,
+ )
+
+ exclude_private_messages_hidden_from(result, user)
+ end
+
+ def self.exclude_private_messages_hidden_from(result, user)
+ visible_private_message_ids =
+ Guardian.new(user).private_message_topic_scope(Topic.unscoped).select(:id)
+
+ result.where(<<~SQL, private_message: Archetype.private_message)
+ NOT EXISTS (
+ SELECT 1
+ FROM topics private_message
+ WHERE private_message.id = reviewables.topic_id
+ AND private_message.archetype = :private_message
+ AND private_message.id NOT IN (#{visible_private_message_ids.to_sql})
+ )
+ SQL
end
+ private_class_method :exclude_private_messages_hidden_from
def self.pending_count(user)
list_for(user).count
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index b659502c02b..3f786392667 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -366,12 +366,6 @@ module TopicGuardian
topic&.slow_mode_seconds.to_i > 0 && @user.human? && !is_staff?
end
- private
-
- def can_delete_own_topic?(topic)
- topic.posts_count <= 1 && topic.created_at? && topic.created_at > 24.hours.ago
- end
-
def private_message_topic_scope(scope)
pm_scope = scope.private_messages_for_user(user)
@@ -383,6 +377,12 @@ module TopicGuardian
pm_scope
end
+ private
+
+ def can_delete_own_topic?(topic)
+ topic.posts_count <= 1 && topic.created_at? && topic.created_at > 24.hours.ago
+ end
+
def secured_regular_topic_scope(scope, topic_ids:)
secured_scope = Topic.unscoped.secured(self)
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 8da11572e58..af60a414db8 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -119,6 +119,47 @@ RSpec.describe Reviewable, type: :model do
end
end
+ describe ".viewable_by" do
+ fab!(:admin)
+ fab!(:pm_author, :user)
+ fab!(:pm_recipient, :user)
+ fab!(:outsider_moderator, :moderator)
+ fab!(:pm_topic) { Fabricate(:private_message_topic, user: pm_author, recipient: pm_recipient) }
+ fab!(:pm_post) { Fabricate(:post, topic: pm_topic, user: pm_author) }
+ fab!(:reviewable) do
+ ReviewablePost.needs_review!(
+ target: pm_post,
+ created_by: Discourse.system_user,
+ reviewable_by_moderator: true,
+ )
+ end
+
+ it "excludes private-message reviewables from moderators outside the conversation" do
+ expect(described_class.viewable_by(outsider_moderator)).not_to exist(id: reviewable.id)
+ end
+
+ it "includes private-message reviewables for admins" do
+ expect(described_class.viewable_by(admin)).to exist(id: reviewable.id)
+ end
+
+ it "includes private-message reviewables for participating moderators" do
+ participant_moderator = Fabricate(:moderator)
+ participant_topic =
+ Fabricate(:private_message_topic, user: pm_author, recipient: participant_moderator)
+ participant_post = Fabricate(:post, topic: participant_topic, user: pm_author)
+ participant_reviewable =
+ ReviewablePost.needs_review!(
+ target: participant_post,
+ created_by: Discourse.system_user,
+ reviewable_by_moderator: true,
+ )
+
+ expect(described_class.viewable_by(participant_moderator)).to exist(
+ id: participant_reviewable.id,
+ )
+ end
+ end
+
describe ".list_for" do
fab!(:user)
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 9b83b73d905..16175d1e5a2 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -1289,4 +1289,63 @@ RSpec.describe ReviewablesController do
end
end
end
+
+ shared_context "with a private-message reviewable" do
+ fab!(:pm_author, :user)
+ fab!(:pm_recipient, :user)
+ fab!(:outsider_moderator, :moderator)
+ fab!(:pm_topic) { Fabricate(:private_message_topic, user: pm_author, recipient: pm_recipient) }
+ fab!(:pm_post) do
+ Fabricate(
+ :post,
+ topic: pm_topic,
+ user: pm_author,
+ raw: "the confidential body of a private message xyzsecret481",
+ )
+ end
+
+ fab!(:unescalated_pm_reviewable) do
+ ReviewablePost.needs_review!(
+ target: pm_post,
+ created_by: Discourse.system_user,
+ reviewable_by_moderator: true,
+ )
+ end
+ end
+
+ describe "#index" do
+ context "when a reviewable targets a private message" do
+ include_context "with a private-message reviewable"
+
+ it "returns no private-message reviewable, body, or unseen count to a moderator outside the conversation" do
+ sign_in(outsider_moderator)
+
+ get "/review.json"
+
+ expect(response.status).to eq(200)
+ listed_ids = response.parsed_body["reviewables"].map { |reviewable| reviewable["id"] }
+ expect(listed_ids).not_to include(unescalated_pm_reviewable.id)
+ expect(response.body).not_to include(pm_post.raw)
+ expect(response.parsed_body["meta"]["unseen_reviewable_count"]).to eq(0)
+ end
+ end
+ end
+
+ describe "#perform" do
+ context "when a reviewable targets a private message" do
+ include_context "with a private-message reviewable"
+
+ it "returns 404 and leaves the post intact for a moderator outside the conversation" do
+ sign_in(outsider_moderator)
+
+ put "/review/#{unescalated_pm_reviewable.id}/perform/reject_and_delete.json",
+ params: {
+ version: unescalated_pm_reviewable.version,
+ }
+
+ expect(response.status).to eq(404)
+ expect(pm_post.reload.trashed?).to eq(false)
+ end
+ end
+ end
end