arachni 0.3 → 0.4

data/lib/arachni/typhoeus/hydra.rb

@@ -0,0 +1,7 @@
+module Typhoeus
+  class Hydra
+
+      attr_accessor :max_concurrency
+
+  end
+end

data/lib/{typhoeus → arachni/typhoeus}/request.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
@@ -19,24 +19,18 @@ module Typhoeus
 
     class Request
 
-        attr_accessor :id, :proxy, :proxy_username, :proxy_password,
-                      :proxy_username, :proxy_password, :proxy_type
+        attr_accessor :id
 
         alias :old_initialize :initialize
 
         def initialize( url, options = {} )
-
             old_initialize( url, options )
 
-            @proxy_type       = options[:proxy_type]
-            @proxy_username   = options[:proxy_username]
-            @proxy_password   = options[:proxy_password]
-            @proxy_auth_method = options[:proxy_auth_method]
-
             @on_complete        = []
             @handled_response   = []
             @multiple_callbacks = false
             @train              = false
+            @update_cookies     = false
         end
 
         def on_complete( multi = false, &block )
@@ -86,6 +80,14 @@ module Typhoeus
             @train = true
         end
 
+        def update_cookies?
+            @update_cookies
+        end
+
+        def update_cookies!
+            @update_cookies = true
+        end
+
     end
 
 end

data/lib/{typhoeus → arachni/typhoeus}/response.rb

@@ -2,6 +2,10 @@
 module Typhoeus
   class Response
 
+    def redirection?
+        (300...399).include?( @code )
+    end
+
     #
     # Converts obj to hash
     #

data/lib/{ui → arachni/ui}/cli/cli.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,7 +12,9 @@
 module Arachni
 
 require Options.instance.dir['lib'] + 'ui/cli/output'
-require Options.instance.dir['lib'] + 'framework'
+require Options.instance.dir['mixins'] + 'terminal'
+require Options.instance.dir['mixins'] + 'progress_bar'
+require Options.instance.dir['arachni']
 
 module UI
 
@@ -26,10 +28,12 @@ module UI
 # @author: Tasos "Zapotek" Laskos
 #                                      <tasos.laskos@gmail.com>
 #                                      <zapotek@segfault.gr>
-# @version: 0.1.7
+# @version: 0.1.9
 # @see Arachni::Framework
 #
 class CLI
+    include ::Arachni::Mixins::Terminal
+    include ::Arachni::Mixins::ProgressBar
 
     #
     # Instance options
@@ -81,6 +85,8 @@ class CLI
         # work on the user supplied arguments
         parse_opts( )
 
+        @interrupt_handler = nil
+
         # trap Ctrl+C interrupts
         trap( 'INT' ) { handle_interrupt( ) }
     end
@@ -93,11 +99,21 @@ class CLI
         print_status( 'Initing...' )
 
         begin
-            # start the show!
-            @arachni.run( ){
-                @interrupt_handler.join if @interrupt_handler
+            # we may need to kill the audit so put it in a thread
+            @audit = Thread.new {
+                # start the show!
+                @arachni.run {
+                    kill_interrupt_handler
+                    clear_screen!
+                }
+                print_stats
             }
-            print_stats
+
+            @audit.join
+
+            # if the user requested to exit the scan wait until the
+            # Thread that takes care of the clean up to finish
+            @exit_handler.join if @exit_handler
         rescue Arachni::Exceptions::NoMods => e
             print_error( e.to_s )
             print_info( "Run arachni with the '-h' parameter for help or " )
@@ -117,37 +133,70 @@ class CLI
 
     private
 
-    def print_stats( refresh_time = false )
+    def print_stats( refresh_time = false, unmute = false )
 
         stats   = @arachni.stats( refresh_time )
 
         audited = stats[:auditmap_size]
         mapped  = stats[:sitemap_size]
 
-        print_line
-        print_info( "Audit progress: #{stats[:progress]}% ( Discovered #{mapped} pages )" )
-        print_line
-        print_info( "Sent #{stats[:requests]} requests." )
-        print_info( "Received and analyzed #{stats[:responses]} responses." )
-        print_info( 'In ' + stats[:time] )
+        print_line( restr, unmute )
+
+        print_info( restr( "#{progress_bar( stats[:progress], 61 )}" ), unmute )
+        print_info( restr( "Est. remaining time: #{stats[:eta]}" ), unmute )
+
+        print_line( restr, unmute )
+
+        if stats[:current_page] && !stats[:current_page].empty?
+            print_info( restr( "Crawler has discovered #{mapped} pages." ), unmute )
+        else
+            print_info( restr( "Crawling, discovered #{mapped} pages and counting." ), unmute )
+        end
+
+        if @arachni.opts.link_count_limit > 0
+
+            feedback = ''
+            if @arachni.page_queue_total_size
+                feedback = " -- excluding #{@arachni.page_queue_total_size} pages of Trainer feedback"
+            end
+
+            print_info( restr( "Audit limited to a max of #{@arachni.opts.link_count_limit} " +
+                "pages#{feedback}." ),
+                unmute
+            )
+        end
+
+        print_line( restr, unmute )
+
+        print_info( restr( "Sent #{stats[:requests]} requests." ), unmute )
+        print_info( restr( "Received and analyzed #{stats[:responses]} responses." ), unmute )
+        print_info( restr( 'In ' + stats[:time] ), unmute )
 
         avg = 'Average: ' + stats[:avg].to_s + ' requests/second.'
-        print_info( avg )
+        print_info( restr( avg ), unmute )
 
-        print_line
-        print_info( "Currently auditing           #{stats[:current_page]}" )
-        print_info( "Burst response time total    #{stats[:curr_res_time]}" )
-        print_info( "Burst response count total   #{stats[:curr_res_cnt]} " )
-        print_info( "Burst average response time  #{stats[:average_res_time]}" )
-        print_info( "Burst average                #{stats[:curr_avg]} requests/second" )
-        print_info( "Timed-out requests           #{stats[:time_out_count]}" )
-        print_info( "Original max concurrency     #{@opts.http_req_limit}" )
-        print_info( "Throttled max concurrency    #{stats[:max_concurrency]}" )
+        print_line( restr, unmute )
+        if stats[:current_page] && !stats[:current_page].empty?
+            print_info( restr( "Currently auditing" +
+                "           #{stats[:current_page]}" ), unmute )
+        end
 
-        print_line
+        print_info( restr( "Burst response time total    #{stats[:curr_res_time]}" ), unmute )
+        print_info( restr( "Burst response count total   #{stats[:curr_res_cnt]} " ), unmute )
+        print_info( restr( "Burst average response time  #{stats[:average_res_time]}" ), unmute )
+        print_info( restr( "Burst average                #{stats[:curr_avg]} requests/second" ), unmute )
+        print_info( restr( "Timed-out requests           #{stats[:time_out_count]}" ), unmute )
+        print_info( restr( "Original max concurrency     #{@opts.http_req_limit}" ), unmute )
+        print_info( restr( "Throttled max concurrency    #{stats[:max_concurrency]}" ), unmute )
 
+        print_line( restr, unmute )
     end
 
+    def kill_interrupt_handler
+        @@only_positives = @only_positives_opt
+        @interrupt_handler.exit if @interrupt_handler
+        unmute!
+    end
 
     #
     # Handles Ctrl+C interrupts
@@ -158,55 +207,65 @@ class CLI
     #
     # The interrupt will be handled after a module has finished.
     #
-    def handle_interrupt( )
+    def handle_interrupt
         return if @interrupt_handler && @interrupt_handler.alive?
 
-        only_positives_opt = only_positives?
+        @only_positives_opt = only_positives_opt = only_positives?
         @@only_positives = false
+
         @interrupt_handler = Thread.new {
 
              Thread.new {
 
-                case gets[0]
+                c = gets[0]
+                clear_screen!
+                unmute!
+                case c
 
                     when 'e'
                         @@only_positives = false
-                        unmute!
                         @interrupt_handler.kill
 
-                        print_info( 'Exiting...' )
-                        exit 0
+                        print_status( 'Exiting...' )
+                        print_info( 'Please wait while the system cleans up.' )
+
+                        # kill the audit
+                        @audit.exit
+
+                        @exit_handler = Thread.new {
+                            @arachni.clean_up!( true )
+                            @arachni.reports.run( @arachni.audit_store( true ) )
+                            print_stats
+                        }
 
                     when 'r'
-                        unmute!
-                        @arachni.reports.run( @arachni.audit_store( ) )
+                        @arachni.reports.run( @arachni.audit_store( true ) )
                 end
 
-                @@only_positives = only_positives_opt
-                unmute!
-                @interrupt_handler.kill
-                Thread.kill
+                kill_interrupt_handler
+                Thread.exit
             }
 
-            while( 1 )
+            mute!
+            clear_screen!
+            loop do
 
-                unmute!
-                print_line
-                clear_screen
-                print_info( 'Results thus far:' )
+                print_line( restr, true )
+                move_to_home!
+                print_info( restr( 'Results thus far:' ), true )
 
                 begin
-                    print_issues( @arachni.audit_store( true ) )
-                    print_stats( true )
+                    print_issues( @arachni.audit_store( true ), true )
+                    print_stats( true, true )
                 rescue Exception => e
                     exception_jail{ raise e }
-                    exit 0
+                    raise e
                 end
 
-                print_info( 'Continue? (hit \'enter\' to continue, \'r\' to generate reports and \'e\' to exit)' )
-                mute!
+                print_info( restr( 'Continue? (hit \'enter\' to continue, \'r\' to generate reports and \'e\' to exit)' ), true )
+                flush!
 
-                ::IO::select( nil, nil, nil, 1 )
+                ::IO::select( nil, nil, nil, 0.3 )
             end
 
             unmute!
@@ -214,30 +273,30 @@ class CLI
 
     end
 
-    def clear_screen
-        puts "\e[H\e[2J"
-    end
-
-    def print_issues( audit_store )
+    def print_issues( audit_store, unmute = false )
 
-        print_line( )
-        print_info( audit_store.issues.size.to_s +
-          ' issues have been detected.' )
+        print_line( restr, unmute )
+        print_info( restr( audit_store.issues.size.to_s +
+          ' issues have been detected.' ), unmute )
 
-        print_line( )
-        audit_store.issues.each {
-            |issue|
+        print_line( restr, unmute )
 
-            print_ok( "#{issue.name} (In #{issue.elem} variable '#{issue.var}'" +
-              " - Severity: #{issue.severity} - Variations: #{issue.variations.size.to_s})" )
+        issues    = audit_store.issues
+        issue_cnt = audit_store.issues.count
+        issues.each.with_index {
+            |issue, i|
 
-            print_info( issue.variations[0]['url'] )
+            input = issue.var ? " input `#{issue.var}`" : ''
+            meth  = issue.method ? " using #{issue.method}" : ''
+            cnt   = "#{i + 1} |".rjust( issue_cnt.to_s.size + 2 )
 
-            print_line( )
+            print_ok( restr(  "#{cnt} #{issue.name} at #{issue.url} in" +
+                " #{issue.elem}#{input}#{meth}." ),
+                unmute
+            )
         }
 
-        print_line( )
-
+        print_line( restr, unmute )
     end
 
     #
@@ -248,7 +307,7 @@ class CLI
     #
     def parse_opts(  )
 
-        if !@opts.repload
+        if !@opts.repload && !@opts.help
 
             if( !@opts.mods || @opts.mods.empty? )
                 print_info( "No modules were specified." )
@@ -361,7 +420,7 @@ class CLI
         print_info( 'Available modules:' )
         print_line
 
-        mods = @arachni.lsmod( )
+        mods = @arachni.lsmod
 
         i = 0
         mods.each {
@@ -378,7 +437,7 @@ class CLI
                     info[:elements].join( ', ' ).downcase )
             end
 
-            print_line( "Author:\t\t"     + info[:author] )
+            print_line( "Author:\t\t"     + info[:author].join( ", " ) )
             print_line( "Version:\t"      + info[:version] )
 
             if( info[:references] )
@@ -389,11 +448,13 @@ class CLI
                 }
             end
 
-            print_line( "Targets:" )
-            info[:targets].keys.each {
-                |key|
-                print_info( key + "\t\t" + info[:targets][key] )
-            }
+            if info[:targets]
+                print_line( "Targets:" )
+                info[:targets].keys.each {
+                    |key|
+                    print_info( key + "\t\t" + info[:targets][key] )
+                }
+            end
 
             if( info[:issue] &&
                 ( sploit = info[:issue][:metasploitable] ) )
@@ -454,7 +515,7 @@ class CLI
                 }
             end
 
-            print_line( "Author:\t\t"     + info[:author] )
+            print_line( "Author:\t\t"     + info[:author].join( ", " ) )
             print_line( "Version:\t"      + info[:version] )
             print_line( "Path:\t"         + info[:path] )
 
@@ -495,7 +556,7 @@ class CLI
                 }
             end
 
-            print_line( "Author:\t\t"     + info[:author] )
+            print_line( "Author:\t\t"     + info[:author].join( ", " ) )
             print_line( "Version:\t"      + info[:version] )
             print_line( "Path:\t"         + info[:path] )
 
@@ -516,7 +577,7 @@ class CLI
             @opts.load_profile = nil
             profiles.each {
                 |filename|
-                @opts.merge!( YAML::load( IO.read( filename ) ) )
+                @opts.merge!( @opts.load( filename ) )
             }
         }
     end
@@ -593,9 +654,9 @@ class CLI
 
     --only-positives            echo positive results *only*
 
-    --http-req-limit            concurent HTTP requests limit
-                                  (Be carefull not to kill your server.)
-                                  (Default: 60)
+    --http-req-limit            concurrent HTTP requests limit
+                                  (Be careful not to kill your server.)
+                                  (Default: #{@opts.http_req_limit})
                                   (*NOTE*: If your scan seems unresponsive try lowering the limit.)
 
     --http-harvest-last         build up the HTTP request queue of the audit for the whole site
@@ -607,14 +668,19 @@ class CLI
                                    *and* you feel dangerous you can use
                                    this flag with an increased '--http-req-limit'
                                    to get maximum performance out of your scan.)
-                                 (*WARNING*: When scanning large websites with hundreads
+                                 (*WARNING*: When scanning large websites with hundreds
                                   of pages this could eat up all your memory pretty quickly.)
 
-    --cookie-jar=<cookiejar>    netscape HTTP cookie file, use curl to create it
+    --cookie-jar=<cookiejar>    Netscape HTTP cookie file, use curl to create it
 
 
     --user-agent=<user agent>   specify user agent
 
+    --custom-header='<name>=<value>'
+
+                                specify custom headers to be included in the HTTP requests
+                                (Can be used multiple times.)
+
     --authed-by=<who>           who authorized the scan, include name and e-mail address
                                   (It'll make it easier on the sys-admins during log reviews.)
                                   (Will be appended to the user-agent string.)
@@ -644,7 +710,7 @@ class CLI
                                   (Can be used multiple times.)
 
     --redundant=<regex>:<count> limit crawl on redundant pages like galleries or catalogs
-                                  (URLs matching <regex> will be crawled <count> links deep.)
+                                  (URLs matching <regex> will be crawled <count> amount of times.)
                                   (Can be used multiple times.)
 
     -f
@@ -657,9 +723,13 @@ class CLI
 
     --link-count=<number>       how many links to follow (default: inf)
 
-    --redirect-limit=<number>   how many redirects to follow (default: inf)
+    --redirect-limit=<number>   how many redirects to follow (default: #{@opts.redirect_limit})
 
-    --spider-first              spider first, audit later
+    --extend-paths=<file>       add the paths in <file> to the ones discovered by the crawler
+                                  (Can be used multiple times.)
+
+    --restrict-paths=<file>     use the paths in <file> instead of crawling
+                                  (Can be used multiple times.)
 
 
     Auditor ------------------------