A platform for community discussion. Free, open, simple.
FIX: Return 404 for permalinks to deleted tags (#44313)
Alan Guo Xiang Tan8055db497f56
diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rbindex 1e000718998..05df9558a17 100644--- a/lib/guardian/tag_guardian.rb+++ b/lib/guardian/tag_guardian.rb@@ -3,6 +3,7 @@module TagGuardiandef can_see_tag?(tag)return false if !SiteSetting.tagging_enabled+ return false if !tagreturn false if hidden_tag_names.include?(tag.name)trueenddiff --git a/spec/lib/guardian/tag_guardian_spec.rb b/spec/lib/guardian/tag_guardian_spec.rbindex 89cd17cddb2..82dc863e44b 100644--- a/spec/lib/guardian/tag_guardian_spec.rb+++ b/spec/lib/guardian/tag_guardian_spec.rb@@ -10,6 +10,10 @@ RSpec.describe TagGuardian dofab!(:trust_level_3)describe "#can_see_tag?" do+ it "returns false when the tag is missing" do+ expect(Guardian.new(nil).can_see_tag?(nil)).to be_falsey+ end+it "returns false when tagging is disabled" doSiteSetting.tagging_enabled = falsediff --git a/spec/requests/permalinks_controller_spec.rb b/spec/requests/permalinks_controller_spec.rbindex c1906117e7a..25435c0f56e 100644--- a/spec/requests/permalinks_controller_spec.rb+++ b/spec/requests/permalinks_controller_spec.rb@@ -138,6 +138,17 @@ RSpec.describe PermalinksController doexpect(response.headers["Location"]).to be_nilendend++ it "returns 404 when the target tag has been deleted" do+ tag = Fabricate(:tag)+ permalink = Fabricate(:permalink, url: "deleted-tag", tag:)+ tag.destroy!++ get "/#{permalink.url}"++ expect(response.status).to eq(404)+ expect(response.headers["Location"]).to be_nil+ endenddescribe "check" do@@ -164,5 +175,16 @@ RSpec.describe PermalinksController doexpect(json["target_url"]).to be_nilendend++ it "reports not found when the target tag has been deleted" do+ tag = Fabricate(:tag)+ permalink = Fabricate(:permalink, url: "deleted-tag-check", tag:)+ tag.destroy!++ get "/permalink-check.json", params: { path: permalink.url }++ expect(response.parsed_body["found"]).to eq(false)+ expect(response.parsed_body["target_url"]).to be_nil+ endendend