cms_scanner 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c298cb52add0fd3b06836ec3d5f5acc7fcc06c
-  data.tar.gz: 32c3dec825b5d3641b86938ea2641bafb34cc0bd
+  metadata.gz: 3954c9c3eb90a7f8acded64914b7b0af297ffffa
+  data.tar.gz: 4379facdd8238326dc6f770bd095db747986db95
 SHA512:
-  metadata.gz: 4444cb50bf62d3b2715bd49054a539ae058aa234b4f27d013b6dda5fa5bfcc4664fd270e85a00f82d3de99add49729223f4f5333146262f92ad67360ea4d6665
-  data.tar.gz: dbd2746ebc6b5912d4bf3c828dbc413499d0b1e306dc2826dc8572017a5025adfa9a1b0c4528a49bd44ae5a704a3cee0c04e719376907679e97926913d88166d
+  metadata.gz: 8fdefebdce42065da6bdcb82b941facbdae7f2ac2d0fec363c6ff6e1043257546fe257c100509b1e7d7869ce56ce04b3e9ddb19d1b173e1ff58ccd15a8715f99
+  data.tar.gz: a8056624c77515e42d8bcc30b022e5ae435c2bb149da9596ba2cb30a7d5171576c5b7f35e582392e8d147c180297f49dc17a6857243ffe1af444f06cb2311a3e

data/cms_scanner.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rspec', '~> 3.2'
-  s.add_development_dependency 'rspec-its', '~> 1.1'
+  s.add_development_dependency 'rspec-its', '~> 1.2'
   s.add_development_dependency 'bundler', '~> 1.6'
   s.add_development_dependency 'rubocop', '~> 0.29'
   s.add_development_dependency 'webmock', '~> 1.20'

data/lib/cms_scanner/finders/finder/enumerator.rb

@@ -44,12 +44,20 @@ module CMSScanner
         def progress_bar(total)
           ProgressBar.create(
             format: '%t %a <%B> (%c / %C) %P%% %e',
-            title: ' ', # Used to craete a left margin
+            title: progress_bar_title,
             total: total
           )
         end
         # :nocov:
 
+        # Progress Bar title to use, allow instance using this module
+        # to display a custom title if needed
+        #
+        # @return [ String ]
+        def progress_bar_title
+          ' ' # Used to create a left margin
+        end
+
         # @return [ CMSScanner::Browser ]
         def browser
           @browser ||= NS::Browser.instance

data/lib/cms_scanner/finders/independent_finders.rb

@@ -17,7 +17,7 @@ module CMSScanner
       def run(opts = {})
         each do |finder|
           symbols_from_mode(opts[:mode]).each do |symbol|
-            [*finder.send(symbol, opts)].compact.each do |found|
+            [*finder.send(symbol, opts.merge(found: findings))].compact.each do |found|
               findings << found
             end
           end

data/lib/cms_scanner/finders/same_type_finders.rb

@@ -12,7 +12,7 @@ module CMSScanner
       def run(opts = {})
         symbols_from_mode(opts[:mode]).each do |symbol|
           each do |finder|
-            [*finder.send(symbol, opts)].compact.each do |found|
+            [*finder.send(symbol, opts.merge(found: findings))].compact.each do |found|
               findings << found
             end
           end

data/lib/cms_scanner/finders/unique_finders.rb

@@ -19,7 +19,9 @@ module CMSScanner
 
         symbols_from_mode(opts[:mode]).each do |symbol|
           each do |finder|
-            [*finder.send(symbol, opts)].compact.each { |found| findings << found }
+            [*finder.send(symbol, opts.merge(found: findings))].compact.each do |found|
+              findings << found
+            end
 
             next if opts[:confidence_threshold] <= 0
 

data/lib/cms_scanner/version.rb

@@ -1,4 +1,4 @@
 # Version
 module CMSScanner
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/spec/lib/finders/independent_finders_spec.rb

@@ -29,7 +29,9 @@ describe CMSScanner::Finders::IndependentFinders do
           let(:mode) { current_mode }
 
           it "calls the #{current_mode} method on each finder" do
-            finders.each { |f| expect(f).to receive(current_mode).ordered }
+            finders.each do |f|
+              expect(f).to receive(current_mode).with(hash_including(found: [])).ordered
+            end
           end
         end
       end
@@ -40,7 +42,7 @@ describe CMSScanner::Finders::IndependentFinders do
         it 'calls :passive then :aggressive on each finder' do
           finders.each do |finder|
             [:passive, :aggressive].each do |method|
-              expect(finder).to receive(method).ordered
+              expect(finder).to receive(method).with(hash_including(found: [])).ordered
             end
           end
         end

data/spec/lib/finders/same_type_finders_spec.rb

@@ -32,10 +32,21 @@ describe CMSScanner::Finders::SameTypeFinders do
       let(:opts) { super().merge(mode: :mixed) }
 
       it 'calls all #passive then #aggressive on finders and returns the best result' do
-        expect(finders[0]).to receive(:passive).ordered.and_return(dummy_passive)
-        expect(finders[1]).to receive(:passive).ordered.and_return(noaggressive)
-        expect(finders[0]).to receive(:aggressive).ordered.and_return(dummy_aggresssive)
-        expect(finders[1]).to receive(:aggressive).ordered
+        expect(finders[0]).to receive(:passive)
+          .with(hash_including(found: [])).ordered
+          .and_return(dummy_passive)
+
+        expect(finders[1]).to receive(:passive)
+          .with(hash_including(found: [dummy_passive.first])).ordered
+          .and_return(noaggressive)
+
+        expect(finders[0]).to receive(:aggressive)
+          .with(hash_including(found: [dummy_passive.first, noaggressive])).ordered
+          .and_return(dummy_aggresssive)
+
+        expect(finders[1]).to receive(:aggressive)
+          .with(hash_including(:found))
+          .ordered
 
         @expected = []
 
@@ -53,8 +64,13 @@ describe CMSScanner::Finders::SameTypeFinders do
       let(:opts) { super().merge(mode: :passive) }
 
       it 'calls #passive on all finders and returns the best result' do
-        expect(finders[0]).to receive(:passive).ordered.and_return(dummy_passive)
-        expect(finders[1]).to receive(:passive).ordered.and_return(noaggressive)
+        expect(finders[0]).to receive(:passive)
+          .with(hash_including(found: [])).ordered
+          .and_return(dummy_passive)
+
+        expect(finders[1]).to receive(:passive)
+          .with(hash_including(found: [dummy_passive.first])).ordered
+          .and_return(noaggressive)
 
         finders.each { |f| expect(f).to_not receive(:aggressive) }
 
@@ -71,8 +87,12 @@ describe CMSScanner::Finders::SameTypeFinders do
       it 'calls #aggressive on all finders and returns the best result' do
         finders.each { |f| expect(f).to_not receive(:passive) }
 
-        expect(finders[0]).to receive(:aggressive).ordered.and_return(dummy_aggresssive)
-        expect(finders[1]).to receive(:aggressive).ordered
+        expect(finders[0]).to receive(:aggressive)
+          .with(hash_including(found: [])).ordered
+          .and_return(dummy_aggresssive)
+
+        expect(finders[1]).to receive(:aggressive)
+          .with(hash_including(found: [dummy_aggresssive])).ordered
 
         @expected = [finding.new('test', confidence: 100, found_by: 'override')]
       end

data/spec/lib/finders/unique_finders_spec.rb

@@ -82,12 +82,23 @@ describe CMSScanner::Finders::UniqueFinders do
 
         it 'calls all #passive then #aggressive on finders and returns the best result' do
           # Maybe there is a way to factorise this
-          expect(finders[0]).to receive(:passive).ordered.and_return(dummy_passive)
-          expect(finders[1]).to receive(:passive).ordered.and_return(noaggressive)
-          expect(finders[2]).to receive(:passive).ordered
-          expect(finders[0]).to receive(:aggressive).ordered.and_return(dummy_aggresssive)
-          expect(finders[1]).to receive(:aggressive).ordered
-          expect(finders[2]).to receive(:aggressive).ordered.and_return(dummy2_aggressive)
+          expect(finders[0]).to receive(:passive)
+            .with(hash_including(found: [])).ordered
+            .and_return(dummy_passive)
+
+          expect(finders[1]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first])).ordered
+            .and_return(noaggressive)
+
+          expect(finders[2]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first, noaggressive])).ordered
+
+          expect(finders[0]).to receive(:aggressive).with(hash_including(:found)).ordered
+            .and_return(dummy_aggresssive)
+
+          expect(finders[1]).to receive(:aggressive).with(hash_including(:found)).ordered
+          expect(finders[2]).to receive(:aggressive).with(hash_including(:found)).ordered
+            .and_return(dummy2_aggressive)
 
           @expected = finding.new('v1', confidence: 100, found_by: 'Dummy (Passive Detection)')
           @expected.confirmed_by << finding.new('v1', confidence: 100, found_by: 'override')
@@ -99,9 +110,16 @@ describe CMSScanner::Finders::UniqueFinders do
         let(:opts) { super().merge(mode: :passive) }
 
         it 'calls #passive on all finders and returns the best result' do
-          expect(finders[0]).to receive(:passive).ordered.and_return(dummy_passive)
-          expect(finders[1]).to receive(:passive).ordered.and_return(noaggressive)
-          expect(finders[2]).to receive(:passive).ordered
+          expect(finders[0]).to receive(:passive)
+            .with(hash_including(found: [])).ordered
+            .and_return(dummy_passive)
+
+          expect(finders[1]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first])).ordered
+            .and_return(noaggressive)
+
+          expect(finders[2]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first, noaggressive])).ordered
 
           finders.each { |f| expect(f).to_not receive(:aggressive) }
 
@@ -116,9 +134,16 @@ describe CMSScanner::Finders::UniqueFinders do
         it 'calls #aggressive on all finders and returns the best result' do
           finders.each { |f| expect(f).to_not receive(:passive) }
 
-          expect(finders[0]).to receive(:aggressive).ordered.and_return(dummy_aggresssive)
-          expect(finders[1]).to receive(:aggressive).ordered
-          expect(finders[2]).to receive(:aggressive).ordered.and_return(dummy2_aggressive)
+          expect(finders[0]).to receive(:aggressive)
+            .with(hash_including(found: [])).ordered
+            .and_return(dummy_aggresssive)
+
+          expect(finders[1]).to receive(:aggressive)
+            .with(hash_including(found: [dummy_aggresssive])).ordered
+
+          expect(finders[2]).to receive(:aggressive)
+            .with(hash_including(:found)).ordered
+            .and_return(dummy2_aggressive)
 
           @expected = finding.new('v1', confidence: 100, found_by: 'override')
           @expected.confirmed_by << finding.new('v1', confidence: 90)
@@ -132,10 +157,20 @@ describe CMSScanner::Finders::UniqueFinders do
 
         it 'calls all #passive then #aggressive methods on finders and returns the '\
            'result which reaches 100% confidence during the process' do
-          expect(finders[0]).to receive(:passive).ordered.and_return(dummy_passive)
-          expect(finders[1]).to receive(:passive).ordered.and_return(noaggressive)
-          expect(finders[2]).to receive(:passive).ordered
-          expect(finders[0]).to receive(:aggressive).ordered.and_return(dummy_aggresssive)
+          expect(finders[0]).to receive(:passive)
+            .with(hash_including(found: [])).ordered
+            .and_return(dummy_passive)
+
+          expect(finders[1]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first])).ordered
+            .and_return(noaggressive)
+
+          expect(finders[2]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first, noaggressive])).ordered
+
+          expect(finders[0]).to receive(:aggressive).with(hash_including(:found)).ordered
+            .and_return(dummy_aggresssive)
+
           expect(finders[1]).to_not receive(:aggressive)
           expect(finders[2]).to_not receive(:aggressive)
 
@@ -148,9 +183,16 @@ describe CMSScanner::Finders::UniqueFinders do
         let(:opts) { super().merge(mode: :passive) }
 
         it 'calls all #passive and returns the best result' do
-          expect(finders[0]).to receive(:passive).ordered.and_return(dummy_passive)
-          expect(finders[1]).to receive(:passive).ordered.and_return(noaggressive)
-          expect(finders[2]).to receive(:passive).ordered
+          expect(finders[0]).to receive(:passive)
+            .with(hash_including(found: [])).ordered
+            .and_return(dummy_passive)
+
+          expect(finders[1]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first])).ordered
+            .and_return(noaggressive)
+
+          expect(finders[2]).to receive(:passive)
+            .with(hash_including(found: [dummy_passive.first, noaggressive])).ordered
 
           finders.each { |f| expect(f).to_not receive(:aggressive) }
 
@@ -165,7 +207,10 @@ describe CMSScanner::Finders::UniqueFinders do
         it 'calls all #aggressive and returns the result which reaches 100% confidence' do
           finders.each { |f| expect(f).to_not receive(:passive) }
 
-          expect(finders[0]).to receive(:aggressive).ordered.and_return(dummy_aggresssive)
+          expect(finders[0]).to receive(:aggressive)
+            .with(hash_including(found: [])).ordered
+            .and_return(dummy_aggresssive)
+
           expect(finders[1]).to_not receive(:aggressive)
           expect(finders[2]).to_not receive(:aggressive)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - WPScanTeam - Erwan Le Rousseau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opt_parse_validator
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement