diff options
| author | Ryan McGeary <ryan@mcgeary.org> | 2012-02-06 17:47:17 -0500 |
|---|---|---|
| committer | Ryan McGeary <ryan@mcgeary.org> | 2012-02-06 17:47:17 -0500 |
| commit | 391e6a47dbd46fdce0a472819e8d27792cc91984 (patch) | |
| tree | c6959229ef34ce1155100d7aeb14225315f6daf8 | |
| parent | dd54137e82852ce3a62ce20ecc8550f1ca3a9f96 (diff) | |
| download | rails-391e6a47dbd46fdce0a472819e8d27792cc91984.tar.gz rails-391e6a47dbd46fdce0a472819e8d27792cc91984.tar.bz2 rails-391e6a47dbd46fdce0a472819e8d27792cc91984.zip | |
Fixed force_ssl redirects to include original query params
`ActionController.force_ssl` redirects http URLs to their https equivalent;
however, when a URL contains a query string, the resulting redirect lacked the
original query string.
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/controller/force_ssl_test.rb | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index 0fd42f9d8a..7a0ede02a2 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -29,6 +29,7 @@ module ActionController 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) redirect_to redirect_options end end diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 06919518e8..552d472afa 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -575,6 +575,7 @@ module ActionDispatch path_addition, params = generate(path_options, path_segments || {}) path << path_addition + params.merge!(options[:params] || {}) ActionDispatch::Http::URL.url_for(options.merge!({ :path => path, diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb index 43b20fdead..3cbc111ebb 100644 --- a/actionpack/test/controller/force_ssl_test.rb +++ b/actionpack/test/controller/force_ssl_test.rb @@ -35,6 +35,12 @@ class ForceSSLControllerLevelTest < ActionController::TestCase 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 |