Resolve conflict

Author: Meatballs1

.gitignore

@@ -1,11 +1,17 @@
+.bundle
 # Rubymine project directory
 .idea
+# Portable ruby version files for rvm
+.ruby-gemset
+.ruby-version
 # RVM control file
 .rvmrc
 # YARD cache directory
 .yardoc
 # Mac OS X files
 .DS_Store
+# database config for testing
+config/database.yml
 # simplecov coverage data
 coverage
 data/meterpreter/ext_server_pivot.dll
@@ -16,6 +22,17 @@ external/source/meterpreter/java/build
 external/source/meterpreter/java/extensions
 external/source/javapayload/bin
 external/source/javapayload/build
+# Java binary ignores. Replace the 5 above with this once we're merged.
+external/source/javapayload/*/.classpath
+external/source/javapayload/*/.project
+external/source/javapayload/*/.settings
+external/source/javapayload/*/bin
+external/source/javapayload/*/target
+external/source/javapayload/*/*/.classpath
+external/source/javapayload/*/*/.project
+external/source/javapayload/*/*/.settings
+external/source/javapayload/*/*/bin
+external/source/javapayload/*/*/target
 # Packaging directory
 pkg
 tags

.mailmap

@@ -0,0 +1,69 @@
+bperry-r7 <bperry-r7@github>       Brandon Perry <[email protected]>
+bperry-r7 <bperry-r7@github>       Brandon Perry <bperry@bperry-rapid7.(none)>
+bturner-r7 <bturner-r7@github>     Brandon Turner <[email protected]>
+dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]> # aka TheLightCosine
+dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
+ecarey-r7 <ecarey-r7@github>       Erran Carey <[email protected]>
+hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
+hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
+jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
+jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
+jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
+joev-r7 <joev-r7@github>           Joe Vennix <[email protected]>
+jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
+limhoff-r7 <limhoff-r7@github>     Luke Imhoff <[email protected]>
+shuckins-r7 <shuckins-r7@github>   Samuel Huckins <[email protected]>
+tasos-r7 <tasos-r7@github>         Tasos Laskos <[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>         Wei Chen <[email protected]>
+wchen-r7 <wchen-r7@github>         sinn3r <[email protected]> # aka sinn3r
+wchen-r7 <wchen-r7@github>         sinn3r <[email protected]>
+
+# Above this line are current Rapid7 employees Below this paragraph are
+# volunteers, former employees, and potential Rapid7 employees who, at
+# one time or another, had some largeish number of commits landed on
+# rapid7/metasploit-framework master branch.  This should be refreshed
+# periodically. If you're on this list and would like to not be, just
+# let [email protected] know.
+
+ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
+ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
+FireFart <FireFart@github>             Christian Mehlmauer <[email protected]>
+Meatballs1 <Meatballs1@github>         Ben Campbell <[email protected]>
+Meatballs1 <Meatballs1@github>         Meatballs <[email protected]>
+Meatballs1 <Meatballs1@github>         Meatballs1 <[email protected]> 
+bannedit <bannedit@github>             David Rude <[email protected]>
+ceballosm <ceballosm@github>           Mario Ceballos <[email protected]>
+corelanc0d3er <corelanc0d3er@github>   Peter Van Eeckhoutte (corelanc0d3r) <[email protected]>
+corelanc0d3er <corelanc0d3er@github>   corelanc0d3r <[email protected]>
+darkoperator <darkoperator@github>     Carlos Perez <[email protected]>
+efraintorres <efraintorres@github>     efraintorres <[email protected]>
+efraintorres <efraintorres@github>     et <>
+fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
+h0ng10 <h0ng10@github>                 Hans-Martin Münch <[email protected]>
+h0ng10 <h0ng10@github>                 h0ng10 <[email protected]>
+jcran <jcran@github>                   Jonathan Cran <[email protected]>
+jcran <jcran@github>                   Jonathan Cran <[email protected]>
+jduck <jduck@github>                   Joshua Drake <[email protected]>
+jgor <jgor@github>                     jgor <[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 <>
+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]>
+mubix <mubix@github>                   Rob Fuller <[email protected]>
+nevdull77 <nevdull77@github>           Patrik Karlsson <[email protected]>
+nmonkee <nmonkee@github>               nmonkee <[email protected]> 
+nullbind <nullbind@github>             nullbind <[email protected]>
+ohdae <ohdae@github>                   ohdae <[email protected]>
+r3dy <r3dy@github>                     Royce Davis <[email protected]>
+r3dy <r3dy@github>                     Royce Davis <[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]>
+skape <skape@???>                      Matt Miller <[email protected]>
+spoonm <spoonm@github>                 Spoon M <[email protected]>
+swtornio <swtornio@github>             Steve Tornio <[email protected]>

.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libpcap-dev
+before_script:
+  - cp config/database.yml.travis config/database.yml
+  - rake db:create
+  - rake db:migrate
 
 rvm:
   #- '1.8.7'

.yardopts

@@ -0,0 +1,7 @@
+--protected
+--exclude samples/
+--exclude \.ut\.rb/
+--exclude \.ts\.rb/
+--files CONTRIBUTING.md,COPYING,HACKING,LICENSE
+lib/msf/**/*.rb
+lib/rex/**/*.rb

CONTRIBUTING.md

@@ -12,7 +12,7 @@ If your bug is new and you'd like to report it you will need to
 first](https://dev.metasploit.com/redmine/account/register). Don't
 worry, it's easy and fun and takes about 30 seconds.
 
-When you file a bug report, please inclue your **steps to reproduce**,
+When you file a bug report, please include your **steps to reproduce**,
 full copy-pastes of Ruby stack traces, and any relevant details about
 your environment. Without repro steps, your bug will likely be closed.
 With repro steps, your bugs will likely be fixed.
@@ -36,3 +36,9 @@ Pull requests tend to be very collaborative for Metasploit -- do not be
 surprised if your pull request to rapid7/metasploit-framework triggers a
 pull request back to your own fork. In this way, we can isolate working
 changes before landing your PR to the Metasploit master branch.
+
+To save yourself the embarrassment of committing common errors, you will
+want to symlink the `msftidy.rb` utility to your pre-commit hooks by
+running `ln -s ../../tools/dev/pre-commit-hook.rb .git/hooks/pre-commit`
+from the top-level directory of your metasploit-framework clone. This
+will prevent you from committing modules that raise WARNINGS or ERRORS.

Gemfile

@@ -2,39 +2,60 @@ source 'http://rubygems.org'
 
 # Need 3+ for ActiveSupport::Concern
 gem 'activesupport', '>= 3.0.0'
-# Needed for Msf::DbManager
-gem 'activerecord'
 # Needed for some admin modules (scrutinizer_add_user.rb)
 gem 'json'
-# Database models shared between framework and Pro.
-gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.6.0'
 # Needed by msfgui and other rpc components
 gem 'msgpack'
 # Needed by anemone crawler
 gem 'nokogiri'
-# Needed for module caching in Mdm::ModuleDetails
-gem 'pg', '>= 0.11'
 # Needed by anemone crawler
 gem 'robots'
-# For sniffer and raw socket modules
-gem 'pcaprub'
+# Needed by db.rb and Msf::Exploit::Capture
+gem 'packetfu', '1.1.8'
+
+group :db do
+	# Needed for Msf::DbManager
+	gem 'activerecord'
+	# Database models shared between framework and Pro.
+	gem 'metasploit_data_models', '~> 0.16.1'
+	# Needed for module caching in Mdm::ModuleDetails
+	gem 'pg', '>= 0.11'
+end
+
+group :pcap do
+	# For sniffer and raw socket modules
+	gem 'pcaprub'
+end
 
 group :development do
-  # Markdown formatting for yard
-  gem 'redcarpet'
-  # generating documentation
-  gem 'yard'
+	# Markdown formatting for yard
+	gem 'redcarpet'
+	# generating documentation
+	gem 'yard'
 end
 
 group :development, :test do
-  # running documentation generation tasks and rspec tasks
-  gem 'rake'
+	# supplies factories for producing model instance for specs
+	# Version 4.1.0 or newer is needed to support generate calls without the
+	# 'FactoryGirl.' in factory definitions syntax.
+	gem 'factory_girl', '>= 4.1.0'
+	# running documentation generation tasks and rspec tasks
+	gem 'rake'
 end
 
 group :test do
-  # testing framework
-  gem 'rspec', '>= 2.12'
-  # code coverage for tests
-  # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
-  gem 'simplecov', '0.5.4', :require => false
+	# Removes records from database created during tests.  Can't use rspec-rails'
+	# transactional fixtures because multiple connections are in use so
+	# transactions won't work.
+	gem 'database_cleaner'
+	# testing framework
+	gem 'rspec', '>= 2.12'
+	# add matchers from shoulda, such as query_the_database, which is useful for
+	# testing that the Msf::DBManager activation is respected.
+	gem 'shoulda-matchers'
+	# code coverage for tests
+	# any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
+	gem 'simplecov', '0.5.4', :require => false
+	# Manipulate Time.now in specs
+	gem 'timecop'
 end

Gemfile.lock

@@ -1,78 +1,82 @@
-GIT
-  remote: git://github.com/rapid7/metasploit_data_models.git
-  revision: 0285d6e199f125b33214100dcb0f4eeb12ee765f
-  tag: 0.6.0
-  specs:
-    metasploit_data_models (0.6.0)
-      activerecord (>= 3.2.10)
-      activesupport
-      pg
-      pry
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (3.0.4)
-    coderay (1.0.9)
-    diff-lcs (1.1.3)
-    i18n (0.6.4)
+    database_cleaner (0.9.1)
+    diff-lcs (1.2.2)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    i18n (0.6.1)
     json (1.7.7)
-    method_source (0.8.1)
-    msgpack (0.5.2)
+    metaclass (0.0.1)
+    metasploit_data_models (0.16.1)
+      activerecord (>= 3.2.13)
+      activesupport
+      pg
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    msgpack (0.5.4)
     multi_json (1.0.4)
-    nokogiri (1.5.6)
+    nokogiri (1.5.9)
+    packetfu (1.1.8)
     pcaprub (0.11.3)
-    pg (0.14.1)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.0.2)
+    pg (0.15.1)
+    rake (10.0.4)
     redcarpet (2.2.2)
     robots (0.10.1)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    shoulda-matchers (1.5.2)
+      activesupport (>= 3.0.0)
+      bourne (~> 1.3)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (3.4.3)
-    tzinfo (0.3.36)
-    yard (0.8.3)
+    timecop (0.6.1)
+    tzinfo (0.3.37)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord
   activesupport (>= 3.0.0)
+  database_cleaner
+  factory_girl (>= 4.1.0)
   json
-  metasploit_data_models!
+  metasploit_data_models (~> 0.16.1)
   msgpack
   nokogiri
+  packetfu (= 1.1.8)
   pcaprub
   pg (>= 0.11)
   rake
   redcarpet
   robots
   rspec (>= 2.12)
+  shoulda-matchers
   simplecov (= 0.5.4)
+  timecop
   yard

HACKING

@@ -110,7 +110,15 @@ Non-scanner aux modules use run().
 Submitting Your Code
 ====================
 
-The process for submitting new modules via GitHub is documented here:
+To get started with a Metasploit Framework source clone, simply:
+
+  - Fork rapid7/metasploit-framework to your GitHub account
+  - git clone git://github.com/YourName/metasploit-framework.git
+  - gem install bundler
+  - bundle install
+
+More detailed documentation regarding the process for submitting new
+modules via GitHub is documented here:
 
 https://github.com/rapid7/metasploit-framework/wiki/Metasploit-Development-Environment