wpscan 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9fd4bc758b868aa36848d44911b54335efdaefc
-  data.tar.gz: e02f0a0f89271384cd00a1d9ab760205c5bd1837
+  metadata.gz: 798d7f0db156c00bfee19eb7f540ffd6a1884ef1
+  data.tar.gz: 89eba229e55e42aa5629e76a8f6ca38e6e1a36a8
 SHA512:
-  metadata.gz: 955e80f693240687635f34d3b7081a302c452511e6d4191624edae196b7395f08759206b9aefc56f95449eccd5bdb9b91e6e48b613d9a27c681e1370759ed6bd
-  data.tar.gz: 9944fa88fba74980f74df6225dd47a2cf2d419eb02da52cf844f296ab729b58a3c7d747d623614bd950832a680352d5fbd9de0c3d0eb0e8dddae3bf46c17a57f
+  metadata.gz: 8af7943d9c8ed54283853d0c9a89d397847d66262f53888c820f177cbc3d86642b6eba9131955cc3fe4406632a38c4fd61b765ac25cee578ae239a637f70a4ea
+  data.tar.gz: 2d356dcfe246a074bc47fd24a4e8bb7b52e253d47a6a0c491b6ff7a6912d283fabb0db7a495c0a1ab03ca7011699c09031e4664b02e6a0811a50732f63b4702e

data/app/controllers/brute_force.rb

@@ -10,11 +10,7 @@ module WPScan
              'If no --username/s option supplied, user enumeration will be run'],
             exists: true
           ),
-          OptString.new(['--username USERNAME', '-u', 'The username to brute force']),
-          OptFilePath.new(
-            ['--usernames FILE-PATH', '-U', 'List of usernames to use during the brute forcing'],
-            exists: true
-          )
+          OptSmartList.new(['--usernames LIST', '-U', 'List of usernames to use during the brute forcing'])
         ]
       end
 
@@ -36,14 +32,10 @@ module WPScan
 
       # @return [ Array<Users> ] The users to brute force
       def users
-        return target.users unless parsed_options[:usernames] || parsed_options[:username]
+        return target.users unless parsed_options[:usernames]
 
-        if parsed_options[:username]
-          [User.new(parsed_options[:username])]
-        else
-          File.open(parsed_options[:usernames]).reduce([]) do |acc, elem|
-            acc << User.new(elem.chomp)
-          end
+        parsed_options[:usernames].reduce([]) do |acc, elem|
+          acc << User.new(elem.chomp)
         end
       end
 
@@ -89,7 +81,7 @@ module WPScan
       def progress_bar(size, username)
         ProgressBar.create(
           format: '%t %a <%B> (%c / %C) %P%% %e',
-          title: "Brute Forcing #{username}",
+          title: "Brute Forcing #{username} -",
           total: size
         )
       end

data/app/controllers/core.rb

@@ -52,8 +52,6 @@ module WPScan
 
         super(false) # disable banner output
 
-        DB.init_db
-
         load_server_module
 
         check_wordpress_state

data/app/controllers/enumeration.rb

@@ -31,7 +31,7 @@ module WPScan
       def create_plugins_comments_finders(mod, config)
         mod.const_set(
           :Comments, Class.new(Finders::Finder::PluginVersion::Comments) do
-            const_set(:PATTERN, Regexp.new(config['pattern'], Regexp::IGNORECASE))
+            const_set(:PATTERN, config['pattern'])
           end
         )
       end

data/app/controllers/enumeration/cli_options.rb

@@ -42,7 +42,7 @@ module WPScan
       # @return [ Array<OptParseValidator::OptBase> ]
       def cli_plugins_opts
         [
-          OptFilePath.new(['--plugins-list FILE-PATH', 'List of plugins\' location to use'], exists: true),
+          OptSmartList.new(['--plugins-list LIST', 'List of plugins to enumerate']),
           OptChoice.new(
             ['--plugins-detection MODE',
              'Use the supplied mode to enumerate Plugins, instead of the global (--detection-mode) mode.'],
@@ -65,7 +65,7 @@ module WPScan
       # @return [ Array<OptParseValidator::OptBase> ]
       def cli_themes_opts
         [
-          OptFilePath.new(['--themes-list FILE-PATH', 'List of themes\' location to use'], exists: true),
+          OptSmartList.new(['--themes-list LIST', 'List of themes to enumerate']),
           OptChoice.new(
             ['--themes-detection MODE',
              'Use the supplied mode to enumerate Themes, instead of the global (--detection-mode) mode.'],
@@ -129,10 +129,9 @@ module WPScan
       # @return [ Array<OptParseValidator::OptBase> ]
       def cli_users_opts
         [
-          OptFilePath.new(
-            ['--users-list FILE-PATH',
-             'List of users to check during the users enumeration from the Login Error Messages'],
-            exists: true
+          OptSmartList.new(
+            ['--users-list LIST',
+             'List of users to check during the users enumeration from the Login Error Messages']
           ),
           OptChoice.new(
             ['--users-detection MODE',

data/app/controllers/enumeration/enum_methods.rb

@@ -63,7 +63,7 @@ module WPScan
       # @return [ Array<String> ] The plugins list associated to the cli options
       def plugins_list_from_opts(opts)
         # List file provided by the user via the cli
-        return File.open(opts[:plugins_list]).map(&:chomp) if opts[:plugins_list]
+        return opts[:plugins_list] if opts[:plugins_list]
 
         if opts[:enumerate][:all_plugins]
           DB::Plugins.all_slugs
@@ -101,7 +101,7 @@ module WPScan
       # @return [ Array<String> ] The themes list associated to the cli options
       def themes_list_from_opts(opts)
         # List file provided by the user via the cli
-        return File.open(opts[:themes_list]).map(&:chomp) if opts[:themes_list]
+        return opts[:themes_list] if opts[:themes_list]
 
         if opts[:enumerate][:all_themes]
           DB::Themes.all_slugs

data/app/finders/users/login_error_messages.rb

@@ -38,9 +38,7 @@ module WPScan
           # usernames from the potential Users found
           unames = opts[:found].map(&:username)
 
-          if opts[:list]
-            File.open(opts[:list]).each { |uname| unames << uname.chomp }
-          end
+          [*opts[:list]].each { |uname| unames << uname.chomp }
 
           unames.uniq
         end

data/app/finders/wp_version/unique_fingerprinting.rb

@@ -5,19 +5,9 @@ module WPScan
       class UniqueFingerprinting < CMSScanner::Finders::Finder
         include CMSScanner::Finders::Finder::Fingerprinter
 
-        QUERY = 'SELECT md5_hash, path_id, version_id, ' \
-                'versions.number AS version,' \
-                'paths.value AS path ' \
-                'FROM fingerprints ' \
-                'LEFT JOIN versions ON version_id = versions.id ' \
-                'LEFT JOIN paths on path_id = paths.id ' \
-                'WHERE md5_hash IN ' \
-                '(SELECT md5_hash FROM fingerprints GROUP BY md5_hash HAVING COUNT(*) = 1) ' \
-                'ORDER BY version DESC'.freeze
-
         # @return [ WpVersion ]
         def aggressive(opts = {})
-          fingerprint(unique_fingerprints, opts) do |version_number, url, md5sum|
+          fingerprint(DB::Fingerprints.wp_unique_fingerprints, opts) do |version_number, url, md5sum|
             hydra.abort
             progress_bar.finish
 
@@ -31,30 +21,6 @@ module WPScan
           nil
         end
 
-        # @return [ Hash ] The unique fingerprints across all versions in the DB
-        #
-        # Format returned:
-        # {
-        #   file_path_1: {
-        #     md5_hash_1: version_1,
-        #     md5_hash_2: version_2
-        #   },
-        #   file_path_2: {
-        #     md5_hash_3: version_1,
-        #     md5_hash_4: version_3
-        #   }
-        # }
-        def unique_fingerprints
-          fingerprints = {}
-
-          repository(:default).adapter.select(QUERY).each do |f|
-            fingerprints[f.path] ||= {}
-            fingerprints[f.path][f.md5_hash] = f.version
-          end
-
-          fingerprints
-        end
-
         def create_progress_bar(opts = {})
           super(opts.merge(title: 'Fingerprinting the version -'))
         end

data/app/models/wp_item.rb

@@ -6,8 +6,8 @@ module WPScan
     include CMSScanner::Target::Platform::PHP
     include CMSScanner::Target::Server::Generic
 
-    READMES    = %w[readme.txt README.txt Readme.txt ReadMe.txt README.TXT readme.TXT].freeze
-    CHANGELOGS = %w[changelog.txt Changelog.txt ChangeLog.txt CHANGELOG.txt].freeze
+    READMES    = %w[readme.txt README.txt README.md readme.md Readme.txt].freeze
+    CHANGELOGS = %w[changelog.txt CHANGELOG.md changelog.md].freeze
 
     attr_reader :uri, :name, :detection_opts, :version_detection_opts, :target, :db_data
 

data/app/models/wp_version.rb

@@ -22,9 +22,15 @@ module WPScan
 
       @all_numbers = []
 
-      DB::Version.all.each { |v| @all_numbers << v.number }
+      DB::Fingerprints.wp_fingerprints.each_value do |fp|
+        fp.each_value do |versions|
+          versions.each do |version|
+            @all_numbers << version unless @all_numbers.include?(version)
+          end
+        end
+      end
 
-      @all_numbers
+      @all_numbers.sort! { |a, b| Gem::Version.new(b) <=> Gem::Version.new(a) }
     end
 
     # @return [ JSON ]

data/lib/wpscan.rb

@@ -11,6 +11,7 @@ require 'uri'
 require 'time'
 require 'readline'
 require 'securerandom'
+
 # Custom Libs
 require 'wpscan/helper'
 require 'wpscan/db'

data/lib/wpscan/db.rb

@@ -1,10 +1,4 @@
-require 'dm-core'
-require 'dm-migrations'
-require 'dm-constraints'
-require 'dm-sqlite-adapter'
-
 require 'wpscan/db/wp_item'
-require 'wpscan/db/schema'
 require 'wpscan/db/updater'
 require 'wpscan/db/wp_items'
 require 'wpscan/db/plugins'
@@ -12,17 +6,5 @@ require 'wpscan/db/themes'
 require 'wpscan/db/plugin'
 require 'wpscan/db/theme'
 require 'wpscan/db/wp_version'
+require 'wpscan/db/fingerprints'
 require 'wpscan/db/dynamic_finders'
-
-module WPScan
-  # DB
-  module DB
-    def self.init_db
-      db_file ||= File.join(DB_DIR, 'wordpress.db')
-
-      # DataMapper::Logger.new($stdout, :debug)
-      DataMapper.setup(:default, "sqlite://#{db_file}")
-      DataMapper.auto_upgrade!
-    end
-  end
-end

data/lib/wpscan/db/dynamic_finders.rb

@@ -4,7 +4,7 @@ module WPScan
     class DynamicFinders
       # @return [ String ]
       def self.db_file
-        @db_file ||= File.join(DB_DIR, 'dynamic_finders.yml')
+        @db_file ||= File.join(DB_DIR, 'dynamic_finders_01.yml')
       end
 
       # @return [ Hash ]
@@ -35,15 +35,7 @@ module WPScan
 
       # @return [ Hash ]
       def self.comments
-        unless @comments
-          @comments = finder_configs('Comments')
-
-          @comments.each do |slug, config|
-            @comments[slug]['pattern'] = Regexp.new(config['pattern'], Regexp::IGNORECASE)
-          end
-        end
-
-        @comments
+        @comments ||= finder_configs('Comments')
       end
 
       # @return [ Hash ]

data/lib/wpscan/db/fingerprints.rb

@@ -0,0 +1,50 @@
+module WPScan
+  module DB
+    # Fingerprints class
+    class Fingerprints
+      # @param [ Hash ] data
+      #
+      # @return [ Hash ] the unique fingerprints in the data argument given
+      # Format returned:
+      # {
+      #   file_path_1: {
+      #     md5_hash_1: version_1,
+      #     md5_hash_2: version_2
+      #   },
+      #   file_path_2: {
+      #     md5_hash_3: version_1,
+      #     md5_hash_4: version_3
+      #   }
+      # }
+      def self.unique_fingerprints(data)
+        unique_fingerprints = {}
+
+        data.each do |file_path, fingerprints|
+          fingerprints.each do |md5sum, versions|
+            next unless versions.size == 1
+
+            unique_fingerprints[file_path] ||= {}
+            unique_fingerprints[file_path][md5sum] = versions.first
+          end
+        end
+
+        unique_fingerprints
+      end
+
+      # @return [ String ]
+      def self.wp_fingerprints_path
+        @wp_unique_fingerprints_path ||= File.join(DB_DIR, 'wp_fingerprints.json')
+      end
+
+      # @return [ Hash ]
+      def self.wp_fingerprints
+        @wp_fingerprints ||= read_json_file(wp_fingerprints_path)
+      end
+
+      # @return [ Hash ]
+      def self.wp_unique_fingerprints
+        @wp_unique_fingerprints ||= unique_fingerprints(wp_fingerprints)
+      end
+    end
+  end
+end

data/lib/wpscan/db/updater.rb

@@ -7,9 +7,11 @@ module WPScan
       FILES = %w[
         plugins.json themes.json wordpresses.json
         timthumbs-v3.txt user-agents.txt config_backups.txt
-        dynamic_finders.yml wordpress.db LICENSE
+        dynamic_finders_01.yml wp_fingerprints.json LICENSE
       ].freeze
 
+      OLD_FILES = %w[wordpress.db dynamic_finders.yml].freeze
+
       attr_reader :repo_directory
 
       def initialize(repo_directory)
@@ -18,6 +20,16 @@ module WPScan
         FileUtils.mkdir_p(repo_directory) unless Dir.exist?(repo_directory)
 
         raise "#{repo_directory} is not writable" unless Pathname.new(repo_directory).writable?
+
+        delete_old_files
+      end
+
+      # Removes DB files which are no longer used
+      # this doesn't raise errors if they don't exist
+      def delete_old_files
+        OLD_FILES.each do |old_file|
+          FileUtils.remove_file(local_file_path(old_file), true)
+        end
       end
 
       # @return [ Time, nil ]

data/lib/wpscan/version.rb

@@ -1,4 +1,4 @@
 # Version
 module WPScan
-  VERSION = '3.0.5'.freeze
+  VERSION = '3.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wpscan
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cms_scanner
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.37.11
+        version: 0.0.37.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.37.11
+        version: 0.0.37.12
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -52,62 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: dm-migrations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: dm-constraints
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -361,9 +305,9 @@ files:
 - lib/wpscan/controllers.rb
 - lib/wpscan/db.rb
 - lib/wpscan/db/dynamic_finders.rb
+- lib/wpscan/db/fingerprints.rb
 - lib/wpscan/db/plugin.rb
 - lib/wpscan/db/plugins.rb
-- lib/wpscan/db/schema.rb
 - lib/wpscan/db/theme.rb
 - lib/wpscan/db/themes.rb
 - lib/wpscan/db/updater.rb

data/lib/wpscan/db/schema.rb

@@ -1,39 +0,0 @@
-module WPScan
-  module DB
-    # WP Version
-    class Version < WpItem
-      include DataMapper::Resource
-
-      storage_names[:default] = 'versions'
-
-      has n, :fingerprints, constraint: :destroy
-
-      property :id, Serial
-      property :number, String, required: true, unique: true
-    end
-
-    # Path
-    class Path
-      include DataMapper::Resource
-
-      storage_names[:default] = 'paths'
-
-      has n, :fingerprints, constraint: :destroy
-
-      property :id, Serial
-      property :value, String, required: true, unique: true
-    end
-
-    # Fingerprint
-    class Fingerprint
-      include DataMapper::Resource
-
-      storage_names[:default] = 'fingerprints'
-
-      belongs_to :version, key: true
-      belongs_to :path, key: true
-
-      property :md5_hash, String, required: true, length: 32
-    end
-  end
-end