Bring rapid7#6404 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,49 +1,45 @@
-bcook-r7 <bcook-r7@github>         Brent Cook <[email protected]>
-bcook-r7 <bcook-r7@github>         <[email protected]>
-bturner-r7 <bturner-r7@github>     Brandon Turner <[email protected]>
-ccatalan-r7 <ccatalan-r7@github>   Christian Catalan <[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]>
-ecarey-r7 <ecarey-r7@github>       Erran Carey <[email protected]>
-farias-r7 <farias-r7@github>       Fernando Arias <[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]>
-jlee-r7 <jlee-r7@github>           <[email protected]> # aka egypt
-jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
-jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
-kgray-r7 <kgray-r7@github>         Kyle Gray <[email protected]>
-limhoff-r7 <limhoff-r7@github>     Luke Imhoff <[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]>
-mbuck-r7 <mbuck-r7@github>         Matt Buck <[email protected]>
-mbuck-r7 <mbuck-r7@github>         Matt Buck <[email protected]>
-mschloesser-r7 <mschloesser-r7@github> Mark Schloesser <[email protected]>
-mschloesser-r7 <mschloesser-r7@github> mschloesser-r7 <[email protected]>
-parzamendi-r7 <parzamendi-r7@github> parzamendi-r7 <[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]>
-trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
-trosen-r7 <trosen-r7@github>       Trevor Rosen <[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
@@ -55,6 +51,8 @@ wvu-r7 <wvu-r7@github>             wvu-r7 <[email protected]>
 bannedit <bannedit@github>             David Rude <[email protected]>
 bcoles <bcoles@github>                 bcoles <[email protected]>
 bcoles <bcoles@github>                 Brendan Coles <[email protected]>
+bokojan <bokojan@github>               parzamendi-r7 <[email protected]>
+brandonprry <brandonprry@github>       <[email protected]>
 brandonprry <brandonprry@github>       Brandon Perry <[email protected]>
 brandonprry <brandonprry@github>       Brandon Perry <bperry@bperry-rapid7.(none)>
 brandonprry <brandonprry@github>       Brandon Perry <[email protected]>
@@ -66,37 +64,57 @@ Chao-mu <Chao-Mu@github>               chao-mu <[email protected]>
 Chao-mu <Chao-Mu@github>               chao-mu <chao@confusion.(none)>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
+claudijd <claudijd@github>             Jonathan Claudius <[email protected]>
+claudijd <claudijd@github>             Jonathan Claudius <[email protected]>
 corelanc0d3r <corelanc0d3r@github>     corelanc0d3r <[email protected]>
 corelanc0d3r <corelanc0d3r@github>     Peter Van Eeckhoutte (corelanc0d3r) <[email protected]>
+crcatala <crcatala@github>             Christian Catalan <[email protected]>
 darkoperator <darkoperator@github>     Carlos Perez <[email protected]>
 efraintorres <efraintorres@github>     efraintorres <[email protected]>
 efraintorres <efraintorres@github>     et <>
+espreto <espreto@github>               Roberto Soares <[email protected]>
+espreto <espreto@github>               Roberto Soares <[email protected]>
+espreto <espreto@github>               Roberto Soares Espreto <[email protected]>
+espreto <espreto@github>               Roberto Soares Espreto <[email protected]>
 fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
-FireFart <FireFart@github>             Christian Mehlmauer <[email protected]>
 FireFart <FireFart@github>             <[email protected]>
+FireFart <FireFart@github>             Christian Mehlmauer <[email protected]>
+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]>
-jcran <jcran@github>                   <[email protected]>
-jcran <jcran@github>                   <[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]>
+jcran <jcran@github>                   <[email protected]>
+jcran <jcran@github>                   <[email protected]>
 jcran <jcran@github>                   <[email protected]>
 jduck <jduck@github>                   <[email protected]>
 jduck <jduck@github>                   <[email protected]>
 jgor <jgor@github>                     jgor <[email protected]>
 joevennix <joevennix@github>           <[email protected]>
 joevennix <joevennix@github>           <[email protected]>
+joevennix <joevennix@github>           Joe Vennix <[email protected]>
+joevennix <joevennix@github>           jvennix-r7 <[email protected]>
+juanvazquez <juanvazquez@github>       jvazquez-r7 <[email protected]>
+juanvazquez <juanvazquez@github>       jvazquez-r7 <[email protected]>
 kernelsmith <kernelsmith@github>       Joshua Smith <[email protected]>
 kernelsmith <kernelsmith@github>       Joshua Smith <[email protected]>
 kernelsmith <kernelsmith@github>       kernelsmith <kernelsmith@kernelsmith>
 kost <kost@github>                     Vlatko Kosturjak <[email protected]>
 kris <kris@???>                        kris <>
+KronicDeth <KronicDeth@github>         Luke Imhoff <[email protected]>
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 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]>
@@ -106,20 +124,34 @@ oj <oj@github>                         <[email protected]>
 r3dy <r3dy@github>                     Royce Davis <[email protected]>
 r3dy <r3dy@github>                     Royce Davis <[email protected]>
 r3dy <r3dy@github>                     Royce Davis <[email protected]>
+rep <mschloesser-r7@github>            Mark Schloesser <[email protected]>
+rep <mschloesser-r7@github>            mschloesser-r7 <[email protected]>
 Rick Flores <[email protected]>  Rick Flores (nanotechz9l) <[email protected]>
 rsmudge <rsmudge@github>               Raphael Mudge <[email protected]> # Aka `butane
 schierlm <schierlm@github>             Michael Schierl <[email protected]> # Aka mihi
 scriptjunkie <scriptjunkie@github>     Matt Weeks <[email protected]>
 scriptjunkie <scriptjunkie@github>     scriptjunkie <[email protected]>
 skape <skape@???>                      Matt Miller <[email protected]>
 spoonm <spoonm@github>                 Spoon M <[email protected]>
+stufus <stufus@github>                 Stuart <[email protected]>
+stufus <stufus@github>                 Stuart Morgan <[email protected]>
 swtornio <swtornio@github>             Steve Tornio <[email protected]>
 Tasos Laskos <[email protected]> Tasos Laskos <[email protected]>
+techpeace <techpeace@github>           Matt Buck <[email protected]>
+techpeace <techpeace@github>           Matt Buck <[email protected]>
 timwr <timwr@github>                   <[email protected]>
 TomSellers <TomSellers@github>         Tom Sellers <[email protected]>
+trevrosen <trevrosen@github>           Trevor Rosen <[email protected]>
+trevrosen <trevrosen@github>           Trevor Rosen <[email protected]>
 TrustedSec <[email protected]>      trustedsec <[email protected]>
+void-in <void-in@github>               root <[email protected]>
+void-in <void-in@github>               void-in <[email protected]>
+void-in <void-in@github>               void-in <[email protected]>
+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]>

.ruby-version

@@ -1 +1 @@
-2.1.7
+2.1.9

.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"
+  - 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.7'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
@@ -38,9 +46,3 @@ branches:
   except:
     - gh-pages
     - metakitty
-
-addons:
-  postgresql: '9.3'
-  apt:
-    packages:
-      - libpcap-dev

CODE_OF_CONDUCT.md

@@ -0,0 +1,52 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project maintainers at [email protected]. If
+the incident involves a committer, you may report directly to
+[email protected] or [email protected].
+
+All complaints will be reviewed and investigated and will result in a
+response that is deemed necessary and appropriate to the circumstances.
+Maintainers are obligated to maintain confidentiality with regard to the
+reporter of an incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

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
 
@@ -51,7 +52,7 @@ Pull requests [PR#2940] and [PR#3043] are a couple good examples to follow.
 
 #### New Modules
 
-* **Do** run `tools/msftidy.rb` against your module and fix any errors or warnings that come up.
+* **Do** run `tools/dev/msftidy.rb` against your module and fix any errors or warnings that come up.
   - It would be even better to set up `msftidy.rb` as a [pre-commit hook].
 * **Do** use the many module mixin [API]s. Wheel improvements are welcome; wheel reinventions, not so much.
 * **Don't** include more than one module per pull request.