Skip to content

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

FIX: Anonymous thread-message access bypasses deleted-thread visibility (#41057)

Penar Musarajdfd1c5db6326
diff --git a/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb b/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
index 18cc98e819f..2416328a7e1 100644
--- a/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
@@ -23,6 +23,7 @@ class Chat::Api::ChannelThreadMessagesController < Chat::ApiController
on_failed_policy(:target_message_exists) { raise Discourse::NotFound }
on_failed_policy(:can_view_thread) { raise Discourse::InvalidAccess }
on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
+ on_failed_policy(:original_message_not_deleted) { raise Discourse::NotFound }
on_model_not_found(:thread) { raise Discourse::NotFound }
on_failed_contract do |contract|
render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
diff --git a/plugins/chat/app/services/chat/list_channel_thread_messages.rb b/plugins/chat/app/services/chat/list_channel_thread_messages.rb
index 1ac73b696e8..3866b26da96 100644
--- a/plugins/chat/app/services/chat/list_channel_thread_messages.rb
+++ b/plugins/chat/app/services/chat/list_channel_thread_messages.rb
@@ -58,6 +58,7 @@ module Chat
model :thread
policy :can_view_thread
policy :threading_enabled_for_channel
+ policy :original_message_not_deleted
model :membership, optional: true
model :target_message_id, optional: true
policy :target_message_exists, class_name: Chat::Thread::Policy::MessageExistence
@@ -69,7 +70,7 @@ module Chat
def fetch_thread(params:)
::Chat::Thread
.strict_loading
- .includes(channel: :chatable)
+ .includes(:original_message, channel: :chatable)
.find_by(id: params.thread_id, channel_id: params.channel_id)
end
@@ -81,6 +82,11 @@ module Chat
thread.channel.threading_enabled || thread.force
end
+ def original_message_not_deleted(thread:, guardian:)
+ thread.original_message.deleted_at.blank? ||
+ guardian.can_moderate_chat?(thread.channel.chatable)
+ end
+
def fetch_membership(thread:, guardian:)
thread.membership_for(guardian.user)
end
diff --git a/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb
index 56972fad5a2..4ab7a38439b 100644
--- a/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb
@@ -48,6 +48,15 @@ RSpec.describe Chat::Api::ChannelThreadMessagesController do
[thread.original_message.id, message_1.id],
)
end
+
+ it "returns 404 when the thread original message is deleted" do
+ thread.original_message.trash!
+
+ get "/chat/api/channels/#{thread.channel.id}/threads/#{thread.id}/messages"
+
+ expect(response.status).to eq(404)
+ expect(response.parsed_body["error_type"]).to eq("not_found")
+ end
end
end