deadfinder 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 248abe3bb3c321a29cb164930132c0a61ad9e3f7987a8cfb863eebe614d0350f
-  data.tar.gz: bbd932e255500d98dbd2171d5fe3fb66a820846bb5801f4b6b1b1b74905675e7
+  metadata.gz: 1e08daa4368e4c3e041e642f1708619637ea618c2937c6e36f2aba841f152ec4
+  data.tar.gz: 5162fb9eb973b7638ece6bcac4e6b2c731f3a6bd654f842f1aeeeed286cee4ed
 SHA512:
-  metadata.gz: 4b722245eafc6373f2776db13377cbb391ab9a4c4cffb7b226e206fb8c8f7a58d1474345a7fef41b7cc14cc350ef3549db95f3359b7df7b3bcd43d0d3d580dac
-  data.tar.gz: 5b9706ea35279e5f7c881d1839bb030ab73fb412a474a3cc9ac01837a256ff121b17154246a9ef6173a7410f29e611f52cf66dff9eff7a14c7176b27a9ab00c1
+  metadata.gz: aa82c3b87b81f8f5293819dbd0e242e57e7fda14fe8820197aa4e32d6c774ea0c379adda7ef49e88865fc00f32cb5cce36c6fae711ac019e2d5be921e1747d65
+  data.tar.gz: 952de90ed7b150e106fe33ec203140c162f2f74c941400328fc3da9c41866111f940043b53d9560903fdb822337ff8973bfc70740ad937cdc04428e5598e37fb

data/lib/deadfinder/logger.rb

@@ -15,6 +15,10 @@ class Logger
     puts '  ● '.colorize(:blue) + text.to_s.colorize(:light_blue)
   end
 
+  def self.sub_done(text)
+    puts '  ✓ '.colorize(:blue) + text.to_s.colorize(:light_blue)
+  end
+
   def self.found(text)
     puts "  ✘ #{text}".colorize(:red)
   end

data/lib/deadfinder/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-VERSION = '1.1.1'
+VERSION = '1.1.2'

data/lib/deadfinder.rb

@@ -9,22 +9,34 @@ require 'deadfinder/logger'
 require 'deadfinder/version'
 require 'concurrent-edge'
 require 'sitemap-parser'
+require 'set'
 
 Channel = Concurrent::Channel
+CacheSet = Set.new
+CacheQue = {}
 
 class DeadFinderRunner
   def run(target, options)
     page = Nokogiri::HTML(URI.open(target))
-    nodeset = page.css('a')
-    link_a = nodeset.map { |element| element['href'] }.compact
+
+    nodeset_a = page.css('a')
+    link_a = nodeset_a.map { |element| element['href'] }.compact
+    nodeset_script = page.css('script')
+    link_script = nodeset_script.map { |element| element['src'] }.compact
+    nodeset_link = page.css('link')
+    link_link = nodeset_link.map { |element| element['href'] }.compact
+
+    link_merged = []
+    link_merged = link_merged.concat link_a, link_script, link_link
+
     Logger.target target
-    Logger.sub_info "Found #{link_a.length} point"
+    Logger.sub_info "Found #{link_merged.length} point. [a:#{link_a.length}/s:#{link_script.length}/l:#{link_link.length}]"
     Logger.sub_info 'Checking'
-    jobs    = Channel.new(buffer: :buffered, capacity: 100)
-    results = Channel.new(buffer: :buffered, capacity: 100)
+    jobs    = Channel.new(buffer: :buffered, capacity: 1000)
+    results = Channel.new(buffer: :buffered, capacity: 1000)
 
     (1..options['concurrency']).each do |w|
-      Channel.go { worker(w, jobs, results) }
+      Channel.go { worker(w, jobs, results, options) }
     end
 
     link_a.uniq.each do |node|
@@ -36,17 +48,27 @@ class DeadFinderRunner
     (1..link_a.uniq.length).each do
       ~results
     end
-    Logger.sub_info 'Done'
+    Logger.sub_done 'Done'
   end
 
-  def worker(_id, jobs, results)
+  def worker(_id, jobs, results, options)
     jobs.each do |j|
-      begin
-        URI.open(j)
-      rescue StandardError => e
-        Logger.found "[#{e}] #{j}" if e.to_s.include? '404 Not Found'
+      if !CacheSet.include? j
+        CacheSet.add j
+        begin
+          CacheQue[j] = true
+          URI.open(j, :read_timeout => options['timeout'])
+        rescue StandardError => e
+          Logger.found "[#{e}] #{j}" if e.to_s.include? '404 Not Found'
+          CacheQue[j] = false
+        end
+        results << j
+      else 
+        if !CacheQue[j] 
+          Logger.found "[404 Not Found] #{j}"
+        end
+        results << j
       end
-      results << j
     end
   end
 end
@@ -82,6 +104,7 @@ end
 
 class DeadFinder < Thor
   class_option :concurrency, aliases: :c, default: 20, type: :numeric
+  class_option :timeout, aliases: :t, default: 10, type: :numeric
 
   desc 'pipe', 'Scan the URLs from STDIN. (e.g cat urls.txt | deadfinder pipe)'
   def pipe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deadfinder
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - hahwul