rangescan 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4144b13853677049e63de5a4214bffd4140923b9627aa165793bd08a5fd3664f
-  data.tar.gz: 5e9a1489605be94188c2a4310013062451630b12764db065af20081c1bc2d2af
+  metadata.gz: 643ca26936dec4a00aabc6551e9cea7c87cecfda46d5055c26f1c3e3c967893b
+  data.tar.gz: 6f034dcd1e4d5c59b36baec5ea6e4911aba47d88cd462d92a33898194b871839
 SHA512:
-  metadata.gz: e82b98bb97b2742ca54bcfd47cecde7a4bee65d7fefe841f7b76cc6dfec7832c397e8d2e422afc5f64a2533ff453bb3cf83c6ad1cbeb98948845ab5710eb84e6
-  data.tar.gz: 5e6e6173d6a858749fce649d25fd658a91a0d2941238f2ca730e07511e147e48440d713e07247c4a40c3299765760b403596b4122ac259a52d5e3847bfbfb4c2
+  metadata.gz: e2ce5509d388bc2d8026a8d9534339c5428bb974751d4e48ca73964d517a6de38665b8fb070247ee28cab5203b3bbad495890b6576bee1a89bb0008437130a1b
+  data.tar.gz: '098beb8cbee3e0f21302a2cffbaa83f9bdae11b9d80270517e7c92210bb8bf0db8050e337f180ba31a128e2cb4d858405f6e0ea0e4604905c54790abfcb27bef'

data/exe/rangescan

@@ -5,4 +5,5 @@ $LOAD_PATH.unshift("#{__dir__}/../lib")
 
 require "rangescan"
 
-RangeScan::CLI.start
+ARGV.unshift(RangeScan::CLI.default_task) unless RangeScan::CLI.all_tasks.key?(ARGV[0])
+RangeScan::CLI.start(ARGV)

data/lib/rangescan/cli.rb

@@ -13,6 +13,7 @@ module RangeScan
     method_option :user_agent, type: :string, desc: "User Agent"
     method_option :verify_ssl, type: :boolean, desc: "Whether to verify SSL or not"
     method_option :max_concurrency, type: :numeric, desc: "Concurrency limit for HTTP requests to scan"
+    method_option :headers, type: :hash, default: {}, desc: "Custom headers"
     def scan(ip_with_subnet_mask, regexp = ".")
       symbolized_options = symbolize_hash_keys(options)
       range = Range.new(ip_with_subnet_mask)
@@ -26,10 +27,18 @@ module RangeScan
       puts JSON.pretty_generate(filtered)
     end
 
+    default_command :scan
+
     no_commands do
       def symbolize_hash_keys(hash)
         hash.map { |k, v| [k.to_sym, v] }.to_h
       end
     end
+
+    class << self
+      def exit_on_failure?
+        true
+      end
+    end
   end
 end

data/lib/rangescan/scanner.rb

@@ -11,6 +11,7 @@ require "rangescan/monkey_patch"
 module RangeScan
   class Scanner
     attr_reader :context
+    attr_reader :headers
     attr_reader :host
     attr_reader :max_concurrency
     attr_reader :port
@@ -21,19 +22,28 @@ module RangeScan
     attr_reader :user_agent
     attr_reader :verify_ssl
 
-    def initialize(host: nil, port: nil, scheme: "http", verify_ssl: true, timeout: 5, user_agent: nil, max_concurrency: nil)
+    def initialize(
+      headers: {},
+      host: nil,
+      max_concurrency: nil,
+      port: nil,
+      scheme: "http",
+      timeout: 5,
+      user_agent: nil,
+      verify_ssl: true
+    )
+      @headers = headers
       @host = host
       @port = port || (scheme == "http" ? 80 : 443)
-      @timeout = timeout
       @scheme = scheme
+      @timeout = timeout
       @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
 
-      @max_concurrency = max_concurrency || Etc.nprocessors * 2
+      @max_concurrency = max_concurrency || Etc.nprocessors * 8
     end
 
     def url_for(ipv4)
@@ -78,7 +88,7 @@ module RangeScan
     private
 
     def default_request_headers
-      @default_request_headers ||= { "host" => host, "user-agent" => user_agent }.compact
+      @default_request_headers ||= headers.merge({ "host" => host, "user-agent" => user_agent }.compact)
     end
 
     def ssl_options

data/lib/rangescan/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rangescan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler