diff --git a/lib/wpscan/target/platform/wordpress.rb b/lib/wpscan/target/platform/wordpress.rb index ac62a7f7..739428ca 100644 --- a/lib/wpscan/target/platform/wordpress.rb +++ b/lib/wpscan/target/platform/wordpress.rb @@ -11,9 +11,10 @@ module WPScan module WordPress include CMSScanner::Target::Platform::PHP - WORDPRESS_PATTERN = %r{/(?:(?:wp-content/(?:themes|(?:mu-)?plugins|uploads))|wp-includes)/}i.freeze - WP_JSON_OEMBED_PATTERN = %r{/wp-json/oembed/}i.freeze - WP_ADMIN_AJAX_PATTERN = %r{\\?/wp-admin\\?/admin-ajax\.php}i.freeze + WORDPRESS_PATTERN = %r{/(?:(?:wp-content/(?:themes|(?:mu-)?plugins|uploads))|wp-includes)/}i.freeze + WORDPRESS_HOSTED_PATTERN = %r{https?://s\d\.wp\.com#{WORDPRESS_PATTERN}}i.freeze + WP_JSON_OEMBED_PATTERN = %r{/wp-json/oembed/}i.freeze + WP_ADMIN_AJAX_PATTERN = %r{\\?/wp-admin\\?/admin-ajax\.php}i.freeze # These methods are used in the associated interesting_findings finders # to keep the boolean state of the finding rather than re-check the whole thing again @@ -103,11 +104,8 @@ module WPScan return true if /\.wordpress\.com$/i.match?(uri.host) unless content_dir - pattern = %r{https?://s\d\.wp\.com#{WORDPRESS_PATTERN}}i.freeze - xpath = '(//@href|//@src)[contains(., "wp.com")]' - - uris_from_page(homepage_res, xpath) do |uri| - return true if uri.to_s.match?(pattern) + uris_from_page(homepage_res, '(//@href|//@src)[contains(., "wp.com")]') do |uri| + return true if uri.to_s.match?(WORDPRESS_HOSTED_PATTERN) end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f529dd33..1df04458 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -54,7 +54,7 @@ def rspec_parsed_options(args) a << WPScan::Controller.const_get(sym).new end - controllers.option_parser.results(args.split(' ')) + controllers.option_parser.results(args.split) end # TODO: remove when https://github.com/bblimke/webmock/issues/552 fixed diff --git a/wpscan.gemspec b/wpscan.gemspec index 31eaed85..a2bea30c 100644 --- a/wpscan.gemspec +++ b/wpscan.gemspec @@ -28,8 +28,8 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.10.0' s.add_development_dependency 'rspec-its', '~> 1.3.0' - s.add_development_dependency 'rubocop', '~> 1.3.0' - s.add_development_dependency 'rubocop-performance', '~> 1.8.0' + s.add_development_dependency 'rubocop', '~> 1.4.2' + s.add_development_dependency 'rubocop-performance', '~> 1.9.0' s.add_development_dependency 'simplecov', '~> 0.19.0' s.add_development_dependency 'simplecov-lcov', '~> 0.8.0' s.add_development_dependency 'stackprof', '~> 0.2.12'