arachni 0.3 → 0.4

data/lib/{http.rb → arachni/http.rb}

@@ -1,6 +1,6 @@
 =begin
                   Arachni
-  Copyright (c) 2010-2011 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
+  Copyright (c) 2010-2012 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 
   This is free software; you can copy and distribute and modify
   this program under the term of the GPL v2.0 License
@@ -12,6 +12,7 @@ require 'typhoeus'
 
 module Arachni
 
+require Options.instance.dir['lib'] + 'typhoeus/hydra'
 require Options.instance.dir['lib'] + 'typhoeus/request'
 require Options.instance.dir['lib'] + 'typhoeus/response'
 require Options.instance.dir['lib'] + 'module/utilities'
@@ -34,7 +35,7 @@ require Options.instance.dir['lib'] + 'mixins/observable'
 # @author: Tasos "Zapotek" Laskos
 #                                      <tasos.laskos@gmail.com>
 #                                      <zapotek@segfault.gr>
-# @version: 0.2.6
+# @version: 0.2.7
 #
 class HTTP
 
@@ -109,7 +110,7 @@ class HTTP
             'From'   => opts.authed_by || '',
             'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
             'User-Agent'    => opts.user_agent
-        }
+        }.merge( opts.custom_headers )
 
         cookies = {}
         cookies.merge!( self.class.parse_cookiejar( opts.cookie_jar ) ) if opts.cookie_jar
@@ -126,7 +127,6 @@ class HTTP
         } if opts.proxy_addr
 
         @opts = {
-            :user_agent      => opts.user_agent,
             :follow_location => false,
             :disable_ssl_peer_verification => true,
             :timeout         => 50000
@@ -149,7 +149,7 @@ class HTTP
     # Runs Hydra (all the asynchronous queued HTTP requests)
     #
     # Should only be called by the framework
-    # after all module threads have beed joined!
+    # after all module threads have been joined!
     #
     def run
         exception_jail {
@@ -195,7 +195,7 @@ class HTTP
 
     #
     # Queues a Tyhpoeus::Request and applies an 'on_complete' callback
-    # on behal of the trainer.
+    # on behalf of the trainer.
     #
     # @param  [Tyhpoeus::Request]  req  the request to queue
     # @param  [Bool]  async  run request async?
@@ -233,7 +233,7 @@ class HTTP
 
             call_on_complete( res )
 
-            parse_and_set_cookies( res )
+            parse_and_set_cookies( res ) if req.update_cookies?
 
             print_debug( '------------' )
             print_debug( 'Got response.' )
@@ -285,53 +285,20 @@ class HTTP
     # @return [Typhoeus::Request]
     #
     def request( url, opts )
-        headers   = opts[:headers]   || {}
-        opts[:headers] = @init_headers.dup.merge( headers )
-
-        train     = opts[:train]
-        async     = opts[:async]
-        async     = true if async == nil
-
-        exception_jail {
-
-            req = Typhoeus::Request.new( normalize_url( url ), opts.merge( @opts ) )
-            req.train! if train
-
-            queue( req, async )
-            return req
-        }
-    end
-
-    #
-    # Gets a URL passing the provided query parameters
-    #
-    # @param  [URI]  url     URL to GET
-    # @param  [Hash] opts    request options
-    #                         * :params  => request parameters || {}
-    #                         * :train   => force Arachni to analyze the HTML code || false
-    #                         * :async   => make the request async? || true
-    #                         * :headers => HTTP request headers  || {}
-    #                         * :follow_location => follow redirects || false
-    #
-    # @return [Typhoeus::Request]
-    #
-    def get( url, opts = { } )
-
         params    = opts[:params]    || {}
         remove_id = opts[:remove_id]
         train     = opts[:train]
         timeout   = opts[:timeout]
+        cookies   = opts[:cookies]
 
-        follow_location    = opts[:follow_location]    || false
+        update_cookies   = opts[:update_cookies]
 
         async     = opts[:async]
         async     = true if async == nil
 
-        headers   = opts[:headers]   || {}
-        headers   = @init_headers.dup.merge( headers )
-
+        follow_location    = opts[:follow_location]    || false
 
-        params = params.merge( { @rand_seed => '' } ) if !remove_id
+        headers   = opts[:headers]   || {}
 
         #
         # the exception jail function wraps the block passed to it
@@ -341,6 +308,11 @@ class HTTP
         #
         exception_jail {
 
+            headers       = @init_headers.merge( headers )
+            headers['cookie'] = get_cookies_str( cookies, false ) if cookies
+
+            params = params.merge( { @rand_seed => '' } ) if !remove_id
+
             #
             # There are cases where the url already has a query and we also have
             # some params to work with. Some webapp frameworks will break
@@ -350,31 +322,51 @@ class HTTP
             # params of the url query and remove the latter from the url.
             #
             cparams = params.dup
-            curl    = URI.escape( url.dup )
-
-            cparams = q_to_h( curl ).merge( cparams )
-
-            begin
-                curl.gsub!( "?#{URI(curl).query}", '' ) if URI(curl).query
-            rescue
-                return
+            curl    = normalize_url( url.dup )
+
+            if opts[:method] != :post
+                begin
+                    cparams = q_to_h( curl ).merge( cparams )
+                    curl.gsub!( "?#{URI(curl).query}", '' ) if URI(curl).query
+                rescue
+                    return
+                end
             end
 
             opts = {
                 :headers       => headers,
                 :params        => cparams.empty? ? nil : cparams,
-                :follow_location => follow_location,
+                :method        => opts[:method].nil? ? :get : opts[:method]
             }.merge( @opts )
 
+            opts[:follow_location] = follow_location if follow_location
+
             opts[:timeout] = timeout if timeout
 
             req = Typhoeus::Request.new( curl, opts )
             req.train! if train
+            req.update_cookies! if update_cookies
 
             queue( req, async )
             return req
         }
+    end
 
+    #
+    # Gets a URL passing the provided query parameters
+    #
+    # @param  [URI]  url     URL to GET
+    # @param  [Hash] opts    request options
+    #                         * :params  => request parameters || {}
+    #                         * :train   => force Arachni to analyze the HTML code || false
+    #                         * :async   => make the request async? || true
+    #                         * :headers => HTTP request headers  || {}
+    #                         * :follow_location => follow redirects || false
+    #
+    # @return [Typhoeus::Request]
+    #
+    def get( url, opts = { } )
+        request( url, opts )
     end
 
     #
@@ -390,33 +382,7 @@ class HTTP
     # @return [Typhoeus::Request]
     #
     def post( url, opts = { } )
-
-        params    = opts[:params]
-        train     = opts[:train]
-        timeout   = opts[:timeout]
-
-        async     = opts[:async]
-        async     = true if async == nil
-
-        headers   = opts[:headers] || {}
-        headers   = @init_headers.dup.merge( headers )
-
-        exception_jail {
-
-            opts = {
-                :method        => :post,
-                :headers       => headers,
-                :params        => params,
-                :follow_location => false,
-            }.merge( @opts )
-            opts[:timeout] = timeout if timeout
-
-            req = Typhoeus::Request.new( normalize_url( url ), opts )
-            req.train! if train
-
-            queue( req, async )
-            return req
-        }
+        request( url, opts.merge( :method => :post ) )
     end
 
     #
@@ -432,31 +398,7 @@ class HTTP
     # @return [Typhoeus::Request]
     #
     def trace( url, opts = { } )
-
-        params    = opts[:params]
-        train     = opts[:train]
-
-        async     = opts[:async]
-        async     = true if async == nil
-
-        headers   = opts[:headers] || {}
-        headers   = @init_headers.dup.merge( headers )
-
-        exception_jail {
-
-            opts = {
-                :method        => :trace,
-                :headers       => headers,
-                :params        => params,
-                :follow_location => false
-            }.merge( @opts )
-
-            req = Typhoeus::Request.new( normalize_url( url ), opts )
-            req.train! if train
-
-            queue( req, async )
-            return req
-        }
+        request( url, opts.merge( :method => :trace ) )
     end
 
 
@@ -473,39 +415,9 @@ class HTTP
     # @return [Typhoeus::Request]
     #
     def cookie( url, opts = { } )
-
-        cookies   = opts[:params] || {}
-        # params    = opts[:params]
-        train     = opts[:train]
-        timeout   = opts[:timeout]
-
-
-        async     = opts[:async]
-        async     = true if async == nil
-
-        headers   = opts[:headers] || {}
-
-        headers = @init_headers.dup.
-          merge( { 'cookie' => get_cookies_str( cookies ) } ).merge( headers )
-
-        # wrap the code in exception handling
-        exception_jail {
-
-            opts = {
-                :headers         => headers,
-                :follow_location => false,
-                # :params          => params
-                :timeout       => opts[:timeout]
-            }.merge( @opts )
-            opts[:timeout] = timeout if timeout
-
-
-            req = Typhoeus::Request.new( normalize_url( url ), opts )
-            req.train! if train
-
-            queue( req, async )
-            return req
-        }
+        opts[:cookies] = opts[:params].dup || {}
+        opts[:params] = nil
+        request( url, opts )
     end
 
     #
@@ -522,34 +434,17 @@ class HTTP
     def header( url, opts = { } )
 
         headers   = opts[:params] || {}
-        # params    = opts[:params]
-        train     = opts[:train]
-
-        async     = opts[:async]
-        async     = true if async == nil
-
 
-        # wrap the code in exception handling
-        exception_jail {
-
-            orig_headers  = @init_headers.clone
-            @init_headers = @init_headers.merge( headers )
-
-            req = Typhoeus::Request.new( normalize_url( url ),
-                :headers       => @init_headers.dup,
-                :user_agent    => @init_headers['User-Agent'],
-                :follow_location => false,
-                # :params        => params
-                :timeout       => opts[:timeout]
-            )
-            req.train! if train
+        orig_headers      = @init_headers.clone
+        opts[:headers]    = @init_headers = @init_headers.merge( headers )
+        opts[:user_agent] = @init_headers['User-Agent']
 
-            @init_headers = orig_headers.clone
+        opts[:params] = nil
 
-            queue( req, async )
-            return req
-        }
+        req = request( url, opts )
 
+        @init_headers = orig_headers.clone
+        return req
     end
 
     def q_to_h( url )
@@ -652,16 +547,18 @@ class HTTP
     #
     # @return   [string]
     #
-    def get_cookies_str( cookies = { } )
+    def get_cookies_str( cookies = { }, with_existing = true )
 
-        jar = parse_cookie_str( @init_headers['cookie'] )
-        cookies = jar.merge( cookies )
+        if with_existing
+            jar = parse_cookie_str( @init_headers['cookie'] )
+            cookies = jar.merge( cookies )
+        end
 
         str = ''
         cookies.each_pair {
             |name, value|
             value = '' if !value
-            val = URI.escape( URI.escape( value ), '+;' )
+            val = uri_encode( uri_encode( value ), '+;' )
             str += "#{name}=#{val};"
         }
         return str

data/lib/{issue.rb → arachni/issue.rb}

@@ -1,8 +1,6 @@
 =begin
-  $Id$
-
                   Arachni
-  Copyright (c) 2010-2011 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
+  Copyright (c) 2010-2012 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
 
   This is free software; you can copy and distribute and modify
   this program under the term of the GPL v2.0 License
@@ -20,7 +18,7 @@
 # @author: Tasos "Zapotek" Laskos
 #                                      <tasos.laskos@gmail.com>
 #                                      <zapotek@segfault.gr>
-# @version: 0.1
+# @version: 0.1.1
 #
 module Arachni
 
@@ -80,7 +78,7 @@ class Issue
     attr_accessor :url
 
     #
-    # The headers exchanhed during the attack
+    # The headers exchanged during the attack
     #
     # @return [Hash<String, Hash>]  request and reply headers
     #
@@ -112,7 +110,7 @@ class Issue
     #
     # @return    [String]
     #
-    attr_accessor :regexp
+    attr_reader   :regexp
 
     #
     # The data that was matched by the regexp
@@ -187,7 +185,7 @@ class Issue
     attr_accessor :remedy_guidance
 
     #
-    # A code snipet showing the user how to remedy the situation
+    # A code snippet showing the user how to remedy the situation
     #
     # @return    [String]
     #
@@ -216,29 +214,28 @@ class Issue
     #
     attr_accessor :metasploitable
 
-    attr_accessor :opts
+    attr_reader   :opts
 
     attr_accessor :internal_modname
     attr_accessor :tags
     attr_accessor :_hash
 
     #
-    # Sets up the instanse attributes
+    # Sets up the instance attributes
     #
-    # @param    Hash    cofiguration hash
+    # @param    Hash    configuration hash
     #                     Usually the returned data of a module's
     #                     info() method for the references
     #                     merged with a name=>value pair hash holding
     #                     class attributes
     #
     def initialize( opts = {} )
-
         @verification = false
 
         opts.each {
             |k, v|
             begin
-                send( "#{k.to_s.downcase}=", v )
+                send( "#{k.to_s.downcase}=", encode( v ) )
             rescue Exception => e
             end
         }
@@ -246,10 +243,18 @@ class Issue
         opts[:issue].each {
             |k, v|
             begin
-                send( "#{k.to_s.downcase}=", v )
+                send( "#{k.to_s.downcase}=", encode( v ) )
             rescue Exception => e
             end
-        }
+        } if opts[:issue]
+
+        if opts[:headers] && opts[:headers][:request]
+            @headers[:request] = {}.merge( opts[:headers][:request] )
+        end
+
+        if opts[:headers] && opts[:headers][:response].is_a?( Hash )
+            @headers[:response] = {}.merge( opts[:headers][:response] )
+        end
 
         if( @cwe )
             @cwe_url = "http://cwe.mitre.org/data/definitions/" + @cwe + ".html"
@@ -257,7 +262,6 @@ class Issue
 
         @mod_name   = opts[:name]
         @references = opts[:references] || {}
-
     end
 
     def regexp=( regexp )
@@ -272,6 +276,28 @@ class Issue
         @opts = hash.dup
     end
 
+    def []( k )
+        instance_variable_get( "@#{k.to_s}".to_sym )
+    end
+
+    def []=( k, v )
+        v= encode( v )
+        begin
+            send( "#{k.to_s}=", v )
+        rescue
+            instance_variable_set( "@#{k.to_s}".to_sym, v )
+        end
+    end
+
+    def to_h
+        h = {}
+        each_pair {
+            |k, v|
+            h[k] = v
+        }
+        h
+    end
+
     def each
         self.instance_variables.each {
             |var|
@@ -292,11 +318,14 @@ class Issue
 
     private
 
+    def encode( str )
+        return str if !str || !str.is_a?( String )
+        str.encode( 'UTF-8', :invalid => :replace, :undef => :replace )
+    end
+
     def normalize_name( name )
         name.to_s.gsub( /@/, '' )
     end
 
-
 end
-
 end