Update to metasploit_data_models 0.7.1

[#47979793]

Author: limhoff-r7

Gemfile

@@ -7,12 +7,12 @@ gem 'activerecord'
 # Needed for some admin modules (scrutinizer_add_user.rb)
 gem 'json'
 # Database models shared between framework and Pro.
-gem 'metasploit_data_models', '~> 0.6.14'
+gem 'metasploit_data_models', '~> 0.7.1'
 # Needed by msfgui and other rpc components
 gem 'msgpack'
 # Needed by anemone crawler
 gem 'nokogiri'
-# Needed for module caching in Mdm::ModuleDetails
+# Needed for module caching in Mdm::Module::Details
 gem 'pg', '>= 0.11'
 # Needed by anemone crawler
 gem 'robots'

Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     i18n (0.6.1)
     json (1.7.7)
     metaclass (0.0.1)
-    metasploit_data_models (0.6.14)
+    metasploit_data_models (0.7.1)
       activerecord (>= 3.2.13)
       activesupport
       pg
@@ -65,7 +65,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl (>= 4.1.0)
   json
-  metasploit_data_models (~> 0.6.14)
+  metasploit_data_models (~> 0.7.1)
   msgpack
   nokogiri
   pcaprub

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130228214900) do
+ActiveRecord::Schema.define(:version => 20130412175040) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -223,26 +223,26 @@
   end
 
   create_table "module_actions", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.text    "name"
   end
 
-  add_index "module_actions", ["module_detail_id"], :name => "index_module_actions_on_module_detail_id"
+  add_index "module_actions", ["detail_id"], :name => "index_module_actions_on_module_detail_id"
 
   create_table "module_archs", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.text    "name"
   end
 
-  add_index "module_archs", ["module_detail_id"], :name => "index_module_archs_on_module_detail_id"
+  add_index "module_archs", ["detail_id"], :name => "index_module_archs_on_module_detail_id"
 
   create_table "module_authors", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.text    "name"
     t.text    "email"
   end
 
-  add_index "module_authors", ["module_detail_id"], :name => "index_module_authors_on_module_detail_id"
+  add_index "module_authors", ["detail_id"], :name => "index_module_authors_on_module_detail_id"
 
   create_table "module_details", :force => true do |t|
     t.datetime "mtime"
@@ -268,34 +268,34 @@
   add_index "module_details", ["refname"], :name => "index_module_details_on_refname"
 
   create_table "module_mixins", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.text    "name"
   end
 
-  add_index "module_mixins", ["module_detail_id"], :name => "index_module_mixins_on_module_detail_id"
+  add_index "module_mixins", ["detail_id"], :name => "index_module_mixins_on_module_detail_id"
 
   create_table "module_platforms", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.text    "name"
   end
 
-  add_index "module_platforms", ["module_detail_id"], :name => "index_module_platforms_on_module_detail_id"
+  add_index "module_platforms", ["detail_id"], :name => "index_module_platforms_on_module_detail_id"
 
   create_table "module_refs", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.text    "name"
   end
 
-  add_index "module_refs", ["module_detail_id"], :name => "index_module_refs_on_module_detail_id"
+  add_index "module_refs", ["detail_id"], :name => "index_module_refs_on_module_detail_id"
   add_index "module_refs", ["name"], :name => "index_module_refs_on_name"
 
   create_table "module_targets", :force => true do |t|
-    t.integer "module_detail_id"
+    t.integer "detail_id"
     t.integer "index"
     t.text    "name"
   end
 
-  add_index "module_targets", ["module_detail_id"], :name => "index_module_targets_on_module_detail_id"
+  add_index "module_targets", ["detail_id"], :name => "index_module_targets_on_module_detail_id"
 
   create_table "nexpose_consoles", :force => true do |t|
     t.datetime "created_at",                     :null => false

lib/msf/core/db.rb

@@ -780,7 +780,7 @@ def report_session(opts)
 
 			if session.via_exploit == "exploit/multi/handler" and sess_data[:datastore]['ParentModule']
 				mod_fullname = sess_data[:datastore]['ParentModule']
-				mod_name = ::Mdm::ModuleDetail.find_by_fullname(mod_fullname).name
+				mod_name = ::Mdm::Module::Detail.find_by_fullname(mod_fullname).name
 			else
 				mod_name = mod.name
 				mod_fullname = mod.fullname

lib/msf/core/db_export.rb

@@ -363,14 +363,14 @@ def create_xml_element(key,value)
 	#   directly, it is the caller's responsibility to add an opening and closing
 	#   tag to report_file around the call to {#extract_module_detail_info}.
 	#
-  # Writes a module_detail element to the report_file for each
-  # Mdm::ModuleDetail.
+	# Writes a module_detail element to the report_file for each
+	# Mdm::Module::Detail.
 	#
 	# @param report_file [#write, #flush] IO stream to which to write the
 	#   module_detail elements.
 	# @return [void]
 	def extract_module_detail_info(report_file)
-		Mdm::ModuleDetail.all.each do |m|
+      Mdm:Module::Detail.all.each do |m|
 			report_file.write("<module_detail>\n")
 			m_id = m.attributes["id"]