arachni 1.3.2 → 1.4

data/lib/arachni/element/capabilities/with_auditor.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/element/capabilities/with_auditor/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
@@ -16,15 +16,15 @@ module WithAuditor
 module Output
     extend ::Forwardable
 
+    def_delegator :auditor, :with_browser_cluster
+
     [ :debug?, :print_error, :print_status, :print_verbose, :print_info,
       :print_line, :print_ok, :print_bad, :print_debug, :print_debug_backtrace,
       :print_error_backtrace, :print_debug_level_1, :print_debug_level_2,
       :print_debug_level_3, :debug_level_1?, :debug_level_2?, :debug_level_3?,
-      :print_exception ].each do |method|
-        def_delegator :auditor, :with_browser_cluster
+      :print_exception, :print_debug_exception ].each do |method|
         define_method method do |*args|
-            return if orphan?
-            auditor.send( method, *args )
+            (orphan? ? UI::Output : auditor).send( method, *args )
         end
     end
 

data/lib/arachni/element/capabilities/with_dom.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/element/capabilities/with_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
@@ -18,7 +18,7 @@ module WithNode
     # @return [Nokogiri::XML::Element]
     def node
         return if !@source
-        Nokogiri::HTML.fragment( @source.dup ).children.first
+        Arachni::Parser.parse_fragment( @source.dup )
     end
 
 end

data/lib/arachni/element/capabilities/with_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/element/capabilities/with_scope/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/element/capabilities/with_source.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
@@ -23,11 +23,11 @@ module WithSource
 
     def initialize( options )
         super
-        self.source = options[:source].freeze
+        self.source = options[:source]
     end
 
     def source=( s )
-        @source = (s ? s.recode.freeze : s)
+        @source = (s ? s : s.freeze )
     end
 
     def to_h
@@ -45,7 +45,7 @@ module WithSource
     private
 
     def copy_with_source( other )
-        other.source = source
+        other.source = @source
         other
     end
 

data/lib/arachni/element/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
@@ -35,16 +35,17 @@ class Cookie < Base
     include Capabilities::Inputtable
     include Capabilities::Mutable
 
-    ENCODE_CHARACTERS      = ['+', ';', '%', "\0", '&', ' ', '"', "\n", "\r"]
+    ENCODE_CHARACTERS      = ['+', ';', '%', "\0", '&', ' ', '"', "\n", "\r", '=']
     ENCODE_CHARACTERS_LIST = ENCODE_CHARACTERS.join
 
-    ENCODE_CHARACTERS_IN_NAME      = ENCODE_CHARACTERS + ['=']
-    ENCODE_CHARACTERS_IN_NAME_LIST = ENCODE_CHARACTERS_IN_NAME.join
+    ENCODE_CACHE = Arachni::Support::Cache::LeastRecentlyPushed.new( 1_000 )
 
     # Default cookie values
     DEFAULT = {
         name:        nil,
         value:       nil,
+        raw_name:    nil,
+        raw_value:   nil,
         version:     0,
         port:        nil,
         discard:     nil,
@@ -94,7 +95,7 @@ class Cookie < Base
         end
 
         if @data[:expires] && !@data[:expires].is_a?( Time )
-            @data[:expires] = Time.parse( @data[:expires] ) rescue nil
+            @data[:expires] = Time.parse( @data[:expires].to_s ) rescue nil
         end
 
         @data[:domain] ||= parsed_uri.host
@@ -171,7 +172,14 @@ class Cookie < Base
     # @return   [String]
     #   To be used in a `Cookie` HTTP request header.
     def to_s
-        "#{encode( name, true )}=#{encode( value )}"
+        # Only do encoding if we're dealing with a mutation, otherwise pass
+        # along the raw data as set in order to deal with server-side decoding
+        # quirks.
+        if mutation? || !(raw_name || raw_value )
+            "#{encode( name )}=#{encode( value )}"
+        else
+            "#{raw_name}=#{raw_value}"
+        end
     end
 
     # @return   [String]
@@ -311,9 +319,9 @@ class Cookie < Base
             if !document.is_a?( Nokogiri::HTML::Document )
                 document = document.to_s
 
-                return [] if !(document =~ /set-cookie/i )
+                return [] if !in_html?( document )
 
-                document = Nokogiri::HTML( document )
+                document = Arachni::Parser.parse( document )
             end
 
             Arachni::Utilities.exception_jail {
@@ -325,6 +333,10 @@ class Cookie < Base
             } rescue []
         end
 
+        def in_html?( html )
+            html =~ /http-equiv/i && html =~ /set-cookie/i
+        end
+
         # Extracts cookies from the `Set-Cookie` HTTP response header field.
         #
         # @param    [String]    url
@@ -360,11 +372,19 @@ class Cookie < Base
                 cookie_hash['expires'] = cookie.expires
 
                 cookie_hash['path'] ||= '/'
+                cookie_hash['raw_name']  = cookie.name
                 cookie_hash['name']  = decode( cookie.name )
 
                 if too_big?( cookie.value )
                     cookie_hash['value'] = ''
                 else
+                    quoted = "\"#{cookie.value}\""
+                    if str.include? quoted
+                        cookie_hash['raw_value']  = quoted
+                    else
+                        cookie_hash['raw_value']  = cookie.value
+                    end
+
                     cookie_hash['value'] = decode( cookie.value )
                 end
 
@@ -393,9 +413,12 @@ class Cookie < Base
                 v = '' if too_big?( v )
 
                 new(
-                    url:    url,
-                    source: cookie_pair,
-                    inputs: { decode( k ) => value_to_v0( v ) }
+                    url:       url,
+                    source:    cookie_pair,
+                    raw_name:  k,
+                    raw_value: v,
+                    name:      decode( k ),
+                    value:     value_to_v0( v )
                 )
             end.flatten.compact
         end
@@ -412,35 +435,32 @@ class Cookie < Base
         #
         # @example
         #    p Cookie.encode "+;%=\0 "
-        #    #=> "%2B%3B%25=%00+"
-        #
-        #    p Cookie.encode "+;%=\0 ", true
         #    #=> "%2B%3B%25%3D%00+"
         # @param    [String]    str
         #
         # @return   [String]
-        def encode( str, name = false )
+        def encode( str )
             str = str.to_s
 
-            return str if !(name ? ENCODE_CHARACTERS_IN_NAME : ENCODE_CHARACTERS).
-                find { |c| str.include? c }
-
-            # Instead of just encoding everything we do this selectively because:
-            #
-            #  * Some webapps don't actually decode some cookies, they just get
-            #    the raw value, so if we encode something may break.
-            #  * We need to encode spaces as '+' because of the above.
-            #    Since we decode values, any un-encoded '+' will be converted
-            #    to spaces, and in order to send back a value that the server
-            #    expects we use '+' for spaces.
-
-            s = ::URI.encode(
-                str,
-                name ? ENCODE_CHARACTERS_IN_NAME_LIST :
-                    ENCODE_CHARACTERS_LIST
-            )
-            s.gsub!( '%20', '+' )
-            s
+            ENCODE_CACHE.fetch( [str, name] )  do
+                if ENCODE_CHARACTERS.find { |c| str.include? c }
+
+                    # Instead of just encoding everything we do this selectively because:
+                    #
+                    #  * Some webapps don't actually decode some cookies, they just get
+                    #    the raw value, so if we encode something may break.
+                    #  * We need to encode spaces as '+' because of the above.
+                    #    Since we decode values, any un-encoded '+' will be converted
+                    #    to spaces, and in order to send back a value that the server
+                    #    expects we use '+' for spaces.
+
+                    s = ::URI.encode( str, ENCODE_CHARACTERS_LIST )
+                    s.gsub!( '%20', '+' )
+                    s
+                else
+                    str
+                end
+            end
         end
 
         # Decodes a {String} encoded for the `Cookie` header field.
@@ -462,6 +482,9 @@ class Cookie < Base
             @keep = Set.new( DEFAULT.keys )
             @keep.delete( :name )
             @keep.delete( :value )
+            @keep.delete( :raw_name )
+            @keep.delete( :raw_value )
+            @keep.delete( :domain )
             @keep.delete( :url )
             @keep.delete( :secure )
             @keep.delete( :httponly )

data/lib/arachni/element/cookie/capabilities/inputtable.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/element/cookie/capabilities/mutable.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
@@ -61,6 +61,7 @@ module Mutable
                 element                     = self.dup
                 element.affected_input_name = FUZZ_NAME
                 element.inputs              = { payload => FUZZ_NAME_VALUE }
+                element.seed                = payload
                 yield element if block_given?
             else
                 print_debug_level_2 'Payload not supported as input name by' <<
@@ -88,6 +89,14 @@ module Mutable
         end
     end
 
+    private
+
+    def prepare_mutation_options( options )
+        options = super( options )
+        options.delete( :with_raw_payloads )
+        options
+    end
+
 end
 
 end

data/lib/arachni/element/cookie/capabilities/with_dom.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/element/cookie/dom.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/element/dom.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
@@ -59,20 +59,6 @@ class DOM < Base
         @page = parent.page if parent
     end
 
-    # @return   [Watir::HTMLElement]
-    def element
-        @element ||= locate
-    end
-
-    def locator
-        @locator ||= Arachni::Browser::ElementLocator.from_node( node )
-    end
-
-    # Locates the element in the page.
-    def locate
-        locator.locate( browser )
-    end
-
     # Triggers the event on the subject {#element}.
     #
     # @return   [Array<Page::DOM::Transition>]

data/lib/arachni/element/dom/capabilities/auditable.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/element/dom/capabilities/inputtable.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/element/dom/capabilities/locatable.rb

@@ -0,0 +1,29 @@
+=begin
+    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
+    web site for more information on licensing and terms of use.
+=end
+
+module Arachni::Element
+class DOM
+module Capabilities
+
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+module Locatable
+
+    def locator
+        @locator ||= Arachni::Browser::ElementLocator.from_node( node )
+    end
+
+    # Locates the element in the page.
+    def locate
+        locator.locate( browser )
+    end
+
+end
+
+end
+end
+end

data/lib/arachni/element/dom/capabilities/mutable.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
@@ -14,6 +14,16 @@ module Capabilities
 module Mutable
     include Arachni::Element::Capabilities::Mutable
 
+    private
+
+    def prepare_mutation_options( options )
+        options = super( options )
+        # No sense in doing this for the DOM, either payload will be raw in the
+        # first place or the browser will override us.
+        options.delete :with_raw_payloads
+        options
+    end
+
 end
 
 end

data/lib/arachni/element/dom/capabilities/submittable.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
@@ -23,7 +23,7 @@ module Submittable
 
             # If we've wondered to an out-of-scope resource don't bother calling.
             # Can be caused by a JS redirect or something akin to that.
-            if (transitions = self.trigger)
+            if (transitions = self.trigger.compact).any?
                 page = browser.to_page
                 page.dom.transitions += transitions
                 block.call page.tap { |p| p.request.performer = self }

data/lib/arachni/element/form.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
@@ -46,6 +46,8 @@ class Form < Base
         end
     end
 
+    DECODE_CACHE = Arachni::Support::Cache::LeastRecentlyPushed.new( 1_000 )
+
     ORIGINAL_VALUES = '__original_values__'
     SAMPLE_VALUES   = '__sample_values__'
 
@@ -69,8 +71,8 @@ class Form < Base
     # @option   options [String]    :action
     #   Form action -- defaults to `:url`.
     # @option   options [Hash]    :inputs
-    #   Form inputs, can either be simple `name => value` pairs or more a
-    #   more detailed representation such as:
+    #   Form inputs, can either be simple `name => value` pairs or a more
+    #   detailed representation such as:
     #
     #       {
     #           'my_token'  => {
@@ -88,7 +90,6 @@ class Form < Base
 
         cinputs = (options[:inputs] || {}).inject({}) do |h, (name, value_or_info)|
              if value_or_info.is_a? Hash
-                 value_or_info             = value_or_info.my_symbolize_keys
                  h[name]                   = value_or_info[:value]
                  @input_details[name.to_s] = value_or_info
              else
@@ -211,7 +212,7 @@ class Form < Base
     #
     # @return   [String]
     def field_type_for( name )
-        details_for( name )[:type] || :text
+        (details_for( name )[:type] || :text).to_sym
     end
 
     def fake_field?( name )
@@ -267,9 +268,9 @@ class Form < Base
             if !document.is_a?( Nokogiri::HTML::Document )
                 document = document.to_s
 
-                return [] if !(document =~ /<\s*form/i)
+                return [] if !in_html?( document )
 
-                document = Nokogiri::HTML( document )
+                document = Arachni::Parser.parse( document )
             end
 
             base_url = (document.search( '//base[@href]' )[0]['href'] rescue url)
@@ -286,6 +287,10 @@ class Form < Base
             end.flatten.compact
         end
 
+        def in_html?( html )
+            html.has_html_tag? 'form'
+        end
+
         def from_node( url, node, ignore_scope = false )
             options          = attributes_to_hash( node.attributes )
             options[:url]    = url.freeze
@@ -305,7 +310,7 @@ class Form < Base
 
             %w(textarea input select button).each do |attr|
                 options[attr] ||= []
-                node.search( ".//#{attr}" ).each do |elem|
+                node.css( attr ).each do |elem|
                     elem_attrs = attributes_to_hash( elem.attributes )
                     elem_attrs[:type] = elem_attrs[:type].to_sym if elem_attrs[:type]
 
@@ -418,16 +423,30 @@ class Form < Base
         def decode( string )
             string = string.to_s
 
-            # Fast, but could throw error.
-            begin
-                ::URI.decode_www_form_component string
+            DECODE_CACHE.fetch( string ) do
+                # Fast, but could throw error.
+                begin
+                    ::URI.decode_www_form_component string
 
-            # Slower, but reliable.
-            rescue ArgumentError
-                URI.decode( string.gsub( '+', ' ' ) )
+                # Slower, but reliable.
+                rescue ArgumentError
+                    URI.decode( string.gsub( '+', ' ' ) )
+                end
             end
         end
 
+        def from_rpc_data( data )
+            # Inputs contain attribute data instead of just values, normalize them.
+            if data['initialization_options']['inputs'].values.first.is_a? Hash
+                data['initialization_options']['inputs'].each do |name, details|
+                    data['initialization_options']['inputs'][name] =
+                        details.my_symbolize_keys( true )
+                end
+            end
+
+            super data
+        end
+
     end
 
     protected