A platform for community discussion. Free, open, simple.
SECURITY: Restrict tagged group message lists (#41342)
Natalie Tay7a92b74abaf5
diff --git a/lib/topic_query/private_message_lists.rb b/lib/topic_query/private_message_lists.rbindex 9c06ba82851..817c3e9c988 100644--- a/lib/topic_query/private_message_lists.rb+++ b/lib/topic_query/private_message_lists.rb@@ -250,7 +250,18 @@ class TopicQueryreturn idsend- @group_with_messages_ids[user.id] = user.groups.where(has_messages: true).pluck(:id)+ group_ids = user.groups.where(has_messages: true)++ group_ids =+ if user.admin? || user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)+ group_ids.pluck(:id)+ elsif user.moderator?+ group_ids.where(id: Group::AUTO_GROUPS[:moderators]).pluck(:id)+ else+ []+ end++ @group_with_messages_ids[user.id] = group_idsendprivatediff --git a/spec/lib/topic_query/private_message_lists_spec.rb b/spec/lib/topic_query/private_message_lists_spec.rbindex 3a4cf76d801..d28de251c50 100644--- a/spec/lib/topic_query/private_message_lists_spec.rb+++ b/spec/lib/topic_query/private_message_lists_spec.rb@@ -3,9 +3,9 @@RSpec.describe TopicQuery::PrivateMessageLists dofab!(:admin)fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }- fab!(:user_2, :user)- fab!(:user_3, :user)- fab!(:user_4, :user)+ fab!(:user_2) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:user_3) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:user_4) { Fabricate(:user, refresh_auto_groups: true) }fab!(:group) doFabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap { |g| g.add(user_2) }diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rbindex e0d1a6123bf..96485914bc0 100644--- a/spec/requests/list_controller_spec.rb+++ b/spec/requests/list_controller_spec.rb@@ -477,6 +477,28 @@ RSpec.describe ListController doexpect(response.status).to eq(200)end++ it "returns only visible tagged private messages" do+ SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]+ SiteSetting.pm_tags_allowed_for_groups = group.name+ group.add(user)+ group.update!(has_messages: true)+ direct_message = Fabricate(:private_message_topic, user: admin, recipient: user)+ group_message = Fabricate(:group_private_message_topic, user: admin, recipient_group: group)+ Fabricate(:topic_tag, tag: tag, topic: direct_message)+ Fabricate(:topic_tag, tag: tag, topic: group_message)++ sign_in(user)+ get "/topics/private-messages-group/#{user.username}/#{group.name}.json"++ expect(response.status).to eq(404)++ get "/topics/private-messages-tags/#{user.username}/#{tag.name}.json"++ expect(response.status).to eq(200)+ topic_ids = response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }+ expect(topic_ids).to contain_exactly(direct_message.id)+ endenddescribe "#private_messages_group" do