Merge pull request #23 from rapid7/master

sync

Author: Pedro Ribeiro

.mailmap

@@ -1,42 +1,39 @@
-bcook-r7 <bcook-r7@github>         Brent Cook <[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]>
-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]>
+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]>
-hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
-hmoore-r7 <hmoore-r7@github>       HD Moore <[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]>
 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]>
+jlee-r7 <jlee-r7@github>           <[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]>
+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]>
@@ -54,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]>
@@ -65,30 +64,46 @@ 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]>
+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]>
@@ -105,20 +120,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.6
+2.1.7

.travis.yml

@@ -1,7 +1,7 @@
 bundler_args: --without coverage development pcap
 cache: bundler
 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"
 
@@ -25,7 +25,7 @@ script:
   - git diff --exit-code db/schema.rb && bundle exec rake $RAKE_TASKS
 sudo: false
 rvm:
-  - '2.1.6'
+  - '2.1.7'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"

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

@@ -51,7 +51,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.
@@ -97,7 +97,7 @@ already way ahead of the curve, so keep it up!
 [Common Coding Mistakes]:https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes
 [Ruby style guide]:https://github.com/bbatsov/ruby-style-guide
 [Rubocop]:https://rubygems.org/search?query=rubocop
-[50.72 rule]:http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[50/72 rule]:http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [topic branch]:http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches
 [console output]:https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks
 [verification steps]:https://help.github.com/articles/writing-on-github#task-lists

COPYING

@@ -1,19 +1,19 @@
-Copyright (C) 2006-2015, Rapid7, Inc.
+Copyright (C) 2006-2016, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
     * Redistributions of source code must retain the above copyright notice,
-	  this list of conditions and the following disclaimer.
+    this list of conditions and the following disclaimer.
 
     * Redistributions in binary form must reproduce the above copyright notice,
-	  this list of conditions and the following disclaimer in the documentation
-	  and/or other materials provided with the distribution.
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
 
     * Neither the name of Rapid7, Inc. nor the names of its contributors
-	  may be used to endorse or promote products derived from this software
-	  without specific prior written permission.
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

Gemfile

@@ -11,10 +11,6 @@ group :coverage do
   gem 'simplecov'
 end
 
-group :db do
-  gemspec name: 'metasploit-framework-db'
-end
-
 group :development do
   # Markdown formatting for yard
   gem 'redcarpet'
@@ -28,18 +24,12 @@ group :development, :test do
   # automatically include factories from spec/factories
   gem 'factory_girl_rails', '~> 4.5.0'
   # Make rspec output shorter and more useful
-  gem 'fivemat', '1.2.1'
+  gem 'fivemat', '~> 1.3.1'
   # running documentation generation tasks and rspec tasks
   gem 'rake', '>= 10.0.0'
-  # testing framework
-  gem 'rspec', '>= 2.12', '< 3.0.0'
   # Define `rake spec`.  Must be in development AND test so that its available by default as a rake test when the
   # environment is development
-  gem 'rspec-rails' , '>= 2.12', '< 3.0.0'
-end
-
-group :pcap do
-  gemspec name: 'metasploit-framework-pcap'
+  gem 'rspec-rails' , '~> 3.3'
 end
 
 group :test do