Merge branch 'staging/rails-4.0' into bug/MSP-12516/db-manager-match-set

Author: ccatalan-r7

Gemfile.lock

@@ -33,7 +33,7 @@ GIT
 
 GIT
   remote: git://github.com/rapid7/metasploit_data_models.git
-  revision: 6add26dc6aa83905db698fe9072d1d9901b1a2d6
+  revision: 24b05f5ec4c337e85968986f0777a823755513cc
   branch: staging/rails-4.0
   specs:
     metasploit_data_models (0.23.3.pre.rails.pre.4.0)

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150317145455) do
+ActiveRecord::Schema.define(version: 20150326183742) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -22,6 +22,54 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "automatic_exploitation_match_results", force: true do |t|
+    t.integer  "match_id"
+    t.integer  "run_id"
+    t.string   "state",      null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "automatic_exploitation_match_results", ["match_id"], name: "index_automatic_exploitation_match_results_on_match_id", using: :btree
+  add_index "automatic_exploitation_match_results", ["run_id"], name: "index_automatic_exploitation_match_results_on_run_id", using: :btree
+
+  create_table "automatic_exploitation_match_sets", force: true do |t|
+    t.integer  "workspace_id"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "automatic_exploitation_match_sets", ["user_id"], name: "index_automatic_exploitation_match_sets_on_user_id", using: :btree
+  add_index "automatic_exploitation_match_sets", ["workspace_id"], name: "index_automatic_exploitation_match_sets_on_workspace_id", using: :btree
+
+  create_table "automatic_exploitation_matches", force: true do |t|
+    t.integer  "module_detail_id"
+    t.string   "state"
+    t.integer  "nexpose_data_vulnerability_definition_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "match_set_id"
+    t.string   "matchable_type"
+    t.integer  "matchable_id"
+    t.text     "module_fullname"
+  end
+
+  add_index "automatic_exploitation_matches", ["module_detail_id"], name: "index_automatic_exploitation_matches_on_module_detail_id", using: :btree
+  add_index "automatic_exploitation_matches", ["module_fullname"], name: "index_automatic_exploitation_matches_on_module_fullname", using: :btree
+
+  create_table "automatic_exploitation_runs", force: true do |t|
+    t.integer  "workspace_id"
+    t.integer  "user_id"
+    t.integer  "match_set_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "automatic_exploitation_runs", ["match_set_id"], name: "index_automatic_exploitation_runs_on_match_set_id", using: :btree
+  add_index "automatic_exploitation_runs", ["user_id"], name: "index_automatic_exploitation_runs_on_user_id", using: :btree
+  add_index "automatic_exploitation_runs", ["workspace_id"], name: "index_automatic_exploitation_runs_on_workspace_id", using: :btree
+
   create_table "clients", force: true do |t|
     t.integer  "host_id"
     t.datetime "created_at"
@@ -158,19 +206,22 @@
   end
 
   create_table "loots", force: true do |t|
-    t.integer  "workspace_id",              default: 1, null: false
+    t.integer  "workspace_id",               default: 1, null: false
     t.integer  "host_id"
     t.integer  "service_id"
-    t.string   "ltype",        limit: 512
-    t.string   "path",         limit: 1024
+    t.string   "ltype",         limit: 512
+    t.string   "path",          limit: 1024
     t.text     "data"
-    t.datetime "created_at",                            null: false
-    t.datetime "updated_at",                            null: false
+    t.datetime "created_at",                             null: false
+    t.datetime "updated_at",                             null: false
     t.string   "content_type"
     t.text     "name"
     t.text     "info"
+    t.integer  "module_run_id"
   end
 
+  add_index "loots", ["module_run_id"], name: "index_loots_on_module_run_id", using: :btree
+
   create_table "macros", force: true do |t|
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false
@@ -362,6 +413,26 @@
   add_index "module_refs", ["detail_id"], name: "index_module_refs_on_detail_id", using: :btree
   add_index "module_refs", ["name"], name: "index_module_refs_on_name", using: :btree
 
+  create_table "module_runs", force: true do |t|
+    t.datetime "attempted_at"
+    t.text     "fail_detail"
+    t.string   "fail_reason"
+    t.text     "module_fullname"
+    t.integer  "port"
+    t.string   "proto"
+    t.integer  "session_id"
+    t.string   "status"
+    t.integer  "trackable_id"
+    t.string   "trackable_type"
+    t.integer  "user_id"
+    t.string   "username"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "module_runs", ["session_id"], name: "index_module_runs_on_session_id", using: :btree
+  add_index "module_runs", ["user_id"], name: "index_module_runs_on_user_id", using: :btree
+
   create_table "module_targets", force: true do |t|
     t.integer "detail_id"
     t.integer "index"
@@ -484,13 +555,16 @@
     t.integer  "port"
     t.string   "platform"
     t.text     "datastore"
-    t.datetime "opened_at",    null: false
+    t.datetime "opened_at",     null: false
     t.datetime "closed_at"
     t.string   "close_reason"
     t.integer  "local_id"
     t.datetime "last_seen"
+    t.integer  "module_run_id"
   end
 
+  add_index "sessions", ["module_run_id"], name: "index_sessions_on_module_run_id", using: :btree
+
   create_table "tags", force: true do |t|
     t.integer  "user_id"
     t.string   "name",           limit: 1024