diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-03-29 14:53:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-03-29 14:53:13 +0000 |
| commit | 1807093b75428f400a46321561c65169a1087621 (patch) | |
| tree | b5809951f9f3e349e386aafdacc07136e1583702 | |
| parent | 665767db440f2e81f03a6604ffda30828b9405fb (diff) | |
| download | redmine-1807093b75428f400a46321561c65169a1087621.tar.gz redmine-1807093b75428f400a46321561c65169a1087621.zip | |
Merged r13018 (#16466).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13027 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | test/functional/account_controller_test.rb | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 43257b2bf..1e251c2a4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -379,7 +379,7 @@ class ApplicationController < ActionController::Base begin uri = URI.parse(back_url) # do not redirect user to another host or to the login or register page - if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)}) + if ((uri.relative? && back_url.match(%r{\A/\w})) || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)}) redirect_to(back_url) return end diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index 35074bd4e..e9156957c 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -66,8 +66,14 @@ class AccountControllerTest < ActionController::TestCase end def test_login_should_not_redirect_to_another_host - post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.foo/fake' - assert_redirected_to '/my/page' + back_urls = [ + 'http://test.foo/fake', + '//test.foo/fake' + ] + back_urls.each do |back_url| + post :login, :username => 'jsmith', :password => 'jsmith', :back_url => back_url + assert_redirected_to '/my/page' + end end def test_login_with_wrong_password |