diff --git a/app/finders/interesting_findings/multisite.rb b/app/finders/interesting_findings/multisite.rb index 54621668..5666d68f 100644 --- a/app/finders/interesting_findings/multisite.rb +++ b/app/finders/interesting_findings/multisite.rb @@ -13,7 +13,7 @@ module WPScan return unless [200, 302].include?(res.code) return if res.code == 302 && location&.include?('wp-login.php?action=register') - return unless res.code == 200 || res.code == 302 && location&.include?('wp-signup.php') + return unless res.code == 200 || (res.code == 302 && location&.include?('wp-signup.php')) target.multisite = true diff --git a/app/models/timthumb.rb b/app/models/timthumb.rb index 08eaa16a..8753c96d 100644 --- a/app/models/timthumb.rb +++ b/app/models/timthumb.rb @@ -30,7 +30,7 @@ module WPScan def vulnerabilities vulns = [] - vulns << rce_webshot_vuln if version == false || version > '1.35' && version < '2.8.14' && webshot_enabled? + vulns << rce_webshot_vuln if version == false || (version > '1.35' && version < '2.8.14' && webshot_enabled?) vulns << rce_132_vuln if version == false || version < '1.33' vulns diff --git a/lib/wpscan/finders/dynamic_finder/finder.rb b/lib/wpscan/finders/dynamic_finder/finder.rb index 9ed3e405..c3342ff2 100644 --- a/lib/wpscan/finders/dynamic_finder/finder.rb +++ b/lib/wpscan/finders/dynamic_finder/finder.rb @@ -56,7 +56,9 @@ module WPScan homepage_result = find(target.homepage_res, opts) - return homepage_result unless homepage_result.nil? || homepage_result.is_a?(Array) && homepage_result&.empty? + unless homepage_result.nil? || (homepage_result.is_a?(Array) && homepage_result&.empty?) + return homepage_result + end find(target.error_404_res, opts) end diff --git a/wpscan.gemspec b/wpscan.gemspec index c62e0b7d..f0c37bd7 100644 --- a/wpscan.gemspec +++ b/wpscan.gemspec @@ -20,14 +20,14 @@ Gem::Specification.new do |s| s.executables = ['wpscan'] s.require_paths = ['lib'] - s.add_dependency 'cms_scanner', '~> 0.13.5' + s.add_dependency 'cms_scanner', '~> 0.13.6' s.add_development_dependency 'bundler', '>= 1.6' s.add_development_dependency 'memory_profiler', '~> 1.0.0' 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.20.0' + s.add_development_dependency 'rubocop', '~> 1.21.0' s.add_development_dependency 'rubocop-performance', '~> 1.11.0' s.add_development_dependency 'simplecov', '~> 0.21.0' s.add_development_dependency 'simplecov-lcov', '~> 0.8.0'