Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_param…

…s_master

Fix force_ssl redirect with params
  • Loading branch information...
commit 12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e 2 parents 275c3a1 + 30e5503
@josevalim josevalim authored
View
1  actionpack/lib/action_controller/metal/force_ssl.rb
@@ -29,6 +29,7 @@ def force_ssl(options = {})
if !request.ssl? && !Rails.env.development?
redirect_options = {:protocol => 'https://', :status => :moved_permanently}
redirect_options.merge!(:host => host) if host
+ redirect_options.merge!(:params => request.query_parameters)
flash.keep
redirect_to redirect_options
end
View
1  actionpack/lib/action_dispatch/routing/route_set.rb
@@ -567,6 +567,7 @@ def url_for(options)
path_addition, params = generate(path_options, path_segments || {})
path << path_addition
+ params.merge!(options[:params] || {})
ActionDispatch::Http::URL.url_for(options.merge!({
:path => path,
View
16 actionpack/test/controller/base_test.rb
@@ -158,6 +158,22 @@ def setup
rescue_action_in_public!
end
+ def test_url_for_query_params_included
+ rs = ActionDispatch::Routing::RouteSet.new
+ rs.draw do
+ match 'home' => 'pages#home'
+ end
+
+ options = {
+ :action => "home",
+ :controller => "pages",
+ :only_path => true,
+ :params => { "token" => "secret" }
+ }
+
+ assert_equal '/home?token=secret', rs.url_for(options)
+ end
+
def test_url_options_override
with_routing do |set|
set.draw do
View
6 actionpack/test/controller/force_ssl_test.rb
@@ -50,6 +50,12 @@ def test_banana_redirects_to_https
assert_equal "https://test.host/force_ssl_controller_level/banana", redirect_to_url
end
+ def test_banana_redirects_to_https_with_extra_params
+ get :banana, :token => "secret"
+ assert_response 301
+ assert_equal "https://test.host/force_ssl_controller_level/banana?token=secret", redirect_to_url
+ end
+
def test_cheeseburger_redirects_to_https
get :cheeseburger
assert_response 301
Please sign in to comment.
Something went wrong with that request. Please try again.