Changes db_data to metadata

Author: erwanlr

app/models/plugin.rb

@@ -16,8 +16,8 @@ def initialize(slug, blog, opts = {})
       end
 
       # @return [ JSON ]
-      def db_data
-        @db_data ||= DB::Plugin.db_data(slug)
+      def metadata
+        @metadata ||= DB::Plugin.metadata_at(slug)
       end
 
       # @param [ Hash ] opts

app/models/theme.rb

@@ -22,8 +22,8 @@ def initialize(slug, blog, opts = {})
       end
 
       # @return [ JSON ]
-      def db_data
-        @db_data ||= DB::Theme.db_data(slug)
+      def metadata
+        @metadata ||= DB::Theme.metadata_at(slug)
       end
 
       # @param [ Hash ] opts

app/models/wp_item.rb

@@ -39,10 +39,11 @@ def vulnerabilities
 
         @vulnerabilities = []
 
-        [*db_data['vulnerabilities']].each do |json_vuln|
-          vulnerability = Vulnerability.load_from_json(json_vuln)
-          @vulnerabilities << vulnerability if vulnerable_to?(vulnerability)
-        end
+        # TODO Get them from API
+        #[*db_data['vulnerabilities']].each do |json_vuln|
+        #  vulnerability = Vulnerability.load_from_json(json_vuln)
+        #  @vulnerabilities << vulnerability if vulnerable_to?(vulnerability)
+        #end
 
         @vulnerabilities
       end
@@ -60,18 +61,18 @@ def vulnerable_to?(vuln)
 
       # @return [ String ]
       def latest_version
-        @latest_version ||= db_data['latest_version'] ? Model::Version.new(db_data['latest_version']) : nil
+        @latest_version ||= metadata['latest_version'] ? Model::Version.new(metadata['latest_version']) : nil
       end
 
       # Not used anywhere ATM
       # @return [ Boolean ]
       def popular?
-        @popular ||= db_data['popular']
+        @popular ||= metadata['popular']
       end
 
       # @return [ String ]
       def last_updated
-        @last_updated ||= db_data['last_updated']
+        @last_updated ||= metadata['last_updated']
       end
 
       # @return [ Boolean ]

app/models/wp_version.rb

@@ -36,8 +36,8 @@ def self.all
       end
 
       # @return [ JSON ]
-      def db_data
-        @db_data ||= DB::Version.db_data(number)
+      def metadata
+        @metadata ||= DB::Version.metadata_at(number)
       end
 
       # @return [ Array<Vulnerability> ]
@@ -46,21 +46,22 @@ def vulnerabilities
 
         @vulnerabilities = []
 
-        [*db_data['vulnerabilities']].each do |json_vuln|
-          @vulnerabilities << Vulnerability.load_from_json(json_vuln)
-        end
+        # TODO get them from API
+        #[*db_data['vulnerabilities']].each do |json_vuln|
+        #  @vulnerabilities << Vulnerability.load_from_json(json_vuln)
+        #end
 
         @vulnerabilities
       end
 
       # @return [ String ]
       def release_date
-        @release_date ||= db_data['release_date'] || 'Unknown'
+        @release_date ||= metadata['release_date'] || 'Unknown'
       end
 
       # @return [ String ]
       def status
-        @status ||= db_data['status'] || 'Unknown'
+        @status ||= metadata['status'] || 'Unknown'
       end
     end
   end

lib/wpscan/db/plugin.rb

@@ -4,9 +4,9 @@ module WPScan
   module DB
     # Plugin DB
     class Plugin < WpItem
-      # @return [ String ]
-      def self.db_file
-        @db_file ||= DB_DIR.join('plugins.json').to_s
+      # @return [ Hash ]
+      def self.metadata
+        @metadata ||= super['plugins'] || {}
       end
     end
   end

lib/wpscan/db/plugins.rb

@@ -5,8 +5,8 @@ module DB
     # WP Plugins
     class Plugins < WpItems
       # @return [ JSON ]
-      def self.db
-        Plugin.db
+      def self.metadata
+        Plugin.metadata
       end
     end
   end

lib/wpscan/db/theme.rb

@@ -4,9 +4,9 @@ module WPScan
   module DB
     # Theme DB
     class Theme < WpItem
-      # @return [ String ]
-      def self.db_file
-        @db_file ||= DB_DIR.join('themes.json').to_s
+      # @return [ Hash ]
+      def self.metadata
+        @metadata ||= super['themes'] || {}
       end
     end
   end

lib/wpscan/db/themes.rb

@@ -5,8 +5,8 @@ module DB
     # WP Themes
     class Themes < WpItems
       # @return [ JSON ]
-      def self.db
-        Theme.db
+      def self.metadata
+        Theme.metadata
       end
     end
   end

lib/wpscan/db/updater.rb

@@ -7,12 +7,15 @@ module DB
     class Updater
       # /!\ Might want to also update the Enumeration#cli_options when some filenames are changed here
       FILES = %w[
-        plugins.json themes.json wordpresses.json
+        metadata.json wp_fingerprints.json
         timthumbs-v3.txt config_backups.txt db_exports.txt
-        dynamic_finders.yml wp_fingerprints.json LICENSE
+        dynamic_finders.yml LICENSE
       ].freeze
 
-      OLD_FILES = %w[wordpress.db user-agents.txt dynamic_finders_01.yml].freeze
+      OLD_FILES = %w[
+        wordpress.db user-agents.txt dynamic_finders_01.yml
+        wordpressess.json plugins.json themes.json
+      ].freeze
 
       attr_reader :repo_directory
 

lib/wpscan/db/wp_item.rb

@@ -6,14 +6,19 @@ module DB
     class WpItem
       # @param [ String ] identifier The plugin/theme slug or version number
       #
-      # @return [ Hash ] The JSON data from the DB associated to the identifier
-      def self.db_data(identifier)
-        db[identifier] || {}
+      # @return [ Hash ] The JSON data from the metadata associated to the identifier
+      def self.metadata_at(identifier)
+        metadata[identifier] || {}
       end
 
       # @return [ JSON ]
-      def self.db
-        @db ||= read_json_file(db_file)
+      def self.metadata
+        @metadata ||= read_json_file(metadata_file)
+      end
+
+      # @return [ String ]
+      def self.metadata_file
+        @metadata_file ||= DB_DIR.join('metadata.json').to_s
       end
     end
   end