A platform for community discussion. Free, open, simple.
SECURITY: Prevent users from editing or synonymizing hidden tags they can't see
Isaac Janzenc17278e3a41f
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rbindex b3818de2872..99ad6d8f98f 100644--- a/app/controllers/tags_controller.rb+++ b/app/controllers/tags_controller.rb@@ -518,7 +518,7 @@ class TagsController < ::ApplicationControllerenddef create_synonyms- guardian.ensure_can_edit_tag!+ guardian.ensure_can_edit_tag!(@tag)# frontend uses form datatags_param = params[:tags].try(:values) || params[:tags]diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rbindex b1c6600f867..f6c27656377 100644--- a/app/serializers/current_user_serializer.rb+++ b/app/serializers/current_user_serializer.rb@@ -205,7 +205,7 @@ class CurrentUserSerializer < BasicUserSerializerenddef can_edit_tags- scope.can_edit_tag?+ scope.can_edit_tag_names?enddef can_invite_to_forumdiff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rbindex 1282d67b379..1d8e13b17f2 100644--- a/lib/guardian/tag_guardian.rb+++ b/lib/guardian/tag_guardian.rb@@ -11,10 +11,14 @@ module TagGuardianSiteSetting.tagging_enabled && @user.in_any_groups?(SiteSetting.create_tag_allowed_groups_map)end- def can_edit_tag?(_tag = nil)+ def can_edit_tag_names?SiteSetting.tagging_enabled && @user.in_any_groups?(SiteSetting.edit_tags_allowed_groups_map)end+ def can_edit_tag?(tag)+ can_edit_tag_names? && can_see_tag?(tag)+ end+def can_tag_topics?SiteSetting.tagging_enabled && @user.in_any_groups?(SiteSetting.tag_topic_allowed_groups_map)enddiff --git a/spec/lib/guardian/tag_guardian_spec.rb b/spec/lib/guardian/tag_guardian_spec.rbindex 3a60ea722b5..df455289b96 100644--- a/spec/lib/guardian/tag_guardian_spec.rb+++ b/spec/lib/guardian/tag_guardian_spec.rb@@ -67,6 +67,21 @@ RSpec.describe TagGuardian doSiteSetting.edit_tags_allowed_groups = "1|2|13"expect(Guardian.new(trust_level_3).can_edit_tag?(tag)).to be_truthyend++ it "returns false for a hidden tag when user is not in the tag's permitted group" do+ SiteSetting.edit_tags_allowed_groups = "1|2|13"+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])+ expect(Guardian.new(trust_level_3).can_edit_tag?(tag)).to be_falsey+ end++ it "returns true for a hidden tag when user is admin" do+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])+ expect(Guardian.new(admin).can_edit_tag?(tag)).to be_truthy+ end++ it "requires a tag" do+ expect { Guardian.new(trust_level_3).can_edit_tag? }.to raise_error(ArgumentError)+ endenddescribe "#can_tag_topics?" dodiff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rbindex 8679fbfcef2..37bdd7562c4 100644--- a/spec/requests/tags_controller_spec.rb+++ b/spec/requests/tags_controller_spec.rb@@ -976,6 +976,15 @@ RSpec.describe TagsController doexpect(response.status).to eq(403)end+ it "returns 403 when tag is hidden and user is not in permitted group" do+ SiteSetting.edit_tags_allowed_groups = "1|2|3|13"+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])+ sign_in(regular_user)+ put "/tag/#{tag.name}.json", params: { tag: { description: "New description" } }++ expect(response.status).to eq(403)+ end+it "returns 404 for non-existing tags" doput "/tag/nonexistenttag.json", params: { tag: { description: "New description" } }@@ -1762,6 +1771,21 @@ RSpec.describe TagsController doexpect(response.status).to eq(200)end+ it "returns 403 when tag is hidden and user is not in permitted group" do+ SiteSetting.edit_tags_allowed_groups = "1|2|13"+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])+ sign_in(regular_user)+ post "/tag/#{tag.name}/synonyms.json", params: { tags: [{ name: "synonym1" }] }+ expect(response.status).to eq(403)+ end++ it "succeeds when tag is hidden and user is admin" do+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])+ sign_in(admin)+ post "/tag/#{tag.name}/synonyms.json", params: { tags: [{ name: "synonym1" }] }+ expect(response.status).to eq(200)+ end+context "when signed in as admin" dobefore { sign_in(admin) }@@ -1843,6 +1867,14 @@ RSpec.describe TagsController doexpect(response.status).to eq(403)end+ it "fails when synonym is hidden and user is not in permitted group" do+ SiteSetting.edit_tags_allowed_groups = "1|2|3|13"+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [synonym.name])+ sign_in(regular_user)+ destroy_synonym+ expect(response.status).to eq(403)+ end+context "when signed in as admin" dobefore { sign_in(admin) }