arachni 1.3.2 → 1.4

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/rpc/serializer.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -18,7 +18,8 @@ class Server
 class ActiveOptions
 
     def initialize( framework )
-        @options = framework.options
+        @framework = framework
+        @options   = framework.options
 
         (@options.public_methods( false ) - public_methods( false ) ).each do |m|
             self.class.class_eval do
@@ -32,7 +33,23 @@ class ActiveOptions
     # @see Arachni::Options#set
     def set( options )
         @options.set( options )
-        HTTP::Client.reset false
+
+        if @framework.running?
+
+            HTTP::Client.reset_options
+
+            # Scope may have been updated.
+            @framework.sitemap.reject! { |k, v| Utilities.skip_path? k }
+
+            @options.scope.extend_paths.each do |url|
+                @framework.push_to_url_queue( url )
+            end
+
+        # Only mess with HTTP state if this is the pre-run config.
+        else
+            HTTP::Client.reset false
+        end
+
         true
     end
 

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/rpc/server/check/manager.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -199,7 +199,7 @@ class Dispatcher
             cjob['currtime'] = currtime.to_s
             cjob['age']      = currtime - Time.parse( cjob['birthdate'] )
             cjob['runtime']  = currtime - Time.parse( cjob['starttime'] )
-            cjob['alive']    = !!Process.kill( 0, pid ) rescue false
+            cjob['alive']    = Arachni::Processes::Manager.alive?( pid )
 
             return cjob
         end
@@ -330,8 +330,8 @@ class Dispatcher
         @operation_in_progress = true
 
         owner = 'dispatcher'
-        port  = available_port
-        token = generate_token
+        port  = Utilities.available_port
+        token = Utilities.generate_token
 
         pid = Processes::Manager.spawn( :instance, port: port, token: token )
         Process.detach( pid )

data/lib/arachni/rpc/server/dispatcher/node.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/rpc/server/dispatcher/service.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -129,6 +129,8 @@ class Framework < ::Arachni::Framework
     #
     # @return   [Hash<String=>Integer>]
     def sitemap_entries( from_index = 0 )
+        return {} if sitemap.size <= from_index + 1
+
         Hash[sitemap.to_a[from_index..-1] || {}]
     end
 

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -669,7 +669,6 @@ class Instance
     # @private
     def consumed_pids( &block )
         pids  = ([Process.pid] | @consumed_pids)
-        pids |= browser_cluster.consumed_pids if browser_cluster
 
         if @consumed_pids.empty?
             return block.call pids
@@ -796,7 +795,6 @@ class Instance
             instance_info[:url] = "#{Options.rpc.server_address}:#{options[:port]}"
 
             pid = Processes::Manager.spawn( :instance, options )
-            Process.detach pid
             @consumed_pids << pid
 
             Client::Instance.when_ready( instance_info[:url], instance_info[:token] ) do

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

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/rpc/server/plugin/manager.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/ruby.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -12,5 +12,4 @@ require lib + 'ruby/hash'
 require lib + 'ruby/set'
 require lib + 'ruby/array'
 require lib + 'ruby/string'
-require lib + 'ruby/io'
 require lib + 'ruby/webrick'

data/lib/arachni/ruby/array.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/ruby/hash.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/ruby/object.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -19,6 +19,20 @@ class Object
         Marshal.load( Marshal.dump( self ) )
     end
 
+    def rpc_clone
+        if self.class.respond_to?( :from_rpc_data )
+            self.class.from_rpc_data(
+                Arachni::RPC::Serializer.serializer.load(
+                    Arachni::RPC::Serializer.serializer.dump( to_rpc_data_or_self )
+                )
+            )
+        else
+            Arachni::RPC::Serializer.serializer.load(
+                Arachni::RPC::Serializer.serializer.dump( self )
+            )
+        end
+    end
+
     def to_rpc_data_or_self
         respond_to?( :to_rpc_data ) ? to_rpc_data : self
     end

data/lib/arachni/ruby/set.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/ruby/string.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -13,6 +13,9 @@ require 'zlib'
 # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
 class String
 
+    HAS_HTML_TAG_CACHE = Arachni::Support::Cache::LeastRecentlyPushed.new( 10_000 )
+    BINARY_CACHE       = Arachni::Support::Cache::LeastRecentlyPushed.new( 10_000 )
+
     # @param    [Regexp]    regexp
     #   Regular expression with named captures.
     #
@@ -25,6 +28,20 @@ class String
         Hash[regexp.names.zip( matches )].reject { |_, v| v.empty? }
     end
 
+    # @param    [String] tag
+    #   Tag name to look for, in lower case.
+    # @param    [String,Regexp] attributes
+    #   Content to look for in attributes, in lower case.
+    def has_html_tag?( tag, attributes = nil )
+        HAS_HTML_TAG_CACHE.fetch [self, tag, attributes] do
+            if attributes
+                attributes = ".*#{attributes}"
+            end
+
+            self =~ /<\s*#{tag}#{attributes}.*?>/mi
+        end
+    end
+
     # @param    [Regexp]    regexp
     #   Regular expression with named captures.
     # @param    [Hash]    substitutions
@@ -156,9 +173,11 @@ class String
 
     def binary?
         # Stolen from YAML.
-        encoding == Encoding::ASCII_8BIT ||
-            index("\x00") ||
-            count("\x00-\x7F", "^ -~\t\r\n").fdiv(length) > 0.3
+        BINARY_CACHE.fetch self do
+            (encoding == Encoding::ASCII_8BIT ||
+                index("\x00") ||
+                count("\x00-\x7F", "^ -~\t\r\n").fdiv(length) > 0.3)
+        end
     end
 
 end

data/lib/arachni/ruby/webrick.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/ruby/webrick/cookie.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/ruby/webrick/httprequest.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/scope.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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

data/lib/arachni/{watir → selenium/webdriver}/element.rb

@@ -1,16 +1,13 @@
-=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 Watir
+module Selenium
+module WebDriver
 class Element
 
+    def html
+        @bridge.executeScript( 'return arguments[0].outerHTML', self )
+    end
+
     def opening_tag
-        browser.execute_script(
+        @bridge.executeScript(
             %Q[
                 var s = '<' + arguments[0].tagName.toLowerCase();
                 var attrs = arguments[0].attributes;
@@ -25,14 +22,14 @@ class Element
     end
 
     def events
-        (browser.execute_script( 'return arguments[0]._arachni_events;', self ) || []).
+        (@bridge.executeScript( 'return arguments[0]._arachni_events;', self ) || []).
             map { |event, fn| [event.to_sym, fn] } |
             (::Arachni::Browser::Javascript.events.flatten.map(&:to_s) & attributes).
-                map { |event| [event.to_sym, attribute_value( event )] }
+                map { |event| [event.to_sym, attribute( event )] }
     end
 
     def attributes
-        browser.execute_script(
+        @bridge.executeScript(
             %Q[
                 var s = [];
                 var attrs = arguments[0].attributes;
@@ -45,5 +42,7 @@ class Element
         )
     end
 
+
+end
 end
 end

data/lib/arachni/session.rb

@@ -1,5 +1,5 @@
 =begin
-    Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+    Copyright 2010-2016 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
@@ -58,6 +58,14 @@ class Session
     # @return   [Block]
     attr_reader :login_sequence
 
+    # @return   [Hash]
+    #   {HTTP::Client#request} options for {#logged_in?}.
+    attr_accessor :check_options
+
+    def initialize
+        @check_options = {}
+    end
+
     def clean_up
         configuration.clear
         shutdown_browser
@@ -267,18 +275,25 @@ class Session
         fail Error::NoLoginCheck if !has_login_check?
 
         http_options = http_options.merge(
+            method:          :get,
             mode:            block_given? ? :async : :sync,
             follow_location: true,
             performer:       self
         )
+        http_options.merge!( @check_options )
 
         print_debug 'Performing login check.'
 
         bool = nil
-        http.get( Options.session.check_url, http_options ) do |response|
+        http.request( Options.session.check_url, http_options ) do |response|
             bool = !!response.body.match( Options.session.check_pattern )
 
-            print_debug "Login check done: #{bool}\n#{response}"
+            print_debug "Login check done: #{bool}"
+
+            if !bool
+                print_debug "\n#{response.request}#{response}"
+            end
+
             block.call( bool ) if block
         end
 
@@ -351,7 +366,7 @@ class Session
             form = form.dom
             form.browser = browser
 
-            if !form.element.visible?
+            if !form.locate.displayed?
                 fail Error::FormNotVisible, 'Login form is not visible in the DOM.'
             end
         end