Support for Serpro captcha backend

Evandro Junior
1 parent 95f84d2d
Showing 4 changed files with 26 additions and 15 deletions Show diff stats
app/models/environment.rb
lib/noosfero/api/helpers.rb
lib/noosfero/api/session.rb
test/unit/api/helpers_test.rb
@@ -310,7 +310,7 @@ class Environment &lt; ActiveRecord::Base
   settings_items :signup_welcome_screen_body, :type => String
-  #Captcha setings
+  #Captcha settings
   settings_items :api_captcha_settings, :type => ActiveSupport::HashWithIndifferentAccess, :default => {}
   def has_custom_welcome_screen?
@@ -202,7 +202,6 @@
       def period(from_date, until_date)
         begin_period = from_date.nil? ? Time.at(0).to_datetime : from_date
         end_period = until_date.nil? ? DateTime.now : until_date
-
         begin_period..end_period
       end
@@ -211,7 +210,6 @@
       ##########################################
       def test_captcha(remote_ip, params, _environment = nil)
-        binding.pry
         environment ||= _environment
         d = environment.api_captcha_settings
         return true unless d[:enabled] == true
@@ -219,19 +217,20 @@
         if d[:provider] == 'google'
           raise ArgumentError, "Environment api_captcha_settings private_key not defined" if d[:private_key].nil?
           raise ArgumentError, "Environment api_captcha_settings version not defined" unless d[:version] == 1 || d[:version] == 2
-          raise ArgumentError, "Environment api_captcha_settings verify_uri not defined" if d[:verify_uri].nil?
           if d[:version]  == 1
+            d[:verify_uri] ||= 'https://www.google.com/recaptcha/api/verify'
             return verify_recaptcha_v1(remote_ip, d[:private_key], d[:verify_uri], params[:recaptcha_challenge_field], params[:recaptcha_response_field])
           end
           if d[:version] == 2
+            d[:verify_uri] ||= 'https://www.google.com/recaptcha/api/siteverify'
             return verify_recaptcha_v2(remote_ip, d[:private_key], d[:verify_uri], params[:g_recaptcha_response])
           end
         end
         if d[:provider] == 'serpro'
-          return verify_serpro_captcha(d[:serpro_client_id], params[:txtToken_captcha_serpro_gov_br], params[:captcha_text])
+          d[:verify_uri] ||= 'http://captcha.servicoscorporativos.serpro.gov.br'
+          return verify_serpro_captcha(d[:serpro_client_id], params[:txtToken_captcha_serpro_gov_br], params[:captcha_text], d[:verify_uri])
         end
-
         raise ArgumentError, "Environment api_captcha_settings provider not defined"
       end
@@ -256,7 +255,6 @@
       end
       def verify_recaptcha_v2(remote_ip, private_key, api_recaptcha_verify_uri, g_recaptcha_response)
-
         if g_recaptcha_response == nil
           return _('Missing captcha data')
         end
@@ -275,8 +273,7 @@
         captcha_result["success"] ? true : captcha_result
       end
-      def verify_serpro_captcha(client_id, token, captcha_text)
-        verify_uri = 'http://homcaptcha.servicoscorporativos.serpro.gov.br/captchavalidar/1.0.0/validar'
+      def verify_serpro_captcha(client_id, token, captcha_text, verify_uri)
         if token == nil || captcha_text == nil
           return _('Missing captcha data')
         end
@@ -41,7 +41,7 @@ module Noosfero
         attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields
         remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
-        unless test_captcha(remote_ip, params) === true
+        if test_captcha(remote_ip, params, environment) != true
           render_api_error!(_('Please solve the test in order to register.'), 401)
           return
         end
@@ -163,7 +163,8 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
   should 'do not test captcha when there are no settings' do
     environment = Environment.new
-    assert test_captcha("127.0.0.1", {}, environment)
+    stubs(:environment).returns(environment)
+    assert test_captcha("127.0.0.1", {})
   end
   should 'do not test captcha when captcha is disabled on settings' do
@@ -171,10 +172,10 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     environment.api_captcha_settings = {
         enabled: false,
     }
-    assert   test_captcha("127.0.0.1", {}, environment)
+    stubs(:environment).returns(environment)
+    assert test_captcha("127.0.0.1", {})
   end
-
   should 'fail display recaptcha v1' do
     environment = Environment.new
     environment.api_captcha_settings = {
@@ -185,7 +186,8 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
         public_key:   '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-',
         verify_uri:   'https://www.google.com/recaptcha/api/verify',
     }
-    assert_equal test_captcha("127.0.0.1", {}, environment), "Missing captcha data"
+    stubs(:environment).returns(environment)
+    assert_equal test_captcha("127.0.0.1", {}), "Missing captcha data"
   end
   should 'fail display recaptcha v2' do
@@ -198,7 +200,19 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
         public_key:   '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-',
         verify_uri:   'https://www.google.com/recaptcha/api/siteverify',
     }
-    assert_equal test_captcha("127.0.0.1", {}, environment), "Missing captcha data"
+    stubs(:environment).returns(environment)
+    assert_equal test_captcha("127.0.0.1", {}), "Missing captcha data"
+  end
+
+  should 'fail display Serpro captcha' do
+    environment = Environment.new
+    environment.api_captcha_settings = {
+        enabled: true,
+        provider: 'serpro',
+        serpro_client_id:  '0000000000000000',
+    }
+    stubs(:environment).returns(environment)
+    assert_equal test_captcha("127.0.0.1", {}), "Missing captcha data"
   end
   protected
	@@ -310,7 +310,7 @@ class Environment < ActiveRecord::Base		@@ -310,7 +310,7 @@ class Environment < ActiveRecord::Base
310		310
311	settings_items :signup_welcome_screen_body, :type => String	311	settings_items :signup_welcome_screen_body, :type => String
312		312
313	- #Captcha setings	313	+ #Captcha settings
314	settings_items :api_captcha_settings, :type => ActiveSupport::HashWithIndifferentAccess, :default => {}	314	settings_items :api_captcha_settings, :type => ActiveSupport::HashWithIndifferentAccess, :default => {}
315		315
316	def has_custom_welcome_screen?	316	def has_custom_welcome_screen?
	@@ -41,7 +41,7 @@ module Noosfero		@@ -41,7 +41,7 @@ module Noosfero
41	attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields	41	attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields
42	remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) \|\| (env && env['REMOTE_ADDR'])	42	remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) \|\| (env && env['REMOTE_ADDR'])
43		43
44	- unless test_captcha(remote_ip, params) === true	44	+ if test_captcha(remote_ip, params, environment) != true
45	render_api_error!(_('Please solve the test in order to register.'), 401)	45	render_api_error!(_('Please solve the test in order to register.'), 401)
46	return	46	return
47	end	47	end