A platform for community discussion. Free, open, simple.
FIX: Invalidate cached 404 topic suggestions when category access is revoked (#42413)
Mark VanLandingham4143157a17dc
diff --git a/app/models/category.rb b/app/models/category.rbindex 2047897a39b..da4bd1e69b6 100644--- a/app/models/category.rb+++ b/app/models/category.rb@@ -155,6 +155,7 @@ class Category < ActiveRecord::Baseafter_update :revise_category_definition, if: :saved_change_to_description?after_update :run_plugin_category_update_param_callbacksafter_update :enqueue_category_hashtag_remap, if: :saved_change_to_hashtag_ref?+ after_update :clear_page_not_found_topics_cache, if: :saved_change_to_read_restricted?after_destroy :trash_category_definitionafter_destroy :clear_related_site_settings@@ -1457,6 +1458,11 @@ class Category < ActiveRecord::Baseresult.map { |row| [row.group_id, row.permission_type] }end+ def clear_page_not_found_topics_cache+ Topic.clear_page_not_found_topics_cache!+ DB.after_commit { Topic.clear_page_not_found_topics_cache! }+ end+def clear_site_cacheSite.clear_cacheenddiff --git a/app/models/topic.rb b/app/models/topic.rbindex 307878a5895..9e49856d39b 100644--- a/app/models/topic.rb+++ b/app/models/topic.rb@@ -306,6 +306,7 @@ class Topic < ActiveRecord::Basebelongs_to :og_image_upload, class_name: "Upload"has_many :topic_thumbnails, through: :image_upload+ after_update :clear_page_not_found_topics_cache, if: :moved_to_read_restricted_category?after_save :regenerate_og_image# When we want to temporarily attach some data to a forum topic (usually before serialization)@@ -443,6 +444,15 @@ class Topic < ActiveRecord::Baseendend+ def self.clear_page_not_found_topics_cache!+ Discourse.cache.keys("page_not_found_topics:*").each { |key| Discourse.cache.redis.del(key) }+ end++ def clear_page_not_found_topics_cache+ self.class.clear_page_not_found_topics_cache!+ DB.after_commit { self.class.clear_page_not_found_topics_cache! }+ end+def regenerate_og_imagereturn if !(saved_changes[:title] || saved_changes[:category_id])return if og_image_upload_id.blank?@@ -2253,6 +2263,10 @@ class Topic < ActiveRecord::Baseprivate+ def moved_to_read_restricted_category?+ saved_change_to_category_id? && category&.read_restricted?+ end+def invite_to_private_message(invited_by, target_user, guardian)if !guardian.can_send_private_message?(target_user)raise UserExists.new(I18n.t("activerecord.errors.models.topic.attributes.base.cant_send_pm"))diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rbindex 4cb3f0ddc0a..3054c1443ec 100644--- a/spec/requests/application_controller_spec.rb+++ b/spec/requests/application_controller_spec.rb@@ -604,6 +604,59 @@ RSpec.describe ApplicationController doendend+ it "does not retain topics moved to a restricted category" do+ Discourse.cache.delete("page_not_found_topics:#{I18n.locale}")+ topic = Fabricate(:topic_with_op, title: "restricted 404 cache topic")+ private_category = Fabricate(:private_category, group: Group[:staff])++ get "/missing-route"++ expect(response).to have_http_status(:not_found)+ expect(response.body).to include(topic.title)++ admin = sign_in(Fabricate(:admin))+ put "/t/#{topic.id}.json", params: { category_id: private_category.id }++ expect(response).to have_http_status(:ok)++ delete "/session/#{admin.username}.json"+ get "/missing-route"++ aggregate_failures do+ expect(response).to have_http_status(:not_found)+ expect(response.body).not_to include(topic.title)+ end+ end++ it "does not retain topics after a category becomes restricted" do+ Discourse.cache.delete("page_not_found_topics:#{I18n.locale}")+ category = Fabricate(:category)+ topic = Fabricate(:topic_with_op, title: "restricted category 404 cache topic", category:)++ get "/missing-route"++ expect(response).to have_http_status(:not_found)+ expect(response.body).to include(topic.title)++ admin = sign_in(Fabricate(:admin))+ put "/categories/#{category.id}.json",+ params: {+ permissions: {+ Group[:staff].name => CategoryGroup.permission_types[:full],+ },+ }++ expect(response).to have_http_status(:ok)++ delete "/session/#{admin.username}.json"+ get "/missing-route"++ aggregate_failures do+ expect(response).to have_http_status(:not_found)+ expect(response.body).not_to include(topic.title)+ end+ end+it "should cache results" doDiscourse.cache.delete("page_not_found_topics:#{I18n.locale}")Discourse.cache.delete("page_not_found_topics:fr")