recaptcha 0.3.6 → 0.6.0

data/lib/recaptcha/configuration.rb

@@ -28,9 +28,7 @@ module Recaptcha
   #   end
   #
   class Configuration
-    attr_accessor :nonssl_api_server_url,
-                  :ssl_api_server_url,
-                  :verify_url,
+    attr_accessor :api_version, 
                   :skip_verify_env,
                   :private_key,
                   :public_key,
@@ -39,20 +37,38 @@ module Recaptcha
                   :use_ssl_by_default
 
     def initialize #:nodoc:
-      @nonssl_api_server_url      = RECAPTCHA_API_SERVER_URL
-      @ssl_api_server_url         = RECAPTCHA_API_SECURE_SERVER_URL
-      @verify_url                 = RECAPTCHA_VERIFY_URL
+      @api_version                = RECAPTCHA_API_VERSION
       @skip_verify_env            = SKIP_VERIFY_ENV
       @handle_timeouts_gracefully = HANDLE_TIMEOUTS_GRACEFULLY
       @use_ssl_by_default         = USE_SSL_BY_DEFAULT
 
       @private_key           = ENV['RECAPTCHA_PRIVATE_KEY']
-      @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']
+      @public_key            = ENV['RECAPTCHA_PUBLIC_KEY']      
     end
 
     def api_server_url(ssl = nil) #:nodoc:
       ssl = use_ssl_by_default if ssl.nil?
       ssl ? ssl_api_server_url : nonssl_api_server_url
     end
+
+    def nonssl_api_server_url
+      CONFIG[@api_version]['server_url']
+    end
+
+    def ssl_api_server_url
+      CONFIG[@api_version]['secure_server_url']
+    end
+
+    def verify_url
+      CONFIG[@api_version]['verify_url']
+    end
+
+    def v1?
+      @api_version == 'v1'
+    end
+
+    def v2?
+      @api_version == 'v2'
+    end
   end
 end

data/lib/recaptcha/rails.rb

@@ -1,5 +1,13 @@
 require 'net/http'
 require 'recaptcha'
 
-ActionView::Base.send(:include, Recaptcha::ClientHelper)
-ActionController::Base.send(:include, Recaptcha::Verify)
+module Rails
+  module Recaptcha
+    class Railtie < Rails::Railtie
+      initializer :recaptcha do
+        ActionView::Base.send(:include, ::Recaptcha::ClientHelper)
+        ActionController::Base.send(:include, ::Recaptcha::Verify)
+      end
+    end
+  end
+end

data/lib/recaptcha/token.rb

@@ -0,0 +1,24 @@
+require 'json'
+require 'recaptcha'
+require 'base64'
+require 'securerandom'
+require 'openssl'
+
+module Recaptcha
+  module Token
+
+    def self.secure_token
+      private_key  =  Recaptcha.configuration.private_key
+      raise RecaptchaError, "No private key specified." unless private_key
+
+      stoken_json = {'session_id' => SecureRandom.uuid, 'ts_ms' => (Time.now.to_f * 1000).to_i}.to_json
+      cipher = OpenSSL::Cipher::AES128.new(:ECB)
+      private_key_digest = Digest::SHA1.digest(private_key)[0...16]
+
+      cipher.encrypt
+      cipher.key = private_key_digest
+      encrypted_stoken = cipher.update(stoken_json) << cipher.final
+      Base64.urlsafe_encode64(encrypted_stoken).gsub(/\=+\Z/, '')
+    end
+  end
+end

data/lib/recaptcha/verify.rb

@@ -1,15 +1,17 @@
 require "uri"
+require "json"
+
 module Recaptcha
   module Verify
+    DEFAULT_TIMEOUT = 3
+
     # Your private API can be specified in the +options+ hash or preferably
     # using the Configuration.
     def verify_recaptcha(options = {})
-      if !options.is_a? Hash
-        options = {:model => options}
-      end
+      options = {:model => options} unless options.is_a? Hash
 
-      env = options[:env] || ENV['RAILS_ENV']
-      return true if Recaptcha.configuration.skip_verify_env.include? env
+      env_options = options[:env] || ENV['RAILS_ENV'] || (Rails.env if defined? Rails.env)
+      return true if Recaptcha.configuration.skip_verify_env.include? env_options
       model = options[:model]
       attribute = options[:attribute] || :base
       private_key = options[:private_key] || Recaptcha.configuration.private_key
@@ -17,59 +19,98 @@ module Recaptcha
 
       begin
         recaptcha = nil
-        if(Recaptcha.configuration.proxy)
+        if Recaptcha.configuration.proxy
           proxy_server = URI.parse(Recaptcha.configuration.proxy)
           http = Net::HTTP::Proxy(proxy_server.host, proxy_server.port, proxy_server.user, proxy_server.password)
         else
           http = Net::HTTP
         end
 
-        Timeout::timeout(options[:timeout] || 3) do
-          recaptcha = http.post_form(URI.parse(Recaptcha.configuration.verify_url), {
+        # env['REMOTE_ADDR'] to retrieve IP for Grape API
+        remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
+        if Recaptcha.configuration.v1?
+          verify_hash = {
             "privatekey" => private_key,
-            "remoteip"   => request.remote_ip,
+            "remoteip"   => remote_ip,
             "challenge"  => params[:recaptcha_challenge_field],
             "response"   => params[:recaptcha_response_field]
-          })
+          }
+          Timeout::timeout(options[:timeout] || DEFAULT_TIMEOUT) do
+            recaptcha = http.post_form(URI.parse(Recaptcha.configuration.verify_url), verify_hash)
+          end
+          answer, error = recaptcha.body.split.map { |s| s.chomp }
         end
-        answer, error = recaptcha.body.split.map { |s| s.chomp }
-        unless answer == 'true'
-          flash[:recaptcha_error] = if defined?(I18n)
-            I18n.translate("recaptcha.errors.#{error}", {:default => error})
-          else
-            error
+
+        if Recaptcha.configuration.v2?
+          verify_hash = {
+            "secret"    => private_key,
+            "remoteip"  => remote_ip,
+            "response"  => params['g-recaptcha-response']
+          }
+
+          Timeout::timeout(options[:timeout] || DEFAULT_TIMEOUT) do
+            uri = URI.parse(Recaptcha.configuration.verify_url + '?' + verify_hash.to_query)
+            http_instance = http.new(uri.host, uri.port)
+            if uri.port == 443
+              http_instance.use_ssl =
+              http_instance.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            end
+            request = Net::HTTP::Get.new(uri.request_uri)
+            recaptcha = http_instance.request(request)
+          end
+          answer, error = JSON.parse(recaptcha.body).values
+        end
+
+        if answer.to_s == 'true'
+          flash.delete(:recaptcha_error) if request_in_html_format?
+          true
+        else
+          error = 'verification_failed' if error && Recaptcha.configuration.v2?
+          if request_in_html_format?
+            flash[:recaptcha_error] = if defined?(I18n)
+              I18n.translate("recaptcha.errors.#{error}", default: error)
+            else
+              error
+            end
           end
 
           if model
             message = "Word verification response is incorrect, please try again."
-            message = I18n.translate('recaptcha.errors.verification_failed', {:default => message}) if defined?(I18n)
+            message = I18n.translate('recaptcha.errors.verification_failed', default: message) if defined?(I18n)
             model.errors.add attribute, options[:message] || message
           end
-          return false
-        else
-          flash.delete(:recaptcha_error)
-          return true
+          false
         end
       rescue Timeout::Error
         if Recaptcha.configuration.handle_timeouts_gracefully
-          flash[:recaptcha_error] = if defined?(I18n)
-            I18n.translate('recaptcha.errors.recaptcha_unreachable', {:default => 'Recaptcha unreachable.'})
-          else
-            'Recaptcha unreachable.'
+          if request_in_html_format?
+            flash[:recaptcha_error] = if defined?(I18n)
+              I18n.translate('recaptcha.errors.recaptcha_unreachable', default: 'Recaptcha unreachable.')
+            else
+              'Recaptcha unreachable.'
+            end
           end
 
           if model
             message = "Oops, we failed to validate your word verification response. Please try again."
-            message = I18n.translate('recaptcha.errors.recaptcha_unreachable', :default => message) if defined?(I18n)
+            message = I18n.translate('recaptcha.errors.recaptcha_unreachable', default: message) if defined?(I18n)
             model.errors.add attribute, options[:message] || message
           end
-          return false
+          false
         else
           raise RecaptchaError, "Recaptcha unreachable."
         end
-      rescue Exception => e
+      rescue StandardError => e
         raise RecaptchaError, e.message, e.backtrace
       end
-    end # verify_recaptcha
-  end # Verify
-end # Recaptcha
+    end
+
+    def request_in_html_format?
+      request.respond_to?(:format) && request.format == :html && respond_to?(:flash)
+    end
+
+    def verify_recaptcha!(options = {})
+      verify_recaptcha(options) or raise VerifyError
+    end
+  end
+end

data/lib/recaptcha/version.rb

@@ -1,3 +1,3 @@
 module Recaptcha
-  VERSION = "0.3.6"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,98 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Jason L Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: maxitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This plugin adds helpers for the reCAPTCHA API
+description: Helpers for the reCAPTCHA API
 email:
 - jasper@ambethia.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG
-- Gemfile
 - LICENSE
-- README.rdoc
-- Rakefile
-- init.rb
+- README.md
 - lib/recaptcha.rb
 - lib/recaptcha/client_helper.rb
 - lib/recaptcha/configuration.rb
-- lib/recaptcha/merb.rb
 - lib/recaptcha/rails.rb
-- lib/recaptcha/railtie.rb
+- lib/recaptcha/token.rb
 - lib/recaptcha/verify.rb
 - lib/recaptcha/version.rb
-- recaptcha.gemspec
-- test/recaptcha_test.rb
-- test/verify_recaptcha_test.rb
 homepage: http://github.com/ambethia/recaptcha
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -100,20 +149,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: recaptcha
-rubygems_version: 2.1.10
+rubyforge_project: 
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Helpers for the reCAPTCHA API
-test_files:
-- test/recaptcha_test.rb
-- test/verify_recaptcha_test.rb
+test_files: []

data/.gitignore

@@ -1,3 +0,0 @@
-rdoc
-pkg
-Gemfile.lock