A platform for community discussion. Free, open, simple.
SECURITY: Scope localized topic notifications (#42756)
Natalie Tay36a61d2fb03d
diff --git a/app/jobs/regular/process_localized_cooked.rb b/app/jobs/regular/process_localized_cooked.rbindex 3f9b3b71f34..54d00b34b22 100644--- a/app/jobs/regular/process_localized_cooked.rb+++ b/app/jobs/regular/process_localized_cooked.rb@@ -32,7 +32,11 @@ module Jobstopic_localization.update_excerpt(cooked:) if topic_localizationend- MessageBus.publish("/topic/#{post.topic_id}", type: :localized, id: post.id)+ MessageBus.publish(+ "/topic/#{post.topic_id}",+ { type: :localized, id: post.id },+ post.topic.secure_audience_publish_messages,+ )endendenddiff --git a/plugins/discourse-ai/app/jobs/regular/detect_translate_post.rb b/plugins/discourse-ai/app/jobs/regular/detect_translate_post.rbindex 6c63e61d21d..499a3e53679 100644--- a/plugins/discourse-ai/app/jobs/regular/detect_translate_post.rb+++ b/plugins/discourse-ai/app/jobs/regular/detect_translate_post.rb@@ -73,7 +73,11 @@ module Jobslocalize(post, locale)end- MessageBus.publish("/topic/#{post.topic_id}", type: :localized, id: post.id)+ MessageBus.publish(+ "/topic/#{post.topic_id}",+ { type: :localized, id: post.id },+ post.topic.secure_audience_publish_messages,+ )endprivatediff --git a/plugins/discourse-ai/spec/jobs/regular/detect_translate_post_spec.rb b/plugins/discourse-ai/spec/jobs/regular/detect_translate_post_spec.rbindex 6dab803911b..53d0357d5d3 100644--- a/plugins/discourse-ai/spec/jobs/regular/detect_translate_post_spec.rb+++ b/plugins/discourse-ai/spec/jobs/regular/detect_translate_post_spec.rb@@ -145,6 +145,24 @@ describe Jobs::DetectTranslatePost doexpect { job.execute({ post_id: post.id }) }.not_to raise_errorend+ it "restricts private message notifications to the topic audience" do+ recipient = Fabricate(:user)+ private_message_post = Fabricate(:private_message_post, recipient: recipient, locale: "en")+ SiteSetting.ai_translation_personal_messages = "all"++ messages =+ MessageBus.track_publish("/topic/#{private_message_post.topic_id}") do+ job.execute(post_id: private_message_post.id)+ end++ expect(messages.length).to eq(1)+ message = messages.first+ expect(message.data).to eq(type: :localized, id: private_message_post.id)+ expect(message.user_ids).to contain_exactly(+ *private_message_post.topic.secure_audience_publish_messages[:user_ids],+ )+ end+describe "with category scope and PM scope" dofab!(:included_category, :category)fab!(:excluded_category, :category)diff --git a/spec/jobs/process_localized_cooked_spec.rb b/spec/jobs/process_localized_cooked_spec.rbindex 05c75943c2f..7cdb2bc9e7c 100644--- a/spec/jobs/process_localized_cooked_spec.rb+++ b/spec/jobs/process_localized_cooked_spec.rb@@ -70,6 +70,31 @@ describe Jobs::ProcessLocalizedCooked doexpect(messages.first.data[:id]).to eq(post.id)end+ it "restricts private message notifications to the topic audience" do+ recipient = Fabricate(:user)+ private_message_post = Fabricate(:private_message_post, recipient: recipient)+ private_message_localization =+ Fabricate(+ :post_localization,+ post: private_message_post,+ locale: "ja",+ raw: "これはテスト投稿です。",+ cooked: "<p>これはテスト投稿です。</p>",+ )++ messages =+ MessageBus.track_publish("/topic/#{private_message_post.topic_id}") do+ job.execute(post_localization_id: private_message_localization.id)+ end++ expect(messages.length).to eq(1)+ message = messages.first+ expect(message.data).to eq(type: :localized, id: private_message_post.id)+ expect(message.user_ids).to contain_exactly(+ *private_message_post.topic.secure_audience_publish_messages[:user_ids],+ )+ end+it "processes oneboxes and images" dostub_image_sizeonebox_html = <<~HTML