Merge pull request #35 from rapid7/master

aa

Author: Pedro Ribeiro

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.12.33)
+    metasploit-framework (4.12.41)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -14,7 +14,7 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.1.21)
+      metasploit-payloads (= 1.1.26)
       metasploit_data_models
       metasploit_payloads-mettle (= 0.0.8)
       msgpack
@@ -37,6 +37,7 @@ PATH
       rex-bin_tools
       rex-core
       rex-encoder
+      rex-exploitation
       rex-java
       rex-mime
       rex-nop
@@ -102,7 +103,7 @@ GEM
     bcrypt (3.1.11)
     bit-struct (0.15.0)
     builder (3.2.2)
-    capybara (2.9.2)
+    capybara (2.10.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -167,8 +168,8 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.1.21)
-    metasploit_data_models (2.0.4)
+    metasploit-payloads (1.1.26)
+    metasploit_data_models (2.0.5)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       arel-helpers
@@ -185,16 +186,15 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
-    msgpack (1.0.0)
+    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)
     openssl-ccm (1.2.1)
@@ -206,7 +206,6 @@ GEM
     pcaprub (0.12.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)
@@ -249,6 +248,12 @@ GEM
       metasm
       rex-arch
       rex-text
+    rex-exploitation (0.1.1)
+      jsobfu
+      metasm
+      rex-arch
+      rex-encoder
+      rex-text
     rex-java (0.1.2)
     rex-mime (0.1.1)
       rex-text
@@ -272,7 +277,7 @@ GEM
       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)
@@ -314,7 +319,7 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.7)
+    tzinfo-data (1.2016.8)
       tzinfo (>= 1.0.0)
     windows_error (0.0.2)
     xpath (2.0.0)
@@ -341,4 +346,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.13.2
+   1.13.6