two_captcha 1.7.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9f28e64ed32b2c3bb8973f14bea2dbb15828550806d0306e6bdbdf07815562
-  data.tar.gz: eaa46657370a298929c7e5f49104abb3f696a74cddeddb8f1052a1f3c2140b8d
+  metadata.gz: b9ebd0f5784ffc3348f29f9abcd82e31f6298d6dc959557c204b41aeb19aae31
+  data.tar.gz: 4e5f0abecd976ea5cd4385bfffda6469a3dd8ba2b79f32bf81299488b9b39571
 SHA512:
-  metadata.gz: cc567f2ecf5c0771e1b1ca7cade9c44a33abe2a224256132d2d8326798b998f5b8750fdbb489995c320a705f68ed7d9bb685450c87174c71389d987eb06258a0
-  data.tar.gz: dac73380663bc6471b233db9b30a6d2be296b27fa92131a3beaf54f7a155d503658c7ad53accf1e500eb50704413bd9af931793f6ccc200251dce157f5dbe1f3
+  metadata.gz: 349f83ce8ce70a30289fac68c9b171bd6e256b189435d5a6802179551ef3e536baf342d9d02e541ffe9c469ca0c3ca86b6ac9f3ab5d96a57a4b4116727d78bee
+  data.tar.gz: acfc725708ace49701cacf0dd465db438d3a3749b76d3c85f7691b828f201728094eeb6ec43db424e654e2a364118586c18655a65d0f24378d112b55fe66d51f

data/README.md

@@ -1,8 +1,6 @@
-Developed by [Infosimples](https://infosimples.com).
-
 # TwoCaptcha
 
-TwoCaptcha is a Ruby API for 2Captcha - [2Captcha.com](http://2captcha.com/?from=1025109).
+TwoCaptcha is a Ruby API for 2Captcha - [2Captcha.com](http://2captcha.com/?from=1025109)
 
 ## Installation
 
@@ -14,264 +12,212 @@ gem 'two_captcha'
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+````
 
 Or install it yourself as:
 
-    $ gem install two_captcha
+```bash
+$ gem install two_captcha
+````
 
 ## Usage
 
-1. **Create a client**
-
-  ```ruby
-  # Create a client
-  client = TwoCaptcha.new('my_captcha_key')
-  ```
-
-2. **Solve a captcha**
-
-  There are two methods available: **decode** and **decode!**
-    * **decode** doesn't raise exceptions.
-    * **decode!** may raise a *TwoCaptcha::Error* if something goes wrong.
-
-  If the solution is not available, an empty captcha object will be returned.
-
-  ```ruby
-  captcha = client.decode!(url: 'http://bit.ly/1xXZcKo')
-  captcha.text        # Solution of the captcha
-  captcha.id          # Numeric ID of the captcha solved by TwoCaptcha
-  ```
-
-  You can also specify *path*, *file*, *raw* and *raw64* when decoding an image.
+### 1. Create a client
 
-  ```ruby
-  client.decode(path: 'path/to/my/captcha/file')
-
-  client.decode(file: File.open('path/to/my/captcha/file', 'rb'))
-
-  client.decode(raw: File.open('path/to/my/captcha/file', 'rb').read)
-
-  client.decode(raw64: Base64.encode64(File.open('path/to/my/captcha/file', 'rb').read))
-  ```
-
-  > Internally, the gem will always convert the image to raw64 (binary base64 encoded).
-
-  You may also specify any POST parameters specified at
-  https://2captcha.com/setting.
-
-3. **Retrieve a previously solved captcha**
-
-  ```ruby
-  captcha = client.captcha('130920620') # with 130920620 as the captcha id
-  ```
-
-4. **Report incorrectly (for refund) or correctly (useful for reCAPTCHA v3) solved captcha**
-
-  ```ruby
-  client.report!('130920620', 'reportbad') # with 130920620 as the captcha id
-  # return true if successfully reported
-
-  client.report!('256892751', 'reportgood') # with 256892751 as the captcha id
-  # return true if successfully reported
-  ```
+```ruby
+client = TwoCaptcha.new('my_key')
+```
 
-  > ***Warning:*** *do not abuse on this method, otherwise you may get banned*
+### 2. Solve a CAPTCHA
 
-5. **Get your balance on 2Captcha**
+There are two types of methods available: `decode` and `decode!`:
 
-  ```ruby
-  client.balance
-  # return a Float balance in USD.
-  ```
+- `decode` does not raise exceptions.
+- `decode!` may raise a `TwoCaptcha::Error` if something goes wrong.
 
-6. **Get usage statistics for a specific date**
+If the solution is not available, an empty solution object will be returned.
 
-  ```ruby
-  client.stats('2015-08-05')
-  # return an XML string with your usage statistics.
-  ```
+```ruby
+captcha = client.decode_image!(url: 'http://bit.ly/1xXZcKo')
+captcha.text        # CAPTCHA solution
+captcha.id          # CAPTCHA numeric id
+```
 
-7. **Get current 2Captcha load**
+#### Image CAPTCHA
 
-  ```ruby
-  client.load
-  # return an XML string with the current service load.
-  ```
+You can specify `file`, `path`, `raw`, `raw64` and `url` when decoding an image.
 
-## reCAPTCHA v2 (e.g. "No CAPTCHA reCAPTCHA")
+```ruby
+client.decode_image!(file: File.open('path/to/my/captcha/file', 'rb'))
+client.decode_image!(path: 'path/to/my/captcha/file')
+client.decode_image!(raw: File.open('path/to/my/captcha/file', 'rb').read)
+client.decode_image!(raw64: Base64.encode64(File.open('path/to/my/captcha/file', 'rb').read))
+client.decode_image!(url: 'http://bit.ly/1xXZcKo')
+```
 
-There are two ways of solving captchas similar to
-[reCAPTCHA v2](https://support.google.com/recaptcha/?hl=en#6262736).
+You may also specify any POST parameters specified at https://2captcha.com/setting.
 
-### (Prefered) Sending the `googlekey` and `pageurl` parameters
+#### reCAPTCHA v2
 
-This method requires no browser emulation. You can send two parameters that
-identify the website in which the captcha is found.
+```ruby
+captcha = client.decode_recaptcha_v2!(
+  googlekey: 'xyz',
+  pageurl:   'http://example.com/example=1',
+)
 
-Please read the [oficial documentation](https://2captcha.com/newapi-recaptcha-en)
-for more information.
+# The response will be a text (token), which you can access with the `text` method.
 
-  ```ruby
-  options = {
-    googlekey: 'xyz',
-    pageurl: 'http://example.com/example=1'
-  }
+captcha.text
+"03AOPBWq_RPO2vLzyk0h8gH0cA2X4v3tpYCPZR6Y4yxKy1s3Eo7CHZRQntxrd..."
+```
 
-  captcha = client.decode_recaptcha_v2(options)
-  captcha.text        # Solution of the captcha
-  captcha.id          # Numeric ID of the captcha solved by TwoCaptcha
-  ```
+*Parameters:*
 
-  The solution (`captcha.text`) will be a code that validates the form, like the
-  following:
+- `googlekey`: the Google key for the reCAPTCHA.
+- `pageurl`: the URL of the page with the reCAPTCHA challenge.
 
-  ```ruby
-  "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
-  ```
 
-### Sending the challenge image
+#### reCAPTCHA v3
 
-You can add the param `coordinatescaptcha: 1` to your request.
+```ruby
+captcha = client.decode_recaptcha_v3!(
+  googlekey: 'xyz',
+  pageurl:   'http://example.com/example=1',
+  action:    'verify',
+  min_score: 0.3, # OPTIONAL
+)
 
-Please read the oficial documentation at https://2captcha.com/en-api-recaptcha for
-more information.
+# The response will be a text (token), which you can access with the `text` method.
 
-  ```ruby
-  client.decode(url: 'http://bit.ly/clickcaptcha', coordinatescaptcha: 1)
-  ```
+captcha.text
+"03AOPBWq_RPO2vLzyk0h8gH0cA2X4v3tpYCPZR6Y4yxKy1s3Eo7CHZRQntxrd..."
+```
 
-**Captcha (screenshot)**
+*Parameters:*
 
-> the argument is passed as *url*, *path*, *file*, *raw* or *raw64*
+- `googlekey`: the Google key for the reCAPTCHA.
+- `pageurl`: the URL of the page with the reCAPTCHA challenge.
+- `action`: the action name used by the CAPTCHA.
+- `min_score`: optional parameter. The minimal score needed for the CAPTCHA resolution. Defaults to `0.3`.
 
-![Example of a captcha based on image clicks](captchas/2.jpg)
+> About the `action` parameter: in order to find out what this is, you need to inspect the JavaScript
+> code of the website looking for a call to the `grecaptcha.execute` function.
+>
+> ```javascript
+> // Example
+> grecaptcha.execute('6Lc2fhwTAAAAAGatXTzFYfvlQMI2T7B6ji8UVV_f', { action: "examples/v3scores" })
+> ````
 
-The response will be an array containing coordinates where the captcha should be
-clicked. For the captcha above it should look something like:
+> About the `min_score` parameter: it's strongly recommended to use a minimum score of `0.3` as higher
+> scores are rare.
 
-  ```ruby
-  # captcha.text
-  "coordinates:x=50.66999816894531,y=130.3300018310547;x=236.66998291015625,y=328.3299865722656"
-  ```
+#### hCaptcha
 
-## Audio reCAPTCHA v2
+```ruby
+captcha = client.decode_hcaptcha!(
+  sitekey: 'xyz',
+  pageurl: 'http://example.com/example=1',
+)
 
-  ```ruby
-  client.decode(url: 'http://bit.ly/audiorecaptchav2', recaptchavoice: 1)
-  ```
+captcha.text
+"P0_eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNza2V5IjoiNnpWV..."
+```
 
-The response will be a simple text:
+#### Amazon WAF
 
 ```ruby
-# captcha.text
-'61267'
+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..."}
 ```
 
-## reCAPTCHA v3
+*Parameters:*
 
-This method requires no browser emulation. You can send four parameters that
-identify the website in which the CAPTCHA is found and the minimum score
-(0.3, 0.5 or 0.7) you desire.
+- `website_key`: the site key for the hCatpcha.
+- `website_url`: the URL of the page with the hCaptcha challenge.
 
-**It's strongly recommended to use a minimum score of 0.3 as higher scores are extremely rare.**
+### 3. Using proxy or other custom options
 
-Please read the [oficial documentation](https://2captcha.com/2captcha-api#solving_recaptchav3)
-for more information.
+You are allowed to use custom options like `proxy`, `proxytype` or `userAgent` whenever the
+2Captcha API supports it. Example:
 
   ```ruby
   options = {
-    googlekey: 'xyz',
+    sitekey:   'xyz',
     pageurl:   'http://example.com/example=1',
-    action:    'verify',
-    min_score: 0.3
+    proxy:     'login:password@123.123.123.123:3128',
+    userAgent: 'user agent',
   }
 
-  captcha = client.decode_recaptcha_v3(options)
-  captcha.text        # Solution of the captcha
-  captcha.id          # Numeric ID of the captcha solved by TwoCaptcha
-  ```
-
-The solution (`captcha.text`) will be a code that validates the form, like the
-following:
-
-  ```ruby
-  "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
+  captcha = client.decode_hcaptcha!(options)
   ```
 
-## hCaptcha
-
-  This method allows you to solve hCaptcha.
-
-  There are two methods available:
+### 4. Retrieve a previously solved CAPTCHA
 
-  - `decode_hcaptcha`: solves hCaptcha CAPTCHAs. It doesn't raise exceptions.
-  - `decode_hcaptcha!`: solves hCaptcha CAPTCHAs. It may raise an error if something goes wrong.
-
-  **Send the `sitekey` and `pageurl` parameters**
+```ruby
+captcha = client.captcha('130920620') # with 130920620 being the CAPTCHA id
+```
 
-  This method requires no browser emulation. You can send two parameters that
-  identify the website in which the CAPTCHA is found.
+### 5. Report an incorrectly solved CAPTCHA for a refund
 
-  ```ruby
-  options = {
-    sitekey: 'xyz',
-    pageurl: 'http://example.com/example=1'
-  }
+```ruby
+client.report!('130920620', 'reportbad') # with 130920620 being the CAPTCHA id
+# returns `true` if successfully reported
 
-  captcha = client.decode_hcaptcha!(options)
-  captcha.text # Solution of the captcha
-  ```
+client.report!('256892751', 'reportgood') # with 256892751 being the CAPTCHA id
+# returns `true` if successfully reported
+```
 
-## Using proxy or other custom options
+### 6. Get your account balance
 
-You are allowed to use custom options like `proxy`, `proxytype` or `userAgent` whenever the 2Captcha API supports it. Example:
+```ruby
+client.balance
+# returns a Float balance in USD.
+```
 
-  ```ruby
-  options = {
-    sitekey: 'xyz',
-    pageurl: 'http://example.com/example=1',
-    proxy: 'login:password@123.123.123.123:3128',
-    userAgent: 'user agent'
-  }
+### 7. Get usage statistics for a specific date
 
-  captcha = client.decode_hcaptcha!(options)
-  ```
+```ruby
+client.stats(Date.new(2022, 10, 7))
+# returns an XML string with your usage statistics.
+```
 
 ## Notes
 
-#### Thread-safety
+### Thread-safety
 
 The API is thread-safe, which means it is perfectly fine to share a client
 instance between multiple threads.
 
-#### Ruby dependencies
+### Ruby dependencies
 
 TwoCaptcha don't require specific dependencies. That saves you memory and
 avoid conflicts with other gems.
 
-#### Input image format
+### Input image format
 
-Any format you use in the decode method (url, file, path, raw, raw64) will
-always be converted to a raw64, which is a binary base64 encoded string. So, if
-you already have this format available on your side, there's no need to do
-convertions before calling the API.
+Any format you use in the `decode_image!` method (`url`, `file`, `path`, `raw` or `raw64`)
+will always be converted to a `raw64`, which is a base64-encoded binary string.
+So, if you already have this format on your end, there is no need for convertions
+before calling the API.
 
 > Our recomendation is to never convert your image format, unless needed. Let
 > the gem convert internally. It may save you resources (CPU, memory and IO).
 
-#### Versioning
+### Versioning
 
 TwoCaptcha gem uses [Semantic Versioning](http://semver.org/).
 
-#### Tested Ruby versions
-
-* MRI 2.2.2
-* MRI 2.2.0
-* MRI 2.1.4
-* MRI 2.0.0
-
-## Contributing
+### Contributing
 
 1. Fork it ( https://github.com/infosimples/two_captcha/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
@@ -287,4 +233,4 @@ https://github.com/infosimples/two_captcha/graphs/contributors
 
 # License
 
-MIT License. Copyright (C) 2011-2015 Infosimples. https://infosimples.com/
+MIT License. Copyright (C) 2011-2022 Infosimples. https://infosimples.com/

data/lib/two_captcha/client.rb

@@ -30,11 +30,12 @@ module TwoCaptcha
     # @return [TwoCaptcha::Captcha] The captcha (with solution) or an empty
     #                               captcha instance if something goes wrong.
     #
-    def decode(options = {})
-      decode!(options)
+    def decode_image(options = {})
+      decode_image!(options)
     rescue TwoCaptcha::Error => ex
       TwoCaptcha::Captcha.new
     end
+    alias :decode :decode_image
 
     # Decode the text from an image (i.e. solve a captcha).
     #
@@ -60,7 +61,7 @@ module TwoCaptcha
     # @return [TwoCaptcha::Captcha] The captcha (with solution) if an error is
     #                               not raised.
     #
-    def decode!(options = {})
+    def decode_image!(options = {})
       started_at = Time.now
 
       raw64 = load_captcha(options)
@@ -77,6 +78,7 @@ module TwoCaptcha
 
       decoded_captcha
     end
+    alias :decode! :decode_image!
 
     #
     # Solve reCAPTCHA v2.
@@ -96,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.
     #
@@ -136,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.
     #
@@ -181,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.
     #
@@ -203,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.7.0'
+  VERSION = '1.9.0'
   USER_AGENT = "TwoCaptcha/Ruby v#{VERSION}"
 end

data/two_captcha.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.33"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_captcha
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Rafael Barbolo
@@ -9,36 +9,36 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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)