A platform for community discussion. Free, open, simple.
FIX: Enforce group PM visibility checks on new/unread list routes (#39992)
Roman Rizzif18962e41e84
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rbindex 3a370c32b14..1ee6eaab59b 100644--- a/app/controllers/list_controller.rb+++ b/app/controllers/list_controller.rb@@ -196,9 +196,13 @@ class ListController < ApplicationController)case action- when :private_messages_unread, :private_messages_new, :private_messages_group_new,- :private_messages_group_unread+ when :private_messages_unread, :private_messages_newraise Discourse::NotFound if target_user.id != current_user.id+ when :private_messages_group_new, :private_messages_group_unread+ raise Discourse::NotFound if target_user.id != current_user.id+ group = Group.find_by("LOWER(name) = ?", params[:group_name].downcase)+ raise Discourse::NotFound if !group+ raise Discourse::NotFound unless guardian.can_see_group_messages?(group)when :private_messages_tagraise Discourse::NotFound if target_user.id != current_user.idraise Discourse::NotFound if !guardian.can_tag_pms?diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rbindex a9e0c8d388c..7aabec8aaed 100644--- a/spec/requests/list_controller_spec.rb+++ b/spec/requests/list_controller_spec.rb@@ -480,6 +480,23 @@ RSpec.describe ListController doenddescribe "#private_messages_group" do+ describe "#private_messages_group_new and #private_messages_group_unread" do+ before do+ group.add(user)+ sign_in(user)+ end++ it "enforces can_see_group_messages? when personal messages are disabled for the user" do+ SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]++ get "/topics/private-messages-group/#{user.username}/#{group.name}/new.json"+ expect(response.status).to eq(404)++ get "/topics/private-messages-group/#{user.username}/#{group.name}/unread.json"+ expect(response.status).to eq(404)+ end+ end+describe "when user not in personal_message_enabled_groups group" dolet!(:topic) { Fabricate(:private_message_topic, allowed_groups: [group]) }