A platform for community discussion. Free, open, simple.
SECURITY: Prevent tag editors from synonymizing hidden or restricted tags (#43796)
Chris Alberti0ea0daa09aea
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rbindex df4316000bd..650356e624e 100644--- a/app/controllers/tags_controller.rb+++ b/app/controllers/tags_controller.rb@@ -467,6 +467,12 @@ class TagsController < ::ApplicationControllernew_synonym_names = params[:synonyms]end+ new_synonym_names =+ DiscourseTagging.tags_for_saving(new_synonym_names, Guardian.new(Discourse.system_user)) || []+ synonyms = Tag.where(id: synonym_tag_ids).or(Tag.where_name(new_synonym_names))+ synonym_tag_ids = DiscourseTagging.editable_synonym_ids(synonyms, guardian)+ new_synonym_names -= synonyms.map(&:name)+value = DiscourseTagging.add_or_create_synonyms(@tag, synonym_tag_ids:, new_synonym_names:)if value.is_a?(Hash)render json: failed_json.merge(failed_tags: value)diff --git a/app/services/tag_settings_updater.rb b/app/services/tag_settings_updater.rbindex 3c28efc77f5..9d57c682ae6 100644--- a/app/services/tag_settings_updater.rb+++ b/app/services/tag_settings_updater.rb@@ -57,7 +57,11 @@ class TagSettingsUpdaterdef remove_synonyms(removed_ids)return if removed_ids.blank?- synonym_tag_ids = editable_synonym_ids(Tag.where(id: removed_ids, target_tag_id: @tag.id))+ synonym_tag_ids =+ DiscourseTagging.editable_synonym_ids(+ Tag.where(id: removed_ids, target_tag_id: @tag.id),+ @actor.guardian,+ )Tag.where(id: synonym_tag_ids, target_tag_id: @tag.id).update_all(target_tag_id: nil)end@@ -65,14 +69,11 @@ class TagSettingsUpdaterreturn if new_synonyms.blank?synonym_tag_ids = new_synonyms.filter_map { |t| t[:id]&.to_i }- synonym_tag_ids = editable_synonym_ids(Tag.where(id: synonym_tag_ids))+ synonym_tag_ids =+ DiscourseTagging.editable_synonym_ids(Tag.where(id: synonym_tag_ids), @actor.guardian)DiscourseTagging.add_or_create_synonyms(@tag, synonym_tag_ids:) if synonym_tag_ids.present?end- def editable_synonym_ids(synonyms)- synonyms.filter_map { |synonym| synonym.id if @actor.guardian.can_edit_tag?(synonym) }- end-def update_localizations(localizations)return if localizations.nil?diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rbindex 80c19b8ffe4..d83712c3cf4 100644--- a/lib/discourse_tagging.rb+++ b/lib/discourse_tagging.rb@@ -956,6 +956,10 @@ module DiscourseTaggingendend+ def self.editable_synonym_ids(synonyms, guardian)+ synonyms.filter_map { |synonym| synonym.id if guardian.can_edit_tag?(synonym) }+ end+# Add synonyms to a target tag.## - ensures synonym tags do not already have synonyms,diff --git a/spec/lib/discourse_tagging_spec.rb b/spec/lib/discourse_tagging_spec.rbindex e8577b79332..a8ab6464321 100644--- a/spec/lib/discourse_tagging_spec.rb+++ b/spec/lib/discourse_tagging_spec.rb@@ -2153,6 +2153,19 @@ RSpec.describe DiscourseTagging doendend+ describe ".editable_synonym_ids" do+ it "returns only tags the guardian can edit" do+ SiteSetting.edit_tags_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]+ restricted_tag = Fabricate(:tag)+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tags: [restricted_tag])++ editable_ids =+ DiscourseTagging.editable_synonym_ids(Tag.where(id: [tag1.id, restricted_tag.id]), guardian)++ expect(editable_ids).to contain_exactly(tag1.id)+ end+ end+describe "#add_or_create_synonyms" doit "can add an existing tag" doexpect {diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rbindex 2d86074de90..fd8f1e0f230 100644--- a/spec/requests/tags_controller_spec.rb+++ b/spec/requests/tags_controller_spec.rb@@ -2469,6 +2469,32 @@ RSpec.describe TagsController doexpect(response.status).to eq(200)end+ it "does not merge hidden tags submitted by ID or name" do+ SiteSetting.edit_tags_allowed_groups = "1|2|13"+ hidden_tag_by_id = Fabricate(:tag, name: "hidden-tag-by-id")+ hidden_tag_by_name = Fabricate(:tag, name: "hidden-tag-by-name")+ topic = Fabricate(:topic, tags: [hidden_tag_by_id, hidden_tag_by_name])+ Fabricate(+ :tag_group,+ permissions: {+ "staff" => 1,+ },+ tags: [hidden_tag_by_id, hidden_tag_by_name],+ )++ sign_in(regular_user)+ post "/tag/#{tag.name}/synonyms.json",+ params: {+ tags: [{ id: hidden_tag_by_id.id }, { name: hidden_tag_by_name.name }],+ }++ expect(response.status).to eq(200)+ expect(response.parsed_body["success"]).to eq("OK")+ expect(hidden_tag_by_id.reload.target_tag_id).to be_nil+ expect(hidden_tag_by_name.reload.target_tag_id).to be_nil+ expect_same_tag_names(topic.reload.tags, [hidden_tag_by_id, hidden_tag_by_name])+ end+context "when signed in as admin" dobefore { sign_in(admin) }