cms_scanner 0.0.39.0 → 0.0.39.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b9e99b72381c97d4645a032bad36d89d19b942
-  data.tar.gz: 5115bf315c7d6c85f38cde547f676aeca5d330ce
+  metadata.gz: c506e545bbc520583708c6c0f1fb9bbbe123f4ec
+  data.tar.gz: 8fcdb2761bdd345469fb69f9c4b6c081e562ecc6
 SHA512:
-  metadata.gz: c39ea44958cf6016a8065762e3481d435e1617f891c55f6f457478dae261e920b9dd0926807a8af3365c10388374891323fb243fe226f309627aa0294397c5b7
-  data.tar.gz: fb8a4133f0b00ac98d7e36908f3a6a6bdf5976328b70df31979b7ef939fcc93689504e051b1579ff83915be2ea0404c61d12ace884f045e5ad80e26e7a35f6e7
+  metadata.gz: 69ce15c63489b1c55d98c2f3440c28ac8c699f9c0a666d1749a954b3f3e02faa820c2956f7dfdf648fb9e7b43c38ac39d650ea3cfe62aeb997cf5db1fd5e7cba
+  data.tar.gz: 1418729d154f6f7e83998f29660fe88f855840aa4bf79885ebbdd8b62cc99a67166c2518244bd80ce212341b0e30aa8fe6c1f5702296f8f75057ecbe43222436

data/app/controllers/core.rb

@@ -14,12 +14,20 @@ module CMSScanner
       end
 
       def before_scan
-        output('banner') if parsed_options[:banner]
+        maybe_output_banner_help_and_version
 
         setup_cache
         check_target_availability
       end
 
+      def maybe_output_banner_help_and_version
+        output('banner') if parsed_options[:banner]
+        output('help', help: option_parser.to_s) if parsed_options[:help]
+        output('version') if parsed_options[:version]
+
+        exit(NS::ExitCode::OK) if parsed_options[:help] || parsed_options[:version]
+      end
+
       # Checks that the target is accessible, raises related errors otherwise
       #
       # @return [ Void ]

data/app/controllers/core/cli_options.rb

@@ -6,10 +6,10 @@ module CMSScanner
         formats = NS::Formatter.availables
 
         [
-          OptURL.new(['-u', '--url URL', 'The URL to scan'], required: true, default_protocol: 'http'),
-          OptBoolean.new(['--ignore-main-redirect', 'Ignore the main redirect if any and scan the target url']),
-          OptBoolean.new(%w[-v --verbose]),
-          OptBoolean.new(['--[no-]banner', 'Whether or not to display the banner'], default: true),
+          OptURL.new(['-u', '--url URL', 'The URL to scan'],
+                     required_unless: %i[help version],
+                     default_protocol: 'http')
+        ] + mixed_cli_options + [
           OptFilePath.new(['-o', '--output FILE', 'Output to FILE'], writable: true, exists: false),
           OptChoice.new(['-f', '--format FORMAT',
                          'Output results in the format supplied'], choices: formats),
@@ -23,6 +23,16 @@ module CMSScanner
         ] + cli_browser_options
       end
 
+      def mixed_cli_options
+        [
+          OptBoolean.new(['-h', '--help', 'Display the help and exit']),
+          OptBoolean.new(['--version', 'Display the version and exit']),
+          OptBoolean.new(['--ignore-main-redirect', 'Ignore the main redirect (if any) and scan the target url']),
+          OptBoolean.new(['-v', '--verbose', 'Verbose mode']),
+          OptBoolean.new(['--[no-]banner', 'Whether or not to display the banner'], default: true)
+        ]
+      end
+
       # @return [ Array<OptParseValidator::OptBase> ]
       def cli_browser_options
         cli_browser_headers_options + [

data/app/formatters.rb

@@ -1,3 +1,4 @@
 require_relative 'formatters/cli'
 require_relative 'formatters/cli_no_colour'
+require_relative 'formatters/cli_no_color'
 require_relative 'formatters/json'

data/app/formatters/cli_no_color.rb

@@ -0,0 +1,7 @@
+module CMSScanner
+  module Formatter
+    # Because Reason https://github.com/wpscanteam/CMSScanner/issues/56
+    class CliNoColor < CliNoColour
+    end
+  end
+end

data/app/views/cli/core/help.erb

@@ -0,0 +1 @@
+<%= @help %>

data/app/views/cli/core/version.erb

@@ -0,0 +1 @@
+Version: <%= NS::VERSION %>

data/app/views/json/core/help.erb

@@ -0,0 +1 @@
+"help": <%= @help.to_s.to_json %>,

data/app/views/json/core/version.erb

@@ -0,0 +1 @@
+"version": <%= NS::VERSION.to_s.to_json %>,

data/cms_scanner.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
 
   s.add_dependency 'nokogiri', '~> 1.8.0'
-  s.add_dependency 'opt_parse_validator', '~> 0.0.15.0'
+  s.add_dependency 'opt_parse_validator', '~> 0.0.15.2'
   s.add_dependency 'public_suffix', '~> 3.0.0'
   s.add_dependency 'ruby-progressbar', '~> 1.9.0'
   s.add_dependency 'typhoeus', '~> 1.3.0'
@@ -50,5 +50,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its', '~> 1.2.0'
   s.add_development_dependency 'rubocop', '~> 0.52.0'
   s.add_development_dependency 'simplecov', '~> 0.14.0' # Can't update to 0.15 as it breaks coveralls dep
-  s.add_development_dependency 'webmock', '~> 3.2.0'
+  s.add_development_dependency 'webmock', '~> 3.3.0'
 end

data/example/cmsscan.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.executables           = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_path          = 'lib'
 
-  s.add_dependency 'cms_scanner', '~> 0.0.38.1'
+  s.add_dependency 'cms_scanner', '~> 0.0.39.0'
 
   # Already required by CMSScanner, so version restrictions loosen
   s.add_dependency 'activesupport', '~> 5.1'
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.7.0'
   s.add_development_dependency 'rspec-its', '~> 1.2.0'
-  s.add_development_dependency 'rubocop', '~> 0.51.0'
+  s.add_development_dependency 'rubocop', '~> 0.52.0'
   s.add_development_dependency 'simplecov', '~> 0.14.0' # Can't update to 0.15 as it breaks coveralls dep
-  s.add_development_dependency 'webmock', '~> 3.1.0'
+  s.add_development_dependency 'webmock', '~> 3.3.0'
 end

data/lib/cms_scanner/controller.rb

@@ -31,6 +31,16 @@ module CMSScanner
         @@target ||= NS::Target.new(parsed_options[:url], parsed_options)
       end
 
+      # @param [ OptParsevalidator::OptParser ] parser
+      def self.option_parser=(parser)
+        @@option_parser = parser
+      end
+
+      # @return [ OptParsevalidator::OptParser ]
+      def option_parser
+        @@option_parser
+      end
+
       # Set the parsed options and initialize the browser
       # with them
       #

data/lib/cms_scanner/controllers.rb

@@ -34,6 +34,7 @@ module CMSScanner
 
     def run
       parsed_options             = option_parser.results
+      first.class.option_parser  = option_parser
       first.class.parsed_options = parsed_options
 
       redirect_output_to_file(parsed_options[:output]) if parsed_options[:output]

data/lib/cms_scanner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.39.0
+  version: 0.0.39.1
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.15.0
+        version: 0.0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.15.0
+        version: 0.0.15.2
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 description: Framework to provide an easy way to implement CMS Scanners
 email:
 - team@wpscan.org
@@ -257,6 +257,7 @@ files:
 - app/finders/interesting_findings/xml_rpc.rb
 - app/formatters.rb
 - app/formatters/cli.rb
+- app/formatters/cli_no_color.rb
 - app/formatters/cli_no_colour.rb
 - app/formatters/json.rb
 - app/models.rb
@@ -269,14 +270,18 @@ files:
 - app/user_agents.txt
 - app/views/cli/core/banner.erb
 - app/views/cli/core/finished.erb
+- app/views/cli/core/help.erb
 - app/views/cli/core/started.erb
+- app/views/cli/core/version.erb
 - app/views/cli/interesting_findings/_array.erb
 - app/views/cli/interesting_findings/findings.erb
 - app/views/cli/scan_aborted.erb
 - app/views/cli/usage.erb
 - app/views/json/core/banner.erb
 - app/views/json/core/finished.erb
+- app/views/json/core/help.erb
 - app/views/json/core/started.erb
+- app/views/json/core/version.erb
 - app/views/json/interesting_findings/findings.erb
 - app/views/json/scan_aborted.erb
 - cms_scanner.gemspec