arachni 1.5 → 1.6.1

data/spec/support/servers/checks/active/source_code_disclosure.rb

@@ -3,6 +3,7 @@ require 'nokogiri'
 require 'json'
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 def default
     'default.html'
@@ -46,11 +47,13 @@ OUT.keys.each do |language|
 
     get "/#{language}" do
         cookies['cookie'] ||= default
+        cookies['nested_cookie'] ||= "name=#{default}"
 
         <<-EOHTML
             <a href="/#{language}/link">Link</a>
             <a href="/#{language}/form">Form</a>
             <a href="/#{language}/cookie">Cookie</a>
+            <a href="/#{language}/nested_cookie">Nested cookie</a>
             <a href="/#{language}/header">Header</a>
             <a href="/#{language}/link-template">Link template</a>
             <a href="/#{language}/json">JSON</a>
@@ -129,6 +132,19 @@ OUT.keys.each do |language|
         get_variations( language, cookies['cookie'] )
     end
 
+    get "/#{language}/nested_cookie" do
+        <<-EOHTML
+            <a href="/#{language}/nested_cookie/straight.#{ext}">Nested cookie</a>
+        EOHTML
+    end
+
+    get "/#{language}/nested_cookie/straight.#{ext}" do
+        value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+        return if value.start_with?( default )
+
+        get_variations( language, value )
+    end
+
     get "/#{language}/header" do
         <<-EOHTML
             <a href="/#{language}/header/straight.#{ext}">Header</a>

data/spec/support/servers/checks/active/sql_injection.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'json'
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 @@errors ||= {}
 if @@errors.empty?
@@ -46,6 +47,7 @@ end
             <a href="/#{platform_str}/link">Link</a>
             <a href="/#{platform_str}/form">Form</a>
             <a href="/#{platform_str}/cookie">Cookie</a>
+            <a href="/#{platform_str}/nested_cookie">Nested cookie</a>
             <a href="/#{platform_str}/header">Header</a>
             <a href="/#{platform_str}/link-template">Link template</a>
             <a href="/#{platform_str}/json">JSON</a>
@@ -132,6 +134,31 @@ end
         get_variations( platform, cookies['cookie2'].split( default ).last )
     end
 
+    get "/#{platform}/nested_cookie" do
+        <<-EOHTML
+            <a href="/#{platform}/nested_cookie/flip">Nested cookie</a>
+            <a href="/#{platform}/nested_cookie/append">Nested cookie</a>
+        EOHTML
+    end
+
+    get "/#{platform}/nested_cookie/flip" do
+        default = 'nested cookie value'
+        cookies['nested_cookie'] ||= "name=#{default}"
+
+        inputs = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )
+        inputs.keys.map { |k| get_variations( platform, k ) }.to_s
+    end
+
+    get "/#{platform}/nested_cookie/append" do
+        default = 'nested cookie value'
+        cookies['nested_cookie'] ||= "name=#{default}"
+
+        value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+        return if !value.start_with?( default )
+
+        get_variations( platform, value.split( default ).last )
+    end
+
     get "/#{platform_str}/header" do
         <<-EOHTML
             <a href="/#{platform_str}/header/flip">Header</a>

data/spec/support/servers/checks/active/sql_injection_differential.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 def default
     'default'
@@ -23,6 +24,7 @@ end
             <a href="/#{platform}/link?input=default">Link</a>
             <a href="/#{platform}/form">Form</a>
             <a href="/#{platform}/cookie">Cookie</a>
+            <a href="/#{platform}/nested_cookie">Nested cookie</a>
             <a href="/#{platform}/header">Header</a>
         EOHTML
     end
@@ -60,5 +62,22 @@ end
         cookies['cookie'] ||= default
         get_result( cookies['cookie'] )
     end
+
+    get "/#{platform}/nested_cookie" do
+        <<-EOHTML
+            <a href="/#{platform}/nested_cookie/straight">Nested cookie</a>
+        EOHTML
+    end
+
+    get "/#{platform}/nested_cookie/straight" do
+        default = 'nested cookie value'
+        cookies['nested_cookie'] ||= "name=#{default}"
+
+        value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+        return if value.start_with?( default )
+
+        get_result( value )
+    end
+
 end
 

data/spec/support/servers/checks/active/sql_injection_timing.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'json'
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 REGEXP = {
     mysql: 'sleep\(\s?(\d+)\s?\)',
@@ -10,7 +11,7 @@ REGEXP = {
 }
 
 def get_variations( platform, str )
-    return if !str
+    return if str.to_s.empty?
 
     time = str.scan( Regexp.new( REGEXP[platform] ) ).flatten.first
     return if !time
@@ -40,6 +41,7 @@ REGEXP.keys.each do |platform|
             <a href="/#{platform}/link?input=default">Link</a>
             <a href="/#{platform}/form">Form</a>
             <a href="/#{platform}/cookie">Cookie</a>
+            <a href="/#{platform}/nested_cookie">Nested cookie</a>
             <a href="/#{platform}/header">Header</a>
             <a href="/#{platform}/link-template">Link template</a>
             <a href="/#{platform}/json">JSON</a>
@@ -140,6 +142,22 @@ REGEXP.keys.each do |platform|
         get_variations( platform, cookies['cookie2'] )
     end
 
+    get "/#{platform}/nested_cookie" do
+        <<-EOHTML
+            <a href="/#{platform}/nested_cookie/append">Nested cookie</a>
+        EOHTML
+    end
+
+    get "/#{platform}/nested_cookie/append" do
+        default = 'nested cookie value'
+        cookies['nested_cookie'] ||= "name=#{default}"
+
+        value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+        return if !value.start_with?( default )
+
+        get_variations( platform, value )
+    end
+
     get "/#{platform}/header" do
         <<-EOHTML
             <a href="/#{platform}/header/straight">Cookie</a>

data/spec/support/servers/checks/active/unvalidated_redirect.rb

@@ -3,9 +3,11 @@ require 'json'
 require 'sinatra'
 require 'sinatra/contrib'
 require 'open-uri'
+require_relative '../check_server'
 
 def get_variations( str )
-    return if !str
+    return if str.to_s.empty?
+
     str = str.split( "\0" ).first
     return if !str
 
@@ -37,6 +39,7 @@ get '/' do
         <a href="/link?input=default">Link</a>
         <a href="/form">Form</a>
         <a href="/cookie">Cookie</a>
+        <a href="/nested_cookie">Nested cookie</a>
         <a href="/header">Header</a>
         <a href="/json">JSON</a>
         <a href="/xml">XML</a>
@@ -161,6 +164,42 @@ get '/cookie/js' do
     get_js_variations( cookies['cookie2'] )
 end
 
+get '/nested_cookie' do
+    <<-EOHTML
+        <a href="/nested_cookie/straight">Nested cookie</a>
+        <a href="/nested_cookie/append">Nested cookie</a>
+        <a href="/nested_cookie/js">Nested cookie</a>
+    EOHTML
+end
+
+get '/nested_cookie/straight' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if value.start_with?( default )
+
+    get_variations( value )
+end
+
+get '/nested_cookie/prepend' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if !value.end_with?( default )
+
+    get_variations( value.split( default ).last )
+end
+
+get '/nested_cookie/js' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    get_js_variations( value )
+end
+
 get '/header' do
     <<-EOHTML
         <a href="/header/straight">Header</a>

data/spec/support/servers/checks/active/xpath_injection.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'json'
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 @@errors ||= {}
 if @@errors.empty?
@@ -38,6 +39,7 @@ get '/'do
         <a href="/link">Link</a>
         <a href="/form">Form</a>
         <a href="/cookie">Cookie</a>
+        <a href="/nested_cookie">Nested cookie</a>
         <a href="/header">Header</a>
         <a href="/link-template">Link template</a>
         <a href="/json">JSON</a>
@@ -119,6 +121,31 @@ get '/cookie/append' do
     get_variations( cookies['cookie2'].split( default ).last )
 end
 
+get '/nested_cookie' do
+    <<-EOHTML
+        <a href="/nested_cookie/flip">Nested cookie</a>
+        <a href="/nested_cookie/append">Nested cookie</a>
+    EOHTML
+end
+
+get '/nested_cookie/flip' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    inputs = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )
+    inputs.keys.map { |k| get_variations( k ) }.to_s
+end
+
+get '/nested_cookie/append' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if !value.start_with?( default )
+
+    get_variations( value.split( default ).last )
+end
+
 get '/header' do
     <<-EOHTML
         <a href="/header/flip">Header</a>

data/spec/support/servers/checks/active/xss.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 def get_variations( str )
     str.to_s.upcase
@@ -24,6 +25,7 @@ get '/' do
         <a href="/link-template">Link template</a>
         <a href="/form">Form</a>
         <a href="/cookie">Cookie</a>
+        <a href="/nested_cookie">Nested cookie</a>
         <a href="/header">Header</a>
 
         <a href="/gotchas">Gotchas</a>
@@ -239,6 +241,44 @@ get '/cookie/append' do
     get_variations( cookies['cookie2'].split( default ).last )
 end
 
+get '/nested_cookie' do
+    <<-EOHTML
+        <a href="/nested_cookie/in_comment">Cookie</a>
+        <a href="/nested_cookie/double_encoded">Cookie</a>
+        <a href="/nested_cookie/append">Cookie</a>
+    EOHTML
+end
+
+get '/nested_cookie/in_comment' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name']
+
+    <<-EOHTML
+        <!-- #{value} -->
+    EOHTML
+end
+
+get '/nested_cookie/append' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if !value.start_with?( default )
+
+    get_variations( value )
+end
+
+get '/nested_cookie/double_encoded' do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+
+    get_variations( ::URI.decode( value ) )
+end
+
 get '/header' do
     <<-EOHTML
         <a href="/header/straight">Header</a>

data/spec/support/servers/checks/active/xss_event.rb

@@ -1,6 +1,7 @@
 require 'sinatra'
 require 'sinatra/contrib'
 require_relative '../check_server'
+require_relative '../check_server'
 
 def attributes
     current_check::ATTRIBUTES
@@ -8,7 +9,7 @@ end
 
 def get_variations( str )
     attribute = env['PATH_INFO'].split( '/' ).last
-    [ '', '"', "'" ].map { |q| "<a href='/' #{attribute}=#{q}#{str.to_s.upcase}#{q}>#{attribute}</a>" }.join
+    [ '', '"', "'" ].map { |q| "<a href='#' #{attribute}=#{q}#{str.to_s.upcase}#{q}>#{attribute}</a>" }.join
 end
 
 get '/' do
@@ -16,6 +17,7 @@ get '/' do
         <a href="/link/?input=default">Link</a>
         <a href="/form/">Form</a>
         <a href="/cookie/">Cookie</a>
+        <a href="/nested_cookie/">Nested cookie</a>
         <a href="/header/">Header</a>
     EOHTML
 end
@@ -65,6 +67,24 @@ attributes.each do |attribute|
     end
 end
 
+get "/nested_cookie/" do
+    attributes.map do |attribute|
+        default = 'nested cookie value'
+        cookies["nested_cookie_#{attribute}"] ||= "#{attribute}_name=#{default}"
+
+        <<-EOHTML
+            <a href="#{attribute}">#{attribute}</a>
+        EOHTML
+    end.join
+end
+
+attributes.each do |attribute|
+    get "/nested_cookie/#{attribute}" do
+        value = Arachni::NestedCookie.parse_inputs( cookies["nested_cookie_#{attribute}"] )["#{attribute}_name"]
+        get_variations( value )
+    end
+end
+
 get "/header/" do
     attributes.map do |attribute|
         <<-EOHTML
@@ -78,3 +98,4 @@ attributes.each do |attribute|
         get_variations( env['HTTP_USER_AGENT'] )
     end
 end
+

data/spec/support/servers/checks/active/xss_script_context.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 def get_variations( str )
     <<-EOHTML
@@ -14,6 +15,7 @@ get '/' do
         <a href="/link?input=default">Link</a>
         <a href="/form">Form</a>
         <a href="/cookie">Cookie</a>
+        <a href="/nested_cookie">Nested cookie</a>
         <a href="/header">Header</a>
         <a href="/link-template">Link template</a>
     EOHTML
@@ -63,6 +65,22 @@ get "/cookie/straight" do
     get_variations( cookies['cookie2'] )
 end
 
+get "/nested_cookie" do
+    <<-EOHTML
+        <a href="/nested_cookie/straight">Cookie</a>
+    EOHTML
+end
+
+get "/nested_cookie/straight" do
+    default = 'nested cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if value.start_with?( default )
+
+    get_variations value
+end
+
 get "/header" do
     <<-EOHTML
         <a href="/header/straight">Header</a>

data/spec/support/servers/checks/active/xss_tag.rb

@@ -1,11 +1,13 @@
 require 'sinatra'
 require 'sinatra/contrib'
+require_relative '../check_server'
 
 get '/' do
     <<-EOHTML
         <a href="/link?input=default">Link</a>
         <a href="/form">Form</a>
         <a href="/cookie">Cookie</a>
+        <a href="/nested_cookie">Nested cookie</a>
         <a href="/header">Header</a>
     EOHTML
 end
@@ -109,6 +111,44 @@ get "/cookie/double" do
     "<a href='/' class=\"#{cookies['cookie2']}more-stuff\">Vuln</a>"
 end
 
+get "/nested_cookie" do
+    <<-EOHTML
+        <a href="/nested_cookie/no">Nested cookie</a>
+        <a href="/nested_cookie/single">Nested cookie</a>
+        <a href="/nested_cookie/double">Nested cookie</a>
+    EOHTML
+end
+
+get "/nested_cookie/no" do
+    default = 'nested_cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if !value.start_with?( default )
+
+    "<a href='/' class=#{value}more-stuff>Vuln</a>"
+end
+
+get "/nested_cookie/single" do
+    default = 'nested_cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if !value.start_with?( default )
+
+    "<a href='/' class='#{value}more-stuff'>Vuln</a>"
+end
+
+get "/nested_cookie/double" do
+    default = 'nested_cookie value'
+    cookies['nested_cookie'] ||= "name=#{default}"
+
+    value = Arachni::NestedCookie.parse_inputs( cookies['nested_cookie'] )['name'].to_s
+    return if !value.start_with?( default )
+
+    "<a href='/' class=\"#{value}more-stuff\">Vuln</a>"
+end
+
 get "/header" do
     <<-EOHTML
         <a href="/header/no">Header</a>

data/spec/support/servers/checks/passive/grep/x_frame_options.rb

@@ -7,3 +7,8 @@ end
 get '/safe' do
     headers 'X-Frame-Options' => 'DENY'
 end
+
+get '/non-200' do
+    headers 'X-Frame-Options' => ''
+    [404, 'Not found']
+end

data/spec/support/shared/check.rb

@@ -52,6 +52,7 @@ shared_examples_for 'check' do
     after( :each ) do
         @issues.clear
         process_kill_reactor
+        framework.clean_up
         framework.reset
     end
 

data/spec/support/shared/element/capabilities/auditable/buffered.rb

@@ -103,7 +103,7 @@ shared_examples_for 'buffered_auditable' do
                 called = nil
 
                 allow_any_instance_of(Arachni::HTTP::Response::Scope).to receive(:out?).and_return(true)
-                allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
+                # allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
 
                 auditable.buffered_audit( 'stuff',
                                           format: [ Arachni::Check::Auditor::Format::STRAIGHT ],
@@ -121,7 +121,7 @@ shared_examples_for 'buffered_auditable' do
                     called = nil
 
                     allow_any_instance_of(Arachni::HTTP::Response::Scope).to receive(:out?).and_return(true)
-                    allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
+                    # allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
                     allow_any_instance_of(Arachni::URI).to receive(:seed_in_host?).and_return(true)
 
                     auditable.buffered_audit( 'stuff',

data/spec/support/shared/element/capabilities/auditable/line_buffered.rb

@@ -109,7 +109,7 @@ shared_examples_for 'line_buffered_auditable' do
                 called = nil
 
                 allow_any_instance_of(Arachni::HTTP::Response::Scope).to receive(:out?).and_return(true)
-                allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
+                # allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
 
                 auditable.line_buffered_audit( 'stuff',
                                                format: [ Arachni::Check::Auditor::Format::STRAIGHT ],
@@ -127,7 +127,7 @@ shared_examples_for 'line_buffered_auditable' do
                     called = nil
 
                     allow_any_instance_of(Arachni::HTTP::Response::Scope).to receive(:out?).and_return(true)
-                    allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
+                    # allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
                     allow_any_instance_of(Arachni::URI).to receive(:seed_in_host?).and_return(true)
 
                     auditable.line_buffered_audit( 'stuff',

data/spec/support/shared/element/capabilities/auditable.rb

@@ -223,7 +223,7 @@ shared_examples_for 'auditable' do
                 called = nil
 
                 allow_any_instance_of(Arachni::HTTP::Response::Scope).to receive(:out?).and_return(true)
-                allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
+                # allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
 
                 auditable.audit( 'stuff',
                                  format: [ Arachni::Check::Auditor::Format::STRAIGHT ],
@@ -241,7 +241,7 @@ shared_examples_for 'auditable' do
                     called = nil
 
                     allow_any_instance_of(Arachni::HTTP::Response::Scope).to receive(:out?).and_return(true)
-                    allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
+                    # allow_any_instance_of(Arachni::Page::Scope).to receive(:out?).and_return(true)
                     allow_any_instance_of(Arachni::URI).to receive(:seed_in_host?).and_return(true)
 
                     auditable.audit( 'stuff',

data/ui/cli/framework/option_parser.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2017 Sarosys LLC <http://www.sarosys.com>
+    Copyright 2010-2022 Ecsypno <http://www.ecsypno.com>
 
     This file is part of the Arachni Framework project and is subject to
     redistribution and commercial restrictions. Please see the Arachni Framework
@@ -164,10 +164,16 @@ class OptionParser < UI::CLI::OptionParser
                 substitution
         end
 
+        on( '--scope-https-only', 'Forces the system to only follow HTTPS URLs.',
+            "(Default: #{!!options.scope.https_only})"
+        ) do
+            options.scope.https_only = true
+        end
+
         on( '--scope-dom-depth-limit LIMIT', Integer,
-               'How deep to go into the DOM tree of each page, for pages with JavaScript code.',
-               "(Default: #{options.scope.dom_depth_limit})",
-               "(Setting it to '0' will disable browser analysis.)"
+            'How deep to go into the DOM tree of each page, for pages with JavaScript code.',
+            "(Default: #{options.scope.dom_depth_limit})",
+            "(Setting it to '0' will disable browser analysis.)"
         ) do |limit|
             options.scope.dom_depth_limit = limit
         end
@@ -179,10 +185,11 @@ class OptionParser < UI::CLI::OptionParser
             options.scope.dom_event_limit = limit
         end
 
-        on( '--scope-https-only', 'Forces the system to only follow HTTPS URLs.',
-            "(Default: #{!!options.scope.https_only})"
-        ) do
-            options.scope.https_only = true
+        on( '--scope-dom-event-inheritance-limit LIMIT', Integer,
+            'How many elements should inherit the DOM events of their parents.',
+            "(Default: #{options.scope.dom_event_inheritance_limit.nil? ? 'inf' : options.scope.dom_event_inheritance_limit })",
+        ) do |limit|
+            options.scope.dom_event_inheritance_limit = limit
         end
     end
 
@@ -202,6 +209,10 @@ class OptionParser < UI::CLI::OptionParser
             options.audit.cookies = true
         end
 
+        on( '--audit-nested-cookies', 'Audit nested cookies.' ) do
+            options.audit.nested_cookies = true
+        end
+
         on( '--audit-cookies-extensively',
                'Submit all links and forms of the page along with the cookie permutations.',
                '(*WARNING*: This will severely increase the scan-time.)'
@@ -573,6 +584,12 @@ class OptionParser < UI::CLI::OptionParser
             options.browser_cluster.local_storage = ::JSON.load( IO.read( file ) )
         end
 
+        on( '--browser-cluster-session-storage FILE',
+            "Sets the browsers' session storage using the JSON data in FILE."
+        ) do |file|
+            options.browser_cluster.session_storage = ::JSON.load( IO.read( file ) )
+        end
+
         on( '--browser-cluster-wait-for-element PATTERN:CSS',
             'Wait for element matching CSS to appear when visiting a page whose' <<
             ' URL matches the PATTERN.'
@@ -582,6 +599,13 @@ class OptionParser < UI::CLI::OptionParser
                 css
         end
 
+        on( '--browser-cluster-wait-for-timers',
+            'Wait for the maximum setTimeout() on each page.',
+            "(Default: #{options.browser_cluster.wait_for_timers})"
+        ) do
+            options.browser_cluster.wait_for_timers = true
+        end
+
         on( '--browser-cluster-pool-size SIZE', Integer,
             'Amount of browser workers to keep in the pool and put to work.',
             "(Default: #{options.browser_cluster.pool_size})"
@@ -709,9 +733,21 @@ class OptionParser < UI::CLI::OptionParser
         validate_report_path
         validate_snapshot_save_path
         validate_session
+        validate_browser
         validate_url
     end
 
+    def validate_browser
+        if options.browser_cluster.pool_size > 0 &&
+          options.scope.dom_depth_limit > 0 &&
+          !Browser.has_executable?
+
+            print_bad "Missing chromedriver but configured for a DOM scan."
+            print_info "Please install a compatible chromedriver and Chrome version."
+            exit 1
+        end
+    end
+
     def validate_url
         return if options.url