ActionItem680: being able to disable ssl

To disable SSL, just set disable_ssl = true in the environment. Like this: Environment.default.update_attributes(:disable_ssl => true) git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.11.x@2511 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem680: being able to disable ssl
To disable SSL, just set disable_ssl = true in the environment. Like this: Environment.default.update_attributes(:disable_ssl => true) git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.11.x@2511 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent c1d3f1a0
Showing 5 changed files with 34 additions and 7 deletions Show diff stats
app/controllers/application.rb
app/models/environment.rb
db/schema.rb
test/functional/application_controller_test.rb
test/unit/environment_test.rb
@@ -38,6 +38,7 @@ class ApplicationController &lt; ActionController::Base
     redirect_to_ssl
   end
   def redirect_to_ssl
+    return true if environment.disable_ssl
     redirect_to(params.merge(:protocol => 'https://'))
   end
@@ -283,6 +283,14 @@ class Environment &lt; ActiveRecord::Base
     result
   end
+  def disable_ssl
+    settings[:disable_ssl]
+  end
+
+  def disable_ssl=(value)
+    settings[:disable_ssl] = value
+  end
+
   def to_s
     self.name || '?'
   end
@@ -77,8 +77,8 @@ ActiveRecord::Schema.define(:version =&gt; 55) do
     t.boolean "virtual",     :default => false
   end
-  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
   add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
+  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
   create_table "blocks", :force => true do |t|
     t.string  "title"
@@ -118,8 +118,8 @@ ActiveRecord::Schema.define(:version =&gt; 55) do
     t.boolean "virtual",     :default => false
   end
-  add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
   add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
+  add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
   create_table "comments", :force => true do |t|
     t.string   "title"
@@ -186,8 +186,8 @@ ActiveRecord::Schema.define(:version =&gt; 55) do
     t.datetime "updated_at"
   end
-  add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
   add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id"
+  add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
   create_table "products", :force => true do |t|
     t.integer  "enterprise_id"
@@ -258,8 +258,8 @@ ActiveRecord::Schema.define(:version =&gt; 55) do
     t.datetime "created_at"
   end
-  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
   add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
   create_table "tags", :force => true do |t|
     t.string  "name"
@@ -292,9 +292,17 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
   end
   should 'add https protocols on redirect_to_ssl' do
-    @controller.expects(:params).returns(:x => '1', :y => '1')
-    @controller.expects(:redirect_to).with(:x => '1', :y => '1', :protocol => 'https://')
-    @controller.redirect_to_ssl
+    get :sslonly, :x => '1', :y => '1'
+    assert_redirected_to :x => '1', :y => '1', :protocol => 'https://'
+  end
+
+  should 'not force ssl when ssl is disabled' do
+    env = Environment.default
+    env.expects(:disable_ssl).returns(true)
+    @controller.stubs(:environment).returns(env)
+    @request.expects(:ssl?).returns(false).at_least_once
+    get :sslonly
+    assert_response :success
   end
 end
@@ -409,4 +409,14 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert !e.person_template.public?
   end
+  should 'not disable ssl by default' do
+    e = Environment.new
+    assert !e.disable_ssl
+  end
+
+  should 'be able to disable ssl' do
+    e = Environment.new(:disable_ssl => true)
+    assert_equal true, e.disable_ssl
+  end
+
 end
	@@ -38,6 +38,7 @@ class ApplicationController < ActionController::Base		@@ -38,6 +38,7 @@ class ApplicationController < ActionController::Base
38	redirect_to_ssl	38	redirect_to_ssl
39	end	39	end
40	def redirect_to_ssl	40	def redirect_to_ssl
		41	+ return true if environment.disable_ssl
41	redirect_to(params.merge(:protocol => 'https://'))	42	redirect_to(params.merge(:protocol => 'https://'))
42	end	43	end
43		44
	@@ -283,6 +283,14 @@ class Environment < ActiveRecord::Base		@@ -283,6 +283,14 @@ class Environment < ActiveRecord::Base
283	result	283	result
284	end	284	end
285		285
		286	+ def disable_ssl
		287	+ settings[:disable_ssl]
		288	+ end
		289	+
		290	+ def disable_ssl=(value)
		291	+ settings[:disable_ssl] = value
		292	+ end
		293	+
286	def to_s	294	def to_s
287	self.name \|\| '?'	295	self.name \|\| '?'
288	end	296	end
	@@ -292,9 +292,17 @@ class ApplicationControllerTest < Test::Unit::TestCase		@@ -292,9 +292,17 @@ class ApplicationControllerTest < Test::Unit::TestCase
292	end	292	end
293		293
294	should 'add https protocols on redirect_to_ssl' do	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	295	+ get :sslonly, :x => '1', :y => '1'
		296	+ assert_redirected_to :x => '1', :y => '1', :protocol => 'https://'
		297	+ end
		298	+
		299	+ should 'not force ssl when ssl is disabled' do
		300	+ env = Environment.default
		301	+ env.expects(:disable_ssl).returns(true)
		302	+ @controller.stubs(:environment).returns(env)
		303	+ @request.expects(:ssl?).returns(false).at_least_once
		304	+ get :sslonly
		305	+ assert_response :success
298	end	306	end
299		307
300	end	308	end
	@@ -409,4 +409,14 @@ class EnvironmentTest < Test::Unit::TestCase		@@ -409,4 +409,14 @@ class EnvironmentTest < Test::Unit::TestCase
409	assert !e.person_template.public?	409	assert !e.person_template.public?
410	end	410	end
411		411
		412	+ should 'not disable ssl by default' do
		413	+ e = Environment.new
		414	+ assert !e.disable_ssl
		415	+ end
		416	+
		417	+ should 'be able to disable ssl' do
		418	+ e = Environment.new(:disable_ssl => true)
		419	+ assert_equal true, e.disable_ssl
		420	+ end
		421	+
412	end	422	end