arachni 1.2.1 → 1.3

data/lib/arachni/element/capabilities/auditable.rb

@@ -6,9 +6,6 @@
     web site for more information on licensing and terms of use.
 =end
 
-require_relative 'inputtable'
-require_relative 'mutable'
-require_relative 'submittable'
 require_relative 'with_auditor'
 
 module Arachni
@@ -20,9 +17,6 @@ module Element::Capabilities
 # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
 module Auditable
     include Utilities
-    include Inputtable
-    include Submittable
-    include Mutable
     include WithAuditor
 
     # Load and include all available analysis/audit techniques.

data/lib/arachni/element/capabilities/dom_only.rb

@@ -0,0 +1,61 @@
+=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
+
+require_relative '../base'
+require_relative 'with_node'
+require_relative 'with_dom'
+
+module Arachni
+module Element::Capabilities
+
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+module DOMOnly
+    include Arachni::Element::Capabilities::Inputtable
+    include Arachni::Element::Capabilities::WithNode
+    include Arachni::Element::Capabilities::WithDOM
+
+    attr_accessor :method
+
+    def initialize( options )
+        super options
+
+        @method   = options[:method]
+
+        self.inputs = options[:inputs]
+        @default_inputs = self.inputs.dup.freeze
+    end
+
+    def mutation?
+        false
+    end
+
+    def coverage_id
+        dom.coverage_id
+    end
+
+    def coverage_hash
+        dom.coverage_hash
+    end
+
+    def id
+        dom.id
+    end
+
+    def dup
+        super.tap do |o|
+            o.method = self.method
+        end
+    end
+
+    def type
+        self.class.type
+    end
+
+end
+end
+end

data/lib/arachni/element/capabilities/with_dom.rb

@@ -23,7 +23,9 @@ module WithDOM
     def dom
         return if skip_dom?
         @dom ||= self.class::DOM.new( parent: self )
-    rescue Inputtable::Error
+    rescue Inputtable::Error => e
+        print_debug_exception e
+        nil
     end
 
     def skip_dom=( bool )

data/lib/arachni/element/cookie.rb

@@ -25,6 +25,8 @@ class Cookie < Base
     Dir.glob( lib ).each { |f| require f }
 
     # Generic element capabilities.
+    include Arachni::Element::Capabilities::Submittable
+    include Arachni::Element::Capabilities::Auditable
     include Arachni::Element::Capabilities::Analyzable
     include Arachni::Element::Capabilities::WithSource
 
@@ -33,6 +35,12 @@ class Cookie < Base
     include Capabilities::Inputtable
     include Capabilities::Mutable
 
+    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
+
     # Default cookie values
     DEFAULT = {
         name:        nil,
@@ -163,7 +171,7 @@ class Cookie < Base
     # @return   [String]
     #   To be used in a `Cookie` HTTP request header.
     def to_s
-        "#{encode( name )}=#{encode( value )}"
+        "#{encode( name, true )}=#{encode( value )}"
     end
 
     # @return   [String]
@@ -404,13 +412,35 @@ class Cookie < Base
         #
         # @example
         #    p Cookie.encode "+;%=\0 "
-        #    #=> "%2B%3B%25%3D%00%20"
+        #    #=> "%2B%3B%25=%00+"
         #
+        #    p Cookie.encode "+;%=\0 ", true
+        #    #=> "%2B%3B%25%3D%00+"
         # @param    [String]    str
         #
         # @return   [String]
-        def encode( str )
-            Arachni::HTTP::Request.encode( str )
+        def encode( str, name = false )
+            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
         end
 
         # Decodes a {String} encoded for the `Cookie` header field.
@@ -423,7 +453,7 @@ class Cookie < Base
         #
         # @return   [String]
         def decode( str )
-            ::URI.decode_www_form_component str.to_s
+            Form.decode str
         end
 
         def keep_for_set_cookie

data/lib/arachni/element/cookie/dom.rb

@@ -6,14 +6,19 @@
     web site for more information on licensing and terms of use.
 =end
 
+require_relative '../dom'
+
 module Arachni::Element
 class Cookie
 
 # Provides access to DOM operations for {Cookie cookies}.
 #
 # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
-class DOM < Base
-    include Arachni::Element::Capabilities::Auditable::DOM
+class DOM < DOM
+    include Arachni::Element::DOM::Capabilities::Mutable
+    include Arachni::Element::DOM::Capabilities::Inputtable
+    include Arachni::Element::DOM::Capabilities::Submittable
+    include Arachni::Element::DOM::Capabilities::Auditable
 
     def initialize( options )
         super
@@ -24,8 +29,12 @@ class DOM < Base
 
     # Submits the cookie using the configured {#inputs}.
     def trigger
-        browser.goto action, take_snapshot: false, cookies: self.inputs,
-                     update_transitions: false
+        [ browser.goto(
+            action,
+            take_snapshot:      false,
+            cookies:            self.inputs,
+            update_transitions: false
+        ) ]
     end
 
     def name

data/lib/arachni/element/{capabilities/auditable/dom.rb → dom.rb}

@@ -6,20 +6,18 @@
     web site for more information on licensing and terms of use.
 =end
 
-require 'forwardable'
+require_relative 'base'
 
-module Arachni
-module Element::Capabilities
-module Auditable
+module Arachni::Element
 
-# Provides access to DOM operations for {Element elements}.
-#
 # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
-module DOM
-    include Auditable
-    extend ::Forwardable
+class DOM < Base
 
-    INVALID_INPUT_DATA = [ "\0" ]
+    # load and include all available capabilities
+    lib = File.dirname( __FILE__ ) + '/dom/capabilities/*.rb'
+    Dir.glob( lib ).each { |f| require f }
+
+    include Arachni::Element::Capabilities::WithSource
 
     # @return   [Element::Base]
     attr_accessor :parent
@@ -29,26 +27,6 @@ module DOM
 
     attr_reader   :action
 
-    # @!method with_browser_cluster( &block )
-    def_delegator :auditor, :with_browser_cluster
-
-    # @!method with_browser( &block )
-    def_delegator :auditor, :with_browser
-
-    def self.included( parent )
-        parent.extend ClassMethods
-    end
-
-    module ClassMethods
-        def encode( string )
-            string
-        end
-
-        def decode( string )
-            string
-        end
-    end
-
     def initialize( options )
         options = options.dup
         @parent = options.delete(:parent)
@@ -57,7 +35,7 @@ module DOM
             @url    = parent.url.dup.freeze    if parent.url
             @action = parent.action.dup.freeze if parent.action
             @page   = parent.page              if parent.page
-            @source = parent.source.dup.freeze   if parent.respond_to?(:source) && parent.source
+            @source = parent.source.dup.freeze if parent.respond_to?(:source) && parent.source
         else
             @url    = options[:url].freeze
             @action = options[:action].freeze
@@ -76,10 +54,6 @@ module DOM
         # NOP
     end
 
-    def valid_input_data?( data )
-        !INVALID_INPUT_DATA.find { |c| data.include? c }
-    end
-
     def page
         return @page if @page
         @page = parent.page if parent
@@ -90,29 +64,8 @@ module DOM
         @element ||= locate
     end
 
-    # @param  [Hash]  options
-    # @param  [Block]  block
-    #   Callback to be passed the evaluated {Page}.
-    def submit( options = {}, &block )
-        with_browser do |browser|
-            prepare_browser( browser, options )
-
-            # 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 (transition = trigger)
-                page = browser.to_page
-                page.dom.transitions << transition
-                block.call page.tap { |p| p.request.performer = self }
-            end
-
-            @element = nil
-            @browser = nil
-        end
-        nil
-    end
-
     def locator
-        @locator ||= Browser::ElementLocator.from_node( node )
+        @locator ||= Arachni::Browser::ElementLocator.from_node( node )
     end
 
     # Locates the element in the page.
@@ -122,6 +75,8 @@ module DOM
 
     # Triggers the event on the subject {#element}.
     #
+    # @return   [Array<Page::DOM::Transition>]
+    #
     # @abstract
     def trigger
         fail NotImplementedError
@@ -130,6 +85,7 @@ module DOM
     # Removes the associated {#page}, {#parent} and {#browser}
     def prepare_for_report
         super
+
         @page    = nil
         @parent  = nil
         @element = nil
@@ -146,9 +102,9 @@ module DOM
 
     def initialization_options
         options = {}
-        options[:url]    = url.dup     if @url
+        options[:url]    = @url.dup    if @url
         options[:action] = @action.dup if @action
-        options[:page]   = page        if page
+        # options[:page]   = @page       if @page
         options[:source] = @source.dup if @source
         options
     end
@@ -161,18 +117,14 @@ module DOM
         self.class.decode( string )
     end
 
-    private
-
-    def prepare_browser( browser, options )
-        @browser = browser
-        browser.javascript.custom_code = options[:custom_code]
-        browser.javascript.taint       = options[:taint]
+    def self.encode( string )
+        string
+    end
 
-        browser.load page
+    def self.decode( string )
+        string
     end
 
 end
 
 end
-end
-end

data/lib/arachni/element/dom/capabilities/auditable.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::Element
+class DOM
+module Capabilities
+
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+module Auditable
+    include Arachni::Element::Capabilities::Auditable
+
+    def with_browser( &block )
+        auditor.with_browser( &block )
+    end
+
+    def with_browser_cluster( &block )
+        auditor.with_browser_cluster( &block )
+    end
+
+end
+
+end
+end
+end

data/lib/arachni/element/dom/capabilities/inputtable.rb

@@ -0,0 +1,27 @@
+=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::Element
+class DOM
+module Capabilities
+
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+module Inputtable
+    include Arachni::Element::Capabilities::Inputtable
+
+    INVALID_INPUT_DATA = [ "\0" ]
+
+    def valid_input_data?( data )
+        !INVALID_INPUT_DATA.find { |c| data.include? c }
+    end
+
+end
+
+end
+end
+end

data/lib/arachni/element/dom/capabilities/mutable.rb

@@ -0,0 +1,21 @@
+=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::Element
+class DOM
+module Capabilities
+
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+module Mutable
+    include Arachni::Element::Capabilities::Mutable
+
+end
+
+end
+end
+end

data/lib/arachni/element/dom/capabilities/submittable.rb

@@ -0,0 +1,52 @@
+=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::Element
+class DOM
+module Capabilities
+
+# @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
+module Submittable
+    include Arachni::Element::Capabilities::Submittable
+
+    # @param  [Hash]  options
+    # @param  [Block]  block
+    #   Callback to be passed the evaluated {Page}.
+    def submit( options = {}, &block )
+        with_browser do |browser|
+            prepare_browser( browser, options )
+
+            # 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)
+                page = browser.to_page
+                page.dom.transitions += transitions
+                block.call page.tap { |p| p.request.performer = self }
+            end
+
+            @element = nil
+            @browser = nil
+        end
+        nil
+    end
+
+    private
+
+    def prepare_browser( browser, options )
+        @browser = browser
+        browser.javascript.custom_code = options[:custom_code]
+        browser.javascript.taint       = options[:taint]
+
+        browser.load page
+    end
+
+end
+
+end
+end
+end