apullo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b744411a938bb7f98a04598b275b8b5fe589ea80eb6a7c17a3b73f55fcdf587c
-  data.tar.gz: 5287747186cca299dd42f43b600cd94934602f25c42ce340c6f6fd4d3428fd49
+  metadata.gz: 2f1f9e5d90ef5abdc9a8caf4084a6afa69d36938aefe6ea5b22d97df003dee16
+  data.tar.gz: 5b25da846587a8a2a96b649a7cb2cd2fec853070a09a13ac57e7e176f20f8199
 SHA512:
-  metadata.gz: f354bee48a12084cdb1d85c71d256ebe6a7f1dacfbcf99b93f2f0d114ccfffdb39aecc201fa1d09f47db0bbdf484cf6e3020d4b9b662a36324b82d00513dd5c4
-  data.tar.gz: a15315ca8452f8b8eb1501f980baabc85594e7202bb3777e54f585432d3d7ee7406318d3b85bd28135efce59ea4c400b8c0cd9a3118c59279d1da54d7b0e0309
+  metadata.gz: afe5791fb852dbf7b162dea37380a057f1491f4878a59186831610e0e9221c7c17c4766e9b169c0e0be68b10f0440482afd355b2b468e127d17f9b1d3a6cfc05
+  data.tar.gz: aa23fc08523091e1f9444fe3261131cda5dd65f8655af513be3c2f7cfd34ebcbbf36aae3aa6724122afb2fdbaad1997caf888e5436479848f17e1c30a514363b

data/apullo.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mem", "~> 0.1"
   spec.add_dependency "murmurhash3", "~> 0.1"
   spec.add_dependency "oga", "~> 2.15"
+  spec.add_dependency "parallel", "~> 1.18"
   spec.add_dependency "public_suffix", "~> 4.0"
   spec.add_dependency "ssh_scan", "~> 0.0"
   spec.add_dependency "thor", "~> 0.20"

data/lib/apullo/cli.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require "thor"
 require "json"
+require "parallel"
+require "thor"
 
 module Apullo
   class CLI < Thor
@@ -24,7 +25,7 @@ module Apullo
           }
         end
 
-        Apullo.fingerprints.map do |klass|
+        Parallel.map(Apullo.fingerprints) do |klass|
           fingerprint = klass.new(target)
           [fingerprint.name, fingerprint.results]
         end.to_h

data/lib/apullo/fingerprints/domain.rb

@@ -52,8 +52,12 @@ module Apullo
         values.reject(&:empty?).empty? ? [] : values
       end
 
+      def whois_client
+        @whois_client ||= Whois::Client.new(timeout: 3)
+      end
+
       def whois
-        @whois ||= Whois.whois(target.host)
+        @whois ||= whois_client.lookup(target.host)
       rescue Timeout::Error, Whois::Error
         nil
       end

data/lib/apullo/fingerprints/favicon.rb

@@ -34,7 +34,7 @@ module Apullo
       def b64_favicon_data
         @b64_favicon_data ||= [].tap do |out|
           data = get(uri.path)
-          break unless data
+          next unless data
 
           b64 = Base64.strict_encode64(data)
           out << b64.chars.each_slice(76).map(&:join).join("\n") + "\n"
@@ -46,7 +46,8 @@ module Apullo
         path = path.empty? ? "/" : path
         request = Net::HTTP::Get.new(path)
         response = http.request(request)
-        response.body
+
+        response.code.to_i == 200 ? response.body : nil
       rescue Errno::ECONNREFUSED, Net::HTTPError, OpenSSL::OpenSSLError => _e
         nil
       end

data/lib/apullo/fingerprints/http.rb

@@ -53,15 +53,19 @@ module Apullo
 
       private
 
+      def default_favicon_url
+        "#{target.uri.scheme}://#{target.uri.host}:#{target.uri.port}/favicon.ico"
+      end
+
       def favicon_url
         return nil unless @body
 
         doc = Oga.parse_html(@body)
         icon = doc.at_css("link[rel='shortcut icon']") || doc.at_css("link[rel='icon']")
-        return nil unless icon
+        return default_favicon_url unless icon
 
         href = icon.get("href")
-        return nil unless href
+        return default_favicon_url unless href
 
         href.start_with?("http://", "https://") ? href : target.url + href
       end

data/lib/apullo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apullo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Manabu Niseki
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement