diff --git a/Gemfile b/Gemfile index 7e44826e0a..42853b4bd9 100755 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :db do # Needed for Msf::DbManager gem 'activerecord' # Database models shared between framework and Pro. - gem 'metasploit_data_models', '~> 0.15.1' + gem 'metasploit_data_models', '~> 0.15.2' # Needed for module caching in Mdm::ModuleDetails gem 'pg', '>= 0.11' end diff --git a/Gemfile.lock b/Gemfile.lock index 632b53cfde..eab842184d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,7 +23,7 @@ GEM i18n (0.6.1) json (1.7.7) metaclass (0.0.1) - metasploit_data_models (0.15.1) + metasploit_data_models (0.15.2) activerecord (>= 3.2.13) activesupport pg @@ -65,7 +65,7 @@ DEPENDENCIES database_cleaner factory_girl (>= 4.1.0) json - metasploit_data_models (~> 0.15.1) + metasploit_data_models (~> 0.15.2) msgpack nokogiri pcaprub diff --git a/db/schema.rb b/db/schema.rb index cad75d250f..4022a68c7b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130522041110) do +ActiveRecord::Schema.define(:version => 20130531144949) do create_table "api_keys", :force => true do |t| t.text "token" @@ -46,11 +46,10 @@ ActiveRecord::Schema.define(:version => 20130522041110) do create_table "clients", :force => true do |t| t.integer "host_id" t.datetime "created_at" - t.string "ua_string", :limit => 1024, :null => false - t.string "ua_name", :limit => 64 - t.string "ua_ver", :limit => 32 + t.string "ua_string", :limit => 1024, :null => false + t.string "ua_name", :limit => 64 + t.string "ua_ver", :limit => 32 t.datetime "updated_at" - t.integer "campaign_id" end create_table "creds", :force => true do |t| @@ -167,18 +166,11 @@ ActiveRecord::Schema.define(:version => 20130522041110) do add_index "hosts", ["state"], :name => "index_hosts_on_state" add_index "hosts", ["workspace_id", "address"], :name => "index_hosts_on_workspace_id_and_address", :unique => true - create_table "hosts_tags", :id => false, :force => true do |t| + create_table "hosts_tags", :force => true do |t| t.integer "host_id" t.integer "tag_id" end - create_table "imported_creds", :force => true do |t| - t.integer "workspace_id", :default => 1, :null => false - t.string "user", :limit => 512 - t.string "pass", :limit => 512 - t.string "ptype", :limit => 16, :default => "password" - end - create_table "listeners", :force => true do |t| t.datetime "created_at", :null => false t.datetime "updated_at", :null => false