squash_matrix 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d16bccb75647110f912d27dd85a00637d45e97f6cd22e121b9fa32437194ff3
-  data.tar.gz: 12ef740678b74fe5203d07a0317f1c1e3e7e0d1c60abfc8af052321908ce856e
+  metadata.gz: eed138cf3aa885351dd0e42f62a5501cfc3f355a4611ea619bc53abd0a138fdc
+  data.tar.gz: 6d4e62d6191d730691a5ab312f844da7ddfceadc8619da8c96bb41d51122bd64
 SHA512:
-  metadata.gz: 8df55de3ae37c996dea5c59ff4ca3ce901bbffd3b12c1d32f23bef9a158adffa28c27fd16a31bbee9f2af2a252a073a1bf5d01d3e26e24aad20a9e551aef6fd6
-  data.tar.gz: b204d011cf005e2698bef9f1f61e08a1e5beb3b68cd9a08719e52d1330185391479cce8361067583d24ca91ba2517d822bf8f9d8ea2811f6433501bbc236c952
+  metadata.gz: 9ed1f044b29eca1efc4d10a3ed4d9b2c3c006ad8df85fc26444e2aa793808cd1a467c52e7ddb37c5269b79131b75a38035ef1fc95190fc04a18843a4add09747
+  data.tar.gz: 6e9cfa37594ad1633b75b3ab72df5b5dffb461e4e4847431d335715a9189a3afa440a0d950e0d5ee060543fa9fe51aa5ae55a5c025f6654df81f40fd9d317f2f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    squash_matrix (1.0.5)
+    squash_matrix (1.0.6)
       http-cookie (~> 1.0, >= 1.0.3)
       nokogiri (~> 1.8, >= 1.8.4)
       user-agent-randomizer (~> 0.2)

data/README.md

@@ -137,7 +137,9 @@ p => {
 replica_client = SquashMatrix::Client.new(p)
 => SquashMatrix::Client
 # Don't want to use credentials, use a proxy instead
-client_behind_proxy = SquashMatrix::Client.new(proxy_addr: '78.186.111.109', proxy_port: 8080)
+proxy_addr = '78.186.111.109'
+proxy_port =  8080
+client_behind_proxy = SquashMatrix::Client.new(proxy_addr: proxy_addr, proxy_port: proxy_port, proxy_custom_headers: {'X-Forwarded-For': proxy_addr}) # squash matrix tracks the X-Forwarded-For header, also depending on the proxy service you are using you may need to overwrite header params
 begin
   (100..1000).each { |i| client_behind_proxy.get_club_info(336) }
 rescue SquashMatrix::Errors::ForbiddenError => e

data/lib/squash_matrix/client.rb

@@ -47,14 +47,21 @@ module SquashMatrix
                    user_agent: nil,
                    cookie: nil,
                    expires: nil,
+                   proxy_port: nil,
                    proxy_addr: nil,
-                   proxy_port: nil)
+                   proxy_user: nil,
+                   proxy_pass: nil,
+                   proxy_custom_headers: nil)
       @user_agent = user_agent || UserAgentRandomizer::UserAgent.fetch(type: 'desktop_browser').string
       @squash_matrix_home_uri = URI::HTTP.build(host: SquashMatrix::Constants::SQUASH_MATRIX_URL)
       @suppress_errors = suppress_errors
       @timeout = timeout
-      @proxy_addr = proxy_addr
       @proxy_port = proxy_port
+      @proxy_addr = proxy_addr
+      @proxy_user = proxy_user
+      @proxy_pass = proxy_pass
+      @proxy_custom_headers = proxy_custom_headers
+      @request_client = @proxy_addr.nil? ? Net::HTTP::Proxy(@proxy_addr, @proxy_port&.to_i, @proxy_user, @proxy_pass) : Net::HTTP
       return unless [player || email, password].none?(&:nil?)
       @cookie_jar = HTTP::CookieJar.new
       @player = player&.to_i
@@ -176,7 +183,7 @@ module SquashMatrix
           set_headers(req, headers: headers)
           req.set_form(form_data, SquashMatrix::Constants::MULTIPART_FORM_DATA)
         end
-        res = Net::HTTP.new(uri.hostname, uri.port, @proxy_addr, @proxy_port&.to_i, use_ssl: uri.scheme == 'https').start { |http| http.request(req) }
+        res = @request_client.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') { |http| http.request(req) }
         case res
         when Net::HTTPSuccess, Net::HTTPFound
           return success_proc&.call(res) || res
@@ -240,6 +247,7 @@ module SquashMatrix
       }
       headers_to_add = headers_to_add.merge(headers) if headers
       headers_to_add = headers_to_add.merge(SquashMatrix::Constants::COOKIE_HEADER => get_cookie_string) if @cookie_jar
+      headers_to_add = headers_to_add.merge(@proxy_custom_headers) if @proxy_custom_headers
       headers_to_add.each { |key, val| req[key.to_s] = val }
     end
 

data/lib/squash_matrix/constants.rb

@@ -15,6 +15,7 @@ module SquashMatrix
     X_WWW__FROM_URL_ENCODED = 'application/x-www-form-urlencoded'
     MULTIPART_FORM_DATA = 'multipart/form-data'
     CONTENT_TYPE_HEADER = 'content-type'
+    X_FORWARDED_FOR_HEADER = 'X-Forwarded-For'
     REFERER = 'Home/Player/:id'
     ASPXAUTH_COOKIE_NAME = '.ASPXAUTH'
     ASP_NET_SESSION_ID_COOKIE_NAME = 'ASP.NET_SessionId'

data/lib/squash_matrix/version.rb

@@ -1,3 +1,3 @@
 module SquashMatrix
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squash_matrix
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Joshua Wilkosz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler