Skip to content

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

SECURITY: Validate policy edits authored as HTML (#44068)

Gabriel Grubba05c025ad8d1f
diff --git a/plugins/discourse-policy/lib/post_validator.rb b/plugins/discourse-policy/lib/post_validator.rb
index 08487e8baa6..a6534eeea27 100644
--- a/plugins/discourse-policy/lib/post_validator.rb
+++ b/plugins/discourse-policy/lib/post_validator.rb
@@ -7,11 +7,8 @@ module DiscoursePolicy
end
def validate_post
- old_raw = @post.changes[:raw]&.first
new_raw = @post.raw
- return true if !old_raw&.include?("[/policy]") && !new_raw.include?("[/policy]")
-
old_policies = extract_policies(@post.cooked)
new_policies = extract_policies(PrettyText.cook(new_raw, {}))
diff --git a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
index 378ebb69509..f3af0d7b8bf 100644
--- a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
+++ b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
@@ -328,6 +328,37 @@ describe DiscoursePolicy::PolicyController do
end
end
+ describe "policy validation" do
+ fab!(:admin)
+ fab!(:editor, :trust_level_4)
+ fab!(:audience_group, :group)
+ fab!(:target_group, :group)
+ fab!(:post) { Fabricate(:post, user: admin, raw: "Original content") }
+
+ before do
+ audience_group.add(editor)
+ target_group.add_owner(admin)
+ end
+
+ it "rejects an HTML policy from an editor without policy permissions" do
+ raw = <<~HTML
+ <div class="policy" data-group="#{audience_group.name}" data-add-users-to-group="#{target_group.name}">
+ I agree
+ </div>
+ HTML
+
+ sign_in(editor)
+ put "/posts/#{post.id}.json", params: { post: { raw: raw } }
+
+ expect(response.status).to eq(422)
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("discourse_policy.errors.no_policy_permission"),
+ )
+ expect(post.reload.raw).to eq("Original content")
+ expect(post.post_policy).to be_nil
+ end
+ end
+
describe "wiki policy posts" do
fab!(:admin)