arachni 1.1 → 1.2

data/lib/arachni/plugin/base.rb

@@ -185,6 +185,14 @@ class Base < Component::Base
         framework.http
     end
 
+    def browser_cluster
+        framework.browser_cluster
+    end
+
+    def with_browser( &block )
+        browser_cluster.with_browser( &block )
+    end
+
     # Registers the plugin's results to {Data::Plugins}.
     #
     # @param    [Object]    results

data/lib/arachni/processes/instances.rb

@@ -68,7 +68,7 @@ class Instances
     #   `rpc_server_address` and `port` instead of `rpc_port`.
     #
     # @return   [RPC::Client::Instance]
-    def spawn( options = {} )
+    def spawn( options = {}, &block )
         token = options.delete(:token) || generate_token
         fork  = options.delete(:fork)
 
@@ -93,17 +93,24 @@ class Instances
 
         Manager.spawn( :instance, options: options, token: token, fork: fork )
 
-        while sleep( 0.1 )
-            begin
-                connect( url, token ).service.alive?
-                break
-            rescue => e
-                # ap e
+        client = connect( url, token )
+
+        if block_given?
+            client.when_ready do
+                block.call client
+            end
+        else
+            while sleep( 0.1 )
+                begin
+                    client.service.alive?
+                    break
+                rescue => e
+                    # ap "#{e.class}: #{e}"
+                    # ap e.backtrace
+                end
             end
+            client
         end
-
-        @list[url] = token
-        connect( url )
     end
 
     # Starts {RPC::Server::Dispatcher} grid and returns a high-performance Instance.
@@ -168,7 +175,14 @@ class Instances
     end
 
     def kill( url )
-        Manager.kill_many connect( url ).service.consumed_pids
+        service = connect( url ).service
+        service.consumed_pids do |pids|
+            service.shutdown do
+                # Make sure....
+                Manager.kill_many pids
+            end
+        end
+
         @list.delete url
     end
 

data/lib/arachni/reporter/manager.rb

@@ -29,8 +29,8 @@ class Manager < Arachni::Component::Manager
     # @param  [Hash]            options
     #
     # @see Report
-    def run( name, report, options = {} )
-        exception_jail false do
+    def run( name, report, options = {}, raise = false )
+        exception_jail raise do
             self[name].new( report, prepare_options( name, self[name], options ) ).tap(&:run)
         end
     end

data/lib/arachni/rpc/client/instance.rb

@@ -63,6 +63,10 @@ class Instance
         @plugins   = Proxy.new( @client, 'plugins' )
     end
 
+    def when_ready( &block )
+        self.class.when_ready( url, token, &block )
+    end
+
     def token
         @token
     end

data/lib/arachni/rpc/server/framework/master.rb

@@ -228,7 +228,7 @@ module Master
 
         # If for some reason we've got pages in the page queue this early,
         # consume them and get it over with.
-        audit_page_queue
+        master_audit_page_queue
 
         @first_run = true if @first_run.nil?
         next_page = nil
@@ -266,10 +266,10 @@ module Master
                 audit_page( page ) or http.run
             end
 
-            audit_page_queue
+            master_audit_page_queue
         end
 
-        audit_page_queue
+        master_audit_page_queue
 
         @audit_queues_done = true
         true

data/lib/arachni/rpc/server/framework/multi_instance.rb

@@ -222,14 +222,6 @@ module MultiInstance
         end
     end
 
-    def audit_page_queue
-        if master?
-            master_audit_page_queue
-        else
-            super
-        end
-    end
-
     # @return   [Boolean]
     #   `true` if `token` matches the local privilege token, `false` otherwise.
     def valid_token?( token )

data/lib/arachni/rpc/server/instance.rb

@@ -276,12 +276,13 @@ class Instance
         @framework.resume( @rpc_pause_request )
 
         if !@framework.has_slaves?
+            @rpc_pause_request = nil
             block.call true
             return
         end
 
         each = proc { |instance, iter| instance.service.resume { iter.next } }
-        each_slave( each, proc { block.call true } )
+        each_slave( each, proc { @rpc_pause_request = nil; block.call true } )
     end
 
     # @note Don't forget to {#shutdown} the instance once you get the report.

data/lib/arachni/ruby/array.rb

@@ -30,6 +30,11 @@ class Array
         map { |v| v.respond_to?( :recode ) ? v.recode : v }
     end
 
+    def recode!
+        each { |v| v.recode! if v.respond_to?( :recode! ) }
+        self
+    end
+
     def chunk( pieces = 2 )
         return self if pieces <= 0
 

data/lib/arachni/ruby/hash.rb

@@ -100,6 +100,11 @@ class Hash
         recoded
     end
 
+    def recode!
+        each { |_, v| v.recode! if v.respond_to?( :recode! ) }
+        self
+    end
+
     # @return   [Array<Symbol>]
     #   Returns all symbol keys from +self+ and children hashes.
     def find_symbol_keys_recursively

data/lib/arachni/ruby/string.rb

@@ -146,9 +146,8 @@ class String
     end
 
     def recode!
-        force_encoding( 'utf-8' )
-        encode!( 'utf-16be', invalid: :replace, undef: :replace )
-        encode!( 'utf-8' )
+        encode!( 'utf-8', invalid: :replace, undef: :replace )
+        self
     end
 
     def recode

data/lib/arachni/session.rb

@@ -43,6 +43,10 @@ class Session
         # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
         class FormNotFound < Error
         end
+
+        # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+        class FormNotVisible < Error
+        end
     end
 
     LOGIN_TRIES      = 5
@@ -153,7 +157,8 @@ class Session
                 elsif (url = opts[:url])
                     http_opts = {
                         update_cookies:  true,
-                        follow_location: true
+                        follow_location: true,
+                        performer:       self
                     }
 
                     if async
@@ -263,14 +268,20 @@ class Session
 
         http_options = http_options.merge(
             mode:            block_given? ? :async : :sync,
-            follow_location: true
+            follow_location: true,
+            performer:       self
         )
 
+        print_debug 'Performing login check.'
+
         bool = nil
         http.get( Options.session.check_url, http_options ) do |response|
             bool = !!response.body.match( Options.session.check_pattern )
+
+            print_debug "Login check done: #{bool}"
             block.call( bool ) if block
         end
+
         bool
     end
 
@@ -335,8 +346,15 @@ class Session
 
         form.page = page
 
-        # Use the form DOM to submit if a browser is available.
-        form = form.dom if has_browser?
+        if has_browser?
+            # Use the form DOM to submit if a browser is available.
+            form = form.dom
+            form.browser = browser
+
+            if !form.element.visible?
+                fail Error::FormNotVisible, 'Login form is not visible in the DOM.'
+            end
+        end
 
         form.update configuration[:inputs]
         form.auditor = self
@@ -352,14 +370,22 @@ class Session
             page = form.submit(
                 mode:            :sync,
                 follow_location: false,
-                update_cookies:  true
+                update_cookies:  true,
+                performer:       self
             ).to_page
 
             if page.response.redirection?
                 url  = to_absolute( page.response.headers.location, page.url )
                 print_debug "Redirected to: #{url}"
 
-                page = Page.from_url( url, precision: 1, http: { update_cookies: true } )
+                page = Page.from_url(
+                    url,
+                    precision: 1,
+                    http: {
+                        performer:      self,
+                        update_cookies: true
+                    }
+                )
             end
         end
 

data/lib/arachni/state/framework.rb

@@ -99,7 +99,6 @@ class Framework
     #   All possible {#status_messages} by type.
     def available_status_messages
         {
-            pausing:                          'Will pause as soon as the current page is audited.',
             suspending:                       'Will suspend as soon as the current page is audited.',
             waiting_for_browser_cluster_jobs: 'Waiting for %i browser cluster jobs to finish.',
             suspending_plugins:               'Suspending plugins.',
@@ -345,7 +344,6 @@ class Framework
 
         if !paused?
             @status = :pausing
-            set_status_message :pausing
         end
 
         @pause_signals << caller
@@ -402,6 +400,12 @@ class Framework
         false
     end
 
+    def force_resume
+        @pause_signals.to_a.each do |ref|
+            resume ref
+        end
+    end
+
     def dump( directory )
         FileUtils.mkdir_p( directory )
 

data/lib/arachni/support/cache.rb

@@ -8,6 +8,7 @@
 
 lib = Arachni::Options.paths.support + 'cache/'
 require lib + 'base'
+require lib + 'least_recently_pushed'
 require lib + 'least_recently_used'
 require lib + 'random_replacement'
 require lib + 'least_cost_replacement'

data/lib/arachni/support/cache/base.rb

@@ -60,7 +60,7 @@ class Base
     # @return   [Integer]
     #   Number of entries in the cache.
     def size
-        cache.size
+        @cache.size
     end
 
     # Storage method.
@@ -74,7 +74,7 @@ class Base
     def store( k, v )
         prune while capped? && (size > max_size - 1)
 
-        cache[k.hash] = v
+        @cache[make_key( k )] = v
     end
 
     # @see {#store}
@@ -90,7 +90,7 @@ class Base
     # @return   [Object, nil]
     #   Value for key `k`, `nil` if there is no key `k`.
     def []( k )
-        cache[k.hash]
+        @cache[make_key( k )]
     end
 
     # @note If key `k` exists, its corresponding value will be returned.
@@ -109,13 +109,13 @@ class Base
     # @return   [Bool]
     #   `true` if cache includes an entry for key `k`, false otherwise.
     def include?( k )
-        cache.include?( k.hash )
+        @cache.include?( make_key( k ) )
     end
 
     # @return   [Bool]
     #   `true` if cache is empty, false otherwise.
     def empty?
-        cache.empty?
+        @cache.empty?
     end
 
     # @return   [Bool]
@@ -132,12 +132,12 @@ class Base
     # @return   [Object, nil]
     #   Value for key `k`, `nil` if there is no key `k`.
     def delete( k )
-        cache.delete( k.hash )
+        @cache.delete( make_key( k ) )
     end
 
     # Clears/empties the cache.
     def clear
-        cache.clear
+        @cache.clear
     end
 
     def ==( other )
@@ -145,7 +145,7 @@ class Base
     end
 
     def hash
-        cache.hash
+        @cache.hash
     end
 
     def dup
@@ -154,6 +154,10 @@ class Base
 
     private
 
+    def make_key( k )
+        k.hash
+    end
+
     def cache
         @cache
     end

data/lib/arachni/support/cache/least_recently_pushed.rb

@@ -0,0 +1,29 @@
+=begin
+    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+
+    This file is part of the Arachni Framework project and is subject to
+    redistribution and commercial restrictions. Please see the Arachni Framework
+    web site for more information on licensing and terms of use.
+=end
+
+module Arachni
+module Support::Cache
+
+# Least Recently Pushed cache implementation.
+#
+# Discards the least recently pushed entries, in order to make room for newer ones.
+#
+# This is the cache with best performance across the board.
+#
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+class LeastRecentlyPushed < Base
+
+    private
+
+    def prune
+        @cache.delete( @cache.first.first )
+    end
+
+end
+end
+end

data/lib/arachni/support/cache/least_recently_used.rb

@@ -15,23 +15,20 @@ module Support::Cache
 # Discards the least recently used entries in order to make room for newer ones.
 #
 # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
-class LeastRecentlyUsed < Base
+class LeastRecentlyUsed < LeastRecentlyPushed
 
     # @see Arachni::Cache::Base#[]
     def []( k )
-        super( k )
-    ensure
+        return if !include? k
+
         renew( k )
+        super( k )
     end
 
     private
 
     def renew( k )
-        @cache[k] = @cache.delete( k )
-    end
-
-    def prune
-        @cache.delete( @cache.first.first )
+        @cache[make_key( k )] = @cache.delete( make_key( k ) )
     end
 
 end