A platform for community discussion. Free, open, simple.
FIX: Gate MessageBus groups when closing topic (#40913)
Mark VanLandingham5e6d53d3bb01
diff --git a/app/jobs/regular/close_topic.rb b/app/jobs/regular/close_topic.rbindex c0b9035d038..501d161b115 100644--- a/app/jobs/regular/close_topic.rb+++ b/app/jobs/regular/close_topic.rb@@ -25,7 +25,11 @@ module Jobs# this handles deleting the topic timer as well, see TopicStatusUpdatertopic.update_status("autoclosed", true, user, { silent: silent })- MessageBus.publish("/topic/#{topic.id}", reload_topic: true)+ MessageBus.publish(+ "/topic/#{topic.id}",+ { reload_topic: true },+ topic.secure_audience_publish_messages,+ )endendenddiff --git a/app/jobs/regular/open_topic.rb b/app/jobs/regular/open_topic.rbindex 8726d2c09f8..3100c46d985 100644--- a/app/jobs/regular/open_topic.rb+++ b/app/jobs/regular/open_topic.rb@@ -31,7 +31,11 @@ module Jobstopic.inherit_auto_close_from_category(timer_type: :close)- MessageBus.publish("/topic/#{topic.id}", reload_topic: true)+ MessageBus.publish(+ "/topic/#{topic.id}",+ { reload_topic: true },+ topic.secure_audience_publish_messages,+ )endendenddiff --git a/spec/integration/topic_timer_message_bus_spec.rb b/spec/integration/topic_timer_message_bus_spec.rbnew file mode 100644index 00000000000..539d9406e4f--- /dev/null+++ b/spec/integration/topic_timer_message_bus_spec.rb@@ -0,0 +1,59 @@+# frozen_string_literal: true++RSpec.describe "topic timer message bus security" do+ fab!(:admin)+ fab!(:group)+ fab!(:member, :user)+ fab!(:group_user) { Fabricate(:group_user, group: group, user: member) }+ fab!(:private_category) { Fabricate(:private_category, group: group) }+ fab!(:topic) { Fabricate(:topic, category: private_category) }++ it "does not expose restricted timer reloads", :aggregate_failures do+ channel = "/topic/#{topic.id}"++ close_timer =+ Fabricate(+ :topic_timer,+ user: admin,+ topic: topic,+ execute_at: 1.minute.ago,+ created_at: 2.minutes.ago,+ )+ close_last_id = MessageBus.last_id(channel)++ Jobs::CloseTopic.new.execute(topic_timer_id: close_timer.id)++ post "/message-bus/poll?dlp=t", params: { channel => close_last_id }+ expect(response.status).to eq(200)+ expect(reload_topic_messages(channel)).to be_empty++ open_timer =+ Fabricate(+ :topic_timer,+ status_type: TopicTimer.types[:open],+ user: admin,+ topic: topic,+ execute_at: 1.minute.ago,+ created_at: 2.minutes.ago,+ )+ open_last_id = MessageBus.last_id(channel)++ Jobs::OpenTopic.new.execute(topic_timer_id: open_timer.id)++ post "/message-bus/poll?dlp=t", params: { channel => open_last_id }+ expect(response.status).to eq(200)+ expect(reload_topic_messages(channel)).to be_empty++ sign_in(member)+ post "/message-bus/poll?dlp=t", params: { channel => open_last_id }+ expect(response.status).to eq(200)+ expect(reload_topic_messages(channel)).to be_present+ end++ def reload_topic_messages(channel)+ response.parsed_body.select do |message|+ data = message["data"]+ message["channel"] == channel && data.is_a?(Hash) && data["reload_topic"] == true+ end+ end+enddiff --git a/spec/jobs/close_topic_spec.rb b/spec/jobs/close_topic_spec.rbindex 29e9d32f2ac..4078fd7941c 100644--- a/spec/jobs/close_topic_spec.rb+++ b/spec/jobs/close_topic_spec.rb@@ -17,7 +17,10 @@ RSpec.describe Jobs::CloseTopic doit "publishes to the topic message bus so the topic status reloads" doMessageBus.expects(:publish).at_least_once- MessageBus.expects(:publish).with("/topic/#{topic.id}", reload_topic: true).once+ MessageBus+ .expects(:publish)+ .with("/topic/#{topic.id}", { reload_topic: true }, topic.secure_audience_publish_messages)+ .oncefreeze_time(61.minutes.from_now) dodescribed_class.new.execute(topic_timer_id: topic.public_topic_timer.id)enddiff --git a/spec/jobs/open_topic_spec.rb b/spec/jobs/open_topic_spec.rbindex aaa355a371d..7a26466178c 100644--- a/spec/jobs/open_topic_spec.rb+++ b/spec/jobs/open_topic_spec.rb@@ -19,7 +19,10 @@ RSpec.describe Jobs::OpenTopic doit "publishes to the topic message bus so the topic status reloads" doMessageBus.expects(:publish).at_least_once- MessageBus.expects(:publish).with("/topic/#{topic.id}", reload_topic: true).once+ MessageBus+ .expects(:publish)+ .with("/topic/#{topic.id}", { reload_topic: true }, topic.secure_audience_publish_messages)+ .oncefreeze_time(61.minutes.from_now) dodescribed_class.new.execute(topic_timer_id: topic.public_topic_timer.id)end