Skip to content

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

SECURITY: Restrict public chat MessageBus broadcasts to chat-eligible users

Nat0104f66b1992
diff --git a/plugins/chat/app/services/chat/publisher.rb b/plugins/chat/app/services/chat/publisher.rb
index 5987ac2fefe..57da6615f15 100644
--- a/plugins/chat/app/services/chat/publisher.rb
+++ b/plugins/chat/app/services/chat/publisher.rb
@@ -501,10 +501,21 @@ module Chat
private
def self.permissions(channel)
- {
- user_ids: channel.allowed_user_ids.presence,
- group_ids: channel.allowed_group_ids.presence,
- }.compact
+ group_ids = channel.allowed_group_ids.presence
+ if group_ids.blank? && channel.category_channel? && !channel.read_restricted?
+ group_ids = chat_allowed_group_ids
+ end
+
+ { user_ids: channel.allowed_user_ids.presence, group_ids: group_ids }.compact
+ end
+
+ def self.chat_allowed_group_ids
+ Chat
+ .allowed_group_ids
+ .map do |group_id|
+ group_id == Group::AUTO_GROUPS[:everyone] ? Group::AUTO_GROUPS[:trust_level_0] : group_id
+ end
+ .uniq
end
def self.anonymous_guardian
diff --git a/plugins/chat/spec/plugin_helper.rb b/plugins/chat/spec/plugin_helper.rb
index ea5824322af..98f324a48a3 100644
--- a/plugins/chat/spec/plugin_helper.rb
+++ b/plugins/chat/spec/plugin_helper.rb
@@ -23,6 +23,7 @@ module ChatSystemHelpers
def chat_system_user_bootstrap(user:, channel:)
user.activate
user.user_option.update!(chat_enabled: true)
+ Group.refresh_automatic_group!(:trust_level_0)
Group.refresh_automatic_group!("trust_level_#{user.trust_level}".to_sym)
channel.add(user)
end
diff --git a/plugins/chat/spec/services/chat/publisher_spec.rb b/plugins/chat/spec/services/chat/publisher_spec.rb
index daa5761eb9c..3ec18698a9b 100644
--- a/plugins/chat/spec/services/chat/publisher_spec.rb
+++ b/plugins/chat/spec/services/chat/publisher_spec.rb
@@ -239,10 +239,48 @@ describe Chat::Publisher do
end
it "calls MessageBus with the correct permissions" do
- MessageBus.stubs(:publish)
- MessageBus.expects(:publish).with("/chat/#{channel.id}", anything, {})
+ messages =
+ MessageBus.track_publish("/chat/#{channel.id}") do
+ described_class.publish_new!(channel, message_1, staged_id)
+ end
- described_class.publish_new!(channel, message_1, staged_id)
+ expect(messages.first.group_ids).to contain_exactly(*Chat.allowed_group_ids)
+ expect(messages.first.user_ids).to eq(nil)
+ end
+
+ it "publishes to trust level 0 when chat is allowed for everyone" do
+ SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+
+ messages =
+ MessageBus.track_publish("/chat/#{channel.id}") do
+ described_class.publish_new!(channel, message_1, staged_id)
+ end
+
+ expect(messages.first.group_ids).to contain_exactly(
+ Group::AUTO_GROUPS[:admins],
+ Group::AUTO_GROUPS[:moderators],
+ Group::AUTO_GROUPS[:trust_level_0],
+ )
+ expect(messages.first.user_ids).to eq(nil)
+ expect(
+ MessageBus::Client.new(client_id: "anonymous", message_bus: MessageBus).allowed?(
+ messages.first,
+ ),
+ ).to eq(false)
+ expect(
+ MessageBus::Client.new(
+ client_id: "allowed",
+ group_ids: [Group::AUTO_GROUPS[:trust_level_0]],
+ message_bus: MessageBus,
+ ).allowed?(messages.first),
+ ).to eq(true)
+ expect(
+ MessageBus::Client.new(
+ client_id: "disallowed",
+ user_id: 1,
+ message_bus: MessageBus,
+ ).allowed?(messages.first),
+ ).to eq(false)
end
end
@@ -269,10 +307,13 @@ describe Chat::Publisher do
end
it "calls MessageBus with the correct permissions" do
- MessageBus.stubs(:publish)
- MessageBus.expects(:publish).with("/chat/#{channel.id}", anything, {})
+ messages =
+ MessageBus.track_publish("/chat/#{channel.id}") do
+ described_class.publish_new!(channel, message_1, staged_id)
+ end
- described_class.publish_new!(channel, message_1, staged_id)
+ expect(messages.first.group_ids).to contain_exactly(*Chat.allowed_group_ids)
+ expect(messages.first.user_ids).to eq(nil)
end
end
@@ -300,10 +341,13 @@ describe Chat::Publisher do
end
it "calls MessageBus with the correct permissions" do
- MessageBus.stubs(:publish)
- MessageBus.expects(:publish).with("/chat/#{channel.id}", anything, {})
+ messages =
+ MessageBus.track_publish("/chat/#{channel.id}") do
+ described_class.publish_new!(channel, message_1, staged_id)
+ end
- described_class.publish_new!(channel, message_1, staged_id)
+ expect(messages.first.group_ids).to contain_exactly(*Chat.allowed_group_ids)
+ expect(messages.first.user_ids).to eq(nil)
end
end
end