Support update cookies according to the responses

lib/output.rb → lib/logging.rb

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with WhatWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-class Output
+class Logging
   include OutputHelper
 
   # if no f, output to STDOUT,

lib/output/brief.rb → lib/logging/brief.rb

@@ -1,5 +1,5 @@
 
-class OutputBrief < Output
+class LoggingBrief < Logging
   def escape(s)
     # Encode all special characters # More info: http://www.asciitable.com/
     # r=/[^\x20-\x5A\x5E-\x7E]/

lib/output/elasticsearch.rb → lib/logging/elasticsearch.rb

@@ -1,6 +1,6 @@
 # Elasticseach Output, copy of JSON ouput then a HTTP request to send result to elastic
 # Does not use elasticsearch gem. Instead only sends HTTP
-class OutputElastic < Output
+class LoggingElastic < Logging
   def initialize(s)
     @host = s[:host] || '127.0.0.1:9200'
     @index = s[:index] || 'whatweb'

lib/output/errors.rb → lib/logging/errors.rb

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with WhatWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-class OutputErrors < Output
+class LoggingErrors < Logging
   # don't need semaphore.synchronize, as it's locked by the error handling routine
   def out(error)
     @f.puts error

lib/output/json.rb → lib/logging/json.rb

@@ -1,6 +1,6 @@
 
 # JSON Output #
-class OutputJSON < Output
+class LoggingJSON < Logging
   def initialize(f = STDOUT)
     super
     # opening bracket

lib/output/jsonverbose.rb → lib/logging/jsonverbose.rb

@@ -1,6 +1,6 @@
 
 # This is not JSON compliant as a list
-class OutputJSONVerbose < Output
+class LoggingJSONVerbose < Logging
   def out(target, status, results)
     # brutal and simple
     $semaphore.synchronize do

lib/output/magictreexml.rb → lib/logging/magictreexml.rb

@@ -1,7 +1,7 @@
 
 # MagicTree #
 # Output XML file in MagicTree XML format
-class OutputMagicTreeXML < Output
+class LoggingMagicTreeXML < Logging
   def initialize(f = STDOUT)
     super
     @substitutions = { '&' => '&amp;', '"' => '&quot;', '<' => '&lt;', '>' => '&gt;' }

lib/output/mongodb.rb → lib/logging/mongodb.rb

@@ -1,6 +1,6 @@
 
 # basically the same as OutputJSON
-class OutputMongo < Output
+class LoggingMongo < Logging
   def initialize(s)
     host = s[:host] || '0.0.0.0'
     database = s[:database] || raise('Missing MongoDB database name')

lib/output/object.rb → lib/logging/object.rb

@@ -1,4 +1,4 @@
-class OutputObject < Output
+class LoggingObject < Logging
   def out(target, status, results)
     $semaphore.synchronize do
       @f.puts "Identifying: #{target}"

lib/output/sql.rb → lib/logging/sql.rb

@@ -1,5 +1,5 @@
 
-class OutputSQL < Output
+class LoggingSQL < Logging
   def initialize(f = STDOUT)
     super
     insert_request_config

lib/output/verbose.rb → lib/logging/verbose.rb

@@ -1,5 +1,5 @@
 
-class OutputVerbose < Output
+class LoggingVerbose < Logging
   def coloured(s, colour)
     use_colour = ((@f == STDOUT && $use_colour == 'auto') || ($use_colour == 'always'))
     if use_colour

lib/output/xml.rb → lib/logging/xml.rb

@@ -4,7 +4,7 @@
 # We'd love to hear any suggestions you may have!
 # Does it bother you that some types of output are joined by commas
 # but other types aren't?
-class OutputXML < Output
+class LoggingXML < Logging
   def initialize(f = STDOUT)
     super
     @substitutions = { '&' => '&amp;', '"' => '&quot;', '<' => '&lt;', '>' => '&gt;' }

lib/whatweb.rb

@@ -37,22 +37,22 @@
 require 'lib/target.rb'
 require 'lib/output_helper.rb'
 require 'lib/plugins.rb'
-require 'lib/output.rb'
+require 'lib/logging.rb'
 require 'lib/colour.rb'
 require 'lib/version_class.rb'
 require 'lib/http-status.rb'
 require 'lib/extend-http.rb'
 
-# load the lib/output/ folder
-Dir["#{File.expand_path(File.dirname(__FILE__))}/output/*.rb"].each {|file| require file }
+# load the lib/logging/ folder
+Dir["#{File.expand_path(File.dirname(__FILE__))}/logging/*.rb"].each {|file| require file }
 
 # Output options
 $WWDEBUG = false # raise exceptions in plugins, etc
 $verbose = 0 # $VERBOSE is reserved in ruby
 $use_colour = 'auto'
 $QUIET = false
 $NO_ERRORS = false
-$OUTPUT_ERRORS = nil
+$LOG_ERRORS = nil
 $PLUGIN_TIMES = Hash.new(0)
 
 # HTTP connection options

lib/whatweb/scan.rb

@@ -40,7 +40,7 @@ def initialize(urls, opts)
   end
 
   target_queue = Queue.new # workers consume from this
-  result_queue = Queue.new # workers return results here for output
+  result_queue = Queue.new # workers return results here for logging
   result_mutex = Mutex.new
   Thread.abort_on_exception = true if $WWDEBUG
   max_threads = opts[:max_threads].to_i || 25
@@ -61,7 +61,9 @@ def initialize(urls, opts)
             target = nil # break target loop
             next
           end
+
           result = run_plugins(target, plugins)
+
           result_mutex.synchronize do
             result_queue << [target, result]
           end
@@ -104,10 +106,10 @@ def initialize(urls, opts)
     #  pp target, result
   end
 
-  # Shut down workers, output, and plugins
+  # Shut down workers, logging, and plugins
   (1..max_threads).each { target_queue << nil }
   workers.each(&:join)
-  opts[:output_list].each(&:close)
+  opts[:logging_list].each(&:close)
   Plugin.registered_plugins.each { |_, plugin| plugin.shutdown }
   # pp $PLUGIN_TIMES.sort_by {|x,y|y }
   end

whatweb

@@ -259,7 +259,7 @@ if ARGV.empty? # faster usage info
   exit
 end
 
-### output
+### logging
 $semaphore = Mutex.new
 # this is noisy in debug
 def $semaphore.reentrant_synchronize(&work)
@@ -281,7 +281,7 @@ def error(s)
     # TODO: make use_color smart, so it detects a tty
     STDERR.puts((($use_colour == 'auto') || ($use_colour == 'always')) ? red(s) : s)
     STDERR.flush
-    $OUTPUT_ERRORS.out(s) if $OUTPUT_ERRORS
+    $LOG_ERRORS.out(s) if $LOG_ERRORS
   end
 end
 
@@ -298,7 +298,7 @@ use_custom_grep_plugin = false
 input_file = nil
 
 # Output
-output_list = []
+logging_list = []
 mongo = {}
 mongo[:use_mongo_log] = false
 elastic = {}
@@ -398,36 +398,36 @@ begin
         raise('--colour argument not recognized')
         end
     when '--log-object'
-      output_list << OutputObject.new(arg)
+      logging_list << LoggingObject.new(arg)
     when '--log-brief'
-      output_list << OutputBrief.new(arg)
+      logging_list << LoggingBrief.new(arg)
     when '--log-xml'
-      output_list << OutputXML.new(arg)
+      logging_list << LoggingXML.new(arg)
     when '--log-magictree'
-      output_list << OutputMagicTreeXML.new(arg)
+      logging_list << LoggingMagicTreeXML.new(arg)
     when '--log-verbose'
-      output_list << OutputVerbose.new(arg)
+      logging_list << LoggingVerbose.new(arg)
     when '--log-sql'
-      output_list << OutputSQL.new(arg)
+      logging_list << LoggingSQL.new(arg)
     when '--log-sql-create'
       PluginSupport.load_plugins('+')
       # delete the file if it already exists
       begin
         File.delete(arg)
       rescue
       end
-      OutputSQL.new(arg).create_tables
+      LoggingSQL.new(arg).create_tables
       puts "SQL CREATE statements written to #{arg}"
       exit
     when '--log-json'
       if defined?(JSON)
-        output_list << OutputJSON.new(arg)
+        output_list << LoggingJSON.new(arg)
       else
         raise('Sorry. The JSON gem is required for JSON output')
       end
     when '--log-json-verbose'
       if defined?(JSON)
-        output_list << OutputJSONVerbose.new(arg)
+        logging_list << LoggingJSONVerbose.new(arg)
       else
         raise('Sorry. The JSON gem is required for JSONVerbose output')
       end
@@ -475,7 +475,7 @@ begin
       elastic[:host] = arg
       elastic[:use_elastic_log] = true
     when '--log-errors'
-      $OUTPUT_ERRORS = OutputErrors.new(arg)
+      $LOG_ERRORS = LoggingErrors.new(arg)
     when '--no-errors'
       $NO_ERRORS = true
     when '-U', '--user-agent'
@@ -592,21 +592,21 @@ end
 PluginSupport.precompile_regular_expressions
 
 ### OUTPUT
-output_list << OutputBrief.new unless $QUIET || $verbose > 0 # by default output brief
-output_list << OutputObject.new if $verbose > 1 # full output if -vv
-output_list << OutputVerbose.new if $verbose > 0 # full output if -v
+logging_list << LoggingBrief.new unless $QUIET || $verbose > 0 # by default logging brief
+logging_list << LoggingObject.new if $verbose > 1 # full logging if -vv
+logging_list << LoggingVerbose.new if $verbose > 0 # full logging if -v
 
-## output dependencies
+## logging dependencies
 if mongo[:use_mongo_log]
   if plugins.map { |a, _b| a }.include?('Charset')
-    output_list << OutputMongo.new(mongo)
+    logging_list << OutputMongo.new(mongo)
   else
     error('MongoDB logging requires the Charset plugin to be activated. The Charset plugin is the slowest whatweb plugin, it not included by default, and resides in the plugins-disabled folder. Use ./whatweb -p +./plugins-disabled/charset.rb to enable it.')
     exit
   end
 end
 
-output_list << OutputElastic.new(elastic) if elastic[:use_elastic_log]
+logging_list << LoggingElastic.new(elastic) if elastic[:use_elastic_log]
 
 ## Headers
 $CUSTOM_HEADERS['User-Agent'] = $USER_AGENT unless $CUSTOM_HEADERS['User-Agent']
@@ -618,7 +618,7 @@ urls = ARGV
 whatweb = WhatWeb::Scan.new(
   # Targets
   urls,
-  output_list: output_list,
+  logging_list: logging_list,
   input_file: input_file,
 
   # Plugins
@@ -633,6 +633,6 @@ whatweb = WhatWeb::Scan.new(
   url_pattern: url_pattern
 ) do | target, result | 
   parser = WhatWeb::Parser.new
-  parser.parse_results(target, result, output_list, use_custom_grep_plugin)
+  parser.parse_results(target, result, logging_list, use_custom_grep_plugin)
 end