Revert "Land rapid7#6812, remove broken OSVDB references"

This reverts commit 2b016e0, reversing
changes made to 7b1d959.

Author: Brent Cook

data/exploits/php/rfi-locations.dat

@@ -1,4 +1,4 @@
-# Compiled by RSnake 02/01/2010 Mostly from milw0rm and elsewhere.
+# Compiled by RSnake 02/01/2010 Mostly from milw0rm osvdb.org and elsewhere.
 # Change XXpathXX to the path of your backdoor.  Note that you may need to 
 # try it against every directory on the target and because of how this was
 # culled you may need to add a question mark to your own XXpathXX URL:

lib/msf/core/db_manager/import/nikto.rb

@@ -40,6 +40,16 @@ def import_nikto_xml(args={}, &block)
             }
             # Always report it as a note.
             report_note(desc_data)
+            # Sometimes report it as a vuln, too.
+            # XXX: There's a Vuln.info field but nothing reads from it? See Bug #5837
+            if item.attributes['osvdbid'].to_i != 0
+              desc_data[:refs] = ["OSVDB-#{item.attributes['osvdbid']}"]
+              desc_data[:name] = "NIKTO-#{item.attributes['id']}"
+              desc_data.delete(:data)
+              desc_data.delete(:type)
+              desc_data.delete(:update)
+              report_vuln(desc_data)
+            end
           end
         end
       end

lib/msf/core/db_manager/import/nmap.rb

@@ -182,6 +182,7 @@ def import_nmap_xml(args={}, &block)
                 :info => 'Microsoft Windows Server Service Crafted RPC Request Handling Unspecified Remote Code Execution',
                 :refs =>['CVE-2008-4250',
                   'BID-31874',
+                  'OSVDB-49243',
                   'CWE-94',
                   'MSFT-MS08-067',
                   'MSF-Microsoft Server Service Relative Path Stack Corruption',
@@ -203,6 +204,8 @@ def import_nmap_xml(args={}, &block)
                   'BID-18325',
                   'BID-18358',
                   'BID-18424',
+                  'OSVDB-26436',
+                  'OSVDB-26437',
                   'MSFT-MS06-025',
                   'MSF-Microsoft RRAS Service RASMAN Registry Overflow',
                   'NSS-21689']
@@ -221,6 +224,7 @@ def import_nmap_xml(args={}, &block)
                 :info => 'Vulnerability in Windows DNS RPC Interface Could Allow Remote Code Execution',
                 # Add more refs based on nessus/nexpose .. results
                 :refs =>['CVE-2007-1748',
+                  'OSVDB-34100',
                   'MSF-Microsoft DNS RPC Service extractQuotedChar()',
                   'NSS-25168']
               }

lib/msf/core/db_manager/module_cache.rb

@@ -158,6 +158,7 @@ def remove_module_details(mtype, refname)
   # +edb+:: Matches modules with the given Exploit-DB ID.
   # +name+:: Matches modules with the given full name or name.
   # +os+, +platform+:: Matches modules with the given platform or target name.
+  # +osvdb+:: Matches modules with the given OSVDB ID.
   # +ref+:: Matches modules with the given reference ID.
   # +type+:: Matches modules with the given type.
   #
@@ -276,7 +277,7 @@ def search_modules(search_string)
 
             query = query.includes(:refs).references(:refs)
             union_conditions << Mdm::Module::Ref.arel_table[:name].matches_any(formatted_values)
-          when 'cve', 'bid', 'edb'
+          when 'cve', 'bid', 'osvdb', 'edb'
             formatted_values = value_set.collect { |value|
               prefix = keyword.upcase
 

lib/msf/core/module/reference.rb

@@ -77,7 +77,7 @@ def self.from_s(str)
 
   #
   # Initializes a site reference from an array.  ary[0] is the site and
-  # ary[1] is the site context identifier, such as CVE.
+  # ary[1] is the site context identifier, such as OSVDB.
   #
   def self.from_a(ary)
     return nil if (ary.length < 2)
@@ -95,7 +95,9 @@ def initialize(in_ctx_id = 'Unknown', in_ctx_val = '')
     self.ctx_id  = in_ctx_id
     self.ctx_val = in_ctx_val
 
-    if (in_ctx_id == 'CVE')
+    if (in_ctx_id == 'OSVDB')
+      self.site = "http://www.osvdb.org/#{in_ctx_val}"
+    elsif (in_ctx_id == 'CVE')
       self.site = "http://cvedetails.com/cve/#{in_ctx_val}/"
     elsif (in_ctx_id == 'CWE')
       self.site = "https://cwe.mitre.org/data/definitions/#{in_ctx_val}.html"
@@ -148,7 +150,7 @@ def from_s(str)
   #
   attr_reader :site
   #
-  # The context identifier of the site, such as CVE.
+  # The context identifier of the site, such as OSVDB.
   #
   attr_reader :ctx_id
   #

lib/msf/core/module/search.rb

@@ -86,6 +86,8 @@ def search_filter(search_string)
               match = [t,w] if refs.any? { |ref| ref =~ /^cve\-/i and ref =~ r }
             when 'bid'
               match = [t,w] if refs.any? { |ref| ref =~ /^bid\-/i and ref =~ r }
+            when 'osvdb'
+              match = [t,w] if refs.any? { |ref| ref =~ /^osvdb\-/i and ref =~ r }
             when 'edb'
               match = [t,w] if refs.any? { |ref| ref =~ /^edb\-/i and ref =~ r }
           end

lib/msf/ui/console/command_dispatcher/core.rb

@@ -1615,6 +1615,7 @@ def cmd_search_help
       'cve'      => 'Modules with a matching CVE ID',
       'edb'      => 'Modules with a matching Exploit-DB ID',
       'name'     => 'Modules with a matching descriptive name',
+      'osvdb'    => 'Modules with a matching OSVDB ID',
       'platform' => 'Modules affecting this platform',
       'ref'      => 'Modules with a matching ref',
       'type'     => 'Modules of a specific type (exploit, auxiliary, or post)',

modules/auxiliary/admin/2wire/xslt_password_reset.rb

@@ -26,6 +26,7 @@ def initialize(info={})
       'References'     =>
         [
           [ 'CVE', '2007-4387' ],
+          [ 'OSVDB', '37667' ],
           [ 'BID', '36075' ],
           [ 'URL', 'http://seclists.org/bugtraq/2007/Aug/225' ],
         ],

modules/auxiliary/admin/android/google_play_store_uxss_xframe_rce.rb

@@ -38,6 +38,7 @@ def initialize(info = {})
       'References' => [
         [ 'URL', 'https://community.rapid7.com/community/metasploit/blog/2014/09/15/major-android-bug-is-a-privacy-disaster-cve-2014-6041'],
         [ 'URL', 'http://1337day.com/exploit/description/22581' ],
+        [ 'OSVDB', '110664' ],
         [ 'CVE', '2014-6041' ]
       ],
       'DefaultAction'  => 'WebServer'

modules/auxiliary/admin/backupexec/dump.rb

@@ -27,6 +27,7 @@ def initialize(info = {})
       'References'     =>
         [
           ['CVE', '2005-2611'],
+          ['OSVDB', '18695'],
           ['BID', '14551'],
           ['URL', 'http://www.fpns.net/willy/msbksrc.lzh'],
         ],