Merge remote-tracking branch 'upstream/master' into land-7261

Author: Brent Cook

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.12.23)
+    metasploit-framework (4.12.42)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -14,10 +14,11 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.1.13)
+      metasploit-payloads (= 1.1.28)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.0.6)
+      metasploit_payloads-mettle (= 0.0.8)
       msgpack
+      nessus_rest
       net-ssh
       network_interface
       nokogiri
@@ -33,15 +34,25 @@ PATH
       recog
       redcarpet
       rex-arch
+      rex-bin_tools
+      rex-core
+      rex-encoder
+      rex-exploitation
       rex-java
+      rex-mime
+      rex-nop
       rex-ole
       rex-powershell
       rex-random_identifier
       rex-registry
+      rex-rop_builder
+      rex-socket
+      rex-sslscan
       rex-struct2
       rex-text
       rex-zip
       robots
+      rubyntlm
       rubyzip
       sqlite3
       sshkey
@@ -78,11 +89,12 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.3)
     arel-helpers (2.3.0)
       activerecord (>= 3.1.0, < 6)
-    aruba (0.14.1)
+    aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -92,7 +104,7 @@ GEM
     bcrypt (3.1.11)
     bit-struct (0.15.0)
     builder (3.2.2)
-    capybara (2.7.1)
+    capybara (2.10.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -113,9 +125,9 @@ GEM
       multi_test (>= 0.1.2)
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
-    cucumber-rails (1.4.4)
+    cucumber-rails (1.4.5)
       capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 3)
+      cucumber (>= 1.3.8, < 4)
       mime-types (>= 1.16, < 4)
       nokogiri (~> 1.5)
       railties (>= 3, < 5.1)
@@ -145,7 +157,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (2.0.3)
+    metasploit-credential (2.0.5)
       metasploit-concern
       metasploit-model
       metasploit_data_models
@@ -157,8 +169,8 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.1.13)
-    metasploit_data_models (2.0.0)
+    metasploit-payloads (1.1.28)
+    metasploit_data_models (2.0.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       arel-helpers
@@ -168,34 +180,33 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.0.6)
+    metasploit_payloads-mettle (0.0.8)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    msgpack (1.0.0)
+    minitest (5.9.1)
+    msgpack (1.0.2)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    nessus_rest (0.1.6)
     net-ssh (3.2.0)
     network_interface (0.0.1)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
+    octokit (4.6.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
     packetfu (1.1.11)
       network_interface (~> 0.0)
       pcaprub (~> 0.12)
     patch_finder (1.0.2)
     pcaprub (0.12.4)
-    pg (0.18.4)
+    pg (0.19.0)
     pg_array_parser (0.0.9)
-    pkg-config (1.1.7)
     postgres_ext (3.0.0)
       activerecord (>= 4.0.0)
       arel (>= 4.0.1)
@@ -204,7 +215,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    public_suffix (2.0.4)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
@@ -220,37 +232,67 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rb-readline-r7 (0.5.2.0)
-    recog (2.0.21)
+    recog (2.0.24)
       nokogiri
     redcarpet (3.3.4)
-    rex-arch (0.1.1)
+    rex-arch (0.1.2)
+      rex-text
+    rex-bin_tools (0.1.1)
+      metasm
+      rex-arch
+      rex-core
+      rex-struct2
+      rex-text
+    rex-core (0.1.2)
+    rex-encoder (0.1.0)
+      metasm
+      rex-arch
+      rex-text
+    rex-exploitation (0.1.2)
+      jsobfu
+      metasm
+      rex-arch
+      rex-encoder
       rex-text
     rex-java (0.1.2)
+    rex-mime (0.1.1)
+      rex-text
+    rex-nop (0.1.0)
+      rex-arch
     rex-ole (0.1.2)
       rex-text
-    rex-powershell (0.1.1)
+    rex-powershell (0.1.66)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.0)
       rex-text
     rex-registry (0.1.0)
+    rex-rop_builder (0.1.0)
+      metasm
+      rex-core
+      rex-text
+    rex-socket (0.1.0)
+      rex-core
+    rex-sslscan (0.1.0)
+      rex-socket
+      rex-text
     rex-struct2 (0.1.0)
-    rex-text (0.2.1)
+    rex-text (0.2.4)
     rex-zip (0.1.0)
       rex-text
     rkelly-remix (0.0.6)
     robots (0.10.1)
-    rspec-core (3.5.2)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -259,10 +301,10 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubyntlm (0.6.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
+    sawyer (0.8.0)
+      addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 0.10)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
@@ -272,14 +314,14 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.12)
     sshkey (1.8.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.6)
+    tzinfo-data (1.2016.9)
       tzinfo (>= 1.0.0)
     windows_error (0.0.2)
     xpath (2.0.0)
@@ -306,4 +348,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.5
+   1.13.6