wordstress 0.50.0 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0aa61cebd1eb419b6a984c3b7dfd1beda4d952f
-  data.tar.gz: 81fd3b8759deaddab58bd678c8b75b273c3ace22
+  metadata.gz: 671f7b006dbdafbbb6121ceef8e02955cfc7e911
+  data.tar.gz: b7cff46bb7c7450ddc56616df38b73a2b3010f72
 SHA512:
-  metadata.gz: c188252811ed425f272b9faa410386abf65f29674e87c96898e0f4f783240cbf93dd8741c2597e80a9dc943954afedf502e489bef057daf4e0c136a2302569a7
-  data.tar.gz: 58f698450f1ae8d0981f017f77cc0b4d3ca01955d920b2672d4c092af0ddc895999f250b3bc40f0d36fdf848c2e7dd92811883a71dccea782148431ee80288d6
+  metadata.gz: ccdd7c979267c9d39ff5de0b403dcf11f47f27e832f0732ee0b47b636ed423b3fea6a4117d9ce0d458474d21f9d6df9d28b4c585ea55f52b539c901742ef714d
+  data.tar.gz: 9f9421817bb5b75fac260bafd1fcdf21c6d7dc2d82f6747c2cac1fd52f16b99898da233ea141478d48afb277c44e537dc7b2b54809eba8a8dfdcdb1364278a86

data/Changelog.md

@@ -0,0 +1,15 @@
+# Wordstress - changelog
+
+Wordstress is a whitebox security scanner for wordpress powered blogs. It needs
+[the wordstress](https://wordpress.org/plugins/wordstress/) plugin to be
+installed on the target server and an access key (stored server side) in order
+to works.
+
+It uses [wpvulndb.com](http://wpvulndb.com) vulnerability database.
+
+_latest update: Tue Mar  3 08:09:56 CET 2015_
+
+## Version 0.60 (2015-xx-xx) - First release with a Changelog
+
+* major cleanup for all greybox/blackbox scanning facilities. wordpress now
+  works only in whitebox mode

data/README.md

@@ -1,8 +1,7 @@
 # Wordstress
 
-wordstress is a application security tool specific for wordpress powered
-websites, inspired by [wpscan](https://github.com/wpscanteam/wpscan) tool.
-
+wordstress is an opensource whitebox security scanner for wordpress powered
+websites.
 
 ## Description
 
@@ -64,8 +63,8 @@ wordpress](https://wordpress.org/plugins/wordstress/) you may must:
   generated, to increase entropy you may want to reload the page a couple of
   times. When you're comfortable with the generated key, press the "Save Changes"
   button.
-  The virtual page is now available at the url http://youblogurl/wordstress?worstress-key=the_key
-* from the command line, use wordstress security scanner this way: `worstress -u http://yourblogurl/wordstress -k the_key`
+  The virtual page is now available at the url http://youblogurl/wordstress?wordstress-key=the_key
+* from the command line, use wordstress security scanner this way: `wordstress -u http://yourblogurl/wordstress -k the_key`
 * enjoy results
 
 ## Why another tool?
@@ -93,6 +92,40 @@ themes and plugins and their version. Since an authenticated check is necessary
 to match scan results with installed plugin (or theme) version, I tought it was
 a better idea to start authenticated from the beginning.
 
+## Usage
+
+Using wordstress from command line is pretty easy. There are 2 mandatory
+arguments, the key to use to query the wordpress plugin and the target url.
+
+`$ wordstress -k d4a34e43b5d74c822830b5c4690eccbb621aa372 http://mywordpressblog.com`
+
+By default, wordstress doesn't look for inactive themes or inactive plugins
+vulnerabilities. This means that if `foobar_plugin` installed version is
+vulnerable to privilege escalation, wordstress scanner by default won't raise
+an alarm if the `foobar_plugin` **is not active**.
+
+If you want to include vulnerabilities for all themes and vulnerabilities you
+can use -T and -P flags.
+
+`$ wordstress -k d4a34e43b5d74c822830b5c4690eccbb621aa372 -T -P http://mywordpressblog.com`
+
+Examples:
+$ wordstress -k d4a34e43b5d74c822830b5c4690eccbb621aa372 -B basic_user:basic_password http://mywordpressblog.com
+
+-k, --key                            uses the key to access wordstress plugin content on target website
+-B, --basic-auth user:pwd            uses 'user' and 'pwd' as basic auth credentials to target website
+
+Plugins and themes specific flags
+
+-T, --fetch-all-themes-vulns         retrieves vulnerabilities also for inactive themes
+-P, --fetch-all-plugins-vulns        retrieves vulnerabilities also for inactive plugins
+
+Service flags
+
+-D, --debug                          enters dawn debug mode
+-v, --version                        shows version information
+-h, --help                           shows this help
+
 ## Online resource
 
 [Wordstress homepage](http://wordstress.org)
@@ -114,6 +147,6 @@ a better idea to start authenticated from the beginning.
 
 1. Fork it ( https://github.com/[my-github-username]/wordstress/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
+  3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+  5. Create a new Pull Request

data/Rakefile

@@ -1,35 +1 @@
 require "bundler/gem_tasks"
-
-namespace :update do
-  desc 'Update themes'
-  task :themes, :name do |t,args|
-
-  end
-
-  desc 'Update plugins'
-  task :plugins, :name do |t, args|
-
-  end
-
-end
-namespace :import do
-  desc 'Import themes'
-  task :themes, :name do |t,args|
-    require 'wordstress/models/themes'
-    name = args.name
-    puts "reading themes from #{name}"
-    t = Wordstress::Models::Themes.new({:dbname=>"themes.db"})
-    t.import_from_file(name)
-  end
-
-  desc 'Import plugins'
-  task :plugins, :name do |t, args|
-    require 'wordstress/models/plugins'
-    name = args.name
-    puts "reading themes from #{name}"
-    p = Wordstress::Models::Plugins.new({:dbname=>"plugins.db"})
-    p.import_from_file(name)
-
-  end
-end
-

data/bin/wordstress

@@ -7,38 +7,35 @@ require 'codesake-commons'
 
 require 'wordstress'
 
-# Scanning modes for plugins and themes
-#   + gentleman: wordstress will try to fetch plugins and themes only using
-#     info in the HTML page (this is very polite but also very inaccurate).
-#   + whitebox: wordstress will use a target installed plugin to fetch
-#     installed plugins and themes with their version
-#   + aggressive: wordstress will use enumeration to find installed plugins and
-#     themes. This will lead to false positives.
-MODES = [:gentleman,:whitebox,:aggressive]
 APPNAME = File.basename($0)
+trap("INT")   { $logger.die('[INTERRUPTED]') }
 
 $logger  = Codesake::Commons::Logging.instance
-$logger.debug = false
-# $logger.toggle_silence
-@output_root = File.join(Dir.home, '/wordstress')
+# $logger.debug = false
+@output_root = File.join(Dir.home, 'wordstress')
 
-scanning_mode = :whitebox
-whitebox = {:url=>"", :key=>""}
-basic_auth  = {:user=>"", :pwd=>""}
+whitebox      = {:url=>"", :key=>""}
+basic_auth    = {:user=>"", :pwd=>""}
 
 opts    = GetoptLong.new(
-  [ '--gentleman',          '-G',   GetoptLong::NO_ARGUMENT],
-  [ '--basic-auth',         '-B',   GetoptLong::REQUIRED_ARGUMENT],
-  [ '--whitebox' ,          '-W',   GetoptLong::NO_ARGUMENT],
-  [ '--wordstress-url',     '-u', GetoptLong::REQUIRED_ARGUMENT],
-  [ '--wordstress-api-key', '-k', GetoptLong::REQUIRED_ARGUMENT],
-  [ '--csv',                '-C',   GetoptLong::NO_ARGUMENT],
-  [ '--debug',              '-D',   GetoptLong::NO_ARGUMENT],
-  [ '--version',            '-v',   GetoptLong::NO_ARGUMENT],
-  [ '--help',               '-h',   GetoptLong::NO_ARGUMENT]
+  #deprecated
+  [ '--gentleman',              '-G',   GetoptLong::NO_ARGUMENT],
+  #deprecated
+  [ '--whitebox' ,              '-W',   GetoptLong::NO_ARGUMENT],
+  #deprecated
+  [ '--wordstress-url',         '-u',   GetoptLong::REQUIRED_ARGUMENT],
+  [ '--fetch-all-themes-vulns', '-T',   GetoptLong::NO_ARGUMENT],
+  [ '--fetch-all-plugins-vulns','-P',   GetoptLong::NO_ARGUMENT],
+  [ '--basic-auth',             '-B',   GetoptLong::REQUIRED_ARGUMENT],
+  [ '--key',                    '-k',   GetoptLong::REQUIRED_ARGUMENT],
+  [ '--csv',                    '-C',   GetoptLong::NO_ARGUMENT],
+  [ '--debug',                  '-D',   GetoptLong::NO_ARGUMENT],
+  [ '--version',                '-v',   GetoptLong::NO_ARGUMENT],
+  [ '--help',                   '-h',   GetoptLong::NO_ARGUMENT]
 )
 
 opts.quiet=true
+deprecation_warning = false
 
 begin
   opts.each do |opt, val|
@@ -47,10 +44,11 @@ begin
       basic_auth[:user] = val.split(':')[0]
       basic_auth[:pwd] = val.split(':')[1]
     when '--whitebox'
-      scanning_mode = :whitebox
+      deprecation_warning = true
     when '--wordstress-url'
+      deprecation_warning = true
       whitebox[:url] = val
-    when '--wordstress-api-key'
+    when '--key'
       whitebox[:key] = val
     when '--version'
       puts "#{Wordstress::VERSION}"
@@ -58,6 +56,7 @@ begin
     when '--debug'
       $logger.debug = true
     when '--help'
+      Wordstress::Utils.help
       Kernel.exit(0)
     end
   end
@@ -67,66 +66,70 @@ rescue GetoptLong::InvalidOption => e
   Kernel.exit(-1)
 end
 
-target=ARGV.shift unless scanning_mode == :whitebox
-target=whitebox[:url] if scanning_mode == :whitebox
-
-
 $logger.helo APPNAME, Wordstress::VERSION
+$logger.warn "-G, -W, -u flags are deprecated and they will be soon removed. whitebox scanning will be the only supported option" if deprecation_warning
+
+if whitebox[:url].empty?
+  whitebox[:url]="#{ARGV.shift}/wordstress"
+  $logger.warn "assuming wordstress virtual page to be found at #{whitebox[:url]}"
+end
 
 unless Dir.exists?(@output_root)
   $logger.log "creating output dir #{@output_root}"
   Dir.mkdir @output_root
 end
 
-@output_dir = Wordstress::Utils.build_output_dir(@output_root, target)
+@output_dir = Wordstress::Utils.build_output_dir(@output_root, whitebox[:url])
 $logger.log "storing results to #{@output_dir}"
 FileUtils::mkdir_p(@output_dir)
 
-trap("INT")   { $logger.die('[INTERRUPTED]') }
-$logger.die("missing target") if target.nil?
+$logger.die("missing target") if whitebox[:url].nil?
 
-$logger.log "scanning #{target}"
-site = Wordstress::Site.new({:target=>target, :scanning_mode=>scanning_mode, :whitebox=>whitebox,:basic_auth=>basic_auth, :output_dir=>@output_dir})
+$logger.log "scanning #{whitebox[:url]}"
+site = Wordstress::Site.new({:whitebox=>whitebox,:basic_auth=>basic_auth, :output_dir=>@output_dir})
 
-if site.version[:version] == "0.0.0"
-  $logger.err "can't detect wordpress version running on #{target}. Giving up!"
-  Kernel.exit(-2)
-end
-
-$logger.ok "#{target} is a wordpress version #{site.version[:version]} with #{site.themes.count} themes and #{site.plugins.count} plugins"
-$logger.warn "scan mode is set to 'gentleman'. We are using only information found on resulting HTML. This can be lead to undetected plugins or themes" if site.scanning_mode == :gentleman
+$logger.ok "#{Wordstress::Utils.url_to_target(whitebox[:url])} is a wordpress version #{site.version[:version]} with #{site.themes.count} themes and #{site.plugins.count} plugins"
 
 if site.online?
   site.wp_vuln["wordpress"]["vulnerabilities"].each do |v|
     $logger.err "#{v["title"]}. Detected: #{site.version[:version]}. Safe: #{v["fixed_in"]}" if Gem::Version.new(site.version[:version]) <= Gem::Version.new(v["fixed_in"])
   end
   site.themes.each do |t|
-    v = site.get_theme_vulnerabilities(t[:name])
-    unless v["theme"].nil?
-      v["theme"]["vulnerabilities"].each do |vv|
-        if Gem::Version.new(t[:version]) <= Gem::Version.new(vv["fixed_in"])
-          $logger.err "#{vv["title"]}. Detected: #{t[:version]}. Safe: #{vv["fixed_in"]}"
-          site.theme_vulns << {:title=>vv["title"], :cve=>vv["cve"], :url=>vv["url"], :detected=>t[:version], :fixed_in=>vv["fixed_in"]}
+
+    if t[:status] == "inactive"
+      $logger.debug "Theme #{t[:name]} is inactive no looking for vulns. Use '--fetch-all-themes-vulns' flag to fetch inactive theme vulnerabilities"
+    else
+      v = site.get_theme_vulnerabilities(t[:name])
+      unless v["theme"].nil?
+        v["theme"]["vulnerabilities"].each do |vv|
+          if Gem::Version.new(t[:version]) <= Gem::Version.new(vv["fixed_in"])
+            $logger.err "Theme #{vv["title"]} is vulnerable. Detected: #{t[:version]}. Safe: #{vv["fixed_in"]}"
+            site.theme_vulns << {:title=>vv["title"], :cve=>vv["cve"], :url=>vv["url"], :detected=>t[:version], :fixed_in=>vv["fixed_in"]}
+          end
         end
       end
-    end
+    end # if t[:status] == "inactive"
   end
 
   site.plugins.each do |t|
-    v = site.get_plugin_vulnerabilities(t[:name])
-    unless v["plugin"].nil?
-      v["plugin"]["vulnerabilities"].each do |vv|
-        if Gem::Version.new(t[:version]) <= Gem::Version.new(vv["fixed_in"])
-          $logger.err "#{vv["title"]}. Detected: #{t[:version]}. Safe: #{vv["fixed_in"]}"
-          site.plugin_vulns << {:title=>vv["title"], :cve=>vv["cve"], :url=>vv["url"], :detected=>t[:version], :fixed_in=>vv["fixed_in"]}
+    if t[:status] == "inactive"
+      $logger.debug "Plugin #{t[:name]} is inactive no looking for vulns. Use '--fetch-all-plugins-vulns' flag to fetch inactive plugin vulnerabilities"
+    else
+      v = site.get_plugin_vulnerabilities(t[:name])
+      unless v["plugin"].nil?
+        v["plugin"]["vulnerabilities"].each do |vv|
+          if Gem::Version.new(t[:version]) <= Gem::Version.new(vv["fixed_in"])
+            $logger.err "Plugin #{vv["title"]} is vulnerable. Detected: #{t[:version]}. Safe: #{vv["fixed_in"]}"
+            site.plugin_vulns << {:title=>vv["title"], :cve=>vv["cve"], :url=>vv["url"], :detected=>t[:version], :fixed_in=>vv["fixed_in"]}
+          end
         end
       end
-    end
+    end # if t[:status] == "inactive"
   end
 else
   site.online = false
   $logger.err "it seems we are offline. wordstress can't reach https://wpvulndb.com"
-  $logger.err "wordpress can't enumerate vulnerabilities"
+  $logger.err "wordstress can't enumerate vulnerabilities"
 end
 
 site.stop_scan

data/lib/wordstress/site.rb

@@ -4,19 +4,17 @@ require 'terminal-table'
 module Wordstress
   class Site
 
-    attr_reader :version, :scanning_mode, :wp_vuln, :plugins, :themes
+    attr_reader :version, :wp_vuln, :plugins, :themes
     attr_accessor :theme_vulns, :plugin_vulns, :online
 
-    def initialize(options={:target=>"http://localhost", :scanning_mode=>:gentleman, :whitebox=>{}, :basic_auth=>{:user=>"", :pwd=>""}, :output_dir=>"./"})
-      @target     = options[:target]
+    def initialize(options={:whitebox=>{:url=>"http://localhost/wordstress", :key=>""}, :basic_auth=>{:user=>"", :pwd=>""}, :output_dir=>"./"})
       begin
-        @uri      = URI(options[:target])
-        @raw_name = options[:target]
+        @uri      = URI(options[:whitebox][:url])
         @valid    = true
       rescue
         @valid = false
       end
-      @scanning_mode    = options[:scanning_mode]
+      @target = Wordstress::Utils.url_to_target(options[:whitebox][:url])
 
       @basic_auth_user  = options[:basic_auth][:user]
       @basic_auth_pwd   = options[:basic_auth][:pwd]
@@ -25,16 +23,8 @@ module Wordstress
       @start_time       = Time.now
       @end_time         = Time.now # I hate init variables to nil...
 
-      unless scanning_mode == :whitebox
-
-        @robots_txt   = get(@raw_name + "/robots.txt")
-        @readme_html  = get(@raw_name + "/readme.html")
-        @homepage     = get(@raw_name)
-        @version      = detect_version(@homepage, false)
-      else
-        @wordstress_page  = get("#{options[:whitebox][:url]}?wordstress-key=#{options[:whitebox][:key]}") if options[:scanning_mode] == :whitebox
-        @version          = detect_version(@wordstress_page, true)
-      end
+      @wordstress_page  = get("#{options[:whitebox][:url]}?wordstress-key=#{options[:whitebox][:key]}")
+      @version          = detect_version(@wordstress_page)
 
       @online       = true
 
@@ -58,7 +48,7 @@ module Wordstress
         return JSON.parse(json)
       rescue => e
         $logger.err e.message
-        @online = false
+        @online = false unless e.message.include?"403"
         return JSON.parse("{}")
       end
     end
@@ -70,7 +60,7 @@ module Wordstress
         return JSON.parse(json)
       rescue => e
         $logger.err e.message
-        @online = false
+        @online = false unless e.message.include?"403"
         return JSON.parse("{}")
       end
     end
@@ -82,7 +72,7 @@ module Wordstress
         return JSON.parse("{\"wordpress\":{\"vulnerabilities\":[]}}") if page.class == Net::HTTPNotFound
       rescue => e
         $logger.err e.message
-        @online = false
+        @online = false unless e.message.include?"403"
         return JSON.parse("{}")
       end
     end
@@ -92,12 +82,7 @@ module Wordstress
       # return version.gsub('.', '')+'0'  if version.split('.').count == 2
     end
 
-    def detect_version(page, whitebox=false)
-      detect_version_blackbox(page) unless whitebox
-      detect_version_whitebox(page) if whitebox
-    end
-
-    def detect_version_whitebox(page)
+    def detect_version(page)
       v_meta = '0.0.0'
       doc = Nokogiri::HTML(page.body)
       doc.css('#wp_version').each do |link|
@@ -107,50 +92,6 @@ module Wordstress
       return {:version => v_meta, :accuracy => 1.0}
     end
 
-    def detect_version_blackbox(page)
-
-      #
-      # 1. trying to detect wordpress version from homepage body meta generator
-      # tag
-
-      v_meta = ""
-      doc = Nokogiri::HTML(page.body)
-      doc.xpath("//meta[@name='generator']/@content").each do |attr|
-        v_meta = attr.value.split(' ')[1]
-      end
-
-      #
-      # 2. trying to detect wordpress version from readme.html in the root
-      # directory
-      #
-      # Not available if scanning 
-
-      unless whitebox
-        v_readme = ""
-        doc = Nokogiri::HTML(@readme_html.body)
-        v_readme = doc.at_css('h1').children.last.text.chop.lstrip.split(' ')[1]
-      end
-
-      #
-      # 3. Detect from RSS link
-      #
-      v_rss = ""
-      rss_doc = Nokogiri::HTML(page.body)
-      begin
-        rss = Nokogiri::HTML(get(rss_doc.css('link[type="application/rss+xml"]').first.attr('href')).body) unless l.nil?
-        v_rss= rss.css('generator').text.split('=')[1]
-      rescue => e
-        v_rss = "0.0.0"
-      end
-
-
-      return {:version => v_meta, :accuracy => 1.0} if v_meta == v_readme && v_meta == v_rss
-      return {:version => v_meta, :accuracy => 0.8} if v_meta == v_readme || v_meta == v_rss
-
-      # we failed detecting wordpress version
-      return {:version => "0.0.0", :accuracy => 0}
-    end
-
     def get(page)
       return get_http(page)   if @uri.scheme == "http"
       return get_https(page)  if @uri.scheme == "https"
@@ -163,22 +104,26 @@ module Wordstress
       return @online
     end
 
-    def find_themes
-      return find_themes_gentleman  if @scanning_mode == :gentleman
-      return find_themes_whitebox if @scanning_mode == :whitebox
-      return []
-    end
     def find_plugins
-      return find_plugins_gentleman if @scanning_mode == :gentleman
-      return find_plugins_whitebox if @scanning_mode == :whitebox
-
-      # bruteforce check must start with error page discovery.
-      # the idea is to send 2 random plugin names (e.g. 2 sha256 of time seed)
-      # and see how webserver answers and then understand if we can rely on a
-      # pattern for the error page.
-      return []
+      ret = []
+      doc = Nokogiri::HTML(@wordstress_page.body)
+      doc.css('#all_plugin').each do |link|
+        l=link.text.split(',')
+        ret << {:name=>l[2].split('/')[0], :version=>l[1], :status=>l[3]} unless is_already_detected?(ret, l[2])
+      end
+      ret
+    end
+    def find_themes
+      ret = []
+      doc = Nokogiri::HTML(@wordstress_page.body)
+      doc.css('#all_theme').each do |link|
+        l=link.text.split(',')
+        ret << {:name=>l[2], :version=>l[1], :status=>l[3]} unless is_already_detected?(ret, l[2])
+      end
+      ret
     end
 
+
     def ascii_report
       # 0_Executive summary
       rows = []
@@ -271,36 +216,6 @@ module Wordstress
       return (!a.nil?)
     end
 
-    def find_plugins_whitebox
-      ret = []
-      doc = Nokogiri::HTML(@wordstress_page.body)
-      doc.css('#all_plugin').each do |link|
-        l=link.text.split(',')
-        ret << {:name=>l[2].split('/')[0], :version=>l[1], :status=>l[3]} unless is_already_detected?(ret, l[2])
-      end
-      ret
-    end
-    def find_themes_whitebox
-      ret = []
-      doc = Nokogiri::HTML(@wordstress_page.body)
-      doc.css('#all_theme').each do |link|
-        l=link.text.split(',')
-        ret << {:name=>l[2], :version=>l[1], :status=>l[3]} unless is_already_detected?(ret, l[2])
-      end
-      ret
-    end
-
-    def find_themes_gentleman
-      ret = []
-      doc = Nokogiri::HTML(@homepage.body)
-      doc.css('link').each do |link|
-        if link.attr('href').include?("wp-content/themes")
-        theme = theme_name(link.attr('href'))
-        ret << {:name=>theme, :version=>""} unless is_already_detected?(ret, theme)
-        end
-      end
-      ret
-    end
 
     def theme_name(url)
       url.match(/\/wp-content\/themes\/(\w)+/)[0].split('/').last
@@ -309,28 +224,6 @@ module Wordstress
       url.match(/\/wp-content\/plugins\/(\w)+/)[0].split('/').last
     end
 
-    def find_plugins_gentleman
-      ret = []
-      doc = Nokogiri::HTML(@homepage.body)
-      doc.css('script').each do |link|
-        if ! link.attr('src').nil?
-          if link.attr('src').include?("wp-content/plugins")
-          plugin = plugin_name(link.attr('src'))
-          ret << {:name=>plugin, :version=>"", :status=>"active"} unless is_already_detected?(ret, plugin)
-          end
-        end
-      end
-      doc.css('link').each do |link|
-        if link.attr('href').include?("wp-content/plugins")
-        plugin = plugin_name(link.attr('href'))
-        ret << plugin if ret.index(plugin).nil?
-        end
-
-      end
-
-      ret
-    end
-
     def get_http(page, use_ssl=false)
       uri = URI(page)
       req = Net::HTTP::Get.new(uri)
@@ -349,7 +242,7 @@ module Wordstress
       when Net::HTTPRedirection then
         location = res['location']
         $logger.debug "redirected to #{location}"
-        get_http(location)
+        get_http(location, use_ssl)
       when Net::HTTPNotFound
         return res
       else

data/lib/wordstress/utils.rb

@@ -1,32 +1,58 @@
 module Wordstress
   class Utils
+    def self.help
+
+      puts "wordstress v#{Wordstress::VERSION} (http://wordstress.org)"
+
+      puts "Usage: wordstress [options] url"
+      printf "\nExamples:\n"
+      puts "\t$ wordstress -k d4a34e43b5d74c822830b5c4690eccbb621aa372 http://mywordpressblog.com"
+      puts "\t$ wordstress -k d4a34e43b5d74c822830b5c4690eccbb621aa372 -B basic_user:basic_password http://mywordpressblog.com"
+      puts "\t$ wordstress -k d4a34e43b5d74c822830b5c4690eccbb621aa372 -T -P http://mywordpressblog.com"
+      printf "\n   -k, --key\t\t\t\tuses the key to access wordstress plugin content on target website"
+      printf "\n   -B, --basic-auth user:pwd\t\tuses 'user' and 'pwd' as basic auth credentials to target website"
+      printf "\n\nPlugins and themes specific flags\n"
+      printf "\n   -T, --fetch-all-themes-vulns\t\tretrieves vulnerabilities also for inactive themes"
+      printf "\n   -P, --fetch-all-plugins-vulns\tretrieves vulnerabilities also for inactive plugins"
+      printf "\n\nService flags\n"
+      printf "\n   -D, --debug\t\t\t\tenters dawn debug mode"
+      printf "\n   -v, --version\t\t\tshows version information"
+      printf "\n   -h, --help\t\t\t\tshows this help\n"
+
+      true
+  end
 
-    # Transform a given URL into a directory name to be used to store data
-    def self.target_to_dirname(target)
-      uri = URI.parse(target)
-      path = uri.request_uri.split('/')
-      blog_path = ""
-      blog_path = "_#{path[1]}" if path.count >= 2
-      return "#{uri.host}_#{uri.port}#{blog_path}"
-    end
-
-    def self.build_output_dir(root, target)
-      attempt=0
-      today=Time.now.strftime("%Y%m%d")
+  def self.url_to_target(url)
+    uri = URI.parse(url)
+    "#{uri.scheme}://#{uri.host}#{uri.request_uri.gsub("/wordstress", "")}" if uri.port == 80
+    "#{uri.scheme}://#{uri.host}:#{uri.port}#{uri.request_uri.gsub("/wordstress", "")}" unless uri.port == 80
+  end
+  # Transform a given URL into a directory name to be used to store data
+  def self.target_to_dirname(target)
+    uri = URI.parse(target)
+    path = uri.request_uri.split('/')
+    blog_path = ""
+    blog_path = "_#{path[1]}" if path.count >= 2
+    return "#{uri.host}_#{uri.port}#{blog_path}"
+  end
 
-      while 1 do
+  def self.build_output_dir(root, target)
+    attempt=0
+    today=Time.now.strftime("%Y%m%d")
 
-        proposed = File.join(root, Wordstress::Utils.target_to_dirname(target), today)
-        if attempt != 0
-          proposed += "_#{attempt}"
-        end
+    while 1 do
 
-        return proposed unless Dir.exists?(proposed)
-        attempt +=1 if Dir.exists?(proposed)
+      proposed = File.join(root, Wordstress::Utils.target_to_dirname(target), today)
+      if attempt != 0
+        proposed += "_#{attempt}"
       end
 
-
+      return proposed unless Dir.exists?(proposed)
+      attempt +=1 if Dir.exists?(proposed)
     end
 
+
   end
+
+end
 end

data/lib/wordstress/version.rb

@@ -1,3 +1,3 @@
 module Wordstress
-  VERSION = "0.50.0"
+  VERSION = "0.70.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordstress
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Paolo Perego
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,14 +105,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/wordstress
 - lib/wordstress.rb
-- lib/wordstress/models/plugins.rb
-- lib/wordstress/models/themes.rb
 - lib/wordstress/site.rb
 - lib/wordstress/utils.rb
 - lib/wordstress/version.rb
@@ -137,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: wordstress is a security scanner for wordpress powered websites

data/lib/wordstress/models/plugins.rb

@@ -1,60 +0,0 @@
-require 'data_mapper'
-require 'dm-sqlite-adapter'
-
-module Wordstress
-  module Models
-
-    class PluginInfo
-      include DataMapper::Resource
-
-      property :id,           Serial
-      property :revision,     Integer
-      property :created_at,   DateTime, :default=>DateTime.now
-      property :updated_at,   DateTime, :default=>DateTime.now
-    end
-
-    class Plugin
-      include DataMapper::Resource
-
-      property :id,           Serial
-      property :name,         String
-      property :link,         String
-      property :created_at,   DateTime, :default=>DateTime.now
-      property :updated_at,   DateTime, :default=>DateTime.now
-    end
-
-    class Plugins
-
-      def initialize(options={:dbname=>"plugins.db"})
-        DataMapper.setup(:default, "sqlite3://#{File.join(Dir.pwd, options[:dbname])}")
-        DataMapper.finalize
-        DataMapper.auto_migrate!
-      end
-
-      def import_from_file(filename)
-        doc = Nokogiri::HTML(File.read(filename))
-        title = doc.at_css('title').children.text
-
-        return nil unless title.include?"Revision"
-        revision = title.split("Revision ")[1].split(':')[0].to_i
-        links = doc.xpath('//li//a')
-
-        puts "Plugin SVN revision is: #{revision}"
-        puts "#{links.count} plugins found"
-
-        i = PluginInfo.new
-        i.revision = revision
-        i.save
-
-        links.each do |link|
-          p = Plugin.new
-          p.name = link.text.chop
-          p.link = 'https://plugins.svn.wordpress.org/'+link.attr('href')
-          p.save
-
-        end
-      end
-
-    end
-  end
-end

data/lib/wordstress/models/themes.rb

@@ -1,62 +0,0 @@
-require 'data_mapper'
-require 'dm-sqlite-adapter'
-
-module Wordstress
-  module Models
-
-    class Info
-      include DataMapper::Resource
-
-      property :id,           Serial
-      property :revision,     Integer
-      property :created_at,   DateTime, :default=>DateTime.now
-      property :updated_at,   DateTime, :default=>DateTime.now
-    end
-
-    class Theme
-      include DataMapper::Resource
-
-      property :id,           Serial
-      property :name,         String
-      property :link,         String
-      property :created_at,   DateTime, :default=>DateTime.now
-      property :updated_at,   DateTime, :default=>DateTime.now
-    end
-
-    class Themes
-
-      def initialize(options={:dbname=>"themes.db"})
-        DataMapper.setup(:default, "sqlite3://#{File.join(Dir.pwd, options[:dbname])}")
-        DataMapper.finalize
-        DataMapper.auto_migrate!
-      end
-
-      def import_from_file(filename)
-        doc = Nokogiri::HTML(File.read(filename))
-        title = doc.at_css('title').children.text
-
-        return nil unless title.include?"Revision"
-        revision = title.split("Revision ")[1].split(':')[0].to_i
-        links = doc.xpath('//li//a')
-
-
-        puts "Theme SVN revision is: #{revision}"
-        puts "#{links.count} themes found"
-
-        i = Info.new
-        i.revision = revision
-        i.save
-
-        links.each do |link|
-          # puts "-> #{link.attr('href')} - #{link.text.chop}"
-          t = Theme.new
-          t.name = link.text.chop
-          t.link = 'https://themes.svn.wordpress.org/'+link.attr('href')
-          t.save
-
-        end
-      end
-
-    end
-  end
-end