Download as
Browse Code »

Commit c3f4edc38cfeb750c259a814d35f1360c4836765

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 0a37bbec
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

ActionItem969: crash when viewing RSS feed under SSL(HTTPS)

Showing 2 changed files with 12 additions and 0 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @c3f4edc
@@ -67,6 +67,7 @@ class ApplicationController < ActionController::Base @@ -67,6 +67,7 @@ class ApplicationController < ActionController::Base
67 def avoid_ssl 67 def avoid_ssl
68 return true if (!request.ssl? || ENV['RAILS_ENV'] == 'development') 68 return true if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
69 redirect_to(params.merge(:protocol => 'http://')) 69 redirect_to(params.merge(:protocol => 'http://'))
  70 + false
70 end 71 end
71 72
72 before_init_gettext :maybe_save_locale 73 before_init_gettext :maybe_save_locale
test/functional/application_controller_test.rb
  Diff comments   View file @c3f4edc
@@ -412,4 +412,15 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -412,4 +412,15 @@ class ApplicationControllerTest < Test::Unit::TestCase
412 assert_no_tag :tag => 'div', :attributes => {:id => 'block-' + b.id.to_s} 412 assert_no_tag :tag => 'div', :attributes => {:id => 'block-' + b.id.to_s}
413 end 413 end
414 414
  415 + should 'return false when not avoid ssl' do
  416 + req = mock
  417 + req.stubs(:ssl?).returns(true)
  418 +
  419 + @controller.expects(:request).returns(req)
  420 + @controller.stubs(:params).returns({})
  421 + @controller.stubs(:redirect_to)
  422 +
  423 + assert_equal false, @controller.avoid_ssl
  424 + end
  425 +
415 end 426 end