sportsflix 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab875fb4cea428df2326513d643cfe01d4a5d408
-  data.tar.gz: 1ddc915f45c262ee95b6b71a21bb5a42edc69d3b
+  metadata.gz: 8fe9cee194bc85a6907925f3fb937c9cce0bef68
+  data.tar.gz: 31b00a384f81ee0f9e7e03ae11ed4f25a5e184f9
 SHA512:
-  metadata.gz: dd303bd3c51135c388a91899a730fea4fc497e776f4c5a877144eca9f6c064733e5f14fa618e83ab69abb8486406f3ce0e00f0bf6d3c0112a25fafd4064c75dc
-  data.tar.gz: c0ecd3bf0e9ff1c37296a2adb3727bc2f4fcf626a2cfaaf7f7623854d05467baa95ddfd3830a923fd1efc6e2c86755b7a89c56f65d36aa22f8e5270e1cc0522c
+  metadata.gz: f3e58ddf0a78d689ff643d6586cf756b76b51d3b8bc2d6fbffd4fc6303369318a97aabf265060addd2deca97155c159578e3b2a19aadd641346f257f256e2f4a
+  data.tar.gz: f2262b2bef876b2b42cd475698678406bb9f97cbb81c28091e4cfe0a20b99e20695768a96fd883ac6b2b087e71472808309a5ebd22a3c821f887dd208b2cbb3f

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    sportsflix (1.1.1)
+    sportsflix (1.2.0)
+      execjs-fastnode (~> 0.2.0)
       oga (~> 2.8)
       thor (~> 0.19.4)
 
@@ -14,6 +15,9 @@ GEM
       simplecov
     diff-lcs (1.3)
     docile (1.1.5)
+    execjs (2.7.0)
+    execjs-fastnode (0.2.0)
+      execjs (~> 2.0)
     json (2.0.3)
     oga (2.10)
       ast

data/lib/sportsflix/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'sportsflix'
+require 'sportsflix/utils/http'
 
 module Sportsflix
 
@@ -13,21 +14,23 @@ module Sportsflix
     DEFAULT_VIDEO_PLAYER_PATH = DEFAULT_VIDEO_PLAYER
     DEFAULT_PROXY_DELAY       = 10
 
-    class_option('verbose', { :type => :boolean, :default => false })
-    class_option('offset', { :aliases => :o, :type => :numeric, :default => DEFAULT_OFFSET })
-    class_option('video-format', { :aliases => :f, :type => :string, :default => DEFAULT_VIDEO_FORMAT })
-    class_option('club', { :aliases => :c, :type => :string })
-    class_option('video-player', { :aliases => :p, :type => :string, :default => DEFAULT_VIDEO_PLAYER })
-    class_option('video-player-path', { :type => :string, :default => DEFAULT_VIDEO_PLAYER_PATH })
-    class_option('interactive', { :type => :boolean, :default => false })
-    class_option('server-only', { :aliases => :s, :type => :boolean, :default => false })
-    class_option('proxy-delay', { :type => :numeric, :default => DEFAULT_PROXY_DELAY })
-    class_option('server-ip', { :type => :string })
+    class_option('verbose', {:type => :boolean, :default => false})
+    class_option('offset', {:aliases => :o, :type => :numeric, :default => DEFAULT_OFFSET})
+    class_option('video-format', {:aliases => :f, :type => :string, :default => DEFAULT_VIDEO_FORMAT})
+    class_option('club', {:aliases => :c, :type => :string})
+    class_option('video-player', {:aliases => :p, :type => :string, :default => DEFAULT_VIDEO_PLAYER})
+    class_option('video-player-path', {:type => :string, :default => DEFAULT_VIDEO_PLAYER_PATH})
+    class_option('interactive', {:type => :boolean, :default => false})
+    class_option('server-only', {:aliases => :s, :type => :boolean, :default => false})
+    class_option('proxy-delay', {:type => :numeric, :default => DEFAULT_PROXY_DELAY})
+    class_option('server-ip', {:type => :string})
 
     desc('watch', 'watch stream in the chosen player')
+
     def watch
       api = API.new(options)
       api.watch
     end
+
   end
 end

data/lib/sportsflix/providers/arenavision.rb

@@ -5,22 +5,23 @@ module Sportsflix
   module Providers
     module Arenavision
       class Client
-        ARENAVISION_BASE_URL        = ['http://arenavision.in', 'http://arenavision.ru']
-        ARENAVISION_DEFAULT_URL_IDX = 0
+        BASE_URLS = ['https://arenavision.in', 'https://arenavision.ru']
+        BASE_URL  = BASE_URLS.sample
 
         def initialize(options)
           @verbose     = options[:verbose]
           @club_name   = options[:club]
           @server_only = options['server-only']
+          @http        = Sportsflix::Utils::HTTP.new
         end
 
         def list_streams
-          home = get_page_contents("#{ARENAVISION_BASE_URL[ARENAVISION_DEFAULT_URL_IDX]}/")
-          schedule_path = home.css('.menu li a').select {|item| item.text.include?('EVENTS GUIDE')}.first.get('href')
-          schedule = get_page_contents("#{ARENAVISION_BASE_URL[ARENAVISION_DEFAULT_URL_IDX]}#{schedule_path}")
-          streams  = schedule.css('table tr')
+          home          = get_page_contents("#{BASE_URL}/")
+          schedule_path = home.css('a').select {|item| item.text.include?('EVENTS GUIDE')}.first.get('href')
+          schedule      = get_page_contents("#{BASE_URL}#{schedule_path}")
+          streams       = schedule.css('table tr')
           # Remove first element
-          streams  = streams.drop(1)
+          streams       = streams.drop(1)
           # Remove last element
           streams.pop(2)
 
@@ -46,24 +47,14 @@ module Sportsflix
         end
 
         def get_stream_uri(stream_nr)
-          stream_raw = get_page_contents("#{ARENAVISION_BASE_URL[ARENAVISION_DEFAULT_URL_IDX]}/av#{stream_nr}")
+          stream_raw = get_page_contents("#{BASE_URL}/av#{stream_nr}")
           stream_raw.css('p[class="auto-style1"] a').first.get('href')
         end
 
         private
         def get_page_contents(raw_url)
-          url  = URI.parse(raw_url)
-          enum = Enumerator.new do |yielder|
-            Net::HTTP.start(url.host, url.port) do |http|
-              http.request_get(url.path, {'Cookie' => 'beget=begetok;'}) do |response|
-                response.read_body do |chunk|
-                  yielder << chunk
-                end
-              end
-            end
-          end
-
-          Oga.parse_xml(enum)
+          html_str = @http.get(raw_url, {}, {Cookie: 'beget=begetok;'}).body
+          Oga.parse_xml(html_str)
         end
 
         def parse_stream_ids(raw_stream)

data/lib/sportsflix/utils/http.rb

@@ -0,0 +1,131 @@
+require 'net/http'
+require 'execjs'
+
+module Sportsflix
+  module Utils
+    class HTTP
+
+      DEFAULT_USER_AGENTS = [
+          'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36',
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36',
+          'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36',
+          'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0',
+          'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:41.0) Gecko/20100101 Firefox/41.0',
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3099.0 Safari/537.36'
+      ]
+
+      DEFAULT_HEADERS = {
+          'User-Agent' => DEFAULT_USER_AGENTS.sample
+      }
+
+      def initialize
+        @headers = DEFAULT_HEADERS
+        @params  = {}
+      end
+
+      def get(raw_url, extra_params = {}, extra_headers = {})
+        uri       = URI.parse(raw_url)
+        uri.query = URI.encode_www_form(@params.merge(extra_params))
+        req       = Net::HTTP::Get.new(uri, @headers.merge(extra_headers))
+
+        res = Net::HTTP.start(uri.hostname, uri.port) {|http|
+          http.request(req)
+        }
+
+        get_lambda = lambda {|url| get(url, extra_params, extra_headers)}
+
+        with_cf_bypass(res, get_lambda)
+      end
+
+      def post(raw_url, body, extra_params = {}, extra_headers = {})
+        uri            = URI.parse(raw_url)
+        uri.query      = URI.encode_www_form(@params.merge(extra_params))
+        merged_headers = @headers
+                             .merge({'Content-Type' => 'application/x-www-form-urlencoded'})
+                             .merge(extra_headers)
+        req            = Net::HTTP::Post.new(uri, merged_headers)
+
+        res = Net::HTTP.start(uri.hostname, uri.port) {|http|
+          http.request(req)
+        }
+
+        post_lambda = lambda {|url| post(url, body, extra_params, extra_headers)}
+
+        bypassed_res = with_cf_bypass(res, post_lambda)
+        bypassed_res.body
+      end
+
+      private
+      def with_cf_bypass(res, req_lambda)
+        if res.is_a?(Net::HTTPRedirection)
+          puts "Redirecting from #{res.uri.to_s} to #{res['location']}."
+          res
+        elsif res.is_a?(Net::HTTPServiceUnavailable) &&
+            res['Server'] == 'cloudflare-nginx' &&
+            res.body.include?('jschl_vc') &&
+            res.body.include?('jschl_answer')
+
+          url = "#{res.uri.scheme}://#{res.uri.hostname}"
+          if res.uri.port
+            url = "#{url}:#{res.uri.port}"
+          end
+
+          url = "#{url}/cdn-cgi/l/chk_jschl"
+
+          @headers = @headers.merge({Referer: res.uri.to_s})
+          @params  = @params.merge(
+              {
+                  jschl_vc:     /name="jschl_vc" value="(\w+)"/.match(res.body),
+                  pass:         /name="pass" value="(.+?)"/.match(res.body),
+                  jschl_answer: "#{solve_challenge(res.body)}#{res.hostname.size}"
+              }
+          )
+
+          redirect = req_lambda.call(url)
+          req_lambda.call(redirect['location'])
+        else
+          res
+        end
+      end
+
+      def solve_challenge(body)
+        begin
+          js = /setTimeout\(function\(\){\s+(var s,t,o,p,b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value =.+?)\r?\n/.match(body)
+        rescue
+          puts 'Unable to identify Cloudflare IUAM Javascript on website.'
+          exit(1)
+        end
+
+        js = js.gsub("a\.value = (parseInt\(.+?\)).+", "\1")
+        js = js.gsub("\s{3,}[a-z](?: = |\.).+", '')
+
+        # Strip characters that could be used to exit the string context
+        # These characters are not currently used in Cloudflare's arithmetic snippet
+        js = js.gsub("[\n\\']", '')
+
+        unless js.include?('parseInt')
+          puts 'Error parsing Cloudflare IUAM Javascript challenge.'
+          exit(1)
+        end
+
+        begin
+          js     = "return require('vm').runInNewContext('#{js}');"
+          result = ExecJS.eval(js)
+        rescue
+          puts 'Error executing Cloudflare IUAM Javascript.'
+          exit(1)
+        end
+
+        begin
+          result = result.to_i
+        rescue
+          puts 'Cloudflare IUAM challenge returned unexpected value.'
+          exit(1)
+        end
+
+        result.to_s
+      end
+
+    end
+  end
+end

data/lib/sportsflix/version.rb

@@ -1,3 +1,3 @@
 module Sportsflix
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/sportsflix.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |spec|
   # Runtime
   spec.add_runtime_dependency 'thor', ['~> 0.19.4']
   spec.add_runtime_dependency 'oga', ['~> 2.8']
+  spec.add_runtime_dependency 'execjs-fastnode', ['~> 0.2.0']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportsflix
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Rodrigo Fernandes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: execjs-fastnode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: "\n    Watch the best sports stream in HD from the command line.\n    Using
   arenavision streams.\n  "
 email:
@@ -166,6 +180,7 @@ files:
 - lib/sportsflix/players/vlc.rb
 - lib/sportsflix/providers/arenavision.rb
 - lib/sportsflix/utils/exec.rb
+- lib/sportsflix/utils/http.rb
 - lib/sportsflix/version.rb
 - sportsflix.gemspec
 homepage: https://github.com/rtfpessoa/sportsflix