apullo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fef54d32890b574081af9e64c6d76dc01287651779bb43eaecc046df9763e43
-  data.tar.gz: 07f3676d94fd54345a40a547c0a6b82ffa5d599ff34a21b7cf59270e608f2df1
+  metadata.gz: 96eb9917a6d5fcef270fe520a2312f7447896b2d1e6f0bfc61f966d554e8f9c6
+  data.tar.gz: ca4807677d7519969aae72fcc647cad01f3799e04cea1d3aee3433efbb4e77bc
 SHA512:
-  metadata.gz: 5bd0f54aebb6c6f7515fbc2979c22c3af2a3553535665f5a3ca7af5bd1358f0e5372b33a2db03c181e115d9aac87d7b819f57b49c281a8362c78860d175c2545
-  data.tar.gz: d5ac2f8806e242005d2bd6ee1d03de9126eed3b01b93a19583fe387e5842cce1b5a99ff05dcbfc6a3b58ba5b4d5ae38e11a48a68872953b03e47dcf2417d5e45
+  metadata.gz: 8d32ee78a83177d0dbca9a7d418f5e5e8af4894f516d05ed705a1ab8b082601663353f69e30571663015ddf0fbe9e91b19e6ac0b83431369a7866f51b147b6f7
+  data.tar.gz: 5e846ede99ffd718f5e75944eb1ef79b97be719f6cbbf62a43ebf05891e405142a1781d6676ec7e8fabdfe5d0530b7fddeedf7ef0573ca07165110828644a098

data/lib/apullo/fingerprints/http.rb

@@ -37,7 +37,7 @@ module Apullo
         hash = Hash.new(@peer_cert.to_der)
         {
           md5: hash.md5,
-          serial: @peer_cert.serial,
+          serial: @peer_cert.serial.to_i,
           sha1: hash.sha1,
           sha256: hash.sha256,
         }
@@ -93,7 +93,9 @@ module Apullo
         href = icon.get("href")
         return default_favicon_url unless href
 
-        href.start_with?("http://", "https://") ? href : target.url + href
+        return href if href.start_with?("http://", "https://")
+
+        target.url.end_with?("/") ? target.url + href : "#{target.url}/#{href}"
       end
 
       def get(path, limit: 3)

data/lib/apullo/fingerprints/ssh.rb

@@ -6,7 +6,7 @@ module Apullo
   module Fingerprint
     class SSH < Base
       DEFAULT_OPTIONS = { "timeout" => 3 }.freeze
-      DEFAULT_PORT = 22
+      DEFAULT_PORTS = [22, 2222].freeze
 
       private
 
@@ -16,7 +16,7 @@ module Apullo
 
       def pluck_fingerprints
         result = scan
-        keys = result.dig("keys") || []
+        keys = result.dig("keys") || {}
         keys.map do |cipher, data|
           raw = data.dig("raw")
           fingerprints = data.dig("fingerprints") || []
@@ -30,14 +30,23 @@ module Apullo
         end.to_h
       end
 
-      def scan
-        return {} unless target.host
+      def _scan(target, port: 22)
+        return nil unless target.host
 
         engine = SSHScan::ScanEngine.new
-        dest = "#{target.host}:#{DEFAULT_PORT}"
+        dest = "#{target.host}:#{port}"
         result = engine.scan_target(dest, DEFAULT_OPTIONS)
         result.to_hash
       end
+
+      def scan
+        [target].product(DEFAULT_PORTS).each do |target, port|
+          result = _scan(target, port: port)
+          keys = result.dig("keys") || {}
+          return result unless keys.empty?
+        end
+        {}
+      end
     end
   end
 end

data/lib/apullo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apullo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler