two_captcha 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6657c4e05fd2c0a00072c9070954b73b1a5573ab9a6896301b2836098aeea66
-  data.tar.gz: ea035f063342b484e83272b2a75838fa4ce1b4b02b2c25a3a49e53b666ecb0d4
+  metadata.gz: b9ebd0f5784ffc3348f29f9abcd82e31f6298d6dc959557c204b41aeb19aae31
+  data.tar.gz: 4e5f0abecd976ea5cd4385bfffda6469a3dd8ba2b79f32bf81299488b9b39571
 SHA512:
-  metadata.gz: ab1e833fbf80a57058f7e78a4b6399473fd56606247c34081212cbd9205ba7f9d6ab6a091a415a9db48d7b55ffe736ec2267c48a76adfa02764d3a4373c5d6f5
-  data.tar.gz: 525b2cd2321e4e2ac9f35ec56a5f05c3ebc0d95ab7d0564e7c31d0c0a38f9a656e6fb7536224452174d3be10c33d5922d2b4d099e76ee78a678f22a1dfb5d6b1
+  metadata.gz: 349f83ce8ce70a30289fac68c9b171bd6e256b189435d5a6802179551ef3e536baf342d9d02e541ffe9c469ca0c3ca86b6ac9f3ab5d96a57a4b4116727d78bee
+  data.tar.gz: acfc725708ace49701cacf0dd465db438d3a3749b76d3c85f7691b828f201728094eeb6ec43db424e654e2a364118586c18655a65d0f24378d112b55fe66d51f

data/README.md

@@ -2,9 +2,6 @@
 
 TwoCaptcha is a Ruby API for 2Captcha - [2Captcha.com](http://2captcha.com/?from=1025109)
 
-> We suggest you to also check the recommended CAPTCHA provider DeathByCaptcha.
-> The gem for this provider is available at https://github.com/infosimples/deathbycaptcha.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -128,6 +125,21 @@ captcha.text
 "P0_eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNza2V5IjoiNnpWV..."
 ```
 
+#### Amazon WAF
+
+```ruby
+captcha = client.decode_amazon_waf!(
+  sitekey:          'xyz',
+  pageurl:          'http://example.com/example=1',
+  iv:               'A1A1A1A1A1A1A1A1',
+  context:          'ABcd...',
+  challenge_script: 'http://example.com/challenge.js',
+)
+
+puts captcha.text
+{"captcha_voucher":"eyJ0...","existing_token":"f2ae6..."}
+```
+
 *Parameters:*
 
 - `website_key`: the site key for the hCatpcha.

data/lib/two_captcha/client.rb

@@ -98,7 +98,7 @@ module TwoCaptcha
     #
     # @param [Hash] options Options hash.
     # @option options [String]  :googlekey The open key of the site in which recaptcha is installed.
-    # @option options [String]  :pageurl The URL of the page where the recaptcha is encountered.
+    # @option options [String]  :pageurl The URL of the page where the recaptcha is present.
     #
     # @return [TwoCaptcha::Captcha] The solution of the given captcha.
     #
@@ -138,7 +138,7 @@ module TwoCaptcha
     #
     # @param [Hash] options Options hash.
     # @option options [String]  :googlekey The open key of the site in which recaptcha is installed.
-    # @option options [String]  :pageurl The URL of the page where the recaptcha is encountered.
+    # @option options [String]  :pageurl The URL of the page where the recaptcha is present.
     # @option options [String]  :action The action paramenter present on the page that uses recaptcha.
     # @option options [String]  :min_score The minimum score necessary to pass the challenge.
     #
@@ -183,7 +183,7 @@ module TwoCaptcha
     #
     # @param [Hash] options Options hash.
     # @option options [String]  :sitekey The  key of the site in which hCaptcha is installed.
-    # @option options [String]  :pageurl The URL of the page where the recaptcha is encountered.
+    # @option options [String]  :pageurl The URL of the page where the hCaptcha is present.
     #
     # @return [TwoCaptcha::Captcha] The solution of the given captcha.
     #
@@ -205,6 +205,49 @@ module TwoCaptcha
       decoded_captcha
     end
 
+    # Solve Amazon WAF.
+    #
+    # @param [Hash] options Options hash. Check docs for the method decode_amazon_waf!.
+    #
+    # @return [TwoCaptcha::Captcha] The solution of the given captcha.
+    #
+    def decode_amazon_waf(options = {})
+      decode_amazon_waf!(opt)
+    rescue TwoCaptcha::Error => ex
+      TwoCaptcha::Captcha.new
+    end
+
+    #
+    # Solve Amazon WAF.
+    #
+    # @param [Hash] options Options hash.
+    # @option options [String]  :sitekey The  key of the site in which Amazon WAF is installed.
+    # @option options [String]  :pageurl The URL of the page where the Amazon WAF is present.
+    # @option options [String]  :iv The value of the `iv` parameter found on the page.
+    # @option options [String]  :context The value of the `context` parameter found on the page.
+    # @option options [String]  :challenge_script The source URL of challenge.js script on the page.
+    # @option options [String]  :captcha_script The source URL of captcha.js script on the page
+    #
+    # @return [TwoCaptcha::Captcha] The solution of the given captcha.
+    #
+    def decode_amazon_waf!(options = {})
+      started_at = Time.now
+
+      fail(TwoCaptcha::ArgumentError) if options[:sitekey].empty? || options[:pageurl].empty? || options[:iv].empty? || options[:context].empty?
+
+      upload_options = { method: 'amazon_waf' }.merge(options)
+      decoded_captcha = upload(upload_options)
+
+      # pool untill the answer is ready
+      while decoded_captcha.text.to_s.empty?
+        sleep([polling, 10].max) # sleep at least 10 seconds
+        decoded_captcha = captcha(decoded_captcha.id)
+        fail TwoCaptcha::Timeout if (Time.now - started_at) > timeout
+      end
+
+      decoded_captcha
+    end
+
     # Upload a captcha to 2Captcha.
     #
     # This method will not return the solution. It helps on separating concerns.

data/lib/two_captcha/version.rb

@@ -1,4 +1,4 @@
 module TwoCaptcha
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
   USER_AGENT = "TwoCaptcha/Ruby v#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_captcha
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Rafael Barbolo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby API for 2Captcha (Captcha Solver as a Service)