A platform for community discussion. Free, open, simple.
SECURITY: Scope discourse-events lifecycle broadcasts to authorized topic audiences (#44402)
Isaac Janzend9486d50c406
diff --git a/plugins/discourse-events/jobs/regular/discourse_post_event/event_started.rb b/plugins/discourse-events/jobs/regular/discourse_post_event/event_started.rbindex 44373a0ac10..446a238a6ad 100644--- a/plugins/discourse-events/jobs/regular/discourse_post_event/event_started.rb+++ b/plugins/discourse-events/jobs/regular/discourse_post_event/event_started.rb@@ -7,7 +7,11 @@ module Jobsdef execute(args)raise Discourse::InvalidParameters.new(:event_id) if args[:event_id].blank?event = DiscourseEvents::Events::Event.find(args[:event_id])- MessageBus.publish("/topic/#{event.post.topic_id}", reload_topic: true, refresh_stream: true)+ MessageBus.publish(+ "/topic/#{event.post.topic_id}",+ { reload_topic: true, refresh_stream: true },+ event.post.topic.secure_audience_publish_messages,+ )DiscourseEvent.trigger(:discourse_post_event_event_started, event)endenddiff --git a/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb b/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rbindex abadca53f6d..75152b6b46f 100644--- a/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb+++ b/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb@@ -50,8 +50,8 @@ module JobsDiscourseEvent.trigger(:discourse_post_event_event_ended, event_date.event, event_date)MessageBus.publish("/topic/#{event_date.event.post.topic_id}",- reload_topic: true,- refresh_stream: true,+ { reload_topic: true, refresh_stream: true },+ event_date.event.post.topic.secure_audience_publish_messages,)return if event_date.event.recurrence.blank?diff --git a/plugins/discourse-events/spec/integration/event_lifecycle_message_bus_spec.rb b/plugins/discourse-events/spec/integration/event_lifecycle_message_bus_spec.rbnew file mode 100644index 00000000000..fc196670eb5--- /dev/null+++ b/plugins/discourse-events/spec/integration/event_lifecycle_message_bus_spec.rb@@ -0,0 +1,70 @@+# frozen_string_literal: true++require_relative "../../jobs/regular/discourse_post_event/event_started"++RSpec.describe "event lifecycle message bus security" do+ fab!(:group)+ fab!(:member, :user)+ fab!(:private_category) { Fabricate(:private_category, group:) }+ fab!(:topic) { Fabricate(:topic, category: private_category) }+ fab!(:event_post) { Fabricate(:post, topic:) }+ fab!(:event) do+ Fabricate(+ :event,+ post: event_post,+ original_starts_at: 7.days.after,+ original_ends_at: 7.days.after + 1.hour,+ )+ end++ before { group.add(member) }++ it "does not expose private event completion reloads to anonymous MessageBus clients",+ :aggregate_failures do+ channel = "/topic/#{topic.id}"+ message_id = MessageBus.last_id(channel)++ freeze_time(8.days.after) { Jobs::DiscourseCalendar::MonitorEventDates.new.execute({}) }++ poll(channel, message_id)+ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to be_empty++ sign_in(member)+ poll(channel, message_id)+ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to contain_exactly(+ include("data" => { "reload_topic" => true, "refresh_stream" => true }),+ )+ end++ it "does not expose private event start reloads to anonymous MessageBus clients",+ :aggregate_failures do+ channel = "/topic/#{topic.id}"+ message_id = MessageBus.last_id(channel)++ Jobs::DiscoursePostEventEventStarted.new.execute(event_id: event.id)++ poll(channel, message_id)+ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to be_empty++ sign_in(member)+ poll(channel, message_id)+ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to contain_exactly(+ include("data" => { "reload_topic" => true, "refresh_stream" => true }),+ )+ end++ def poll(channel, message_id)+ post "/message-bus/poll?dlp=t", params: { channel => message_id }+ end++ def topic_reload_messages(channel)+ response.parsed_body.select do |message|+ message["channel"] == channel &&+ message["data"] == { "reload_topic" => true, "refresh_stream" => true }+ end+ end+enddiff --git a/plugins/discourse-events/spec/integration/monitor_event_dates_message_bus_spec.rb b/plugins/discourse-events/spec/integration/monitor_event_dates_message_bus_spec.rbnew file mode 100644index 00000000000..9177a1e3943--- /dev/null+++ b/plugins/discourse-events/spec/integration/monitor_event_dates_message_bus_spec.rb@@ -0,0 +1,85 @@+# frozen_string_literal: true++RSpec.describe "event date monitoring MessageBus security" do+ fab!(:member, :user)+ fab!(:group)+ fab!(:private_category) { Fabricate(:private_category, group: group) }+ fab!(:restricted_topic) { Fabricate(:topic, category: private_category) }+ fab!(:restricted_post) { Fabricate(:post, topic: restricted_topic) }+ fab!(:restricted_event) do+ Fabricate(+ :event,+ post: restricted_post,+ original_starts_at: 7.days.after,+ original_ends_at: 7.days.after + 1.hour,+ )+ end+ fab!(:private_message_recipient, :user)+ fab!(:private_message_topic) do+ Fabricate(:private_message_topic, recipient: private_message_recipient)+ end+ fab!(:private_message_post) { Fabricate(:post, topic: private_message_topic) }+ fab!(:private_message_event) do+ Fabricate(+ :event,+ post: private_message_post,+ original_starts_at: 7.days.after,+ original_ends_at: 7.days.after + 1.hour,+ )+ end++ before do+ SiteSetting.discourse_events_enabled = true+ SiteSetting.discourse_post_event_enabled = true+ group.add(member)+ end++ it "does not expose a restricted topic's event completion to anonymous MessageBus clients" do+ channel = "/topic/#{restricted_topic.id}"+ message_id = MessageBus.last_id(channel)++ freeze_time 8.days.after+ Jobs::DiscourseCalendar::MonitorEventDates.new.execute({})++ post "/message-bus/poll?dlp=t", params: { channel => message_id }++ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to be_empty++ sign_in(member)+ post "/message-bus/poll?dlp=t", params: { channel => message_id }++ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to contain_exactly(+ include("data" => include("reload_topic" => true, "refresh_stream" => true)),+ )+ end++ it "delivers a private message event completion only to its recipients" do+ channel = "/topic/#{private_message_topic.id}"+ message_id = MessageBus.last_id(channel)++ freeze_time 8.days.after+ Jobs::DiscourseCalendar::MonitorEventDates.new.execute({})++ post "/message-bus/poll?dlp=t", params: { channel => message_id }++ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to be_empty++ sign_in(private_message_recipient)+ post "/message-bus/poll?dlp=t", params: { channel => message_id }++ expect(response.status).to eq(200)+ expect(topic_reload_messages(channel)).to contain_exactly(+ include("data" => include("reload_topic" => true, "refresh_stream" => true)),+ )+ end++ def topic_reload_messages(channel)+ response.parsed_body.select do |message|+ message["channel"] == channel &&+ message["data"] == { "reload_topic" => true, "refresh_stream" => true }+ end+ end+end