arachni 0.4.2 → 0.4.3

data/spec/arachni/ruby/webrick_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
 describe WEBrick::Cookie do
 

data/spec/arachni/session_spec.rb

@@ -1,9 +1,9 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe Arachni::Session do
 
     before( :all ) do
-        @url = server_url_for( :session )
+        @url = web_server_url_for( :session )
         @opts = Arachni::Options.instance
     end
 
@@ -283,7 +283,7 @@ describe Arachni::Session do
     describe '#set_login_check' do
         it 'sets a login check using a URL and regular expression' do
             s = new_session
-            url = server_url_for( :session ) + '/'
+            url = web_server_url_for( :session ) + '/'
             s.opts.url = "#{url}/congrats"
 
             s.has_login_sequence?.should be_false

data/spec/arachni/spider_spec.rb

@@ -1,9 +1,9 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe Arachni::Spider do
     before( :all ) do
         @opts = Arachni::Options.instance
-        @opts.url = server_url_for :spider
+        @opts.url = web_server_url_for :spider
         @url = @opts.url.to_s
     end
 
@@ -14,7 +14,7 @@ describe Arachni::Spider do
     end
 
     it 'supports HTTPS' do
-        @opts.url = (server_url_for :spider_https).gsub( 'http', 'https' )
+        @opts.url = (web_server_url_for :spider_https).gsub( 'http', 'https' )
         spider = Arachni::Spider.new
 
         spider.run.size.should == 3
@@ -222,6 +222,17 @@ describe Arachni::Spider do
             end
         end
         context 'when the link-count-limit option has been set' do
+            context 'and the limit has been reached' do
+                it 'immediately returns' do
+                    @opts.link_count_limit = 1
+                    spider = Arachni::Spider.new
+                    spider.run.should == spider.sitemap
+                    spider.sitemap.should == [@url]
+
+                    spider.run.should be_false
+                end
+            end
+
             it 'follows only a <link-count-limit> amount of paths' do
                 @opts.link_count_limit = 1
                 spider = Arachni::Spider.new
@@ -381,7 +392,7 @@ describe Arachni::Spider do
 
             s = Arachni::Spider.new
             paths = [@url + 'a_pushed_path', @url + 'another_pushed_path']
-            s.push( paths )
+            s.push( paths ).should be_true
             (s.paths & paths).sort.should == paths.sort
             s.run
             (s.paths & paths).should be_empty
@@ -396,12 +407,25 @@ describe Arachni::Spider do
             nwp = Arachni::Module::Utilities.to_absolute( wp )
             np = Arachni::Module::Utilities.to_absolute( p )
 
-            s.push( p )
+            s.push( p ).should be_true
             s.run
             s.fancy_sitemap[np].should == 200
             s.fancy_sitemap[nwp].should == 200
         end
 
+        context 'when the link-count-limit option has been set' do
+            context 'and the limit has been reached' do
+                it 'immediately returns' do
+                    @opts.link_count_limit = 1
+                    spider = Arachni::Spider.new
+                    spider.run.should == spider.sitemap
+                    spider.sitemap.should == [@url]
+
+                    spider.push( Arachni::Module::Utilities.to_absolute( 'test' ) ).should be_false
+                end
+            end
+        end
+
         #context 'when called after the crawl has finished' do
         #    it 'should wake the crawler up after pushing the new paths' do
         #        s = Arachni::Spider.new
@@ -445,7 +469,7 @@ describe Arachni::Spider do
         end
         context 'when running' do
             it 'returns false' do
-                @opts.url = server_url_for( :auditor ) + '/sleep'
+                @opts.url = web_server_url_for( :auditor ) + '/sleep'
                 s = Arachni::Spider.new
                 Thread.new{ s.run }
                 sleep 1

data/spec/arachni/{buffer → support/buffer}/autoflush_spec.rb

@@ -1,16 +1,11 @@
-require_relative '../../spec_helper'
-require Arachni::Options.dir['lib'] + 'buffer'
-
-describe Arachni::Buffer::AutoFlush do
-    before( :all ) do
-        @buffer = Arachni::Buffer::AutoFlush
-    end
+require 'spec_helper'
 
+describe Arachni::Support::Buffer::AutoFlush do
     describe '#initialize' do
         context 'when passed a max_size' do
             context 'when the buffer reaches that size' do
                 it 'forces the buffer to #flush itself' do
-                    b = @buffer.new( 10 )
+                    b = described_class.new( 10 )
 
                     buffers = []
                     b.on_flush do |buffer|
@@ -31,7 +26,7 @@ describe Arachni::Buffer::AutoFlush do
         context 'when passed a max_pushes' do
             context 'when the amount of pushes reaches that size' do
                 it 'forces the buffer to #flush itself' do
-                    b = @buffer.new( 99999, 10 )
+                    b = described_class.new( 99999, 10 )
 
                     buffers = []
                     b.on_flush do |buffer|
@@ -45,7 +40,7 @@ describe Arachni::Buffer::AutoFlush do
                     buffers.shift.should == (10...20).to_a
                     b.should be_empty
 
-                    b = @buffer.new( 99999, 10 )
+                    b = described_class.new( 99999, 10 )
 
                     buffers = []
                     b.on_flush do |buffer|
@@ -64,13 +59,13 @@ describe Arachni::Buffer::AutoFlush do
 
         context 'when passed a type' do
             it 'should be used for internal storage' do
-                b = @buffer.new( 10, 999, Set )
+                b = described_class.new( 10, 999, Set )
                 b << 'test'
                 b << 'test'
                 b.size.should == 1
                 b.flush.class.should == Set
 
-                b = @buffer.new
+                b = described_class.new
                 b << 'test'
                 b << 'test'
                 b.size.should == 2

data/spec/arachni/{buffer → support/buffer}/base_spec.rb

@@ -1,15 +1,11 @@
-require_relative '../../spec_helper'
-require Arachni::Options.dir['lib'] + 'buffer'
+require 'spec_helper'
 
-describe Arachni::Buffer::Base do
-    before( :all ) do
-        @buffer = Arachni::Buffer::Base
-    end
+describe Arachni::Support::Buffer::Base do
 
     describe '#initialize' do
         context 'when passed a max_size' do
             it 'determines whether or not the buffer is full' do
-                b = @buffer.new( 10 )
+                b = described_class.new( 10 )
                 20.times { |i| b << i }
                 b.full?.should be_true
             end
@@ -17,13 +13,13 @@ describe Arachni::Buffer::Base do
 
         context 'when passed a type' do
             it 'determines the type to use for internal storage' do
-                b = @buffer.new( 10, Set )
+                b = described_class.new( 10, Set )
                 b << 'test'
                 b << 'test'
                 b.size.should == 1
                 b.flush.class.should == Set
 
-                b = @buffer.new
+                b = described_class.new
                 b << 'test'
                 b << 'test'
                 b.size.should == 2
@@ -35,13 +31,13 @@ describe Arachni::Buffer::Base do
 
     describe '#<<' do
         it 'adds an element to the buffer' do
-            b = @buffer.new
+            b = described_class.new
             b << 'test'
             b << 'test'
             b.size.should == 2
         end
         it 'aliased to #push' do
-            b = @buffer.new
+            b = described_class.new
             b.push 'test'
             b.push 'test'
             b.size.should == 2
@@ -50,7 +46,7 @@ describe Arachni::Buffer::Base do
 
     describe '#batch_push' do
         it 'pushes a batch of entries' do
-            b = @buffer.new
+            b = described_class.new
             b.batch_push [ 'test', 'test2' ]
             b.size.should == 2
         end
@@ -58,7 +54,7 @@ describe Arachni::Buffer::Base do
 
     describe '#size' do
         it 'returns the number of entries in the buffer' do
-            b = @buffer.new
+            b = described_class.new
             b.batch_push [ 'test', 'test2', 'test3' ]
             b.size.should == 3
         end
@@ -68,13 +64,13 @@ describe Arachni::Buffer::Base do
         context 'when the buffer' do
             context 'is empty' do
                 it 'returns true' do
-                    b = @buffer.new( 10 )
+                    b = described_class.new( 10 )
                     b.empty?.should be_true
                 end
             end
             context 'is not empty' do
                 it 'returns false' do
-                    b = @buffer.new( 10 )
+                    b = described_class.new( 10 )
                     b << 1
                     b.empty?.should be_false
                 end
@@ -86,14 +82,14 @@ describe Arachni::Buffer::Base do
         context 'when the buffer has' do
             context 'reached its maximum size' do
                 it 'returns true' do
-                    b = @buffer.new( 10 )
+                    b = described_class.new( 10 )
                     20.times { |i| b << i }
                     b.full?.should be_true
                 end
             end
             context 'not reached its maximum size' do
                 it 'returns false' do
-                    b = @buffer.new( 100 )
+                    b = described_class.new( 100 )
                     20.times { |i| b << i }
                     b.full?.should be_false
                 end
@@ -103,7 +99,7 @@ describe Arachni::Buffer::Base do
 
     describe '#flush' do
         it 'returns buffer contents' do
-            b = @buffer.new
+            b = described_class.new
             b.batch_push [ 'test', 'test2', 'test3' ]
             b.size.should == 3
 
@@ -111,7 +107,7 @@ describe Arachni::Buffer::Base do
             b.size.should == 0
         end
         it 'empties the buffer' do
-            b = @buffer.new
+            b = described_class.new
             b.batch_push [ 'test', 'test2', 'test3' ]
             b.size.should == 3
 
@@ -124,7 +120,7 @@ describe Arachni::Buffer::Base do
         it 'adds blocks to be called every time #<< (or #push) is called' do
             item = :ya
 
-            b = @buffer.new
+            b = described_class.new
 
             call_args = []
             b.on_push do |buffer|
@@ -138,7 +134,7 @@ describe Arachni::Buffer::Base do
             b << item
             call_args.should == [ item, item]
 
-            b = @buffer.new
+            b = described_class.new
 
             call_args = []
             b.on_push do |buffer|
@@ -158,7 +154,7 @@ describe Arachni::Buffer::Base do
         it 'adds blocks to be called every time #batch_push is called' do
             item = [:ya, :ya1]
 
-            b = @buffer.new
+            b = described_class.new
 
             call_args = []
             b.on_batch_push do |buffer|
@@ -178,7 +174,7 @@ describe Arachni::Buffer::Base do
         it 'adds blocks to be called every time #flush is called' do
             item = :ya
 
-            b = @buffer.new
+            b = described_class.new
             b << item
 
             call_args = []

data/spec/arachni/{cache → support/cache}/base_spec.rb

@@ -1,19 +1,19 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Arachni::Cache::Base do
+describe Arachni::Support::Cache::Base do
 
-    before { @cache = Arachni::Cache::Base.new }
+    before { @cache = described_class.new }
 
     describe '#new' do
         describe 'max_size' do
             describe 'nil' do
                 it 'leaves the cache uncapped' do
-                    Arachni::Cache::Base.new.capped?.should be_false
+                    described_class.new.capped?.should be_false
                 end
             end
             describe Integer do
                 it 'imposes a limit to the size of the cache' do
-                    Arachni::Cache::Base.new( 10 ).capped?.should be_true
+                    described_class.new( 10 ).capped?.should be_true
                 end
             end
         end
@@ -182,7 +182,7 @@ describe Arachni::Cache::Base do
                 old_val = 'my val'
                 new_val = 'new val'
 
-                cache = Arachni::Cache::Base.new
+                cache = described_class.new
                 cache[:my_key] = old_val
                 cache.fetch_or_store( :my_key ) { new_val }
 
@@ -193,7 +193,7 @@ describe Arachni::Cache::Base do
         context 'when the passed key does not exist' do
             it 'assigns to it the return value of the given block' do
                 new_val = 'new val'
-                cache = Arachni::Cache::Base.new
+                cache = described_class.new
                 cache.fetch_or_store( :my_key ) { new_val }
 
                 cache[:my_key].should == new_val

data/spec/arachni/{cache → support/cache}/least_cost_replacement_spec.rb

@@ -1,8 +1,8 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Arachni::Cache::LeastCostReplacement do
+describe Arachni::Support::Cache::LeastCostReplacement do
 
-    before { @cache = Arachni::Cache::LeastCostReplacement.new }
+    before { @cache = described_class.new }
 
 
     it 'prunes itself by removing the least costly entries' do

data/spec/arachni/{cache → support/cache}/least_recently_used_spec.rb

@@ -1,8 +1,8 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Arachni::Cache::LeastRecentlyUsed do
+describe Arachni::Support::Cache::LeastRecentlyUsed do
 
-    before { @cache = Arachni::Cache::LeastRecentlyUsed.new }
+    before { @cache = described_class.new }
 
     it 'prunes itself by removing Least Recently Used entries' do
         @cache.max_size = 3

data/spec/arachni/{cache → support/cache}/preference_spec.rb

@@ -1,8 +1,8 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Arachni::Cache::Preference do
+describe Arachni::Support::Cache::Preference do
 
-    before { @cache = Arachni::Cache::Preference.new }
+    before { @cache = described_class.new }
 
     it 'prunes itself by removing entries returned by the given block' do
         @cache.max_size = 3

data/spec/arachni/{cache → support/cache}/random_replacement_spec.rb

@@ -1,8 +1,8 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
 
-describe Arachni::Cache::RandomReplacement do
+describe Arachni::Support::Cache::RandomReplacement do
 
-    before { @cache = Arachni::Cache::RandomReplacement.new }
+    before { @cache = described_class.new }
 
     it 'prunes itself by removing random entries (Random Replacement)' do
         @cache.max_size = 3

data/spec/arachni/{crypto → support/crypto}/rsa_aes_cbc_spec.rb

@@ -1,9 +1,7 @@
-require_relative '../../spec_helper'
-require_testee
-
+require 'spec_helper'
 require 'tempfile'
 
-describe RSA_AES_CBC do
+describe Arachni::Support::Crypto::RSA_AES_CBC do
 
     SEED = 'seed data'
 
@@ -21,7 +19,7 @@ describe RSA_AES_CBC do
         @private_key_file_path = private_key_file.path
         @public_key_file_path = public_key_file.path
 
-        @crypto = RSA_AES_CBC.new( @public_key_file_path, @private_key_file_path )
+        @crypto = described_class.new( @public_key_file_path, @private_key_file_path )
     end
 
     it 'generates matching encrypted and decrypted data' do

data/spec/arachni/{database → support/database}/hash_spec.rb

@@ -1,10 +1,9 @@
-require_relative '../../spec_helper'
-require_testee
+require 'spec_helper'
 
-describe Arachni::Database::Hash do
+describe Arachni::Support::Database::Hash do
 
     before :all do
-        @hash = Arachni::Database::Hash.new
+        @hash = described_class.new
         @non_existent = 'blahblahblah'
 
         @seeds = {
@@ -16,7 +15,7 @@ describe Arachni::Database::Hash do
 
     # http://www.ruby-doc.org/core-1.9.3/Hash.html#method-i-empty?
     it 'implements #empty?' do
-        h = Arachni::Database::Hash.new
+        h = described_class.new
 
         h.empty?.should == {}.empty?