Issue #415

lib/common/browser.rb

@@ -9,12 +9,10 @@ class Browser
   include Browser::Options
 
   OPTIONS = [
-    :available_user_agents,
     :basic_auth,
     :cache_ttl,
     :max_threads,
-    :user_agent,
-    :user_agent_mode,
+    :useragent,
     :proxy,
     :proxy_auth,
     :request_timeout,
@@ -23,16 +21,15 @@ class Browser
 
   @@instance = nil
 
-  attr_reader :hydra, :config_file, :cache_dir
+  attr_reader :hydra, :cache_dir
 
   # @param [ Hash ] options
   #
   # @return [ Browser ]
   def initialize(options = {})
-    @config_file = options[:config_file] || CONF_DIR + '/browser.conf.json'
     @cache_dir   = options[:cache_dir]   || CACHE_DIR + '/browser'
 
-    load_config
+    browser_defaults
     override_config(options)
 
     unless @hydra
@@ -62,28 +59,14 @@ class Browser
   end
 
   #
-  # If an option was set but is not in the new config_file
-  # it's value is kept
+  # sets browser default values
   #
-  # @param [ String ] config_file
-  #
-  # @return [ void ]
-  def load_config(config_file = nil)
-    @config_file = config_file || @config_file
-
-    if File.symlink?(@config_file)
-      raise '[ERROR] Config file is a symlink.'
-    else
-      data = JSON.parse(File.read(@config_file))
-    end
-
-    OPTIONS.each do |option|
-      option_name = option.to_s
-
-      unless data[option_name].nil?
-        self.send(:"#{option_name}=", data[option_name])
-      end
-    end
+  def browser_defaults
+    @max_threads = 20
+    @cache_ttl = 600 # 10 minutes, at this time the cache is cleaned before each scan. If this value is set to 0, the cache will be disabled
+    @request_timeout = 2000 # 2s
+    @connect_timeout = 1000 # 1s
+    @useragent = "WPScan v#{WPSCAN_VERSION} (http://wpscan.org)"
   end
 
   # @param [ String ] url
@@ -101,7 +84,7 @@ class Browser
     params = Browser.append_params_header_field(
       params,
       'User-Agent',
-      self.user_agent
+      @useragent
     )
 
     if @proxy

lib/common/browser/options.rb

@@ -3,11 +3,9 @@
 class Browser
   module Options
 
-    USER_AGENT_MODES = %w{ static semi-static random }
-
-    attr_accessor :available_user_agents, :cache_ttl, :request_timeout, :connect_timeout
-    attr_reader   :basic_auth, :user_agent_mode, :proxy, :proxy_auth
-    attr_writer   :user_agent
+    attr_accessor :cache_ttl, :request_timeout, :connect_timeout
+    attr_reader   :basic_auth, :proxy, :proxy_auth
+    attr_writer   :useragent
 
     # Sets the Basic Authentification credentials
     # Accepted format:
@@ -41,42 +39,6 @@ class Browser
       end
     end
 
-    # Sets the user_agent_mode, which can be one of the following:
-    #   static:      The UA is defined by the user, and will be the same in each requests
-    #   semi-static: The UA is randomly chosen at the first request, and will not change
-    #   random:      UA randomly chosen each request
-    #
-    # UA are from @available_user_agents
-    #
-    # @param [ String ] ua_mode
-    #
-    # @return [ void ]
-    def user_agent_mode=(ua_mode)
-      ua_mode ||= 'static'
-
-      if USER_AGENT_MODES.include?(ua_mode)
-        @user_agent_mode = ua_mode
-        # For semi-static user agent mode, the user agent has to
-        # be nil the first time (it will be set with the getter)
-        @user_agent = nil if ua_mode === 'semi-static'
-      else
-        raise "Unknow user agent mode : '#{ua_mode}'"
-      end
-    end
-
-    # @return [ String ] The user agent, according to the user_agent_mode
-    def user_agent
-      case @user_agent_mode
-      when 'semi-static'
-        unless @user_agent
-          @user_agent = @available_user_agents.sample
-        end
-      when 'random'
-        @user_agent = @available_user_agents.sample
-      end
-      @user_agent
-    end
-
     # Sets the proxy
     # Accepted format:
     #   [protocol://]host:post