lib/scanner/plugins/http/directory_search.rb in yawast-0.4.0.beta4 vs lib/scanner/plugins/http/directory_search.rb in yawast-0.4.0.beta5

@@ -1,20 +1,32 @@
 module Yawast
   module Scanner
     module Plugins
       module Http
         class DirectorySearch
-          def self.search(uri, recursive, list_redirects)
+          def self.search(uri, recursive, list_redirects, search_list = nil)
             @recursive = recursive
             @list_redirects = list_redirects
 
             if recursive
               puts 'Recursively searching for common directories (this will take a while)...'
             else
               puts 'Searching for common directories...'
             end
 
+            if search_list == nil
+              @search_list = []
+
+              File.open(File.dirname(__FILE__) + '/../../../resources/common.txt', 'r') do |f|
+                f.each_line do |line|
+                  @search_list.push line.strip
+                end
+              end
+            else
+              @search_list = search_list
+            end
+
             begin
               pool_size = 16
               @jobs = Queue.new
               @results = Queue.new
 
@@ -56,17 +68,15 @@
 
             puts
           end
 
           def self.load_queue(uri)
-            File.open(File.dirname(__FILE__) + '/../../../resources/common.txt', "r") do |f|
-              f.each_line do |line|
-                check = uri.copy
-                check.path = check.path + "#{line.strip}/"
+            @search_list.each do |line|
+              check = uri.copy
+              check.path = check.path + "#{line}/"
 
-                #add the job to the queue
-                @jobs.push check
-              end
+              #add the job to the queue
+              @jobs.push check
             end
           end
 
           def self.process(uri)
             begin