erge changes

Ábner Silva de Oliveira
2 parents 2b942cdf 078060c7
Showing 3 changed files with 38 additions and 11 deletions Show diff stats
app/models/environment.rb
lib/noosfero/api/helpers.rb
test/unit/api/helpers_test.rb
@@ -326,7 +326,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?
@@ -255,7 +255,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
@@ -271,18 +270,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'
-              #TODO ADD SERPRO's CAPTCHA
+          d[:verify_uri] ||= 'http://captcha2.servicoscorporativos.serpro.gov.br/captchavalidar/1.0.0/validar'
+          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
       def verify_recaptcha_v1(remote_ip, private_key, api_recaptcha_verify_uri, recaptcha_challenge_field, recaptcha_response_field)
@@ -306,7 +307,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
@@ -325,6 +325,19 @@
         captcha_result["success"] ? true : captcha_result
       end
+      def verify_serpro_captcha(client_id, token, captcha_text, verify_uri)
+        if token == nil || captcha_text == nil
+          return _('Missing captcha data')
+        end
+        uri = URI(verify_uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        request = Net::HTTP::Post.new(uri.path)
+        verify_string = "#{client_id}&#{token}&#{captcha_text}"
+        request.body = verify_string
+        body = http.request(request).body
+        body == '1' ? true : body 
+      end
+
     end
   end
 end
@@ -164,7 +164,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
@@ -172,10 +173,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 = {
@@ -186,7 +187,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
@@ -199,7 +201,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
   should 'render not_found if endpoint is unavailable' do
	@@ -326,7 +326,7 @@ class Environment < ActiveRecord::Base		@@ -326,7 +326,7 @@ class Environment < ActiveRecord::Base
326		326
327	settings_items :signup_welcome_screen_body, :type => String	327	settings_items :signup_welcome_screen_body, :type => String
328		328
329	- #Captcha setings	329	+ #Captcha settings
330	settings_items :api_captcha_settings, :type => ActiveSupport::HashWithIndifferentAccess, :default => {}	330	settings_items :api_captcha_settings, :type => ActiveSupport::HashWithIndifferentAccess, :default => {}
331		331
332	def has_custom_welcome_screen?	332	def has_custom_welcome_screen?