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

Changes some DF method names to avoid confusion with db ones

Browse Source
This commit is contained in:
erwanlr
2019-07-07 08:35:41 +01:00
parent 921096ca10
commit 99c2aaef7a
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/plugin.rb
View File

@@ -31,7 +31,7 @@ module WPScan
# @return [ Array<String> ]
def potential_readme_filenames
@potential_readme_filenames ||= [*(DB::DynamicFinders::Plugin.db_data.dig(slug, 'Readme', 'path') || super)]
@potential_readme_filenames ||= [*(DB::DynamicFinders::Plugin.df_data.dig(slug, 'Readme', 'path') || super)]
end
end
end

8
lib/wpscan/db/dynamic_finders/base.rb
View File

@@ -5,13 +5,13 @@ module WPScan
module DynamicFinders
class Base
# @return [ String ]
def self.db_file
@db_file ||= DB_DIR.join('dynamic_finders.yml').to_s
def self.df_file
@df_file ||= DB_DIR.join('dynamic_finders.yml').to_s
end
# @return [ Hash ]
def self.raw_db_data
@raw_db_data ||= YAML.safe_load(File.read(db_file), [Regexp])
def self.all_df_data
@all_df_data ||= YAML.safe_load(File.read(df_file), [Regexp])
end
# @return [ Array<Symbol> ]

8
lib/wpscan/db/dynamic_finders/plugin.rb
View File

@@ -5,8 +5,8 @@ module WPScan
module DynamicFinders
class Plugin < Base
# @return [ Hash ]
def self.db_data
@db_data ||= raw_db_data['plugins'] || {}
def self.df_data
@df_data ||= all_df_data['plugins'] || {}
end
def self.version_finder_module
@@ -21,7 +21,7 @@ module WPScan
return configs unless allowed_classes.include?(finder_class)
db_data.each do |slug, finders|
df_data.each do |slug, finders|
# Quite sure better can be done with some kind of logic statement in the select
fs = if aggressive
finders.reject { |_f, c| c['path'].nil? }
@@ -48,7 +48,7 @@ module WPScan
@versions_finders_configs = {}
db_data.each do |slug, finders|
df_data.each do |slug, finders|
finders.each do |finder_name, config|
next unless config.key?('version')

4
lib/wpscan/db/dynamic_finders/theme.rb
View File

@@ -5,8 +5,8 @@ module WPScan
module DynamicFinders
class Theme < Plugin
# @return [ Hash ]
def self.db_data
@db_data ||= raw_db_data['themes'] || {}
def self.df_data
@df_data ||= all_df_data['themes'] || {}
end
def self.version_finder_module

10
lib/wpscan/db/dynamic_finders/wordpress.rb
View File

@@ -5,8 +5,8 @@ module WPScan
module DynamicFinders
class Wordpress < Base
# @return [ Hash ]
def self.db_data
@db_data ||= raw_db_data['wordpress'] || {}
def self.df_data
@df_data ||= all_df_data['wordpress'] || {}
end
# @return [ Constant ]
@@ -30,9 +30,9 @@ module WPScan
return configs unless allowed_classes.include?(finder_class)
finders = if aggressive
db_data.reject { |_f, c| c['path'].nil? }
df_data.reject { |_f, c| c['path'].nil? }
else
db_data.select { |_f, c| c['path'].nil? }
df_data.select { |_f, c| c['path'].nil? }
end
finders.each do |finder_name, config|
@@ -48,7 +48,7 @@ module WPScan
# @return [ Hash ]
def self.versions_finders_configs
@versions_finders_configs ||= db_data.select { |_finder_name, config| config.key?('version') }
@versions_finders_configs ||= df_data.select { |_finder_name, config| config.key?('version') }
end
def self.create_versions_finders