Skip to content

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

FIX: Respect group member visibility in private-message read receipts (#42372)

Isaac Janzencf34ec28e055
diff --git a/app/controllers/post_readers_controller.rb b/app/controllers/post_readers_controller.rb
index 1d5f0a819e8..d66c7638413 100644
--- a/app/controllers/post_readers_controller.rb
+++ b/app/controllers/post_readers_controller.rb
@@ -39,17 +39,15 @@ class PostReadersController < ApplicationController
private
def ensure_can_see_readers!(post)
+ allowed_groups = post.topic.allowed_groups.to_a
+
show_readers =
- GroupUser
- .where(user: current_user)
- .joins(:group)
- .where(
- groups: {
- id: post.topic.topic_allowed_groups.map(&:group_id),
- publish_read_state: true,
- },
- )
- .exists?
+ allowed_groups.all? { |group| guardian.can_see_group_members?(group) } &&
+ GroupUser
+ .where(user: current_user)
+ .joins(:group)
+ .where(groups: { id: allowed_groups.map(&:id), publish_read_state: true })
+ .exists?
raise Discourse::InvalidAccess unless show_readers
end
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 6eb34175b0c..d98c12cf77c 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -600,7 +600,7 @@ class TopicTrackingState
def self.trigger_post_read_count_update(post, groups, last_read_post_number, user_id)
return if !post
return if groups.empty?
- opts = { readers_count: post.readers_count, reader_id: user_id }
+ opts = { readers_count: post.readers_count }
post.publish_change_to_clients!(:read, opts)
end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 9de343fe715..2e8fea70100 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -297,7 +297,10 @@ class TopicView
def show_read_indicator?
return false if !@user || !topic.private_message?
- topic.allowed_groups.any? { |group| group.publish_read_state? && group.users.include?(@user) }
+ allowed_groups = topic.allowed_groups
+
+ allowed_groups.all? { |group| @guardian.can_see_group_members?(group) } &&
+ allowed_groups.any? { |group| group.publish_read_state? && group.users.include?(@user) }
end
def canonical_path
diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rb
index 8fa49f165fc..a0569e6e26e 100644
--- a/spec/lib/topic_view_spec.rb
+++ b/spec/lib/topic_view_spec.rb
@@ -1181,6 +1181,21 @@ RSpec.describe TopicView do
expect(topic_view.show_read_indicator?).to be_truthy
end
+ it "does not show read indicator if current_user cannot see members of the read state group" do
+ user = Fabricate(:user)
+ group =
+ Fabricate(
+ :group,
+ users: [user],
+ publish_read_state: true,
+ members_visibility_level: Group.visibility_levels[:staff],
+ )
+ pm_topic.topic_allowed_groups = [Fabricate.build(:topic_allowed_group, group: group)]
+
+ topic_view = TopicView.new(pm_topic.id, user)
+ expect(topic_view.show_read_indicator?).to be_falsey
+ end
+
it "does not show read indicator if groups do not have read indicator enabled" do
topic_view = TopicView.new(pm_topic.id, admin)
expect(topic_view.show_read_indicator?).to be_falsey
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index a865871dd5b..98469315ede 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -522,7 +522,7 @@ RSpec.describe TopicTrackingState do
expect(messages).to be_empty
end
- it "publish a read count update to every client" do
+ it "publishes a read count update to every client" do
message =
MessageBus
.track_publish(read_post_key) do
@@ -534,7 +534,8 @@ RSpec.describe TopicTrackingState do
end
.first
- expect(message.data[:type]).to eq :read
+ expect(message.data[:type]).to eq(:read)
+ expect(message.data[:readers_count]).to eq(post_2.readers_count)
end
end
end
diff --git a/spec/requests/post_readers_controller_spec.rb b/spec/requests/post_readers_controller_spec.rb
index 38251ab4eb8..434f9b90632 100644
--- a/spec/requests/post_readers_controller_spec.rb
+++ b/spec/requests/post_readers_controller_spec.rb
@@ -117,6 +117,30 @@ RSpec.describe PostReadersController do
expect(reader_data["username_lower"]).to eq reader.username_lower
end
+ it "returns forbidden if current_user cannot see members of the read state group" do
+ member = Fabricate(:user)
+ hidden_member = Fabricate(:user)
+
+ @group.update!(
+ visibility_level: Group.visibility_levels[:members],
+ members_visibility_level: Group.visibility_levels[:staff],
+ publish_read_state: true,
+ )
+ @group.add(member)
+ @group.add(hidden_member)
+ TopicUser.create!(
+ user: hidden_member,
+ topic: @group_message,
+ last_read_post_number: @post.post_number,
+ )
+
+ sign_in(member)
+ get "/post_readers.json", params: { id: @post.id }
+
+ expect(response).to be_forbidden
+ expect(response.parsed_body["error_type"]).to eq("invalid_access")
+ end
+
it "returns forbidden if no group has publish_read_state enabled" do
get "/post_readers.json", params: { id: @post.id }