rangescan 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d88f06375987da13e9983620c34abb676dfe2b12b3e6b6f6f1f8f85468b7e1
-  data.tar.gz: dde41f60761ce812ee29210468c4c685381a0c7431ff0d1e88be841e88500de6
+  metadata.gz: 85943fdeb085b7c2c3066cf997292246d2ec6c2d4fd85447ad31ebc8da586b4a
+  data.tar.gz: c4562cf5ea80b8cd2fa744977c42b2dee961e4dfb28ffd7727fa59287a27128d
 SHA512:
-  metadata.gz: c33c2d5f53ca8328b5c04df66cb8856dadf13662ee0477576bd56682d4e223083682fec64f3206deb86ce1065a52ab2fd016d93617f5f5b70190b4ebfbd2a202
-  data.tar.gz: e92a5a7cab860c07d571187cb140260d5ba0510d1ac63077b9c41c8e3608a5b2b11893dfbc6cba75835e2e2e5c34bbd569e883e72b8fc16d875d43d139e6756f
+  metadata.gz: 5445af72c8e99671c8760d8b8decbaeb52bef0796e317562efa9b2e32f13be96abdbd74f368fc277796ff930229e2197836ae8dab806b872dcd89140e737254c
+  data.tar.gz: 10453c71febba8b2d630997de509befac9b4c1e070a2478df464c4220542ec8616f3e400d413182fcd9c86393ce287a2b970a669e0f8a3a71ed05e31e0783b96

data/lib/rangescan/monkey_patch.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "protocol/http1/connection"
+
+module Protocol
+  module HTTP1
+    class Connection
+      def write_request(authority, method, path, version, headers)
+        host = authority
+        if headers.include?("host")
+          host = headers["host"]
+          headers.delete "host"
+        end
+
+        @stream.write("#{method} #{path} #{version}\r\n")
+        @stream.write("host: #{host}\r\n")
+
+        write_headers(headers)
+      end
+    end
+  end
+end

data/lib/rangescan/scanner.rb

@@ -1,17 +1,24 @@
 # frozen_string_literal: true
 
-require "http"
-require "parallel"
+require "async"
+require "async/barrier"
+require "async/semaphore"
+require "async/http"
+require "etc"
+
+require "rangescan/monkey_patch"
 
 module RangeScan
   class Scanner
     attr_reader :context
     attr_reader :host
     attr_reader :port
+    attr_reader :processor_count
     attr_reader :scheme
     attr_reader :ssl_context
     attr_reader :timeout
     attr_reader :user_agent
+    attr_reader :verify_ssl
 
     def initialize(host: nil, port: nil, scheme: "http", verify_ssl: true, timeout: 5, user_agent: nil)
       @host = host
@@ -20,8 +27,12 @@ module RangeScan
       @scheme = scheme
       @user_agent = user_agent
 
+      @verify_ssl = verify_ssl
+
       @ssl_context = OpenSSL::SSL::SSLContext.new
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE unless verify_ssl
+
+      @processor_count ||= Etc.nprocessors
     end
 
     def url_for(ipv4)
@@ -31,36 +42,46 @@ module RangeScan
     end
 
     def scan(ipv4s)
-      Parallel.map(ipv4s) do |ipv4|
-        get ipv4
-      end.compact
+      results = []
+      Async do
+        barrier = Async::Barrier.new
+        semaphore = Async::Semaphore.new(processor_count, parent: barrier)
+
+        ipv4s.each do |ipv4|
+          semaphore.async do
+            url = url_for(ipv4)
+
+            endpoint = Async::HTTP::Endpoint.parse(url, ssl_context: ssl_context, timeout: timeout)
+            client = Async::HTTP::Client.new(endpoint, retries: 0)
+            res = client.get(endpoint.path, default_request_headers)
+
+            headers = res.headers.fields.to_h
+            body = res.read || ""
+
+            results << {
+              url: url,
+              ipv4: ipv4,
+              code: res.status,
+              headers: Utils.to_utf8(headers),
+              body: Utils.to_utf8(body)
+            }
+          rescue Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, EOFError, OpenSSL::SSL::SSLError, Async::TimeoutError
+            next
+          end
+        end
+        barrier.wait
+      end
+      results.compact
     end
 
     private
 
-    def default_headers
-      { host: host, user_agent: user_agent }.compact
+    def default_request_headers
+      @default_request_headers ||= { "host" => host, "user-agent" => user_agent }.compact
     end
 
     def ssl_options
       scheme == "http" ? {} : { ssl_context: ssl_context }
     end
-
-    def get(ipv4)
-      url = url_for(ipv4)
-
-      begin
-        res = HTTP.timeout(timeout).headers(default_headers).get(url, ssl_options)
-        {
-          url: url,
-          ipv4: ipv4,
-          code: res.code,
-          headers: Utils.to_utf8(res.headers),
-          body: Utils.to_utf8(res.body.to_s)
-        }
-      rescue OpenSSL::SSL::SSLError, HTTP::Error, Addressable::URI::InvalidURIError
-        nil
-      end
-    end
   end
 end

data/lib/rangescan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RangeScan
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/rangescan.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "webmock", "~> 3.8"
 
-  spec.add_dependency "http", "~> 4.4"
+  spec.add_dependency "async", "~> 1.26"
+  spec.add_dependency "async-http", "~> 0.52"
   spec.add_dependency "ipaddress", "~> 0.8"
-  spec.add_dependency "parallel", "~> 1.19"
   spec.add_dependency "thor", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rangescan
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Manabu Niseki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
-  name: ipaddress
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.52'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - lib/rangescan.rb
 - lib/rangescan/cli.rb
 - lib/rangescan/matcher.rb
+- lib/rangescan/monkey_patch.rb
 - lib/rangescan/range.rb
 - lib/rangescan/scanner.rb
 - lib/rangescan/utils.rb
@@ -181,7 +182,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/ninoseki/rangescan
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Scan websites on a specific IP range
 test_files: []