apullo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1f9e5d90ef5abdc9a8caf4084a6afa69d36938aefe6ea5b22d97df003dee16
-  data.tar.gz: 5b25da846587a8a2a96b649a7cb2cd2fec853070a09a13ac57e7e176f20f8199
+  metadata.gz: b0827cde956b63c66bd88b8c6a37597626f355cd677a701e6590ab5996011c21
+  data.tar.gz: bb53dfba7e8297f85b3992a54efa8546e2d815247443430134bfbd1b15963acd
 SHA512:
-  metadata.gz: afe5791fb852dbf7b162dea37380a057f1491f4878a59186831610e0e9221c7c17c4766e9b169c0e0be68b10f0440482afd355b2b468e127d17f9b1d3a6cfc05
-  data.tar.gz: aa23fc08523091e1f9444fe3261131cda5dd65f8655af513be3c2f7cfd34ebcbbf36aae3aa6724122afb2fdbaad1997caf888e5436479848f17e1c30a514363b
+  metadata.gz: 53469022402714f62e9561da863f35e0bf5032b29d7ec2754224d04b5dc44e40615d4f3fee980d23c8e60a3a27b84388561f3f00e7b14ab816e79aec63ec7acb
+  data.tar.gz: c67723532f368589ee043c700fa4fb3cc5a6dd500bdbbe29244f5a3f2c992a64181c08d7531c2ef2315c0b4854fa109052485ab81b64c9de09e845f369945f88

data/apullo.gemspec

@@ -36,7 +36,6 @@ 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,16 +1,17 @@
 # frozen_string_literal: true
 
 require "json"
-require "parallel"
 require "thor"
 
 module Apullo
   class CLI < Thor
     desc "check [Target]", "Take fingerprints from a target(IP, domain or URL)"
+    method_option :headers, type: :hash, default: {}
     def check(target)
       target = Target.new(target)
+      headers = options["headers"]
 
-      results = build_results(target)
+      results = build_results(target, headers: headers)
       meta = { target: target.id }
       results = results.merge(meta: meta)
 
@@ -18,15 +19,17 @@ module Apullo
     end
 
     no_commands do
-      def build_results(target)
+      def build_results(target, headers: {})
         unless target.valid?
           return {
             error: "Invalid target is given. Target should be an IP, domain or URL."
           }
         end
 
-        Parallel.map(Apullo.fingerprints) do |klass|
+        Apullo.fingerprints.map do |klass|
           fingerprint = klass.new(target)
+          fingerprint.headers = headers if fingerprint.respond_to?(:headers=)
+
           [fingerprint.name, fingerprint.results]
         end.to_h
       end

data/lib/apullo/fingerprints/favicon.rb

@@ -48,7 +48,7 @@ module Apullo
         response = http.request(request)
 
         response.code.to_i == 200 ? response.body : nil
-      rescue Errno::ECONNREFUSED, Net::HTTPError, OpenSSL::OpenSSLError => _e
+      rescue Errno::ECONNREFUSED, Net::HTTPError, OpenSSL::OpenSSLError, Timeout::Error => _e
         nil
       end
 

data/lib/apullo/fingerprints/http.rb

@@ -7,6 +7,13 @@ require "openssl"
 module Apullo
   module Fingerprint
     class HTTP < Base
+      attr_writer :headers
+
+      def initialize(target)
+        @target = target
+        @headers = {}
+      end
+
       def results
         @results ||= [].tap do |out|
           get(target.uri.path)
@@ -14,7 +21,10 @@ module Apullo
           out << {
             body: body,
             cert: cert,
-            favicon: favicon
+            favicon: favicon,
+            meta: {
+              url: target.url
+            }
           }
         end.first
       end
@@ -53,6 +63,10 @@ module Apullo
 
       private
 
+      def headers
+        @headers.compact
+      end
+
       def default_favicon_url
         "#{target.uri.scheme}://#{target.uri.host}:#{target.uri.port}/favicon.ico"
       end
@@ -73,18 +87,23 @@ module Apullo
       def get(path, limit: 3)
         http = build_http
         path = path.empty? ? "/" : path
-        request = Net::HTTP::Get.new(path)
+        request = Net::HTTP::Get.new(path, headers)
         response = http.request request
 
         location = response["Location"]
         if location && limit.positive?
-          get(location, limit: limit - 1)
+          if location.start_with?("http://", "https://")
+            rebuild_target location
+            get(target.uri.path)
+          else
+            get(location, limit: limit - 1)
+          end
         else
           @peer_cert = http.peer_cert
           @body = response.body
           @path = path
         end
-      rescue Errno::ECONNREFUSED, Net::HTTPError, OpenSSL::OpenSSLError => _e
+      rescue Errno::ECONNREFUSED, Net::HTTPError, OpenSSL::OpenSSLError, Timeout::Error => _e
         nil
       end
 
@@ -95,6 +114,10 @@ module Apullo
           Net::HTTP.start(target.uri.host, target.uri.port, use_ssl: true)
         end
       end
+
+      def rebuild_target(url)
+        @target = Target.new(url)
+      end
     end
   end
 end

data/lib/apullo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apullo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ 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