cms_scanner.rb in cms_scanner-0.0.41.3

- old
+ new

@@ -11,10 +11,11 @@
 # Standard Libs
 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
 require 'cms_scanner/typhoeus/hydra' # https://github.com/typhoeus/typhoeus/issues/439
 require 'cms_scanner/public_suffix/domain' # Adds a Domain#match method and logic, used in scope stuff
@@ -22,10 +23,11 @@
 require 'cms_scanner/progressbar_null_output'
 # Custom Libs
 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'
 require 'cms_scanner/version'
 require 'cms_scanner/controller'
@@ -183,10 +185,10 @@
       return NS::ExitCode::CLI_OPTION_ERROR if run_error.is_a?(OptParseValidator::Error) ||
                                                run_error.is_a?(OptionParser::ParseError)
 
       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
   end
 end