Download as
Browse Code »

Commit e99eb5ca9cad3c5c787aa82fdf05485b7c4a48e0

Authored by AntonioTerceiro
1 parent 1533ee71
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem438: don't loose parameters in custom SSL handling 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2477 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 11 additions and 2 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @e99eb5c
@@ -35,6 +35,9 @@ class ApplicationController < ActionController::Base @@ -35,6 +35,9 @@ class ApplicationController < ActionController::Base
35 end 35 end
36 def check_ssl 36 def check_ssl
37 return true if (request.ssl? || ENV['RAILS_ENV'] == 'development') 37 return true if (request.ssl? || ENV['RAILS_ENV'] == 'development')
  38 + redirect_to_ssl
  39 + end
  40 + def redirect_to_ssl
38 redirect_to(params.merge(:protocol => 'https://')) 41 redirect_to(params.merge(:protocol => 'https://'))
39 end 42 end
40 43
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @e99eb5c
@@ -29,7 +29,7 @@ class ContentViewerController < ApplicationController @@ -29,7 +29,7 @@ class ContentViewerController < ApplicationController
29 end 29 end
30 30
31 if !@page.public? && !request.ssl? 31 if !@page.public? && !request.ssl?
32 - redirect_to :protocol => 'https://' 32 + redirect_to_ssl
33 return 33 return
34 end 34 end
35 35
test/functional/application_controller_test.rb
  Diff comments   View file @e99eb5c
@@ -291,4 +291,10 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -291,4 +291,10 @@ class ApplicationControllerTest < Test::Unit::TestCase
291 assert_redirected_to :protocol => 'http://', :x => '1', :y => '2' 291 assert_redirected_to :protocol => 'http://', :x => '1', :y => '2'
292 end 292 end
293 293
  294 + should 'add https protocols on redirect_to_ssl' do
  295 + @controller.expects(:params).returns(:x => '1', :y => '1')
  296 + @controller.expects(:redirect_to).with(:x => '1', :y => '1', :protocol => 'https://')
  297 + @controller.redirect_to_ssl
  298 + end
  299 +
294 end 300 end
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @e99eb5c
@@ -421,7 +421,7 @@ class ContentViewerControllerTest < Test::Unit::TestCase @@ -421,7 +421,7 @@ class ContentViewerControllerTest < Test::Unit::TestCase
421 should 'require SSL for viewing non-public articles' do 421 should 'require SSL for viewing non-public articles' do
422 page = profile.articles.create!(:name => 'myarticle', :body => 'top secret', :public_article => false) 422 page = profile.articles.create!(:name => 'myarticle', :body => 'top secret', :public_article => false)
423 get :view_page, :profile => 'testinguser', :page => [ 'myarticle' ] 423 get :view_page, :profile => 'testinguser', :page => [ 'myarticle' ]
424 - assert_redirected_to :protocol => 'https://' 424 + assert_redirected_to :protocol => 'https://', :profile => 'testinguser', :page => [ 'myarticle' ]
425 end 425 end
426 426
427 should 'not redirect to SSL if already on SSL' do 427 should 'not redirect to SSL if already on SSL' do