rangescan 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091f1965640f47e7388f95a42cc9e787c417fe10431e136d4b1d53903741a7ce'
-  data.tar.gz: 1bfe329bab43732f42a3ba8416e0bf3ffa9f357684d5c18f2658c19e2670af1b
+  metadata.gz: f1d88f06375987da13e9983620c34abb676dfe2b12b3e6b6f6f1f8f85468b7e1
+  data.tar.gz: dde41f60761ce812ee29210468c4c685381a0c7431ff0d1e88be841e88500de6
 SHA512:
-  metadata.gz: 04a9e7acda25595b2b05efa506a2a9c21364804bda569e3af281399ba46785df6b99625319dfd539ae40a7c0bd06d0a5084a34f47c8d01796703ba325e4228c1
-  data.tar.gz: '079ec52307a9e18f86baffd3510ec1db8d3cc16f291e68ade601d38a6e0949a9dd8d4c827f10bf9fb43c90d6e9958d6852de99107b73a2f036d49e56c46e995f'
+  metadata.gz: c33c2d5f53ca8328b5c04df66cb8856dadf13662ee0477576bd56682d4e223083682fec64f3206deb86ce1065a52ab2fd016d93617f5f5b70190b4ebfbd2a202
+  data.tar.gz: e92a5a7cab860c07d571187cb140260d5ba0510d1ac63077b9c41c8e3608a5b2b11893dfbc6cba75835e2e2e5c34bbd569e883e72b8fc16d875d43d139e6756f

data/lib/rangescan.rb

@@ -3,6 +3,7 @@
 require "rangescan/version"
 
 require "rangescan/range"
+require "rangescan/utils"
 require "rangescan/scanner"
 require "rangescan/matcher"
 

data/lib/rangescan/scanner.rb

@@ -24,6 +24,12 @@ module RangeScan
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE unless verify_ssl
     end
 
+    def url_for(ipv4)
+      return "#{scheme}://#{ipv4}" if (port == 80 && scheme == "http") || (port == 443 && scheme == "https")
+
+      "#{scheme}://#{ipv4}:#{port}"
+    end
+
     def scan(ipv4s)
       Parallel.map(ipv4s) do |ipv4|
         get ipv4
@@ -41,7 +47,7 @@ module RangeScan
     end
 
     def get(ipv4)
-      url = "#{scheme}://#{ipv4}:#{port}"
+      url = url_for(ipv4)
 
       begin
         res = HTTP.timeout(timeout).headers(default_headers).get(url, ssl_options)
@@ -49,8 +55,8 @@ module RangeScan
           url: url,
           ipv4: ipv4,
           code: res.code,
-          headers: res.headers.to_h,
-          body: res.body.to_s
+          headers: Utils.to_utf8(res.headers),
+          body: Utils.to_utf8(res.body.to_s)
         }
       rescue OpenSSL::SSL::SSLError, HTTP::Error, Addressable::URI::InvalidURIError
         nil

data/lib/rangescan/utils.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RangeScan
+  class Utils
+    class << self
+      def to_utf8(obj)
+        return obj.dup.force_encoding(Encoding::UTF_8) if obj.is_a?(String)
+
+        obj.map do |k, v|
+          k = k.dup.force_encoding(Encoding::UTF_8) if k.is_a?(String)
+          v = v.dup.force_encoding(Encoding::UTF_8) if v.is_a?(String)
+          [k, v]
+        end.to_h
+      end
+    end
+  end
+end

data/lib/rangescan/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rangescan
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,7 @@ files:
 - lib/rangescan/matcher.rb
 - lib/rangescan/range.rb
 - lib/rangescan/scanner.rb
+- lib/rangescan/utils.rb
 - lib/rangescan/version.rb
 - rangescan.gemspec
 homepage: https://github.com/ninoseki/rangescan