Skip to content

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

SECURITY: Harden chat DM channel creation and expansion

Joffrey JAFFEUX769f438f0d88
diff --git a/plugins/chat/app/models/chat/null_user.rb b/plugins/chat/app/models/chat/null_user.rb
index d9d3f59f56d..c565ec636eb 100644
--- a/plugins/chat/app/models/chat/null_user.rb
+++ b/plugins/chat/app/models/chat/null_user.rb
@@ -13,6 +13,10 @@ module Chat
def bot?
false
end
+
+ def user_option
+ UserOption.new
+ end
end
end
diff --git a/plugins/chat/app/services/chat/add_users_to_channel.rb b/plugins/chat/app/services/chat/add_users_to_channel.rb
index efbaba7a181..789566abf97 100644
--- a/plugins/chat/app/services/chat/add_users_to_channel.rb
+++ b/plugins/chat/app/services/chat/add_users_to_channel.rb
@@ -79,9 +79,18 @@ module Chat
end
def fetch_target_users(params:, channel:, guardian:)
+ target_groups =
+ if params.groups.present?
+ Group
+ .where(name: params.groups)
+ .visible_groups(guardian.user)
+ .members_visible_groups(guardian.user)
+ .pluck(:name)
+ end
+
::Chat::UsersFromUsernamesAndGroupsQuery.call(
usernames: params.usernames,
- groups: params.groups,
+ groups: target_groups,
excluded_user_ids: channel.chatable.direct_message_users.pluck(:user_id),
dm_channel: channel.direct_message_channel?,
) + channel.chatable.users.where.not(id: guardian.user)
diff --git a/plugins/chat/app/services/chat/create_direct_message_channel.rb b/plugins/chat/app/services/chat/create_direct_message_channel.rb
index 5a4e8cb7e73..42d2aac0583 100644
--- a/plugins/chat/app/services/chat/create_direct_message_channel.rb
+++ b/plugins/chat/app/services/chat/create_direct_message_channel.rb
@@ -64,10 +64,22 @@ module Chat
end
def fetch_target_users(guardian:, params:)
- ::Chat::UsersFromUsernamesAndGroupsQuery.call(
- usernames: [*params.target_usernames, guardian.user.username],
- groups: params.target_groups,
- )
+ target_groups =
+ if params.target_groups.present?
+ Group
+ .where(name: params.target_groups)
+ .visible_groups(guardian.user)
+ .members_visible_groups(guardian.user)
+ .pluck(:name)
+ end
+
+ users =
+ ::Chat::UsersFromUsernamesAndGroupsQuery.call(
+ usernames: [*params.target_usernames, guardian.user.username],
+ groups: target_groups,
+ )
+ return if users.none? { |u| u.id == guardian.user.id }
+ users
end
def fetch_user_comm_screener(target_users:, guardian:)
diff --git a/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb b/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb
index 50c6e45cc04..570a926fba1 100644
--- a/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb
@@ -107,6 +107,44 @@ RSpec.describe Chat::Api::DirectMessagesController do
}.to change { Chat::UserChatChannelMembership.count }.by(3)
end
+ context "when using target_groups with a group not visible to the user" do
+ fab!(:secret_group) do
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:staff],
+ members_visibility_level: Group.visibility_levels[:staff],
+ )
+ end
+ fab!(:secret_user, :user)
+
+ before do
+ secret_group.add(secret_user)
+ secret_user.user_option.update!(chat_enabled: true)
+ end
+
+ it "does not resolve members from groups the acting user cannot see" do
+ post "/chat/api/direct-message-channels.json",
+ params: {
+ target_groups: [secret_group.name],
+ }
+ expect(
+ response.parsed_body.dig("channel", "chatable", "users").map { |u| u["id"] },
+ ).not_to include(secret_user.id)
+ end
+ end
+
+ context "when the acting user has chat disabled" do
+ before { current_user.user_option.update!(chat_enabled: false) }
+
+ it "returns a 404" do
+ post "/chat/api/direct-message-channels.json",
+ params: {
+ target_usernames: [user2.username],
+ }
+ expect(response.status).to eq(404)
+ end
+ end
+
context "when one of the users I am messaging has ignored, muted, or prevented DMs from the acting user creating the channel" do
let(:usernames) { [user1, user2, user3].map(&:username) }
let(:direct_message_user_ids) { [current_user.id, user1.id, user2.id, user3.id] }
diff --git a/plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb b/plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb
index 01f218de91b..7c3aecf0339 100644
--- a/plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb
@@ -51,6 +51,21 @@ describe Chat::DirectMessageSerializer do
expect(json[:users][0][:username]).to eq(I18n.t("chat.deleted_chat_username"))
end
+
+ it "serializes without error when user status is enabled" do
+ SiteSetting.enable_user_status = true
+ me = Fabricate(:user)
+ you = Fabricate(:user)
+ direct_message = Fabricate(:direct_message, users: [me, you])
+
+ you.destroy!
+
+ serializer =
+ described_class.new(direct_message.reload, scope: Guardian.new(me), root: false)
+ json = serializer.as_json
+
+ expect(json[:users][0][:username]).to eq(I18n.t("chat.deleted_chat_username"))
+ end
end
end
end
diff --git a/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb b/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb
index 573680a3305..0b13e6cfeba 100644
--- a/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb
+++ b/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb
@@ -62,6 +62,20 @@ RSpec.describe Chat::AddUsersToChannel do
)
end
+ it "does not include users from groups the acting user cannot see" do
+ secret_group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:staff],
+ members_visibility_level: Group.visibility_levels[:staff],
+ )
+ secret_user = Fabricate(:user)
+ secret_group.add(secret_user)
+
+ params.merge!(groups: [secret_group.name])
+ expect(result.target_users.map(&:username)).not_to include(secret_user.username)
+ end
+
context "with user count validation" do
before { SiteSetting.chat_max_direct_message_users = 8 }
diff --git a/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb b/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb
index 96af40322c6..f8dbd3e0afa 100644
--- a/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb
+++ b/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb
@@ -191,6 +191,12 @@ RSpec.describe Chat::CreateDirectMessageChannel do
it { is_expected.to fail_a_policy(:satisfies_dms_max_users_limit) }
end
+ context "when the acting user has chat disabled" do
+ before { current_user.user_option.update!(chat_enabled: false) }
+
+ it { is_expected.to fail_to_find_a_model(:target_users) }
+ end
+
context "when the current user cannot make direct messages" do
fab!(:current_user, :user)