summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2023-01-23 08:08:21 +0000
committerGo MAEDA <maeda@farend.jp>2023-01-23 08:08:21 +0000
commitc80c7f1d26e64407abe973b6a8e80c0260e5baa4 (patch)
treeb2afa4378f5ef708e6a089b0ec9bb718e1c875dd
parent055856825783b7e1303c7cad8e99779d5f4567fc (diff)
downloadredmine-c80c7f1d26e64407abe973b6a8e80c0260e5baa4.tar.gz
redmine-c80c7f1d26e64407abe973b6a8e80c0260e5baa4.zip
Fix robots.txt to disallow issue lists with a sort or query_id parameter in any position, not just first (#38201).
Patch by Felix Schäfer. git-svn-id: https://svn.redmine.org/redmine/trunk@22070 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/welcome/robots.text.erb4
-rw-r--r--test/integration/welcome_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/welcome/robots.text.erb b/app/views/welcome/robots.text.erb
index 0eabf6cff..ed8c230ec 100644
--- a/app/views/welcome/robots.text.erb
+++ b/app/views/welcome/robots.text.erb
@@ -13,8 +13,8 @@ Disallow: <%= url_for(issues_gantt_path) %>
Disallow: <%= url_for(issues_calendar_path) %>
Disallow: <%= url_for(activity_path) %>
Disallow: <%= url_for(search_path) %>
-Disallow: <%= url_for(issues_path(:sort => '')) %>
-Disallow: <%= url_for(issues_path(:query_id => '')) %>
+Disallow: <%= url_for(issues_path) %>?*sort=
+Disallow: <%= url_for(issues_path) %>?*query_id=
Disallow: <%= url_for(issues_path) %>?*set_filter=
Disallow: <%= url_for(issues_path(:trailing_slash => true)) %>*.pdf$
Disallow: <%= url_for(projects_path(:trailing_slash => true)) %>*.pdf$
diff --git a/test/integration/welcome_test.rb b/test/integration/welcome_test.rb
index a27f6869e..d1b0c8889 100644
--- a/test/integration/welcome_test.rb
+++ b/test/integration/welcome_test.rb
@@ -31,7 +31,7 @@ class WelcomeTest < Redmine::IntegrationTest
assert_equal 'text/plain', @response.media_type
# Redmine::Utils.relative_url_root does not effect on Rails 5.1.4.
assert @response.body.match(%r{^Disallow: /projects/ecookbook/issues\r?$})
- assert @response.body.match(%r{^Disallow: /issues\?sort=\r?$})
+ assert @response.body.match(%r{^Disallow: /issues\?\*sort=\r?$})
assert @response.body.match(%r{^Disallow: /issues\?\*set_filter=\r?$})
assert @response.body.match(%r{^Disallow: /issues/\*\.pdf\$\r?$})
assert @response.body.match(%r{^Disallow: /projects/\*\.pdf\$\r?$})