Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: add X-Robots-Tag header for check_xhr-covered GET actions, too (#9868) 

* FIX: add X-Robots-Tag header for check_xhr-covered GET actions, too

see https://meta.discourse.org/t/missing-x-robots-tag/152593/3 for context

* test: a spec making sure X-Robots-Tag header is present when needed

/groups path responds to anonymous requests and doesn't skip `check_xhr` method, so we can use it here.
This commit is contained in:
Artem Vasiliev 2020-05-27 18:57:05 +03:00 committed by GitHub
parent 461df7d050
commit 12544c02c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -39,12 +39,12 @@ class ApplicationController < ActionController::Base
before_action :redirect_to_login_if_required before_action :redirect_to_login_if_required
before_action :block_if_requires_login before_action :block_if_requires_login
before_action :preload_json before_action :preload_json
before_action :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
before_action :check_xhr before_action :check_xhr
after_action :add_readonly_header after_action :add_readonly_header
after_action :perform_refresh_session after_action :perform_refresh_session
after_action :dont_cache_page after_action :dont_cache_page
after_action :conditionally_allow_site_embedding after_action :conditionally_allow_site_embedding
after_action :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt }
layout :set_layout layout :set_layout

6
spec/requests/groups_controller_spec.rb
View File

@ -176,6 +176,12 @@ describe GroupsController do
) )
end end
it 'should return correct X-Robots-Tag header when allow_index_in_robots_txt is set to false' do
SiteSetting.allow_index_in_robots_txt = false
get "/groups"
expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow')
end
context 'viewing groups of another user' do context 'viewing groups of another user' do
describe 'when an invalid username is given' do describe 'when an invalid username is given' do
it 'should return the right response' do it 'should return the right response' do