A platform for community discussion. Free, open, simple.
SECURITY: Validate policy permissions on post save
Alan Guo Xiang Tan451ed6aa985e
diff --git a/plugins/discourse-policy/config/locales/server.en.yml b/plugins/discourse-policy/config/locales/server.en.ymlindex 3753fe91665..99c442823ac 100644--- a/plugins/discourse-policy/config/locales/server.en.yml+++ b/plugins/discourse-policy/config/locales/server.en.yml@@ -11,6 +11,7 @@ en:no_policy: "No policy exists for post"staff_only: "Policies may only apply to staff posts"policy_group_inaccessible: "This policy cannot be accepted at this time. Please contact a site administrator."+ no_policy_permission: "You do not have permission to modify policies in this post."error:no_permission: "Not authorized"reports:diff --git a/plugins/discourse-policy/lib/post_validator.rb b/plugins/discourse-policy/lib/post_validator.rbnew file mode 100644index 00000000000..7ca33695b6f--- /dev/null+++ b/plugins/discourse-policy/lib/post_validator.rb@@ -0,0 +1,44 @@+# frozen_string_literal: true++module DiscoursePolicy+ class PostValidator+ def initialize(post)+ @post = post+ 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, {}))++ return true if old_policies == new_policies++ if !user_allowed?(@post.acting_user) || !user_allowed?(@post.user)+ @post.errors.add(:base, I18n.t("discourse_policy.errors.no_policy_permission"))+ return false+ end++ true+ end++ private++ def extract_policies(cooked)+ return [] if cooked.blank?++ Nokogiri::HTML5+ .fragment(cooked)+ .css("div.policy")+ .reject { |p| p.ancestors("blockquote").any? }+ .map(&:to_html)+ end++ def user_allowed?(user)+ user&.in_any_groups?(SiteSetting.create_policy_allowed_groups_map)+ end+ end+enddiff --git a/plugins/discourse-policy/plugin.rb b/plugins/discourse-policy/plugin.rbindex a7aeb7c8e81..2160454be63 100644--- a/plugins/discourse-policy/plugin.rb+++ b/plugins/discourse-policy/plugin.rb@@ -33,6 +33,7 @@ after_initialize dorequire_relative "lib/extensions/user_notifications_extension"require_relative "lib/extensions/user_option_extension"require_relative "lib/policy_mailer"+ require_relative "lib/post_validator"Discourse::Application.routes.append { mount DiscoursePolicy::Engine, at: "/policy" }@@ -58,6 +59,15 @@ after_initialize doTopicView.default_post_custom_fields << DiscoursePolicy::HAS_POLICY+ validate(:post, :validate_policy) do+ return unless self.raw_changed?++ validator = DiscoursePolicy::PostValidator.new(self)+ return unless validator.validate_post++ true+ end+on(:post_process_cooked) do |doc, post|has_group = falsediff --git a/plugins/discourse-policy/spec/lib/post_validator_spec.rb b/plugins/discourse-policy/spec/lib/post_validator_spec.rbnew file mode 100644index 00000000000..adb53c3977b--- /dev/null+++ b/plugins/discourse-policy/spec/lib/post_validator_spec.rb@@ -0,0 +1,172 @@+# frozen_string_literal: true++RSpec.describe DiscoursePolicy::PostValidator do+ fab!(:policy_group, :group)+ fab!(:user)+ fab!(:post_owner, :user)+ fab!(:acting_user, :user)+ fab!(:post) { Fabricate(:post, user: post_owner) }++ let(:policy_raw) { <<~MD }+ [policy group=#{policy_group.name}]+ I agree+ [/policy]+ MD++ before do+ enable_current_plugin+ SiteSetting.create_policy_allowed_groups = "#{policy_group.id}"+ end++ describe "#validate_post" do+ it "returns true when policy blocks have not changed" do+ policy_group.add(post_owner)+ post.update!(raw: <<~MD)+ Intro++ #{policy_raw}+ MD+ post.raw = <<~MD+ New intro++ #{policy_raw}+ MD+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(true)+ end++ it "returns true when policy blocks appear only inside blockquotes" do+ post.update!(raw: <<~MD)+ [quote="someone, post:1, topic:1"]+ #{policy_raw}+ [/quote]+ MD+ post.raw = <<~MD+ [quote="someone, post:1, topic:1"]+ #{policy_raw}+ [/quote]+ Updated quote context+ MD+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(true)+ end++ context "when policy blocks have changed" do+ it "returns true when both users have permission to modify policy blocks" do+ policy_group.add(post_owner)+ policy_group.add(acting_user)+ post.raw = policy_raw+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(true)+ end++ it "returns false when acting user lacks permission to modify policy blocks" do+ policy_group.add(post_owner)+ post.raw = policy_raw+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(false)+ expect(post.errors[:base]).to include(+ I18n.t("discourse_policy.errors.no_policy_permission"),+ )+ end++ it "returns false when post owner lacks permission to modify policy blocks" do+ policy_group.add(acting_user)+ post.raw = policy_raw+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(false)+ expect(post.errors[:base]).to include(+ I18n.t("discourse_policy.errors.no_policy_permission"),+ )+ end++ it "returns false when acting user modifies one of multiple policy blocks without permission" do+ policy_group.add(post_owner)+ second_policy_raw = <<~MD+ [policy group=#{policy_group.name}]+ I also agree+ [/policy]+ MD+ post.update!(raw: <<~MD)+ #{policy_raw}++ #{second_policy_raw}+ MD+ post.raw = <<~MD+ #{policy_raw}++ [policy group=#{policy_group.name}]+ Updated+ [/policy]+ MD+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(false)+ expect(post.errors[:base]).to include(+ I18n.t("discourse_policy.errors.no_policy_permission"),+ )+ end++ it "returns false when acting user removes policy blocks without permission" do+ policy_group.add(post_owner)+ post.update!(raw: policy_raw)+ post.raw = "Policy removed"+ post.acting_user = acting_user++ result = described_class.new(post).validate_post++ expect(result).to eq(false)+ expect(post.errors[:base]).to include(+ I18n.t("discourse_policy.errors.no_policy_permission"),+ )+ end+ end++ context "when there is no previous raw" do+ it "returns true when author has permission to add policy blocks" do+ policy_group.add(user)+ new_post = Fabricate.build(:post, raw: policy_raw, user: user)++ result = described_class.new(new_post).validate_post++ expect(result).to eq(true)+ end++ it "returns false when author lacks permission to add policy blocks" do+ new_post = Fabricate.build(:post, raw: policy_raw, user: user)++ result = described_class.new(new_post).validate_post++ expect(result).to eq(false)+ expect(new_post.errors[:base]).to include(+ I18n.t("discourse_policy.errors.no_policy_permission"),+ )+ end++ it "returns true when raw has no policy blocks" do+ new_post = Fabricate.build(:post, raw: "No policy", user: user)++ result = described_class.new(new_post).validate_post++ expect(result).to eq(true)+ end+ end+ end+enddiff --git a/plugins/discourse-policy/spec/plugin_spec.rb b/plugins/discourse-policy/spec/plugin_spec.rbindex c3953527b3c..341120cdbfb 100644--- a/plugins/discourse-policy/spec/plugin_spec.rb+++ b/plugins/discourse-policy/spec/plugin_spec.rb@@ -133,6 +133,33 @@ describe DiscoursePolicy doendend+ describe "policy validation" do+ fab!(:policy_group, :group)+ fab!(:moderator)+ fab!(:acting_user, :user)++ let(:policy_raw) { <<~MD }+ [policy group=#{policy_group.name}]+ I agree+ [/policy]+ MD++ before do+ Jobs.run_immediately!+ SiteSetting.create_policy_allowed_groups = "#{policy_group.id}"+ end++ it "blocks unauthorized users from modifying policy blocks" do+ policy_group.add(moderator)+ post = create_post(raw: "Original content", user: moderator)++ result = post.revise(acting_user, { raw: policy_raw })++ expect(result).to eq(false)+ expect(post.errors[:base]).to include(I18n.t("discourse_policy.errors.no_policy_permission"))+ end+ end+describe "current user serializer extensions" dolet(:serializer) { CurrentUserSerializer.new(user1, scope: Guardian.new(user1)) }