Land rapid7#4546

Author: shuckins-r7

Gemfile.lock

@@ -22,9 +22,9 @@ PATH
       tzinfo
     metasploit-framework-db (4.11.0.pre.dev)
       activerecord (>= 3.2.21, < 4.0.0)
-      metasploit-credential (~> 0.13.11)
+      metasploit-credential (~> 0.13.12)
       metasploit-framework (= 4.11.0.pre.dev)
-      metasploit_data_models (~> 0.21.3)
+      metasploit_data_models (~> 0.22.1)
       pg (>= 0.11)
     metasploit-framework-pcap (4.11.0.pre.dev)
       metasploit-framework (= 4.11.0.pre.dev)
@@ -62,7 +62,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    arel-helpers (2.0.2)
+    arel-helpers (2.1.0)
       activerecord (>= 3.1.0, < 5)
     aruba (0.6.1)
       childprocess (>= 0.3.6)
@@ -112,18 +112,18 @@ GEM
     metasploit-concern (0.3.0)
       activesupport (~> 3.0, >= 3.0.0)
       railties (< 4.0.0)
-    metasploit-credential (0.13.11)
+    metasploit-credential (0.13.12)
       metasploit-concern (~> 0.3.0)
       metasploit-model (~> 0.28.0)
-      metasploit_data_models (~> 0.21.0)
+      metasploit_data_models (~> 0.22.1)
       pg
       railties (< 4.0.0)
       rubyntlm
       rubyzip (~> 1.1)
     metasploit-model (0.28.0)
       activesupport
       railties (< 4.0.0)
-    metasploit_data_models (0.21.3)
+    metasploit_data_models (0.22.1)
       activerecord (>= 3.2.13, < 4.0.0)
       activesupport
       arel-helpers

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150106201450) do
+ActiveRecord::Schema.define(:version => 20150112203945) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -454,6 +454,7 @@
     t.text     "info"
   end
 
+  add_index "services", ["host_id", "port", "proto"], :name => "index_services_on_host_id_and_port_and_proto", :unique => true
   add_index "services", ["name"], :name => "index_services_on_name"
   add_index "services", ["port"], :name => "index_services_on_port"
   add_index "services", ["proto"], :name => "index_services_on_proto"

metasploit-framework-db.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
   # Metasploit::Credential database models
-  spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.11'
+  spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.12'
   # Database models shared between framework and Pro.
-  spec.add_runtime_dependency 'metasploit_data_models', '~> 0.21.3'
+  spec.add_runtime_dependency 'metasploit_data_models', '~> 0.22.1'
   # 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