Merge pull request #30 from rapid7/master

aa

Author: Pedro Ribeiro

.mailmap

@@ -1,8 +1,11 @@
 acammack-r7 <acammack-r7@github>     Adam Cammack <[email protected]>
 bcook-r7 <bcook-r7@github>           <[email protected]>
 bcook-r7 <bcook-r7@github>           Brent Cook <[email protected]>
-bturner-r7 <bturner-r7@github>       Brandon Turner <[email protected]>
 bpatterson-r7 <bpatterson-r7@github> Brian Patterson <[email protected]>
+bpatterson-r7 <bpatterson-r7@github> bpatterson-r7 <[email protected]>
+bturner-r7 <bturner-r7@github>       Brandon Turner <[email protected]>
+bwatters-r7 <bwatters-r7@github>     Brendan <[email protected]>
+bwatters-r7 <bwatters-r7@github>     Brendan Watters <[email protected]>
 cdoughty-r7 <cdoughty-r7@github>     Chris Doughty <[email protected]>
 dheiland-r7 <dheiland-r7@github>     Deral Heiland <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>     David Maloney <[email protected]>
@@ -16,30 +19,40 @@ ecarey-r7 <ecarey-r7@github>         Erran Carey <[email protected]>
 farias-r7 <farias-r7@github>         Fernando Arias <[email protected]>
 gmikeska-r7 <gmikeska-r7@github>     Greg Mikeska <[email protected]>
 gmikeska-r7 <gmikeska-r7@github>     Gregory Mikeska <[email protected]>
+jbarnett-r7 <jbarnett-r7@github>     James Barnett <[email protected]>
 jhart-r7 <jhart-r7@github>           Jon Hart <[email protected]>
 jlee-r7 <jlee-r7@github>             <[email protected]> # aka egypt
 jlee-r7 <jlee-r7@github>             <[email protected]>
 kgray-r7 <kgray-r7@github>           Kyle Gray <[email protected]>
+khayes-r7 <khayes-r7@github>         l0gan <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>     darkbushido <[email protected]>
 lsato-r7 <lsato-r7@github>           Louis Sato <[email protected]>
+pbarry-r7 <pbarry-r7@github>         Pearce Barry <[email protected]>
 pdeardorff-r7 <pdeardorff-r7@github> Paul Deardorff <[email protected]>
 pdeardorff-r7 <pdeardorff-r7@github> pdeardorff-r7 <[email protected]>
+sdavis-r7 <sdavis-r7@github>         Scott Davis <[email protected]>
+sdavis-r7 <sdavis-r7@github>         Scott Lee Davis <[email protected]>
+sdavis-r7 <sdavis-r7@github>         Scott Lee Davis <[email protected]>
+sgonzalez-r7 <sgonzalez-r7@github>   Sonny Gonzalez <[email protected]>
 sgonzalez-r7 <sgonzalez-r7@github>   Sonny Gonzalez <[email protected]>
 shuckins-r7 <shuckins-r7@github>     Samuel Huckins <[email protected]>
+tdoan-r7 <tdoan-r7@github>           tdoan-r7 <[email protected]>
+tdoan-r7 <tdoan-r7@github>           thao doan <[email protected]>
 todb-r7 <todb-r7@github>             Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>             Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>             Tod Beardsley <[email protected]>
 wchen-r7 <wchen-r7@github>           <[email protected]> # aka sinn3r
 wchen-r7 <wchen-r7@github>           <[email protected]>
 wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
-wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
+wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>               wvu-r7 <[email protected]>
 wwebb-r7 <wwebb-r7@github>           William Webb <[email protected]>
+wwebb-r7 <wwebb-r7@github>           wwebb-r7 <[email protected]>
 
 # Above this line are current Rapid7 employees. Below this paragraph are
 # volunteers, former employees, and potential Rapid7 employees who, at
@@ -151,10 +164,11 @@ void-in <void-in@github>               void_in <[email protected]>
 void-in <void-in@github>               Waqas Ali <[email protected]>
 zeroSteiner <zeroSteiner@github>       Spencer McIntyre <[email protected]>
 
-
 # Aliases for utility author names. Since they're fake, typos abound
 
-Tab Assassin <[email protected]> Tabassassin <[email protected]>
+Metasploit Bot <[email protected]>    Metasploit <[email protected]>
+Jenkins Bot <[email protected]>          Jenkins <[email protected]>
 Tab Assassin <[email protected]> TabAssassin <[email protected]>
+Tab Assassin <[email protected]> Tabassassin <[email protected]>
 Tab Assassin <[email protected]> Tabasssassin <[email protected]>
 Tab Assassin <[email protected]> URI Assassin <[email protected]>

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.12.10)
+    metasploit-framework (4.12.17)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -14,9 +14,11 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.1.12)
+      metasploit-payloads (= 1.1.13)
       metasploit_data_models
+      metasploit_payloads-mettle (= 0.0.6)
       msgpack
+      net-ssh
       network_interface
       nokogiri
       octokit
@@ -29,14 +31,16 @@ PATH
       rb-readline-r7
       recog
       redcarpet
+      rex-arch
       rex-java
+      rex-ole
       rex-powershell
       rex-random_identifier
       rex-registry
+      rex-struct2
       rex-text
       rex-zip
       robots
-      rubyntlm
       rubyzip
       sqlite3
       sshkey
@@ -46,27 +50,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.7)
+      activemodel (= 4.2.7)
+      activesupport (= 4.2.7)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -97,16 +101,16 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
     contracts (0.14.0)
-    cucumber (2.3.3)
+    cucumber (2.4.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.4.0)
+      cucumber-core (~> 1.5.0)
       cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 3.2.0)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.4.0)
-      gherkin (~> 3.2.0)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
     cucumber-rails (1.4.3)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 3)
@@ -124,10 +128,10 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.14)
     filesize (0.1.1)
     fivemat (1.3.2)
-    gherkin (3.2.0)
+    gherkin (4.0.0)
     i18n (0.7.0)
     jsobfu (0.4.1)
       rkelly-remix (= 0.0.6)
@@ -151,7 +155,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.1.12)
+    metasploit-payloads (1.1.13)
     metasploit_data_models (2.0.0)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -162,19 +166,22 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
+    metasploit_payloads-mettle (0.0.6)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    msgpack (0.7.6)
-    multi_json (1.12.0)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    msgpack (1.0.0)
+    multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    net-ssh (3.2.0)
     network_interface (0.0.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      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)
@@ -185,11 +192,12 @@ GEM
     pcaprub (0.12.4)
     pg (0.18.4)
     pg_array_parser (0.0.9)
+    pkg-config (1.1.7)
     postgres_ext (3.0.0)
       activerecord (>= 4.0.0)
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -204,55 +212,60 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rb-readline-r7 (0.5.2.0)
     recog (2.0.21)
       nokogiri
     redcarpet (3.3.4)
+    rex-arch (0.1.0)
+      rex-text
     rex-java (0.1.2)
-    rex-powershell (0.1.0)
+    rex-ole (0.1.2)
+      rex-text
+    rex-powershell (0.1.1)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.0)
       rex-text
     rex-registry (0.1.0)
+    rex-struct2 (0.1.0)
     rex-text (0.1.1)
     rex-zip (0.1.0)
       rex-text
     rkelly-remix (0.0.6)
     robots (0.10.1)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rubyntlm (0.6.0)
     rubyzip (1.2.0)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
@@ -263,11 +276,11 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.5)
+    tzinfo-data (1.2016.6)
       tzinfo (>= 1.0.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.6)
+    yard (0.9.0)
 
 PLATFORMS
   ruby