##// END OF EJS Templates
Merged r13040 (#16467)....
Jean-Philippe Lang -
r12770:0565e3371ee4
parent child
Show More
@@ -379,7 +379,7 class ApplicationController < ActionController::Base
379 begin
379 begin
380 uri = URI.parse(back_url)
380 uri = URI.parse(back_url)
381 # do not redirect user to another host or to the login or register page
381 # do not redirect user to another host or to the login or register page
382 if ((uri.relative? && back_url.match(%r{\A/\w})) || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
382 if ((uri.relative? && back_url.match(%r{\A/(\w.*)?\z})) || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
383 redirect_to(back_url)
383 redirect_to(back_url)
384 return
384 return
385 end
385 end
@@ -43,8 +43,14 class AccountControllerTest < ActionController::TestCase
43
43
44 def test_login_should_redirect_to_back_url_param
44 def test_login_should_redirect_to_back_url_param
45 # request.uri is "test.host" in test environment
45 # request.uri is "test.host" in test environment
46 post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1'
46 back_urls = [
47 assert_redirected_to '/issues/show/1'
47 'http://test.host/issues/show/1',
48 '/'
49 ]
50 back_urls.each do |back_url|
51 post :login, :username => 'jsmith', :password => 'jsmith', :back_url => back_url
52 assert_redirected_to back_url
53 end
48 end
54 end
49
55
50 def test_login_should_not_redirect_to_another_host
56 def test_login_should_not_redirect_to_another_host
General Comments 0
You need to be logged in to leave comments. Login now