Merge pull request rapid7#3583 from jlee-r7/feature/MSP-9932/creds-add-subcommands

Add `creds` subcommands

MSP-9932 #land

Author: trosen-r7

Gemfile

@@ -7,7 +7,7 @@ group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
   # Metasploit::Credential database models
-  gem 'metasploit-credential', '>= 0.7.10.pre.core.pre.search', '< 0.8'
+  gem 'metasploit-credential', '~> 0.7.14', '< 0.8'
   # Database models shared between framework and Pro.
   gem 'metasploit_data_models', '~> 0.19'
   # Needed for module caching in Mdm::ModuleDetails

Gemfile.lock

@@ -5,6 +5,7 @@ PATH
       activesupport (>= 3.0.0, < 4.0.0)
       bcrypt
       json
+      metasploit-model (~> 0.25.7)
       meterpreter_bins (= 0.0.6)
       msgpack
       nokogiri
@@ -41,7 +42,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    arel-helpers (2.0.0)
+    arel-helpers (2.0.1)
       activerecord (>= 3.1.0, < 5)
     bcrypt (3.1.7)
     builder (3.0.4)
@@ -60,16 +61,16 @@ GEM
     json (1.8.1)
     metasploit-concern (0.1.1)
       activesupport (~> 3.0, >= 3.0.0)
-    metasploit-credential (0.7.10.pre.core.pre.search)
+    metasploit-credential (0.7.16)
       metasploit-concern (~> 0.1.0)
       metasploit-model (>= 0.25.6)
       metasploit_data_models (~> 0.19)
       pg
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (0.25.6)
+    metasploit-model (0.25.7)
       activesupport
-    metasploit_data_models (0.19.0)
+    metasploit_data_models (0.19.3)
       activerecord (>= 3.2.13, < 4.0.0)
       activesupport
       arel-helpers
@@ -82,7 +83,7 @@ GEM
     msgpack (0.5.8)
     multi_json (1.0.4)
     network_interface (0.0.1)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     packetfu (1.1.9)
     pcaprub (0.11.3)
@@ -118,9 +119,9 @@ GEM
     rspec-collection_matchers (1.0.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
+    rspec-mocks (2.99.2)
     rspec-rails (2.99.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
@@ -132,13 +133,13 @@ GEM
       rspec-mocks (~> 2.99.0)
     rubyntlm (0.4.0)
     rubyzip (1.1.6)
-    shoulda-matchers (2.6.1)
+    shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (3.5.0)
+    slop (3.6.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -159,7 +160,7 @@ DEPENDENCIES
   factory_girl (>= 4.1.0)
   factory_girl_rails
   fivemat (= 1.2.1)
-  metasploit-credential (>= 0.7.10.pre.core.pre.search, < 0.8)
+  metasploit-credential (~> 0.7.14, < 0.8)
   metasploit-framework!
   metasploit_data_models (~> 0.19)
   network_interface (~> 0.0.1)

lib/metasploit/framework.rb

@@ -9,6 +9,7 @@
 require 'bcrypt'
 require 'json'
 require 'msgpack'
+require 'metasploit/model'
 require 'nokogiri'
 require 'packetfu'
 # railties has not autorequire defined
@@ -43,4 +44,4 @@ def self.root
       @root
     end
   end
-end
+end