Skip to content

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

SECURITY: Honor group visibility in discourse-assign group lookups (#41176)

Gabriel Grubba8bcf5126e814
diff --git a/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb b/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb
index 2504b4e7c61..f685482cfda 100644
--- a/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb
+++ b/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb
@@ -75,6 +75,7 @@ module DiscourseAssign
)
raise Discourse::NotFound unless assign_to
+ guardian.ensure_can_see_group!(assign_to) if assign_to.is_a?(Group)
raise Discourse::NotFound if !Assignment.valid_type?(target_type)
target = target_type.constantize.where(id: target_id).first
raise Discourse::NotFound if target.blank? || !guardian.can_see?(target)
@@ -148,6 +149,7 @@ module DiscourseAssign
group = Group.find_by(name: params[:group_name])
+ guardian.ensure_can_see_group!(group)
guardian.ensure_can_see_group_members!(group)
raise Discourse::InvalidAccess if !guardian.can_assign_globally?
diff --git a/plugins/discourse-assign/plugin.rb b/plugins/discourse-assign/plugin.rb
index f43aa846c8f..9acd7a3bdab 100644
--- a/plugins/discourse-assign/plugin.rb
+++ b/plugins/discourse-assign/plugin.rb
@@ -457,6 +457,7 @@ after_initialize do
add_to_class(:list_controller, :group_topics_assigned) do
group = Group.find_by("name = ?", params[:groupname])
+ guardian.ensure_can_see_group!(group)
guardian.ensure_can_see_group_members!(group)
raise Discourse::NotFound unless group
@@ -1074,7 +1075,12 @@ after_initialize do
posts.where(<<~SQL, user_id)
topics.id IN (SELECT a.topic_id FROM assignments a WHERE a.assigned_to_id = ? AND a.assigned_to_type = 'User' AND a.active)
SQL
- elsif group_id = Group.find_by(name: match)&.id
+ elsif group_id =
+ Group
+ .visible_groups(@guardian.user)
+ .members_visible_groups(@guardian.user)
+ .where(name: match)
+ .pick(:id)
posts.where(<<~SQL, group_id)
topics.id IN (SELECT a.topic_id FROM assignments a WHERE a.assigned_to_id = ? AND a.assigned_to_type = 'Group' AND a.active)
SQL
diff --git a/plugins/discourse-assign/spec/components/search_spec.rb b/plugins/discourse-assign/spec/components/search_spec.rb
index 168ac6fc81a..586a38f74f8 100644
--- a/plugins/discourse-assign/spec/components/search_spec.rb
+++ b/plugins/discourse-assign/spec/components/search_spec.rb
@@ -49,6 +49,36 @@ describe Search do
).to eq(2)
end
+ it "does not let assigned:<group> resolve a group the user cannot see" do
+ hidden_group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:staff],
+ assignable_level: Group::ALIAS_LEVELS[:everyone],
+ )
+ hidden_post = Fabricate(:post)
+ Assigner.new(hidden_post.topic, user).assign(hidden_group)
+
+ # An admin can see the group, so the filter resolves and narrows to its topic.
+ expect(
+ Search
+ .execute("assigned:#{hidden_group.name}", guardian: Guardian.new(Fabricate(:admin)))
+ .posts
+ .map(&:topic_id),
+ ).to include(hidden_post.topic_id)
+
+ # A non-staff assigner cannot see the group, so the name must not resolve: the
+ # filter behaves like an unknown name (a no-op) instead of narrowing the
+ # results down to the hidden group's assigned topics.
+ cannot_see = Guardian.new(user)
+ hidden_result = Search.execute("assigned:#{hidden_group.name}", guardian: cannot_see)
+ unknown_result = Search.execute("assigned:#{hidden_group.name}-unknown", guardian: cannot_see)
+
+ expect(hidden_result.posts).not_to be_empty
+ expect(hidden_result.posts.map(&:id).sort).to eq(unknown_result.posts.map(&:id).sort)
+ expect(hidden_result.posts.map(&:topic_id)).not_to contain_exactly(hidden_post.topic_id)
+ end
+
it "serializes results" do
guardian = Guardian.new(user)
result = Search.execute("in:assigned", guardian: guardian)
diff --git a/plugins/discourse-assign/spec/requests/assign_controller_spec.rb b/plugins/discourse-assign/spec/requests/assign_controller_spec.rb
index 2321c0ca81e..73b08dbc236 100644
--- a/plugins/discourse-assign/spec/requests/assign_controller_spec.rb
+++ b/plugins/discourse-assign/spec/requests/assign_controller_spec.rb
@@ -252,6 +252,31 @@ RSpec.describe DiscourseAssign::AssignController do
expect(post.topic.reload.assignment.assigned_to_id).to eq(allowed_user.id)
end
+ it "does not assign to a group hidden from the acting user" do
+ hidden_group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:staff],
+ assignable_level: Group::ALIAS_LEVELS[:everyone],
+ )
+
+ sign_in(allowed_user)
+
+ get "/g/#{hidden_group.name}.json"
+ expect(response.status).to eq(404)
+
+ put "/assign/assign.json",
+ params: {
+ target_id: post.topic_id,
+ target_type: "Topic",
+ group_name: hidden_group.name,
+ }
+
+ expect(response.status).to eq(403)
+ expect(response.body).not_to include(hidden_group.name)
+ expect(post.topic.reload.assignment).to be_nil
+ end
+
it "assigns topic with note to a user" do
put "/assign/assign.json",
params: {
@@ -564,6 +589,29 @@ RSpec.describe DiscourseAssign::AssignController do
Fabricate(:post_assignment, assigned_to: allowed_group, assigned_by_user: admin)
end
+ it "does not list members for a group hidden from the user" do
+ hidden_group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:staff],
+ members_visibility_level: Group.visibility_levels[:logged_on_users],
+ )
+ hidden_member = Fabricate(:user)
+ hidden_group.add(hidden_member)
+ Fabricate(:topic_assignment, assigned_to: hidden_member, assigned_by_user: admin)
+
+ sign_in(allowed_user)
+
+ get "/g/#{hidden_group.name}.json"
+ expect(response.status).to eq(404)
+
+ get "/assign/members/#{hidden_group.name}.json"
+ expect(response.status).to eq(403)
+ expect(
+ response.parsed_body.fetch("members", []).map { |member| member["username"] },
+ ).not_to include(hidden_member.username)
+ end
+
describe "members" do
describe "without filter" do
it "list members ordered by the number of assignments" do
diff --git a/plugins/discourse-assign/spec/requests/list_controller_spec.rb b/plugins/discourse-assign/spec/requests/list_controller_spec.rb
index fb17f385992..aedd05068a1 100644
--- a/plugins/discourse-assign/spec/requests/list_controller_spec.rb
+++ b/plugins/discourse-assign/spec/requests/list_controller_spec.rb
@@ -80,6 +80,21 @@ describe ListController do
sign_in(user)
end
+ it "returns 403 for a group hidden from the acting user" do
+ hidden_group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:staff],
+ assignable_level: Group::ALIAS_LEVELS[:everyone],
+ )
+
+ get "/g/#{hidden_group.name}.json"
+ expect(response.status).to eq(404)
+
+ get "/topics/group-topics-assigned/#{hidden_group.name}.json"
+ expect(response.status).to eq(403)
+ end
+
it "returns user-assigned-topics-list of users in the assigned_allowed_group and doesn't include deleted topic" do
get "/topics/group-topics-assigned/#{get_assigned_allowed_group_name}.json"
expect(