Skip to content

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

SECURITY: Clear stale add-users-to-group when policy removes the assignment (#42689)

Chris Albertia042da9ca118
diff --git a/plugins/discourse-policy/plugin.rb b/plugins/discourse-policy/plugin.rb
index c75fa397344..7e14db187ba 100644
--- a/plugins/discourse-policy/plugin.rb
+++ b/plugins/discourse-policy/plugin.rb
@@ -160,6 +160,8 @@ after_initialize do
if add_to_group && Guardian.new(post.user).can_edit_group?(add_to_group)
add_to_group.id
end
+ else
+ post_policy.add_users_to_group = nil
end
if has_group
diff --git a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
index f727db7407f..aeee2e7d2ef 100644
--- a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
+++ b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
@@ -64,6 +64,46 @@ describe DiscoursePolicy::PolicyController do
end
end
+ context "when an add-users-to-group assignment is removed" do
+ it "does not grant accepters access to topics restricted to the former group" do
+ group_to_add = Fabricate(:group)
+ group_to_add.add_owner(moderator)
+ private_category = Fabricate(:private_category, group: group_to_add)
+ private_topic = Fabricate(:topic, category: private_category, user: moderator)
+ private_post = Fabricate(:post, topic: private_topic, user: moderator, raw: "Restricted post")
+ policy_post = create_post(raw: <<~MD, user: moderator)
+ [policy group=#{group.name} add-users-to-group=#{group_to_add.name}]
+ I always open **doors**!
+ [/policy]
+ MD
+
+ sign_in(moderator)
+ put "/posts/#{policy_post.id}.json", params: { post: { raw: <<~MD } }
+ [policy group=#{group.name}]
+ I always open **doors**!
+ [/policy]
+ MD
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["post"]["raw"]).not_to include("add-users-to-group")
+
+ sign_in(user1)
+ get "/t/#{private_topic.id}.json"
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(private_post.raw)
+
+ put "/policy/accept.json", params: { post_id: policy_post.id }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["success"]).to eq("OK")
+
+ get "/t/#{private_topic.id}.json"
+
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(private_post.raw)
+ end
+ end
+
describe "#accepted" do
before { sign_in(user1) }