garfield/wpscan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes support for Ruby 2.4 as EOL

Browse Source
This commit is contained in:
erwanlr
2020-04-12 18:21:23 +02:00
parent c362527903
commit 57c6c2d471
6 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
matrix: matrix:
ruby: [2.4, 2.5, 2.6, 2.7] ruby: [2.5, 2.6, 2.7]
steps: steps:
- name: Checkout code - name: Checkout code

2
.rubocop.yml
View File

@@ -1,6 +1,6 @@
require: rubocop-performance require: rubocop-performance
AllCops: AllCops:
TargetRubyVersion: 2.4 TargetRubyVersion: 2.5
Exclude: Exclude:
- '*.gemspec' - '*.gemspec'
- 'vendor/**/*' - 'vendor/**/*'

2
app/finders/plugin_version/readme.rb
View File

@@ -68,12 +68,10 @@ module WPScan
extracted_versions = extracted_versions.select { |x| x =~ /[0-9]+/ } extracted_versions = extracted_versions.select { |x| x =~ /[0-9]+/ }
sorted = extracted_versions.sort do |x, y| sorted = extracted_versions.sort do |x, y|
begin
Gem::Version.new(x) <=> Gem::Version.new(y) Gem::Version.new(x) <=> Gem::Version.new(y)
rescue StandardError rescue StandardError
0 0
end end
end
sorted.last sorted.last
end end

2
lib/wpscan/db/updater.rb
View File

@@ -139,7 +139,6 @@ module WPScan
updated = [] updated = []
FILES.each do |filename| FILES.each do |filename|
begin
db_checksum = remote_file_checksum(filename) db_checksum = remote_file_checksum(filename)
# Checking if the file needs to be updated # Checking if the file needs to be updated
@@ -157,7 +156,6 @@ module WPScan
ensure ensure
delete_backup(filename) if File.exist?(backup_file_path(filename)) delete_backup(filename) if File.exist?(backup_file_path(filename))
end end
end
File.write(last_update_file, Time.now) File.write(last_update_file, Time.now)

2
lib/wpscan/finders/dynamic_finder/version/config_parser.rb
View File

@@ -21,14 +21,12 @@ module WPScan
parsers = ALLOWED_PARSERS.include?(self.class::PARSER) ? [self.class::PARSER] : ALLOWED_PARSERS parsers = ALLOWED_PARSERS.include?(self.class::PARSER) ? [self.class::PARSER] : ALLOWED_PARSERS
parsers.each do |parser| parsers.each do |parser|
begin
parsed = parser.respond_to?(:safe_load) ? parser.safe_load(body) : parser.load(body) parsed = parser.respond_to?(:safe_load) ? parser.safe_load(body) : parser.load(body)
return parsed if parsed.is_a?(Hash) || parsed.is_a?(Array) return parsed if parsed.is_a?(Hash) || parsed.is_a?(Array)
rescue StandardError rescue StandardError
next next
end end
end
nil # Make sure nil is returned in case none of the parsers managed to parse the body correctly nil # Make sure nil is returned in case none of the parsers managed to parse the body correctly
end end

4
wpscan.gemspec
View File

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
s.name = 'wpscan' s.name = 'wpscan'
s.version = WPScan::VERSION s.version = WPScan::VERSION
s.platform = Gem::Platform::RUBY s.platform = Gem::Platform::RUBY
s.required_ruby_version = '>= 2.4' s.required_ruby_version = '>= 2.5'
s.authors = ['WPScanTeam'] s.authors = ['WPScanTeam']
s.date = Time.now.utc.strftime('%Y-%m-%d') s.date = Time.now.utc.strftime('%Y-%m-%d')
s.email = ['team@wpscan.org'] s.email = ['team@wpscan.org']
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.executables = ['wpscan'] s.executables = ['wpscan']
s.require_paths = ['lib'] s.require_paths = ['lib']
s.add_dependency 'cms_scanner', '~> 0.8.6' s.add_dependency 'cms_scanner', '~> 0.9.0'
s.add_development_dependency 'bundler', '>= 1.6' s.add_development_dependency 'bundler', '>= 1.6'
s.add_development_dependency 'memory_profiler', '~> 0.9.13' s.add_development_dependency 'memory_profiler', '~> 0.9.13'