cms_scanner 0.0.41.2 → 0.0.41.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc8a5e5ea4c59952b7b9e9b0c989275b1694f2c97f109a12e66c35c45d5918b
-  data.tar.gz: 289ca0de5f2c507cb21d0e9b80ed5bc06309937271945eeda2a6a5448d8350c5
+  metadata.gz: 110b5b109b6dd1c9d09549e7deb8fb7508c9bfb0468b24dd6b6d2c2a4c83301d
+  data.tar.gz: 0c09f110f1c432518d16a21f87cd3787b29322bcb109a5180e5aec3f5facd637
 SHA512:
-  metadata.gz: 96e2d75cd756402a389cffb1ecfb31aa0e11efcc96634aae67bb35782edfc6b0bf612c6f82eb04cee93f9e4ebaf9c7abf8cc04969a215abdb4f84cba1dda0bb2
-  data.tar.gz: c521e2d89534f3d2027a00420e2a7662b958e8bcc880e560c07c0e5336c615ce0b859a7b38112287bb1387daf9ed077ce40d6c802a0a9b7f6e6c267ca4b1692f
+  metadata.gz: c070cc68a72da9669cefc5792e0d9a8f61ded544cddb4cdc78db2a4dbe9d5f6890e40004761b2f04646b7d685b86c2cd56624d0568b84f0f17fc51c0298b9edb
+  data.tar.gz: 9fd44567c3802590a41c8db6fec6c6ed0bfbdff3a91afb70c1832752d119fb61591bf5e24d8c4bad80fe53ef7f486212050b452c93101ef814efafb3f94be2ba

data/app/controllers/core/cli_options.rb

@@ -31,7 +31,10 @@ module CMSScanner
           OptBoolean.new(['--ignore-main-redirect', 'Ignore the main redirect (if any) and scan the target url'],
                          advanced: true),
           OptBoolean.new(['-v', '--verbose', 'Verbose mode']),
-          OptBoolean.new(['--[no-]banner', 'Whether or not to display the banner'], default: true)
+          OptBoolean.new(['--[no-]banner', 'Whether or not to display the banner'], default: true),
+          OptPositiveInteger.new(['--max-scan-duration SECONDS',
+                                  'Abort the scan if it exceeds the time provided in seconds'],
+                                 advanced: true)
         ]
       end
 

data/lib/cms_scanner.rb

@@ -13,6 +13,7 @@ require 'erb'
 require 'uri'
 require 'fileutils'
 require 'pathname'
+require 'timeout'
 require 'xmlrpc/client'
 # Monkey Patches
 require 'cms_scanner/typhoeus/response' # Adds a Response#html using Nokogiri to parse the body
@@ -24,6 +25,7 @@ require 'cms_scanner/progressbar_null_output'
 require 'cms_scanner/helper'
 require 'cms_scanner/exit_code'
 require 'cms_scanner/errors/http'
+require 'cms_scanner/errors/scan'
 require 'cms_scanner/cache/typhoeus'
 require 'cms_scanner/target'
 require 'cms_scanner/browser'
@@ -185,7 +187,7 @@ module CMSScanner
 
       return NS::ExitCode::INTERRUPTED if run_error.is_a?(Interrupt)
 
-      return NS::ExitCode::ERROR if run_error.is_a?(NS::Error)
+      return NS::ExitCode::ERROR if run_error.is_a?(NS::Error) || run_error.is_a?(CMSScanner::Error)
 
       NS::ExitCode::EXCEPTION
     end

data/lib/cms_scanner/controllers.rb

@@ -39,11 +39,13 @@ module CMSScanner
 
       redirect_output_to_file(parsed_options[:output]) if parsed_options[:output]
 
-      each(&:before_scan)
-      each(&:run)
-      # Reverse is used here as the app/controllers/core#after_scan finishes the output
-      # and must be the last one to be executed
-      reverse_each(&:after_scan)
+      Timeout.timeout(parsed_options[:max_scan_duration], NS::MaxScanDurationReachedError) do
+        each(&:before_scan)
+        each(&:run)
+        # Reverse is used here as the app/controllers/core#after_scan finishes the output
+        # and must be the last one to be executed
+        reverse_each(&:after_scan)
+      end
     end
   end
 end

data/lib/cms_scanner/errors/scan.rb

@@ -0,0 +1,10 @@
+module CMSScanner
+  # Used instead of the Timeout::Error
+  class MaxScanDurationReachedError < Error
+    # :nocov:
+    def to_s
+      'Max Scan Duration Reached'
+    end
+    # :nocov:
+  end
+end

data/lib/cms_scanner/version.rb

@@ -1,4 +1,4 @@
 # Version
 module CMSScanner
-  VERSION = '0.0.41.2'.freeze
+  VERSION = '0.0.41.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.41.2
+  version: 0.0.41.3
 platform: ruby
 authors:
 - WPScanTeam
@@ -280,6 +280,7 @@ files:
 - lib/cms_scanner/controller.rb
 - lib/cms_scanner/controllers.rb
 - lib/cms_scanner/errors/http.rb
+- lib/cms_scanner/errors/scan.rb
 - lib/cms_scanner/exit_code.rb
 - lib/cms_scanner/finders.rb
 - lib/cms_scanner/finders/base_finders.rb