A platform for community discussion. Free, open, simple.
FIX: Ensure consistent admin bypasses for tag restrictions in bulk actions (#37928)
Régis Hanol3197618ef06d
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rbindex b01cc083ff1..559e3d27c56 100644--- a/lib/discourse_tagging.rb+++ b/lib/discourse_tagging.rb@@ -289,7 +289,7 @@ module DiscourseTaggingenddef self.validate_min_required_tags_for_category(guardian, model, category, tags = [])- if !guardian.is_staff? && category && category.minimum_required_tags > 0 &&+ if !guardian.is_admin? && category && category.minimum_required_tags > 0 &&tags.length < category.minimum_required_tagsmodel.errors.add(:base,@@ -302,7 +302,7 @@ module DiscourseTaggingenddef self.validate_required_tags_from_group(guardian, model, category, tags = [])- return true if guardian.is_staff? || category.nil?+ return true if guardian.is_admin? || category.nil?success = truecategory.category_required_tag_groups.each do |crtg|@@ -332,10 +332,12 @@ module DiscourseTaggingtags_restricted_to_categories = Hash.new { |h, k| h[k] = Set.new }query = Tag.where(name: tags)+query.joins(tag_groups: :categories).pluck(:name, "categories.id").each { |(tag, cat_id)| tags_restricted_to_categories[tag] << cat_id }+query.joins(:categories).pluck(:name, "categories.id")@@ -347,6 +349,8 @@ module DiscourseTaggingendif unallowed_tags.present?+ return true if guardian.is_admin?+msg =I18n.t("tags.forbidden.restricted_tags_cannot_be_used_in_category",@@ -361,6 +365,8 @@ module DiscourseTaggingif !category.allow_global_tags && category.has_restricted_tags?unrestricted_tags = tags - tags_restricted_to_categories.keysif unrestricted_tags.present?+ return true if guardian.is_admin?+msg =I18n.t("tags.forbidden.category_does_not_allow_tags",@@ -372,6 +378,7 @@ module DiscourseTaggingreturn falseendend+trueend@@ -379,6 +386,7 @@ module DiscourseTaggingtags_cant_be_used = filter_tags_violating_one_tag_from_group_per_topic(guardian, category, tags)return true if tags_cant_be_used.blank?+ return true if guardian&.is_admin?tags_cant_be_used.each do |_, incompatible_tags|model.errors.add(diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rbindex c983453dfc0..c94bcb9d049 100644--- a/spec/integration/category_tag_spec.rb+++ b/spec/integration/category_tag_spec.rb@@ -110,10 +110,11 @@ RSpec.describe "category tag restrictions" doexpect {create_post(category: category_with_tags, tags: [tag1.name, "newtag"])}.to raise_error(StandardError, msg)+ end- expect {- create_post(category: category_with_tags, tags: [tag1.name, "newtag"], user: admin)- }.to raise_error(StandardError, msg)+ it "lets admins post in a restricted category without raising on disallowed tags" do+ post = create_post(category: category_with_tags, tags: [tag1.name, "newtag"], user: admin)+ expect_same_tag_names(post.topic.tags, [tag1.name])endit "can create new tags in a non-restricted category" dodiff --git a/spec/lib/topics_bulk_action_spec.rb b/spec/lib/topics_bulk_action_spec.rbindex 92debabf654..7d878efac68 100644--- a/spec/lib/topics_bulk_action_spec.rb+++ b/spec/lib/topics_bulk_action_spec.rb@@ -280,14 +280,13 @@ RSpec.describe TopicsBulkAction dofab!(:restricted_tag) { Fabricate(:tag, name: "restricted-tag") }fab!(:source_category) { Fabricate(:category, tags: [restricted_tag]) }fab!(:admin)+ fab!(:moderator)fab!(:topic_with_tag) { Fabricate(:topic, category: source_category, tags: [restricted_tag]) }fab!(:first_post_for_tagged_topic) { Fabricate(:post, topic: topic_with_tag) }before { destination_category.update!(tags: [other_tag]) }- it "does not change category" do- original_category = topic_with_tag.category-+ it "allows admins to change category" dotopic_ids =TopicsBulkAction.new(admin,@@ -296,33 +295,35 @@ RSpec.describe TopicsBulkAction docategory_id: destination_category.id,).perform!- expect(topic_ids).to eq([])- expect(topic_with_tag.reload.category).to eq(original_category)+ expect(topic_ids).to eq([topic_with_tag.id])+ expect(topic_with_tag.reload.category).to eq(destination_category)+ expect(topic_with_tag.tags).to contain_exactly(restricted_tag)end- it "logs a warning with error details" do- Rails.logger.expects(:warn).with(includes("restricted-tag"))+ it "does not change category for moderators" do+ topic_ids =+ TopicsBulkAction.new(+ moderator,+ [topic_with_tag.id],+ type: "change_category",+ category_id: destination_category.id,+ ).perform!- TopicsBulkAction.new(- admin,- [topic_with_tag.id],- type: "change_category",- category_id: destination_category.id,- ).perform!+ expect(topic_ids).to eq([])+ expect(topic_with_tag.reload.category).to eq(source_category)end- it "exposes errors via attr_reader" do- operator =+ it "does not change category for regular users" do+ topic_ids =TopicsBulkAction.new(- admin,+ topic_with_tag.user,[topic_with_tag.id],type: "change_category",category_id: destination_category.id,- )- operator.perform!+ ).perform!- expect(operator.errors).to be_present- expect(operator.errors.values.sum).to eq(1)+ expect(topic_ids).to eq([])+ expect(topic_with_tag.reload.category).to eq(source_category)endend@@ -370,6 +371,88 @@ RSpec.describe TopicsBulkAction doexpect(topic_with_tag.reload.category).to eq(destination_category)endend++ context "when destination category disallows global tags" do+ fab!(:global_tag) { Fabricate(:tag, name: "global-tag") }+ fab!(:restricted_tag) { Fabricate(:tag, name: "restricted-tag") }+ fab!(:tag_group) { Fabricate(:tag_group, tags: [restricted_tag]) }+ fab!(:source_category, :category)+ fab!(:destination_category) do+ Fabricate(:category, tag_groups: [tag_group], allow_global_tags: false)+ end+ fab!(:admin)+ fab!(:moderator)+ fab!(:topic_with_global_tag) do+ Fabricate(:topic, category: source_category, tags: [global_tag])+ end+ fab!(:first_post) { Fabricate(:post, topic: topic_with_global_tag) }++ it "allows admin to move topic with global tags" do+ topic_ids =+ TopicsBulkAction.new(+ admin,+ [topic_with_global_tag.id],+ type: "change_category",+ category_id: destination_category.id,+ ).perform!++ expect(topic_ids).to eq([topic_with_global_tag.id])+ expect(topic_with_global_tag.reload.category).to eq(destination_category)+ end++ it "prevents moderator from moving topic with global tags" do+ topic_ids =+ TopicsBulkAction.new(+ moderator,+ [topic_with_global_tag.id],+ type: "change_category",+ category_id: destination_category.id,+ ).perform!++ expect(topic_ids).to eq([])+ expect(topic_with_global_tag.reload.category).to eq(source_category)+ end+ end++ context "when tags violate one-per-topic tag group rule" do+ fab!(:tag1) { Fabricate(:tag, name: "priority-high") }+ fab!(:tag2) { Fabricate(:tag, name: "priority-low") }+ fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2], one_per_topic: true) }+ fab!(:source_category, :category)+ fab!(:destination_category) { Fabricate(:category, tag_groups: [tag_group]) }+ fab!(:admin)+ fab!(:moderator)+ fab!(:topic_with_conflicting_tags) do+ Fabricate(:topic, category: source_category, tags: [tag1, tag2])+ end+ fab!(:first_post) { Fabricate(:post, topic: topic_with_conflicting_tags) }++ it "allows admin to move topic with conflicting tags" do+ topic_ids =+ TopicsBulkAction.new(+ admin,+ [topic_with_conflicting_tags.id],+ type: "change_category",+ category_id: destination_category.id,+ ).perform!++ expect(topic_ids).to eq([topic_with_conflicting_tags.id])+ expect(topic_with_conflicting_tags.reload.category).to eq(destination_category)+ end++ it "prevents moderator from moving topic with conflicting tags" do+ topic_ids =+ TopicsBulkAction.new(+ moderator,+ [topic_with_conflicting_tags.id],+ type: "change_category",+ category_id: destination_category.id,+ ).perform!++ expect(topic_ids).to eq([])+ expect(topic_with_conflicting_tags.reload.category).to eq(source_category)+ end+ endenddescribe "destroy_post_timing" do@@ -595,7 +678,7 @@ RSpec.describe TopicsBulkAction doenddescribe "change_tags" do- fab!(:first_post) { Fabricate(:post, topic:) }+ fab!(:first_post) { Fabricate(:post, topic: topic) }fab!(:tag1, :tag)fab!(:tag2, :tag)@@ -692,7 +775,7 @@ RSpec.describe TopicsBulkAction doenddescribe "append_tags" do- fab!(:first_post) { Fabricate(:post, topic:) }+ fab!(:first_post) { Fabricate(:post, topic: topic) }fab!(:tag1, :tag)fab!(:tag2, :tag)fab!(:tag3, :tag)@@ -786,7 +869,7 @@ RSpec.describe TopicsBulkAction doenddescribe "remove_tags" do- fab!(:first_post) { Fabricate(:post, topic:) }+ fab!(:first_post) { Fabricate(:post, topic: topic) }fab!(:tag1, :tag)fab!(:tag2, :tag)diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rbindex e2a6a6e6926..7bd66868424 100644--- a/spec/requests/topics_controller_spec.rb+++ b/spec/requests/topics_controller_spec.rb@@ -4739,7 +4739,7 @@ RSpec.describe TopicsController doendit "includes errors in the response when operations partially fail" do- sign_in(Fabricate(:admin))+ sign_in(Fabricate(:moderator))restricted_tag = Fabricate(:tag, name: "restricted-tag")source_category = Fabricate(:category, tags: [restricted_tag])diff --git a/spec/system/topic_bulk_select_spec.rb b/spec/system/topic_bulk_select_spec.rbindex 8924f1d6ef1..da4cc75c720 100644--- a/spec/system/topic_bulk_select_spec.rb+++ b/spec/system/topic_bulk_select_spec.rb@@ -541,7 +541,7 @@ describe "Topic bulk select" doit "shows errors in the modal when some topics cannot be moved due to tag restrictions" dooriginal_category = topics.first.category- sign_in(admin)+ sign_in(Fabricate(:moderator))visit("/latest")open_bulk_actions_modal([topics.first], "update-category")