Skip to content

Commit

Permalink
SECURITY: banner-info (#17071)
Browse files Browse the repository at this point in the history
  • Loading branch information
oblakeerickson committed Jun 13, 2022
1 parent 6650218 commit ae6a907
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/application_controller.rb
Expand Up @@ -676,6 +676,7 @@ def self.banner_json_cache

def banner_json
json = ApplicationController.banner_json_cache["json"]
return "{}" if !current_user && SiteSetting.login_required?

unless json
topic = Topic.where(archetype: Archetype.banner).first
Expand Down
49 changes: 49 additions & 0 deletions spec/requests/application_controller_spec.rb
Expand Up @@ -1002,4 +1002,53 @@ def headers(locale)
expect(response.status).to eq(200)
end
end

describe "#banner_json" do
let(:admin) { Fabricate(:admin) }
let(:user) { Fabricate(:user) }
fab!(:banner_topic) { Fabricate(:banner_topic) }
fab!(:p1) { Fabricate(:post, topic: banner_topic, raw: "A banner topic") }

before do
admin # to skip welcome wizard at home page `/`
end

context "login_required" do
before do
SiteSetting.login_required = true
end
it "does not include banner info for anonymous users" do
get "/login"

expect(response.body).to have_tag("div#data-preloaded") do |element|
json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
expect(json['banner']).to eq("{}")
end
end

it "includes banner info for logged-in users" do
sign_in(user)
get "/"

expect(response.body).to have_tag("div#data-preloaded") do |element|
json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
expect(JSON.parse(json['banner'])["html"]).to eq("<p>A banner topic</p>")
end
end
end

context "login not required" do
before do
SiteSetting.login_required = false
end
it "does include banner info for anonymous users" do
get "/login"

expect(response.body).to have_tag("div#data-preloaded") do |element|
json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
expect(JSON.parse(json['banner'])["html"]).to eq("<p>A banner topic</p>")
end
end
end
end
end

0 comments on commit ae6a907

Please sign in to comment.