Skip to content

A platform for community discussion. Free, open, simple.

DEV: Gate read-restricted banner topics (#38496)

Isaac Janzenc2d590a541cc
diff --git a/lib/application_layout_preloader.rb b/lib/application_layout_preloader.rb
index 5685b23ff35..b149a8c4abb 100644
--- a/lib/application_layout_preloader.rb
+++ b/lib/application_layout_preloader.rb
@@ -43,7 +43,7 @@ class ApplicationLayoutPreloader
.banner_json_cache
.defer_get_set("json_#{I18n.locale}") do
topic = Topic.where(archetype: Archetype.banner).first
- banner = topic.present? ? topic.banner(@guardian) : {}
+ banner = topic.present? && !topic.category&.read_restricted? ? topic.banner(@guardian) : {}
MultiJson.dump(banner)
end
end
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 02f74b1e7a5..63cc4c9f69a 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -316,7 +316,8 @@ module TopicGuardian
end
def can_banner_topic?(topic)
- topic && authenticated? && !topic.private_message? && is_staff?
+ topic && authenticated? && !topic.private_message? && !topic.category&.read_restricted? &&
+ is_staff?
end
def can_change_archetype?(topic, new_archetype)
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index 1f09ab56103..84f89b56b78 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -505,6 +505,14 @@ RSpec.describe Guardian do
expect(Guardian.new(admin).can_banner_topic?(topic)).to be_truthy
end
+ it "does not allow staff to banner topics in read-restricted categories" do
+ group = Fabricate(:group)
+ private_category = Fabricate(:private_category, group: group)
+ topic = Fabricate(:topic, category: private_category)
+
+ expect(Guardian.new(admin).can_banner_topic?(topic)).to be_falsey
+ end
+
describe "#can_change_archetype?" do
fab!(:topic)
diff --git a/spec/requests/site_controller_spec.rb b/spec/requests/site_controller_spec.rb
index da4040540d7..6cf9bbd4846 100644
--- a/spec/requests/site_controller_spec.rb
+++ b/spec/requests/site_controller_spec.rb
@@ -45,6 +45,37 @@ RSpec.describe SiteController do
end
end
+ describe "#banner" do
+ fab!(:admin)
+ fab!(:group)
+ fab!(:private_category) { Fabricate(:private_category, group: group) }
+
+ before { ApplicationLayoutPreloader.banner_json_cache.clear }
+ after { ApplicationLayoutPreloader.banner_json_cache.clear }
+
+ it "does not expose banner content from a read-restricted category to anonymous users" do
+ topic = Fabricate(:topic, category: private_category, archetype: Archetype.banner)
+ Fabricate(:post, topic: topic, raw: "secret banner content")
+
+ get "/site/banner.json"
+ expect(response.status).to eq(200)
+ json = response.parsed_body
+ expect(json).to eq({})
+ end
+
+ it "does not expose banner content from a read-restricted category to regular users" do
+ user = Fabricate(:user)
+ topic = Fabricate(:topic, category: private_category, archetype: Archetype.banner)
+ Fabricate(:post, topic: topic, raw: "secret banner content")
+
+ sign_in(user)
+ get "/site/banner.json"
+ expect(response.status).to eq(200)
+ json = response.parsed_body
+ expect(json).to eq({})
+ end
+ end
+
describe "#statistics" do
after { DiscoursePluginRegistry.reset! }