stoa-plugin: not test ssl connection on Noosfero

Our default ssl setup uses a reverse proxy (pound) that treats https connection and passes clean http connections to Noosfero. That way, even using https connections Noosfero will only see http connections. So we can't test if the connection is ssl inside Noosfero.

stoa-plugin: not test ssl connection on Noosfero
Our default ssl setup uses a reverse proxy (pound) that treats https connection and passes clean http connections to Noosfero. That way, even using https connections Noosfero will only see http connections. So we can't test if the connection is ssl inside Noosfero.
Rodrigo Souto
1 parent b7823262
Showing 2 changed files with 2 additions and 21 deletions Show diff stats
plugins/stoa/controllers/stoa_plugin_controller.rb
plugins/stoa/test/functional/stoa_plugin_controller_test.rb
@@ -6,7 +6,7 @@ class StoaPluginController &lt; PublicController
   include StoaPlugin::PersonFields
   def authenticate
-    if request.ssl? && request.post?
+    if request.post?
       if params[:login].blank?
         person = Person.find_by_usp_id(params[:usp_id])
         login = person ? person.user.login : nil
@@ -22,7 +22,7 @@ class StoaPluginController &lt; PublicController
       end
       render :text => result.to_json
     else
-      render :text => { :error => _('Conection requires SSL certificate and post method.'), :ok => false }.to_json
+      render :text => { :error => _('Conection requires post method.'), :ok => false }.to_json
     end
   end
@@ -24,23 +24,13 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   attr_accessor :user
   should 'not authenticate if method not post' do
-    @request.stubs(:ssl?).returns(true)
     get :authenticate, :login => user.login, :password => '123456'
     assert_not_nil json_response['error']
     assert_match /post method/,json_response['error']
   end
-  should 'not authenticate if request is not using ssl' do
-    @request.stubs(:ssl?).returns(false)
-    post :authenticate, :login => user.login, :password => '123456'
-
-    assert_not_nil json_response['error']
-    assert_match /SSL/,json_response['error']
-  end
-
   should 'not authenticate if method password is wrong' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => 'wrong_password'
     assert_not_nil json_response['error']
@@ -48,7 +38,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'authenticate if everything is right' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => '123456'
     assert_nil json_response['error']
@@ -56,7 +45,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'authenticate with usp_id' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :usp_id => user.person.usp_id.to_s, :password => '123456'
     assert_nil json_response['error']
@@ -64,7 +52,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'return no fields if fields requested was none' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => '123456', :fields => 'none'
     expected_response = {'ok' => true}
@@ -74,7 +61,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'return only the essential fields if no fields requested' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => '123456'
     response = json_response.clone
@@ -87,7 +73,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'return only selected fields' do
-    @request.stubs(:ssl?).returns(true)
     Person.any_instance.stubs(:f1).returns('field1')
     Person.any_instance.stubs(:f2).returns('field2')
     Person.any_instance.stubs(:f3).returns('field3')
@@ -104,7 +89,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'not return private fields' do
-    @request.stubs(:ssl?).returns(true)
     Person.any_instance.stubs(:f1).returns('field1')
     Person.any_instance.stubs(:f2).returns('field2')
     Person.any_instance.stubs(:f3).returns('field3')
@@ -121,7 +105,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'return essential fields even if they are private' do
-    @request.stubs(:ssl?).returns(true)
     person = user.person
     person.fields_privacy = {:email => 'private'}
     person.save!
@@ -132,7 +115,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'return only essential fields when profile is private' do
-    @request.stubs(:ssl?).returns(true)
     Person.any_instance.stubs(:f1).returns('field1')
     Person.any_instance.stubs(:f2).returns('field2')
     Person.any_instance.stubs(:f3).returns('field3')
@@ -153,7 +135,6 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
   end
   should 'not crash if usp_id is invalid' do
-    @request.stubs(:ssl?).returns(true)
     assert_nothing_raised do
       post :authenticate, :usp_id => 12321123, :password => '123456'
     end
	@@ -6,7 +6,7 @@ class StoaPluginController < PublicController		@@ -6,7 +6,7 @@ class StoaPluginController < PublicController
6	include StoaPlugin::PersonFields	6	include StoaPlugin::PersonFields
7		7
8	def authenticate	8	def authenticate
9	- if request.ssl? && request.post?	9	+ if request.post?
10	if params[:login].blank?	10	if params[:login].blank?
11	person = Person.find_by_usp_id(params[:usp_id])	11	person = Person.find_by_usp_id(params[:usp_id])
12	login = person ? person.user.login : nil	12	login = person ? person.user.login : nil
	@@ -22,7 +22,7 @@ class StoaPluginController < PublicController		@@ -22,7 +22,7 @@ class StoaPluginController < PublicController
22	end	22	end
23	render :text => result.to_json	23	render :text => result.to_json
24	else	24	else
25	- render :text => { :error => _('Conection requires SSL certificate and post method.'), :ok => false }.to_json	25	+ render :text => { :error => _('Conection requires post method.'), :ok => false }.to_json
26	end	26	end
27	end	27	end
28		28