ruby-recaptcha 1.0.4 → 1.0.5

data/lib/recaptcha.rb

@@ -171,6 +171,13 @@ module ReCaptcha
       </noscript>
       }
     end
+    def add_base_error(msg,  errors)
+      if errors.respond_to?(:add_to_base)
+        errors.add_to_base(msg)
+      else
+        errors.add(:base, msg)
+      end
+    end
 
     # Validate request. Note that this function actually makes a network request.
     # [remoteip] request remote ip address
@@ -179,19 +186,22 @@ module ReCaptcha
     # [errors] errors hash-likethingy (usually from ActiveRecord::Base.errors)
     def validate(remoteip, challenge, response, errors, msg)
       unless response and challenge
-        errors.add_to_base(msg)
+        add_base_error(msg, errors)
         return false
       end
       proxy_host, proxy_port = nil, nil
       proxy_host, proxy_port = ENV['proxy_host'].split(':')  if ENV.has_key?('proxy_host')
-      http = Net::HTTP::Proxy(proxy_host, proxy_port).start(@vhost)
+      proxy_user=ENV['proxy_user']
+      proxy_pass=ENV['proxy_pass']
+      http = Net::HTTP::Proxy(proxy_host, proxy_port, proxy_user, proxy_pass).start(@vhost)
       path='/recaptcha/api/verify'
       data = "privatekey=#{CGI.escape(@privkey)}&remoteip=#{CGI.escape(remoteip)}&challenge=#{CGI.escape(challenge)}&response=#{CGI.escape(response)}"
       resp = http.post(path, data, {'Content-Type'=>'application/x-www-form-urlencoded'})
+      data = resp.body
       response = resp.body.split
       result = response[0].chomp
       @last_error=response[1].chomp
-      errors.add_to_base(msg) if  result != 'true'
+      add_base_error(msg, errors) if result != 'true'
       result == 'true' 
     end
   end

data/lib/ruby-recaptcha.rb

@@ -1,4 +1,4 @@
 require 'recaptcha'
 module RubyRecaptcha
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/test/test_recaptcha.rb

@@ -138,7 +138,30 @@ class TestRecaptcha < Test::Unit::TestCase
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
     stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
-    Net::HTTP.expects(:Proxy).with(nil, nil).returns(stub_proxy)
+    Net::HTTP.expects(:Proxy).with(nil, nil, nil, nil).returns(stub_proxy)
+    client = new_client
+    assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
+  end
+  def test_validate_good_authenticated_proxy
+    ENV['proxy_host']='fubar:8080'
+    ENV['proxy_user']='user'
+    ENV['proxy_pass']='secret'
+    goodwords_resp="true\r\nsuccess"
+    err_stub=mock()
+    stub_proxy=mock('proxy')
+    stub_http = mock('http mock')
+    stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
+    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
+    Net::HTTP.expects(:Proxy).with('fubar', '8080','user','secret').returns(stub_proxy)
+    client = new_client
+    assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
+    ENV['proxy_host']='fubar'
+    err_stub=mock()
+    stub_proxy=mock('proxy')
+    stub_http = mock('http mock')
+    stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
+    stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
+    Net::HTTP.expects(:Proxy).with('fubar', nil, 'user', 'secret').returns(stub_proxy)
     client = new_client
     assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
   end
@@ -150,7 +173,7 @@ class TestRecaptcha < Test::Unit::TestCase
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
     stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
-    Net::HTTP.expects(:Proxy).with('fubar', '8080').returns(stub_proxy)
+    Net::HTTP.expects(:Proxy).with('fubar', '8080',nil,nil).returns(stub_proxy)
     client = new_client
     assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
     ENV['proxy_host']='fubar'
@@ -159,7 +182,7 @@ class TestRecaptcha < Test::Unit::TestCase
     stub_http = mock('http mock')
     stub_proxy.expects(:start).with('www.google.com').returns(stub_http)
     stub_http.expects(:post).with('/recaptcha/api/verify', 'privatekey=def&remoteip=localhost&challenge=abc&response=def', {'Content-Type' => 'application/x-www-form-urlencoded'}).returns(ResponseMock.new(['foo', goodwords_resp]))
-    Net::HTTP.expects(:Proxy).with('fubar', nil).returns(stub_proxy)
+    Net::HTTP.expects(:Proxy).with('fubar', nil, nil, nil).returns(stub_proxy)
     client = new_client
     assert client.validate('localhost', 'abc', 'def', err_stub, 'Captcha failed.')
   end
@@ -306,6 +329,16 @@ class TestRecaptcha < Test::Unit::TestCase
     mock.expects(:validate).with('0.0.0.0', nil,  nil, e, 'Captcha failed.').returns(true)
     assert @cf.validate_recap({}, e, {:rcc_pub => 'foobar', :rcc_priv => 'blegga'})
   end
+  def test_safe_errors
+    r31err = mock('rails 31 error')
+    msg = "hi"
+    r31err.expects(:add).with(:base, msg)
+    ReCaptcha::Client.new(nil, nil).add_base_error(msg, r31err)
+    r21err = mock('rails sub3 error')
+    r21err.expects(:respond_to?).with(:add_to_base).returns(true)
+    r21err.expects(:add_to_base).with(msg)
+    ReCaptcha::Client.new(nil, nil).add_base_error(msg, r21err)
+  end
   def test_validate_recap_is_correct_with_constants_and_with_options_and_non_default_msg
     # first, with constants
     e = mock('errors')
@@ -349,6 +382,12 @@ class TestRecaptcha < Test::Unit::TestCase
     assert_equal(((expected % ['foobar', 'foobar']).strip), actual.strip)
   end
 
+  def teardown
+    ENV['proxy_user']=nil
+    ENV['proxy_pass']=nil
+    ENV['proxy_host']=nil
+  end
+
   private
 
   def new_client(pubkey='abc', privkey='def', ssl=false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-recaptcha
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9701860 !ruby/object:Gem::Requirement
+  requirement: &7491720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *9701860
+  version_requirements: *7491720
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9700580 !ruby/object:Gem::Requirement
+  requirement: &7469900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *9700580
+  version_requirements: *7469900
 description: ''
 email:
 - m@loonsoft.com