A platform for community discussion. Free, open, simple.
SECURITY: Require topic visibility for category group moderator actions
Isaac Janzen0e690370b49a
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rbindex 8f0ffc6d4ec..46341122fa3 100644--- a/lib/guardian/post_guardian.rb+++ b/lib/guardian/post_guardian.rb@@ -158,10 +158,14 @@ module PostGuardian# Must be staff to edit a locked postreturn false if post.locked? && !is_staff?- if is_in_edit_post_groups? || is_category_group_moderator?(post.topic&.category)- return can_create_post?(post.topic)+ # Staff in edit groups skip visibility (e.g. deleted topics); non-staff must pass it+ if is_in_edit_post_groups?+ return can_create_post?(post.topic) if is_staff?+ return can_create_post?(post.topic) if can_see_post_topic?(post)+ return falseendreturn false if !can_see_post_topic?(post)+ return can_create_post?(post.topic) if is_category_group_moderator?(post.topic&.category)return false if post.topic&.archived? || post.user_deleted || post.deleted_atdiff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rbindex 6ca1a44886a..cbc186a792d 100644--- a/lib/guardian/topic_guardian.rb+++ b/lib/guardian/topic_guardian.rb@@ -10,6 +10,7 @@ module TopicGuardiandef can_review_topic?(topic)return false if anonymous? || topic.nil?return true if is_staff?+ return false if !can_see_topic?(topic)is_category_group_moderator?(topic.category)end@@ -144,6 +145,7 @@ module TopicGuardiandef can_recover_topic?(topic)return false if topic.blank?+ return false if !is_staff? && !can_see_topic?(topic, false)if is_category_group_moderator?(topic.category) ||user&.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)@@ -157,7 +159,7 @@ module TopicGuardianreturn false if topic.trashed?return false if topic.is_category_topic?return false if Discourse.static_doc_topic_ids.include?(topic.id)- return true if is_category_group_moderator?(topic.category)+ return true if is_category_group_moderator?(topic.category) && can_see_topic?(topic)return true if user&.in_any_groups?(SiteSetting.delete_all_posts_and_topics_allowed_groups_map)is_my_own?(topic) && can_delete_own_topic?(topic)diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rbindex fba76001ab4..b6ac3b25102 100644--- a/spec/lib/guardian/post_guardian_spec.rb+++ b/spec/lib/guardian/post_guardian_spec.rb@@ -532,6 +532,46 @@ RSpec.describe PostGuardian doexpect(guardian.can_edit_post?(post)).to eq(false)end+ context "when category group moderation is enabled" do+ before { SiteSetting.enable_category_group_moderation = true }++ it "returns false for a category group moderator who cannot see the topic" do+ mod_group = Fabricate(:group)+ cat_mod_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: Fabricate(:group))+ private_t = Fabricate(:topic, category: private_cat)+ private_p = Fabricate(:post, topic: private_t)+ Fabricate(:category_moderation_group, category: private_cat, group: mod_group)+ mod_group.add(cat_mod_user)++ expect(Guardian.new(cat_mod_user).can_edit_post?(private_p)).to eq(false)+ end++ it "returns true for a category group moderator who can see the topic" do+ mod_group = Fabricate(:group)+ cat_mod_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: mod_group)+ private_t = Fabricate(:topic, category: private_cat)+ private_p = Fabricate(:post, topic: private_t)+ Fabricate(:category_moderation_group, category: private_cat, group: mod_group)+ mod_group.add(cat_mod_user)++ expect(Guardian.new(cat_mod_user).can_edit_post?(private_p)).to eq(true)+ end+ end++ it "returns false for edit_all_post_groups user who cannot see the topic" do+ edit_group = Fabricate(:group)+ edit_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: Fabricate(:group))+ private_t = Fabricate(:topic, category: private_cat)+ private_p = Fabricate(:post, topic: private_t)+ edit_group.add(edit_user)+ SiteSetting.edit_all_post_groups = edit_group.id.to_s++ expect(Guardian.new(edit_user).can_edit_post?(private_p)).to eq(false)+ end+it "returns true even if the topic is closed" dotopic.update!(closed: true)diff --git a/spec/lib/guardian/topic_guardian_spec.rb b/spec/lib/guardian/topic_guardian_spec.rbindex ef59b767572..588cd227f02 100644--- a/spec/lib/guardian/topic_guardian_spec.rb+++ b/spec/lib/guardian/topic_guardian_spec.rb@@ -116,6 +116,30 @@ RSpec.describe TopicGuardian doexpect(Guardian.new(user).can_recover_topic?(Topic.with_deleted.last)).to eq(true)end+ it "returns false for a category group moderator who cannot see the topic" do+ SiteSetting.enable_category_group_moderation = true+ mod_group = Fabricate(:group)+ cat_mod_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: Fabricate(:group))+ private_t = Fabricate(:topic, category: private_cat, deleted_at: 1.day.ago)+ Fabricate(:category_moderation_group, category: private_cat, group: mod_group)+ mod_group.add(cat_mod_user)++ expect(Guardian.new(cat_mod_user).can_recover_topic?(private_t)).to eq(false)+ end++ it "returns true for a category group moderator who can see the topic" do+ SiteSetting.enable_category_group_moderation = true+ mod_group = Fabricate(:group)+ cat_mod_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: mod_group)+ private_t = Fabricate(:topic, category: private_cat, deleted_at: 1.day.ago)+ Fabricate(:category_moderation_group, category: private_cat, group: mod_group)+ mod_group.add(cat_mod_user)++ expect(Guardian.new(cat_mod_user).can_recover_topic?(private_t)).to eq(true)+ end+it "returns true when tl4 can delete posts and topics" doexpect(Guardian.new(tl4_user).can_recover_topic?(Topic.with_deleted.last)).to eq(false)SiteSetting.delete_all_posts_and_topics_allowed_groups = Group::AUTO_GROUPS[:trust_level_4]@@ -246,6 +270,28 @@ RSpec.describe TopicGuardian doexpect(Guardian.new(group_user.user).can_delete_topic?(topic)).to be_truthyend++ it "returns false for a category group moderator who cannot see the topic" do+ mod_group = Fabricate(:group)+ cat_mod_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: Fabricate(:group))+ private_t = Fabricate(:topic, category: private_cat)+ Fabricate(:category_moderation_group, category: private_cat, group: mod_group)+ mod_group.add(cat_mod_user)++ expect(Guardian.new(cat_mod_user).can_delete_topic?(private_t)).to be_falsey+ end++ it "returns true for a category group moderator who can see the topic" do+ mod_group = Fabricate(:group)+ cat_mod_user = Fabricate(:user)+ private_cat = Fabricate(:private_category, group: mod_group)+ private_t = Fabricate(:topic, category: private_cat)+ Fabricate(:category_moderation_group, category: private_cat, group: mod_group)+ mod_group.add(cat_mod_user)++ expect(Guardian.new(cat_mod_user).can_delete_topic?(private_t)).to be_truthy+ endendenddiff --git a/spec/lib/guardian/user_guardian_spec.rb b/spec/lib/guardian/user_guardian_spec.rbindex f3fce132a99..761e1379195 100644--- a/spec/lib/guardian/user_guardian_spec.rb+++ b/spec/lib/guardian/user_guardian_spec.rb@@ -87,6 +87,54 @@ RSpec.describe UserGuardian doexpect(guardian.can_claim_reviewable_topic?(topic, true)).to eq(true)endend++ context "with category group moderator who cannot see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ let(:guardian) { Guardian.new(cat_mod_user) }++ before do+ SiteSetting.enable_category_group_moderation = true+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ end++ it "returns false for non-automatic requests" do+ SiteSetting.reviewable_claiming = "optional"+ expect(guardian.can_claim_reviewable_topic?(private_topic)).to eq(false)+ end++ it "returns false for automatic requests" do+ expect(guardian.can_claim_reviewable_topic?(private_topic, true)).to eq(false)+ end+ end++ context "with category group moderator who can see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ let(:guardian) { Guardian.new(cat_mod_user) }++ before do+ SiteSetting.enable_category_group_moderation = true+ private_category.set_permissions(mod_group => :full)+ private_category.save!+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ end++ it "returns true for non-automatic requests" do+ SiteSetting.reviewable_claiming = "optional"+ expect(guardian.can_claim_reviewable_topic?(private_topic)).to eq(true)+ end++ it "returns true for automatic requests" do+ expect(guardian.can_claim_reviewable_topic?(private_topic, true)).to eq(true)+ end+ endenddescribe "#can_pick_avatar?" dodiff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rbindex 4d937038cdc..480bc0b8080 100644--- a/spec/lib/guardian_spec.rb+++ b/spec/lib/guardian_spec.rb@@ -1406,6 +1406,24 @@ RSpec.describe Guardian doFabricate(:category_moderation_group, category: topic.category, group:)expect(Guardian.new(user).can_review_topic?(topic)).to eq(true)end++ it "returns false for a category group moderator who cannot see the topic" do+ SiteSetting.enable_category_group_moderation = true+ private_category = Fabricate(:private_category, group: Fabricate(:group))+ private_topic = Fabricate(:topic, category: private_category)+ GroupUser.create!(group_id: group.id, user_id: user.id)+ Fabricate(:category_moderation_group, category: private_category, group:)+ expect(Guardian.new(user).can_review_topic?(private_topic)).to eq(false)+ end++ it "returns true for a category group moderator who can see the topic" do+ SiteSetting.enable_category_group_moderation = true+ private_category = Fabricate(:private_category, group:)+ private_topic = Fabricate(:topic, category: private_category)+ GroupUser.create!(group_id: group.id, user_id: user.id)+ Fabricate(:category_moderation_group, category: private_category, group:)+ expect(Guardian.new(user).can_review_topic?(private_topic)).to eq(true)+ endenddescribe "#can_close_topic?" dodiff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rbindex 4af5692c623..a902dce8692 100644--- a/spec/requests/posts_controller_spec.rb+++ b/spec/requests/posts_controller_spec.rb@@ -836,6 +836,52 @@ RSpec.describe PostsController doendend+ context "when logged in as a category group moderator who cannot see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_post) { Fabricate(:post, topic: private_topic) }++ before do+ SiteSetting.enable_category_group_moderation = true+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "prevents editing a post in a topic the user cannot see" do+ put "/posts/#{private_post.id}.json", params: { post: { raw: "edited body" } }++ expect(response.status).to eq(403)+ expect(private_post.reload.raw).not_to eq("edited body")+ end+ end++ context "when logged in as a category group moderator who can see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_post) { Fabricate(:post, topic: private_topic) }++ before do+ SiteSetting.enable_category_group_moderation = true+ private_category.set_permissions(mod_group => :full)+ private_category.save!+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "allows editing a post in a topic the user can see" do+ put "/posts/#{private_post.id}.json", params: { post: { raw: "edited body" } }++ expect(response.status).to eq(200)+ expect(private_post.reload.raw).to eq("edited body")+ end+ end+it "can not change category to a disallowed category" dopost = create_postsign_in(post.user)diff --git a/spec/requests/reviewable_claimed_topics_controller_spec.rb b/spec/requests/reviewable_claimed_topics_controller_spec.rbindex 7fc1d5acb89..c21c4123514 100644--- a/spec/requests/reviewable_claimed_topics_controller_spec.rb+++ b/spec/requests/reviewable_claimed_topics_controller_spec.rb@@ -17,6 +17,112 @@ RSpec.describe ReviewableClaimedTopicsController doexpect(response.status).to eq(403)end+ context "when logged in as a category group moderator who cannot see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_reviewable) { Fabricate(:reviewable_flagged_post, topic: private_topic) }++ before do+ SiteSetting.enable_category_group_moderation = true+ SiteSetting.reviewable_claiming = "optional"+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "prevents claiming a topic the user cannot see" do+ post "/reviewable_claimed_topics.json",+ params: {+ reviewable_claimed_topic: {+ topic_id: private_topic.id,+ },+ }++ expect(response.status).to eq(403)+ expect(+ ReviewableClaimedTopic.where(+ user_id: cat_mod_user.id,+ topic_id: private_topic.id,+ ).exists?,+ ).to eq(false)+ end++ it "prevents claiming a topic the user cannot see with automatic param" do+ post "/reviewable_claimed_topics.json",+ params: {+ reviewable_claimed_topic: {+ topic_id: private_topic.id,+ automatic: "true",+ },+ }++ expect(response.status).to eq(403)+ expect(+ ReviewableClaimedTopic.where(+ user_id: cat_mod_user.id,+ topic_id: private_topic.id,+ ).exists?,+ ).to eq(false)+ end++ it "prevents claiming a deleted topic the user cannot see" do+ first_post = private_topic.first_post || Fabricate(:post, topic: private_topic)+ PostDestroyer.new(Discourse.system_user, first_post, context: "Automated testing").destroy++ post "/reviewable_claimed_topics.json",+ params: {+ reviewable_claimed_topic: {+ topic_id: private_topic.id,+ },+ }++ expect(response.status).to eq(403)+ expect(+ ReviewableClaimedTopic.where(+ user_id: cat_mod_user.id,+ topic_id: private_topic.id,+ ).exists?,+ ).to eq(false)+ end+ end++ context "when logged in as a category group moderator who can see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_reviewable) { Fabricate(:reviewable_flagged_post, topic: private_topic) }++ before do+ SiteSetting.enable_category_group_moderation = true+ SiteSetting.reviewable_claiming = "optional"+ private_category.set_permissions(mod_group => :full)+ private_category.save!+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "allows claiming a topic the user can see" do+ post "/reviewable_claimed_topics.json",+ params: {+ reviewable_claimed_topic: {+ topic_id: private_topic.id,+ },+ }++ expect(response.status).to eq(200)+ expect(+ ReviewableClaimedTopic.where(+ user_id: cat_mod_user.id,+ topic_id: private_topic.id,+ ).exists?,+ ).to eq(true)+ end+ end+context "when logged in" dobefore doSiteSetting.reviewable_claiming = "optional"@@ -165,6 +271,64 @@ RSpec.describe ReviewableClaimedTopicsController doendend+ context "when logged in as a category group moderator who cannot see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_claimed) { Fabricate(:reviewable_claimed_topic, topic: private_topic) }++ before do+ SiteSetting.enable_category_group_moderation = true+ SiteSetting.reviewable_claiming = "optional"+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "prevents unclaiming a topic the user cannot see" do+ delete "/reviewable_claimed_topics/#{private_topic.id}.json"++ expect(response.status).to eq(404)+ expect(ReviewableClaimedTopic.where(topic_id: private_topic.id).exists?).to eq(true)+ end++ it "prevents unclaiming a deleted topic the user cannot see" do+ first_post = private_topic.first_post || Fabricate(:post, topic: private_topic)+ PostDestroyer.new(Discourse.system_user, first_post, context: "Automated testing").destroy++ delete "/reviewable_claimed_topics/#{private_topic.id}.json"++ expect(response.status).to eq(404)+ expect(ReviewableClaimedTopic.where(topic_id: private_topic.id).exists?).to eq(true)+ end+ end++ context "when logged in as a category group moderator who can see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_claimed) { Fabricate(:reviewable_claimed_topic, topic: private_topic) }++ before do+ SiteSetting.enable_category_group_moderation = true+ SiteSetting.reviewable_claiming = "optional"+ private_category.set_permissions(mod_group => :full)+ private_category.save!+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "allows unclaiming a topic the user can see" do+ delete "/reviewable_claimed_topics/#{private_topic.id}.json"++ expect(response.status).to eq(200)+ expect(ReviewableClaimedTopic.where(topic_id: private_topic.id).exists?).to eq(false)+ end+ end+before { sign_in(moderator) }it "works" dodiff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rbindex a0eeec0a11f..0a8901cc215 100644--- a/spec/requests/topics_controller_spec.rb+++ b/spec/requests/topics_controller_spec.rb@@ -1914,6 +1914,72 @@ RSpec.describe TopicsController doexpect(post.trashed?).to be_falseyendend++ context "when logged in as a category group moderator who cannot see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) do+ Fabricate(:topic, category: private_category, deleted_at: Time.now, deleted_by: moderator)+ end+ fab!(:private_post) do+ Fabricate(+ :post,+ topic: private_topic,+ post_number: 1,+ deleted_at: Time.now,+ deleted_by: moderator,+ )+ end++ before do+ SiteSetting.enable_category_group_moderation = true+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "prevents recovering a topic the user cannot see" do+ put "/t/#{private_topic.id}/recover.json"++ expect(response).to be_forbidden+ expect(private_topic.reload.trashed?).to be_truthy+ end+ end++ context "when logged in as a category group moderator who can see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) do+ Fabricate(:topic, category: private_category, deleted_at: Time.now, deleted_by: moderator)+ end+ fab!(:private_post) do+ Fabricate(+ :post,+ topic: private_topic,+ post_number: 1,+ deleted_at: Time.now,+ deleted_by: moderator,+ )+ end++ before do+ SiteSetting.enable_category_group_moderation = true+ private_category.set_permissions(mod_group => :full)+ private_category.save!+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "allows recovering a topic the user can see" do+ put "/t/#{private_topic.id}/recover.json"++ expect(response.status).to eq(200)+ expect(private_topic.reload.trashed?).to be_falsey+ end+ endendend@@ -1945,6 +2011,52 @@ RSpec.describe TopicsController doexpect(topic.trashed?).to be_truthyendend++ context "when logged in as a category group moderator who cannot see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_post) { Fabricate(:post, topic: private_topic, user: user, post_number: 1) }++ before do+ SiteSetting.enable_category_group_moderation = true+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "prevents deleting a topic the user cannot see" do+ delete "/t/#{private_topic.id}.json"++ expect(response.status).to eq(422)+ expect(private_topic.reload.trashed?).to be_falsey+ end+ end++ context "when logged in as a category group moderator who can see the topic" do+ fab!(:mod_group, :group)+ fab!(:cat_mod_user, :user)+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }+ fab!(:private_topic) { Fabricate(:topic, category: private_category) }+ fab!(:private_post) { Fabricate(:post, topic: private_topic, user: user, post_number: 1) }++ before do+ SiteSetting.enable_category_group_moderation = true+ private_category.set_permissions(mod_group => :full)+ private_category.save!+ Fabricate(:category_moderation_group, category: private_category, group: mod_group)+ mod_group.add(cat_mod_user)+ sign_in(cat_mod_user)+ end++ it "allows deleting a topic the user can see" do+ delete "/t/#{private_topic.id}.json"++ expect(response.status).to eq(200)+ expect(private_topic.reload.trashed?).to be_truthy+ end+ endenddescribe "force destroy" do