From: Go MAEDA <maeda@farend.jp>
Date: Mon, 23 Jan 2023 08:08:21 +0000 (+0000)
Subject: Fix robots.txt to disallow issue lists with a sort or query_id parameter in any posit... 
X-Git-Tag: 5.1.0~265
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c80c7f1d26e64407abe973b6a8e80c0260e5baa4;p=redmine.git

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
---

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?$})