Update to latest Mdm

Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec name: 'metasploit-framework'
 
-gem 'metasploit_data_models', git: 'https://github.com/rapid7/metasploit_data_models.git', branch: 'staging/single-vuln-push'
-
 # separate from test as simplecov is not run on travis-ci
 group :coverage do
   # code coverage for tests

Gemfile.lock

@@ -1,18 +1,3 @@
-GIT
-  remote: https://github.com/rapid7/metasploit_data_models.git
-  revision: 6835d9cf61ad998db4184405ab21a92ef92caaa5
-  branch: staging/single-vuln-push
-  specs:
-    metasploit_data_models (0.23.2.pre.single.pre.vuln.pre.push)
-      activerecord (>= 3.2.13, < 4.0.0)
-      activesupport
-      arel-helpers
-      metasploit-concern (~> 0.3.0)
-      metasploit-model (~> 0.29.0)
-      pg
-      railties (< 4.0.0)
-      recog (~> 1.0)
-
 PATH
   remote: .
   specs:
@@ -39,7 +24,7 @@ PATH
       activerecord (>= 3.2.21, < 4.0.0)
       metasploit-credential (~> 0.14.3)
       metasploit-framework (= 4.11.0.pre.dev)
-      metasploit_data_models (~> 0.23.0)
+      metasploit_data_models (~> 0.23.2)
       pg (>= 0.11)
     metasploit-framework-pcap (4.11.0.pre.dev)
       metasploit-framework (= 4.11.0.pre.dev)
@@ -138,6 +123,15 @@ GEM
     metasploit-model (0.29.0)
       activesupport
       railties (< 4.0.0)
+    metasploit_data_models (0.23.2)
+      activerecord (>= 3.2.13, < 4.0.0)
+      activesupport
+      arel-helpers
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.29.0)
+      pg
+      railties (< 4.0.0)
+      recog (~> 1.0)
     meterpreter_bins (0.0.17)
     method_source (0.8.2)
     mime-types (1.25.1)
@@ -242,7 +236,6 @@ DEPENDENCIES
   metasploit-framework!
   metasploit-framework-db!
   metasploit-framework-pcap!
-  metasploit_data_models!
   pry
   rake (>= 10.0.0)
   redcarpet

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150312155312) do
+ActiveRecord::Schema.define(:version => 20150326183742) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -27,6 +27,9 @@ ActiveRecord::Schema.define(:version => 20150312155312) do
     t.datetime "updated_at", :null => false
   end
 
+  add_index "automatic_exploitation_match_results", ["match_id"], :name => "index_automatic_exploitation_match_results_on_match_id"
+  add_index "automatic_exploitation_match_results", ["run_id"], :name => "index_automatic_exploitation_match_results_on_run_id"
+
   create_table "automatic_exploitation_match_sets", :force => true do |t|
     t.integer  "workspace_id"
     t.integer  "user_id"
@@ -60,6 +63,10 @@ ActiveRecord::Schema.define(:version => 20150312155312) do
     t.datetime "updated_at",   :null => false
   end
 
+  add_index "automatic_exploitation_runs", ["match_set_id"], :name => "index_automatic_exploitation_runs_on_match_set_id"
+  add_index "automatic_exploitation_runs", ["user_id"], :name => "index_automatic_exploitation_runs_on_user_id"
+  add_index "automatic_exploitation_runs", ["workspace_id"], :name => "index_automatic_exploitation_runs_on_workspace_id"
+
   create_table "clients", :force => true do |t|
     t.integer  "host_id"
     t.datetime "created_at"
@@ -407,8 +414,7 @@ ActiveRecord::Schema.define(:version => 20150312155312) do
     t.datetime "attempted_at"
     t.text     "fail_detail"
     t.string   "fail_reason"
-    t.integer  "module_detail_id"
-    t.text     "module_full_name"
+    t.text     "module_fullname"
     t.integer  "port"
     t.string   "proto"
     t.integer  "session_id"
@@ -417,10 +423,13 @@ ActiveRecord::Schema.define(:version => 20150312155312) do
     t.string   "trackable_type"
     t.integer  "user_id"
     t.string   "username"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
+  add_index "module_runs", ["session_id"], :name => "index_module_runs_on_session_id"
+  add_index "module_runs", ["user_id"], :name => "index_module_runs_on_user_id"
+
   create_table "module_targets", :force => true do |t|
     t.integer "detail_id"
     t.integer "index"

metasploit-framework-db.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   # Metasploit::Credential database models
   spec.add_runtime_dependency 'metasploit-credential', '~> 0.14.3'
   # Database models shared between framework and Pro.
-  spec.add_runtime_dependency 'metasploit_data_models', '~> 0.23.0'
+  spec.add_runtime_dependency 'metasploit_data_models', '~> 0.23.2'
   # depend on metasploit-framewrok as the optional gems are useless with the actual code
   spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
   # Needed for module caching in Mdm::ModuleDetails