Bring rapid7#6545 up to date with upstream-master

Author: wchen-r7

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+## Steps to reproduce
+
+How'd you do it?
+
+1. ...
+2. ...
+
+This section should also tell us any relevant information about the
+environment; for example, if an exploit that used to work is failing,
+tell us the victim operating system and service versions.
+
+## Expected behavior
+
+What should happen?
+
+## Current behavior
+
+What happens instead?
+
+You might also want to check the last ~1k lines of
+`/opt/metasploit/apps/pro/engine/config/logs/framework.log` or
+`~/.msf4/logs/framework.log` for relevant stack traces
+
+
+## System stuff
+
+### Metasploit version
+
+Get this with the `version` command in msfconsole (or `git log -1 --pretty=oneline` for a source install).
+
+### I installed Metasploit with:
+- [ ] Kali package via apt
+- [ ] Omnibus installer (nightly)
+- [ ] Commercial/Community installer (from http://www.rapid7.com/products/metasploit/download.jsp)
+- [ ] Source install (please specify ruby version)
+
+### OS
+
+What OS are you running Metasploit on?
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+
+Tell us what this change does. If you're fixing a bug, please mention
+the github issue number.
+
+## Verification
+
+List the steps needed to make sure this thing works
+
+- [ ] Start `msfconsole`
+- [ ] `use exploit/windows/smb/ms08_067_netapi`
+- [ ] ...
+- [ ] **Verify** the thing does what it should
+- [ ] **Verify** the thing does not do what it should not
+

.gitignore

@@ -68,6 +68,8 @@ external/source/exploits/**/Release
 # Avoid checking in Meterpreter binaries. These are supplied upstream by
 # the metasploit-payloads gem.
 data/meterpreter/*.dll
+data/meterpreter/*.php
+data/meterpreter/*.py
 data/meterpreter/*.bin
 data/meterpreter/*.jar
 data/meterpreter/*.lso

.mailmap

@@ -1,45 +1,45 @@
-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]>
-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]>
-dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>   dmaloney-r7 <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>   Dev Mohanty <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>   Dev Mohanty <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>   dmohanty-r7 <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>   dmohanty-r7 <[email protected]>
-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]>
-hdm <hdm@github>                   HD Moore <[email protected]>
-hdm <hdm@github>                   HD Moore <[email protected]>
-hdm <hdm@github>                   HD Moore <[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]>
-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]>
+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]>
+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]>
+dmaloney-r7 <dmaloney-r7@github>     David Maloney <[email protected]>
+dmaloney-r7 <dmaloney-r7@github>     dmaloney-r7 <[email protected]>
+dmohanty-r7 <dmohanty-r7@github>     Dev Mohanty <[email protected]>
+dmohanty-r7 <dmohanty-r7@github>     Dev Mohanty <[email protected]>
+dmohanty-r7 <dmohanty-r7@github>     dmohanty-r7 <[email protected]>
+dmohanty-r7 <dmohanty-r7@github>     dmohanty-r7 <[email protected]>
+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]>
+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]>
+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]>
 pdeardorff-r7 <pdeardorff-r7@github> Paul Deardorff <[email protected]>
 pdeardorff-r7 <pdeardorff-r7@github> pdeardorff-r7 <[email protected]>
-sgonzalez-r7 <sgonzalez-r7@github> Sonny Gonzalez <[email protected]>
-shuckins-r7 <shuckins-r7@github>   Samuel Huckins <[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>             wvu-r7 <[email protected]>
+sgonzalez-r7 <sgonzalez-r7@github>   Sonny Gonzalez <[email protected]>
+shuckins-r7 <shuckins-r7@github>     Samuel Huckins <[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>               wvu-r7 <[email protected]>
+wwebb-r7 <wwebb-r7@github>           William Webb <[email protected]>
 
 # Above this line are current Rapid7 employees. Below this paragraph are
 # volunteers, former employees, and potential Rapid7 employees who, at
@@ -83,6 +83,9 @@ g0tmi1k <g0tmi1k@github>               <[email protected]>
 g0tmi1k <g0tmi1k@github>               <[email protected]>
 h0ng10 <h0ng10@github>                 h0ng10 <[email protected]>
 h0ng10 <h0ng10@github>                 Hans-Martin Münch <[email protected]>
+hdm <hdm@github>                       HD Moore <[email protected]>
+hdm <hdm@github>                       HD Moore <[email protected]>
+hdm <hdm@github>                       HD Moore <[email protected]>
 jabra <jabra@github>                   Josh Abraham <[email protected]>
 jabra <jabra@github>                   Joshua Abraham <[email protected]>
 jcran <jcran@github>                   <[email protected]>
@@ -111,6 +114,7 @@ m-1-k-3 <m-1-k-3@github>               Michael Messner <[email protected]>
 Meatballs1 <Meatballs1@github>         <[email protected]>
 Meatballs1 <Meatballs1@github>         <[email protected]>
 mubix <mubix@github>                   Rob Fuller <[email protected]>
+net-ninja <[email protected]>       Steven Seeley <[email protected]>
 nevdull77 <nevdull77@github>           Patrik Karlsson <[email protected]>
 nmonkee <nmonkee@github>               nmonkee <[email protected]>
 nullbind <nullbind@github>             nullbind <[email protected]>

.travis.yml

@@ -1,11 +1,22 @@
+sudo: false
+group: stable
 bundler_args: --without coverage development pcap
 cache: bundler
+addons:
+  postgresql: '9.3'
+  apt:
+    packages:
+      - libpcap-dev
+      - graphviz
+language: ruby
+rvm:
+  - '2.1.8'
+
 env:
   - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true
   - RAKE_TASKS=spec SPEC_OPTS="--tag content"
   - RAKE_TASKS=spec SPEC_OPTS="--tag ~content"
 
-language: ruby
 matrix:
   fast_finish: true
 before_install:
@@ -23,9 +34,6 @@ before_script:
 script:
   # fail build if db/schema.rb update is not committed
   - git diff --exit-code db/schema.rb && bundle exec rake $RAKE_TASKS
-sudo: false
-rvm:
-  - '2.1.8'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
@@ -37,10 +45,4 @@ git:
 branches:
   except:
     - gh-pages
-    - metakitty
-
-addons:
-  postgresql: '9.3'
-  apt:
-    packages:
-      - libpcap-dev
+    - metakitty

CONTRIBUTING.md

@@ -37,6 +37,7 @@ and Metasploit's [Common Coding Mistakes].
 * **Do** follow the [50/72 rule] for Git commit messages.
 * **Don't** use the default merge messages when merging from other branches.
 * **Do** create a [topic branch] to work on instead of working directly on `master`.
+* **Do** license your code as BSD 3-clause, BSD 2-clause, or MIT.
 
 ### Pull Requests
 

Gemfile

@@ -18,6 +18,9 @@ group :development do
   gem 'yard'
   # for development and testing purposes
   gem 'pry'
+  # module documentation
+  gem 'octokit', '~> 4.0'
+  # rails-upgrade staging gems
 end
 
 group :development, :test do

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.11.10)
+    metasploit-framework (4.11.20)
       actionpack (>= 4.0.9, < 4.1.0)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
@@ -10,21 +10,24 @@ PATH
       jsobfu (~> 0.4.1)
       json
       metasm (~> 1.0.2)
-      metasploit-concern (= 1.0.0)
-      metasploit-credential (= 1.0.1)
-      metasploit-model (= 1.0.0)
-      metasploit-payloads (= 1.0.23)
-      metasploit_data_models (= 1.2.10)
+      metasploit-concern
+      metasploit-credential (= 1.1.0)
+      metasploit-model (= 1.1.0)
+      metasploit-payloads (= 1.1.4)
+      metasploit_data_models (= 1.3.0)
       msgpack
       network_interface (~> 0.0.1)
       nokogiri
+      octokit
       openssl-ccm (= 1.2.1)
       packetfu (= 1.1.11)
+      patch_finder (>= 1.0.2)
       pcaprub
       pg (>= 0.11)
       railties
       rb-readline-r7
       recog (= 2.0.14)
+      redcarpet
       robots
       rubyzip (~> 1.1)
       sqlite3
@@ -57,14 +60,15 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    addressable (2.3.8)
     arel (4.0.2)
-    arel-helpers (2.1.1)
-      activerecord (= 4.0.13)
+    arel-helpers (2.2.0)
+      activerecord (>= 3.1.0, < 5)
     aruba (0.6.2)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     builder (3.1.4)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -95,6 +99,8 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.8)
     filesize (0.1.1)
     fivemat (1.3.2)
@@ -108,29 +114,29 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     metasm (1.0.2)
-    metasploit-concern (1.0.0)
+    metasploit-concern (1.1.0)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
-    metasploit-credential (1.0.1)
-      metasploit-concern (~> 1.0)
-      metasploit-model (~> 1.0)
-      metasploit_data_models (~> 1.0)
+    metasploit-credential (1.1.0)
+      metasploit-concern (~> 1.1)
+      metasploit-model (~> 1.1)
+      metasploit_data_models (~> 1.3)
       pg
       railties
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (1.0.0)
+    metasploit-model (1.1.0)
       activemodel (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
-    metasploit-payloads (1.0.23)
-    metasploit_data_models (1.2.10)
+    metasploit-payloads (1.1.4)
+    metasploit_data_models (1.3.0)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       arel-helpers
-      metasploit-concern (~> 1.0)
-      metasploit-model (~> 1.0)
+      metasploit-concern (~> 1.1)
+      metasploit-model (~> 1.1)
       pg
       postgres_ext
       railties (>= 4.0.9, < 4.1.0)
@@ -139,20 +145,24 @@ GEM
     mime-types (2.6.1)
     mini_portile2 (2.0.0)
     minitest (4.7.5)
-    msgpack (0.7.1)
+    msgpack (0.7.4)
     multi_json (1.11.2)
     multi_test (0.1.2)
+    multipart-post (2.0.0)
     network_interface (0.0.1)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
+    octokit (4.2.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     packetfu (1.1.11)
       network_interface (~> 0.0)
       pcaprub (~> 0.12)
-    pcaprub (0.12.0)
+    patch_finder (1.0.2)
+    pcaprub (0.12.1)
     pg (0.18.4)
     pg_array_parser (0.0.9)
-    postgres_ext (2.4.1)
+    postgres_ext (3.0.0)
       activerecord (>= 4.0.0)
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
@@ -200,8 +210,11 @@ GEM
       rspec-mocks (~> 3.3.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    rubyntlm (0.5.2)
-    rubyzip (1.1.7)
+    rubyntlm (0.6.0)
+    rubyzip (1.2.0)
+    sawyer (0.6.0)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     simplecov (0.9.2)
@@ -238,6 +251,7 @@ DEPENDENCIES
   factory_girl_rails (~> 4.5.0)
   fivemat (~> 1.3.1)
   metasploit-framework!
+  octokit (~> 4.0)
   pry
   rake (>= 10.0.0)
   redcarpet