ActionItem1165: fixing SSL support

* removing logic inversion in ssl support * using environment's default hostname instead of the request hostname for SSL links

ActionItem1165: fixing SSL support
* removing logic inversion in ssl support * using environment's default hostname instead of the request hostname for SSL links
Antonio Terceiro
1 parent 91226c8b
Showing 8 changed files with 42 additions and 29 deletions Show diff stats
app/controllers/application.rb
app/helpers/application_helper.rb
app/models/environment.rb
app/views/layouts/application.rhtml
test/functional/application_controller_test.rb
test/integration/login_to_the_application_test.rb
test/unit/application_helper_test.rb
test/unit/environment_test.rb
@@ -50,18 +50,24 @@ class ApplicationController &lt; ActionController::Base
     redirect_to_ssl
   end
   def redirect_to_ssl
-    return false if environment.disable_ssl
-    redirect_to(params.merge(:protocol => 'https://'))
-    true
+    if environment.enable_ssl
+      redirect_to(params.merge(:protocol => 'https://'))
+      true
+    else
+      false
+    end
   end
   def self.refuse_ssl(*options)
     before_filter :avoid_ssl, *options
   end
   def avoid_ssl
-    return true if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
-    redirect_to(params.merge(:protocol => 'http://'))
-    false
+    if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
+      true
+    else
+      redirect_to(params.merge(:protocol => 'http://'))
+      false
+    end
   end
   before_init_gettext :maybe_save_locale
@@ -792,12 +792,16 @@ module ApplicationHelper
   def login_url
     options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
-    if !environment.disable_ssl && (ENV['RAILS_ENV'] != 'development')
-      options.merge!(:protocol => 'https://', :host => request.host)
+    if environment.enable_ssl && (ENV['RAILS_ENV'] != 'development')
+      options.merge!(:protocol => 'https://', :host => ssl_hostname)
     end
     url_for(options)
   end
+  def ssl_hostname
+    environment.default_hostname
+  end
+
   def base_url
     environment.top_url(request.ssl?)
   end
@@ -513,12 +513,12 @@ class Environment &lt; ActiveRecord::Base
     result
   end
-  def disable_ssl
-    settings[:disable_ssl]
+  def enable_ssl
+    settings[:enable_ssl]
   end
-  def disable_ssl=(value)
-    settings[:disable_ssl] = value
+  def enable_ssl=(value)
+    settings[:enable_ssl] = value
   end
   def to_s
@@ -87,7 +87,7 @@
                         :id=>"menu_link_to_envhome",
                         :title=>@environment.name  %>
           <% unless environment.enabled?(:disable_categories) %>
-            <% cache(environment.name.id.to_s +  '_categories_menu') do %>
+            <% cache(environment.id.to_s +  '_categories_menu') do %>
               <%= render :file => 'shared/categories_menu' %>
             <% end %>
           <% end %>
@@ -267,6 +267,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
   end
   should 'require ssl when told to' do
+    Environment.default.update_attribute(:enable_ssl, true)
     @request.expects(:ssl?).returns(false).at_least_once
     get :sslonly
     assert_redirected_to :protocol => 'https://'
@@ -292,6 +293,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
   end
   should 'keep arguments when redirecting to ssl' do
+    Environment.default.update_attribute(:enable_ssl, true)
     @request.expects(:ssl?).returns(false).at_least_once
     get :sslonly, :x => '1', :y => '2'
     assert_redirected_to :protocol => 'https://', :x => '1', :y => '2'
@@ -327,13 +329,14 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
   end
   should 'add https protocols on redirect_to_ssl' do
+    Environment.default.update_attribute(:enable_ssl, true)
     get :sslonly, :x => '1', :y => '1'
     assert_redirected_to :x => '1', :y => '1', :protocol => 'https://'
   end
   should 'return true in redirect_to_ssl' do
     env = mock
-    env.expects(:disable_ssl).returns(false)
+    env.expects(:enable_ssl).returns(true)
     @controller.expects(:environment).returns(env)
     @controller.expects(:params).returns({})
     @controller.expects(:redirect_to).with({:protocol => 'https://'})
@@ -341,14 +344,14 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
   end
   should 'return false in redirect_to_ssl when ssl is disabled' do
     env = mock
-    env.expects(:disable_ssl).returns(true)
+    env.expects(:enable_ssl).returns(false)
     @controller.expects(:environment).returns(env)
     assert_equal false, @controller.redirect_to_ssl
   end
   should 'not force ssl when ssl is disabled' do
     env = Environment.default
-    env.expects(:disable_ssl).returns(true)
+    env.expects(:enable_ssl).returns(false)
     @controller.stubs(:environment).returns(env)
     @request.expects(:ssl?).returns(false).at_least_once
     get :sslonly
@@ -20,7 +20,7 @@ class LoginToTheApplicationTest &lt; ActionController::IntegrationTest
   end
   def test_unauthenticated_user_tries_to_access_his_control_panel
-    Environment.any_instance.stubs(:disable_ssl).returns(true) # ignore SSL for this test 
+    Environment.any_instance.stubs(:enable_ssl).returns(false) # ignore SSL for this test 
     get '/myprofile/ze'
     assert_redirected_to '/account/login'
@@ -195,19 +195,19 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'use https:// for login_url' do
-    environment = mock
-    environment.expects(:disable_ssl).returns(false)
+    environment = Environment.default
+    environment.update_attribute(:enable_ssl, true)
+    environment.domains << Domain.new(:name => "test.domain.net", :is_default => true)
     stubs(:environment).returns(environment)
-    request = mock
-    request.stubs(:host).returns('myhost.net')
-    stubs(:request).returns(request)
-    stubs(:url_for).with(has_entries(:protocol => 'https://', :host => 'myhost.net')).returns('LALALA')
+
+    stubs(:url_for).with(has_entries(:protocol => 'https://', :host => 'test.domain.net')).returns('LALALA')
+
     assert_equal 'LALALA', login_url
   end
   should 'not force ssl in login_url when environment has ssl disabled' do
     environment = mock
-    environment.expects(:disable_ssl).returns(true).at_least_once
+    environment.expects(:enable_ssl).returns(false).at_least_once
     stubs(:environment).returns(environment)
     request = mock
     request.stubs(:host).returns('localhost')
@@ -487,14 +487,14 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal template, e.enterprise_template 
   end
-  should 'not disable ssl by default' do
+  should 'not enable ssl by default' do
     e = Environment.new
-    assert !e.disable_ssl
+    assert !e.enable_ssl
   end
-  should 'be able to disable ssl' do
-    e = Environment.new(:disable_ssl => true)
-    assert_equal true, e.disable_ssl
+  should 'be able to enable ssl' do
+    e = Environment.new(:enable_ssl => true)
+    assert_equal true, e.enable_ssl
   end
   should 'have a layout template' do
	@@ -87,7 +87,7 @@		@@ -87,7 +87,7 @@
87	:id=>"menu_link_to_envhome",	87	:id=>"menu_link_to_envhome",
88	:title=>@environment.name %>	88	:title=>@environment.name %>
89	<% unless environment.enabled?(:disable_categories) %>	89	<% unless environment.enabled?(:disable_categories) %>
90	- <% cache(environment.name.id.to_s + '_categories_menu') do %>	90	+ <% cache(environment.id.to_s + '_categories_menu') do %>
91	<%= render :file => 'shared/categories_menu' %>	91	<%= render :file => 'shared/categories_menu' %>
92	<% end %>	92	<% end %>
93	<% end %>	93	<% end %>
	@@ -20,7 +20,7 @@ class LoginToTheApplicationTest < ActionController::IntegrationTest		@@ -20,7 +20,7 @@ class LoginToTheApplicationTest < ActionController::IntegrationTest
20	end	20	end
21		21
22	def test_unauthenticated_user_tries_to_access_his_control_panel	22	def test_unauthenticated_user_tries_to_access_his_control_panel
23	- Environment.any_instance.stubs(:disable_ssl).returns(true) # ignore SSL for this test	23	+ Environment.any_instance.stubs(:enable_ssl).returns(false) # ignore SSL for this test
24		24
25	get '/myprofile/ze'	25	get '/myprofile/ze'
26	assert_redirected_to '/account/login'	26	assert_redirected_to '/account/login'