arachni 1.0.5 → 1.0.6

data/lib/arachni/http/client.rb

@@ -206,7 +206,7 @@ class Client
                 duped_after_run = observers_for( :after_run ).dup
                 observers_for( :after_run ).clear
                 duped_after_run.each { |block| block.call }
-            end while @queue_size > 0
+            end while @queue_size > 0 || observers_for( :after_run ).any?
 
             notify_after_each_run
 
@@ -711,7 +711,8 @@ class Client
     #
     # @param    [Request]     request
     def forward_request( request )
-        request.id = @request_count
+        add_callbacks = !request.id
+        request.id    = @request_count
 
         if debug_level_3?
             print_debug_level_3 '------------'
@@ -728,40 +729,42 @@ class Client
             print_debug_level_3  '------------'
         end
 
-        request.on_complete do |response|
-            synchronize do
-                @response_count          += 1
-                @burst_response_count    += 1
-                @burst_response_time_sum += response.time
-                @total_response_time_sum += response.time
+        if add_callbacks
+            request.on_complete do |response|
+                synchronize do
+                    @response_count          += 1
+                    @burst_response_count    += 1
+                    @burst_response_time_sum += response.time
+                    @total_response_time_sum += response.time
+
+                    if Platform::Manager.fingerprint?( response )
+                        # Force a fingerprint by converting the Response to a Page object.
+                        response.to_page
+                    end
 
-                if Platform::Manager.fingerprint?( response )
-                    # Force a fingerprint by converting the Response to a Page object.
-                    response.to_page
-                end
+                    notify_on_complete( response )
 
-                notify_on_complete( response )
+                    parse_and_set_cookies( response ) if request.update_cookies?
 
-                parse_and_set_cookies( response ) if request.update_cookies?
+                    if debug_level_3?
+                        print_debug_level_3 '------------'
+                        print_debug_level_3 "Got response for request ID#: #{response.request.id}"
+                        print_debug_level_3 "Performer: #{response.request.performer}"
+                        print_debug_level_3 "Status: #{response.code}"
+                        print_debug_level_3 "Code: #{response.return_code}"
+                        print_debug_level_3 "Message: #{response.return_message}"
+                        print_debug_level_3 "URL: #{response.url}"
+                        print_debug_level_3 "Headers:\n#{response.headers_string}"
+                        print_debug_level_3 "Parsed headers: #{response.headers}"
+                    end
 
-                if debug_level_3?
-                    print_debug_level_3 '------------'
-                    print_debug_level_3 "Got response for request ID#: #{response.request.id}"
-                    print_debug_level_3 "Performer: #{response.request.performer}"
-                    print_debug_level_3 "Status: #{response.code}"
-                    print_debug_level_3 "Code: #{response.return_code}"
-                    print_debug_level_3 "Message: #{response.return_message}"
-                    print_debug_level_3 "URL: #{response.url}"
-                    print_debug_level_3 "Headers:\n#{response.headers_string}"
-                    print_debug_level_3 "Parsed headers: #{response.headers}"
-                end
+                    if response.timed_out?
+                        print_debug_level_3 "Request timed-out! -- ID# #{response.request.id}"
+                        @time_out_count += 1
+                    end
 
-                if response.timed_out?
-                    print_debug_level_3 "Request timed-out! -- ID# #{response.request.id}"
-                    @time_out_count += 1
+                    print_debug_level_3 '------------'
                 end
-
-                print_debug_level_3 '------------'
             end
         end
 

data/lib/arachni/http/request.rb

@@ -97,6 +97,10 @@ class Request < Message
     # @return   [Bool]
     attr_accessor :high_priority
 
+    # @return   [Integer]
+    #   Maximum HTTP response size to accept, in bytes.
+    attr_accessor :response_max_size
+
     # @private
     attr_accessor :root_redirect_id
 
@@ -447,8 +451,6 @@ class Request < Message
         end
     end
 
-    private
-
     def prepare_headers
         headers['Cookie'] = effective_cookies.
             map { |k, v| "#{Cookie.encode( k )}=#{Cookie.encode( v )}" }.
@@ -462,6 +464,8 @@ class Request < Message
         headers.each { |k, v| headers[k] = Header.encode( v ) if v }
     end
 
+    private
+
     def fill_in_data_from_typhoeus_response( response )
         @headers_string = response.debug_info.header_out.first
         @effective_body = response.debug_info.data_out.first

data/lib/arachni/issue.rb

@@ -112,6 +112,10 @@ class Issue
     #   Variations of this issue.
     attr_accessor :variations
 
+    # @return   [Issue,nil]
+    #   Parent of variation.
+    attr_accessor :parent
+
     # @param    [Hash]    options
     #   Configuration hash holding instance attributes.
     def initialize( options = {} )
@@ -130,6 +134,42 @@ class Issue
         @tags       ||= []
         @variations ||= []
         @variation    = nil
+        @parent       = nil
+    end
+
+    # @note The whole environment needs to be fresh.
+    #
+    # Rechecks the existence of this issue.
+    #
+    # @param    [Framework.nil]     framework
+    #   {Framework} to use, if `nil` is given a new {Framework} will be
+    #   instantiated and used.
+    #
+    # @return   [Issue,nil]
+    #   Fresh {Issue} if the issue still exists, `nil` otherwise.
+    def recheck( framework = nil )
+        new_issue = nil
+        checker = proc do |f|
+            referring_page.update_element_audit_whitelist vector
+
+            f.options.url = referring_page.url
+            f.options.audit.elements vector.class.type
+
+            f.checks.load( parent ? parent.check[:shortname] : check[:shortname] )
+            f.push_to_page_queue referring_page
+
+            f.run
+
+            new_issue = Data.issues[digest]
+        end
+
+        if framework
+            checker.call framework
+        else
+            Arachni::Framework.new( &checker )
+        end
+
+        new_issue
     end
 
     # @return   [HTTP::Response]
@@ -307,6 +347,8 @@ class Issue
             h[:request]  = request.to_h  if request
         end
 
+        h.delete :parent
+
         h
     end
     alias :to_hash :to_h
@@ -358,6 +400,7 @@ class Issue
 
         issue.unique_id = unique_id
         issue.variation = false
+        issue.parent    = nil
         issue
     end
 
@@ -376,6 +419,7 @@ class Issue
 
         issue.unique_id = unique_id
         issue.variation = true
+        issue.parent    = self
         issue
     end
 
@@ -394,6 +438,7 @@ class Issue
 
         @variations = []
         @variation  = nil
+        @parent     = nil
 
         self
     end
@@ -425,9 +470,11 @@ class Issue
     def to_rpc_data
         data = {}
         instance_variables.each do |ivar|
-            data[ivar.to_s.gsub('@','')] = instance_variable_get( ivar ).to_rpc_data_or_self
+            data[ivar.to_s.gsub('@','')] =
+                instance_variable_get( ivar ).to_rpc_data_or_self
         end
 
+        data.delete 'parent'
 
         if data['check'] && data['check'][:elements]
             data['check'] = data['check'].dup
@@ -487,6 +534,13 @@ class Issue
 
             instance.instance_variable_set( "@#{name}", value )
         end
+
+        if instance.variations
+            instance.variations.each do |v|
+                v.parent = instance
+            end
+        end
+
         instance
     end
 

data/lib/arachni/platform/manager.rb

@@ -60,26 +60,29 @@ class Manager
         windows: {}
     }
 
-    DB = [
-        :mysql,
-        :pgsql,
-        :mssql,
-        :oracle,
-        :sqlite,
-        :emc,
-        :db2,
-        :coldfusion,
-        :interbase,
-        :informix,
-        :firebird,
-        :maxdb,
-        :sybase,
-        :frontbase,
-        :ingres,
-        :hsqldb,
-        :access,
-        :mongodb
-    ]
+    DB = {
+        sql: {
+            mysql:      {},
+            pgsql:      {},
+            mssql:      {},
+            oracle:     {},
+            sqlite:     {},
+            ingres:     {},
+            emc:        {},
+            db2:        {},
+            interbase:  {},
+            informix:   {},
+            firebird:   {},
+            maxdb:      {},
+            sybase:     {},
+            frontbase:  {},
+            hsqldb:     {},
+            access:     {},
+        },
+        nosql: {
+            mongodb:    {}
+        }
+    }
 
     SERVERS = [
         :apache,
@@ -114,6 +117,7 @@ class Manager
         windows:    'MS Windows',
 
         # Databases
+        sql:        'Generic SQL family',
         mysql:      'MySQL',
         pgsql:      'Postgresql',
         mssql:      'MSSQL',
@@ -121,7 +125,6 @@ class Manager
         sqlite:     'SQLite',
         emc:        'EMC',
         db2:        'DB2',
-        coldfusion: 'ColdFusion',
         interbase:  'InterBase',
         informix:   'Informix',
         firebird:   'Firebird',
@@ -131,6 +134,7 @@ class Manager
         ingres:     'IngresDB',
         hsqldb:     'HSQLDB',
         access:     'MS Access',
+        nosql:      'Generic NoSQL family',
         mongodb:    'MongoDB',
 
         # Web servers

data/lib/arachni/state/framework.rb

@@ -227,7 +227,7 @@ class Framework
         return false if aborting? || aborted?
 
         if !running?
-            fail Error::StateNotAbortable, 'Cannot suspend an idle state.'
+            fail Error::StateNotAbortable, 'Cannot abort an idle state.'
         end
 
         set_status_message :aborting
@@ -264,6 +264,12 @@ class Framework
         @status == :aborting
     end
 
+    # @return   [Bool]
+    #   `true` if the system has completed successfully, `false` otherwise.
+    def done?
+        @status == :done
+    end
+
     # @param    [Bool]  block
     #   `true` if the method should block until a suspend has completed,
     #   `false` otherwise.

data/lib/arachni/utilities.rb

@@ -413,6 +413,16 @@ module Utilities
         nil
     end
 
+    def regexp_array_match( regexps, str )
+        regexps = [regexps].flatten.compact.
+            map { |s| s.is_a?( Regexp ) ? s : Regexp.new( s.to_s ) }
+        return true if regexps.empty?
+
+        cnt = 0
+        regexps.each { |filter| cnt += 1 if str =~ filter }
+        cnt == regexps.size
+    end
+
     def remove_constants( mod, skip = [] )
         return if skip.include?( mod )
         return if !(mod.is_a?( Class ) || mod.is_a?( Module )) ||

data/lib/version

@@ -1 +1 @@
-1.0.5
+1.0.6

data/spec/arachni/browser_spec.rb

@@ -1211,6 +1211,19 @@ describe Arachni::Browser do
                                     inputs[:email]
                             end
 
+                            context 'when one of those inputs is a' do
+                                context 'select' do
+                                    let(:url) { "#{@url}/fire_event/form/select" }
+
+                                    it 'selects it' do
+                                        @browser.watir.div( id: 'container-name' ).text.should ==
+                                            inputs[:name]
+                                        @browser.watir.div( id: 'container-email' ).text.should ==
+                                            inputs[:email]
+                                    end
+                                end
+                            end
+
                             context 'but has missing values' do
                                 let(:inputs) do
                                     { name:  'The Dude' }

data/spec/arachni/check/auditor_spec.rb

@@ -40,6 +40,7 @@ class AuditorTest < Arachni::Check::Base
     end
 
     def self.clear_info_cache
+        super
         @check_info = nil
     end
 end

data/spec/arachni/check/base_spec.rb

@@ -13,6 +13,7 @@ describe Arachni::Check::Base do
     after( :each ) do
         @framework.reset
         Arachni::Options.reset
+        described_class.clear_info_cache
     end
 
     subject { described_class.new( Factory[:page], framework ) }
@@ -30,4 +31,83 @@ describe Arachni::Check::Base do
         end
     end
 
+    describe '#has_platforms?' do
+        context 'when platforms are provided' do
+            before do
+                described_class.stub(:info) { { platforms: [ :unix ] } }
+            end
+
+            it 'returns true' do
+                described_class.has_platforms?.should be_true
+            end
+        end
+
+        context 'when platforms are not provided' do
+            before do
+                described_class.stub(:info) { { platforms: [] } }
+            end
+
+            it 'returns false' do
+                described_class.has_platforms?.should be_false
+            end
+        end
+    end
+
+    describe '#supports_platforms?' do
+        context 'when empty platforms are given' do
+            it 'returns true' do
+                described_class.supports_platforms?([]).should be_true
+            end
+        end
+
+        context 'when no supported platforms are declared' do
+            before do
+                described_class.stub(:info) { { platforms: [] } }
+            end
+
+            it 'returns true' do
+                described_class.supports_platforms?([]).should be_true
+            end
+        end
+
+        context 'when any of the given platforms are supported' do
+            before do
+                described_class.stub(:info) { { platforms: [:php] } }
+            end
+
+            it 'returns true' do
+                described_class.supports_platforms?([:unix, :php]).should be_true
+            end
+        end
+
+        context 'when a parent of any of the given platforms is supported' do
+            before do
+                described_class.stub(:info) { { platforms: [:unix] } }
+            end
+
+            it 'returns true' do
+                described_class.supports_platforms?([:linux]).should be_true
+            end
+        end
+
+        context 'when a child of any of the given platforms is supported' do
+            before do
+                described_class.stub(:info) { { platforms: [:linux] } }
+            end
+
+            it 'returns true' do
+                described_class.supports_platforms?([:unix]).should be_true
+            end
+        end
+
+        context 'when none of the given platforms are not provided' do
+            before do
+                described_class.stub(:info) { { platforms: [:windows] } }
+            end
+
+            it 'returns false' do
+                described_class.supports_platforms?([:unix]).should be_false
+            end
+        end
+    end
 end