Merge branch 'master' into feature/mdm-module-namespace

Conflicts:
	Gemfile
	Gemfile.lock
	lib/msf/core/db_manager.rb

Author: limhoff-r7

.gitignore

@@ -1,6 +1,9 @@
 .bundle
 # Rubymine project directory
 .idea
+# Portable ruby version files for rvm
+.ruby-gemset
+.ruby-version
 # RVM control file
 .rvmrc
 # YARD cache directory

.mailmap

@@ -1,24 +1,24 @@
-wchen-r7 <wchen-r7@github>         sinn3r <[email protected]> # aka sinn3r
-wchen-r7 <wchen-r7@github>         Wei Chen <[email protected]>
-wchen-r7 <wchen-r7@github>         sinn3r <[email protected]>
-todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
-jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
+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
-jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]> # aka TheLightCosine
-dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
 joev-r7 <joev-r7@github>           Joe Vennix <[email protected]>
-bturner-r7 <bturner-r7@github>     Brandon Turner <[email protected]>
-ecarey-r7 <ecarey-r7@github>       Erran Carey <[email protected]>
+jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 limhoff-r7 <limhoff-r7@github>     Luke Imhoff <[email protected]>
-todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
-tasos-r7 <tasos-r7@github>         Tasos Laskos <[email protected]>
 shuckins-r7 <shuckins-r7@github>   Samuel Huckins <[email protected]>
-bperry-r7 <bperry-r7@github>       Brandon Perry <bperry@bperry-rapid7.(none)>
-bperry-r7 <bperry-r7@github>       Brandon Perry <[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
@@ -27,43 +27,43 @@ bperry-r7 <bperry-r7@github>       Brandon Perry <[email protected]>
 # 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]> 
-Meatballs1 <Meatballs1@github>         Ben Campbell <[email protected]>
-jduck <jduck@github>                   Joshua Drake <[email protected]>
-jcran <jcran@github>                   Jonathan Cran <[email protected]>
-jcran <jcran@github>                   Jonathan Cran <[email protected]>
 bannedit <bannedit@github>             David Rude <[email protected]>
-darkoperator <darkoperator@github>     Carlos Perez <[email protected]>
-scriptjunkie <scriptjunkie@github>     Matt Weeks <[email protected]>
-skape <skape@???>                      Matt Miller <[email protected]>
 ceballosm <ceballosm@github>           Mario Ceballos <[email protected]>
-swtornio <swtornio@github>             Steve Tornio <[email protected]>
-kris <kris@???>                        kris <>
-spoonm <spoonm@github>                 Spoon M <[email protected]>
-fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
+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 <>
-r3dy <r3dy@github>                     Royce Davis <[email protected]>
-r3dy <r3dy@github>                     Royce Davis <[email protected]>
+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]> 
-rsmudge <rsmudge@github>               Raphael Mudge <[email protected]> # Aka `butane
-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]>
-kost <kost@github>                     Vlatko Kosturjak <[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
-corelanc0d3er <corelanc0d3er@github>   Peter Van Eeckhoutte (corelanc0d3r) <[email protected]>
-corelanc0d3er <corelanc0d3er@github>   corelanc0d3r <[email protected]>
-kernelsmith <kernelsmith@github>       Joshua Smith <[email protected]>
-kernelsmith <kernelsmith@github>       kernelsmith <kernelsmith@kernelsmith>
-h0ng10 <h0ng10@github>                 h0ng10 <[email protected]>
-h0ng10 <h0ng10@github>                 Hans-Martin Münch <[email protected]>
-nullbind <nullbind@github>             nullbind <[email protected]>
-nevdull77 <nevdull77@github>           Patrik Karlsson <[email protected]>
-jgor <jgor@github>                     jgor <[email protected]>
-ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
-ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
-FireFart <FireFart@github>             Christian Mehlmauer <[email protected]>
+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]>

Gemfile

@@ -2,52 +2,58 @@ 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', '~> 0.7.1'
 # Needed by msfgui and other rpc components
 gem 'msgpack'
 # Needed by anemone crawler
 gem 'nokogiri'
-# Needed for module caching in Mdm::Module::Details
-gem 'pg', '>= 0.11'
 # Needed by anemone crawler
 gem 'robots'
-# For sniffer and raw socket modules
-gem 'pcaprub'
+
+group :db do
+	# Needed for Msf::DbManager
+	gem 'activerecord'
+	# Database models shared between framework and Pro.
+	gem 'metasploit_data_models', '~> 0.7.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
 	# 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'
+	# 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
 	# 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
+	# 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

LICENSE

@@ -32,18 +32,10 @@ Files: external/ruby-lorcon/*
 Copyright: 2005, dragorn and Joshua Wright
 License: LGPL-2.1
 
-Files: external/source/armitage/* data/armitage/*
-Copyright: 2010-2012 Raphael Mudge
-License: BSD-3-clause
-
 Files: external/source/byakugan/*
 Copyright: Lurene Grenier, 2009
 License: BSD-3-clause
 
-Files: external/source/gui/msfguijava/* data/gui/*
-Copyright: 2010 scriptjunkie
-License: BSD-3-clause
-
 Files: external/source/ipwn/*
 Copyright: 2004-2005 vlad902 <vlad902 [at] gmail.com>
            2007 H D Moore <hdm [at] metasploit.com>
@@ -451,7 +443,7 @@ Copyright: 2011 James Miller
 License: MIT
 
 Files: lib/windows_console_color_support.rb
-Copyright: 2011 Michael 'migi' Schierl
+Copyright: 2011 Michael 'mihi' Schierl
 License: BSD-3-clause
 
 Files: lib/zip.rb lib/zip/*

Rakefile

@@ -1,7 +1,5 @@
 require 'bundler/setup'
 
-require 'metasploit_data_models'
-
 pathname = Pathname.new(__FILE__)
 root = pathname.parent
 
@@ -18,6 +16,8 @@ $LOAD_PATH.unshift(lib_pathname.to_s)
 rakefile_glob = root.join('lib', 'tasks', '**', '*.rake').to_path
 
 Dir.glob(rakefile_glob) do |rakefile|
+  # Skip database tasks, will load them later if MDM is present
+  next if rakefile =~ /database\.rake$/
   load rakefile
 end
 
@@ -36,6 +36,28 @@ else
 	task :default => :spec
 end
 
+begin
+	require 'metasploit_data_models'
+rescue LoadError
+	puts "metasploit_data_models not in bundle, so can't set up db tasks.  " \
+	     "To run database tasks, ensure to install the db bundler group."
+
+	print_without = true
+else
+	load 'lib/tasks/database.rake'
+	metasploit_data_models_task_glob = MetasploitDataModels.root.join(
+			'lib',
+			'tasks',
+			'**',
+			'*.rake'
+	).to_s
+	# include tasks from metasplioit_data_models, such as `rake yard`.
+	# metasploit-framework specific yard options are in .yardopts
+	Dir.glob(metasploit_data_models_task_glob) do |path|
+		load path
+	end
+end
+
 begin
   require 'yard'
 rescue LoadError
@@ -45,18 +67,6 @@ rescue LoadError
 	print_without = true
 end
 
-metasploit_data_models_task_glob = MetasploitDataModels.root.join(
-		'lib',
-		'tasks',
-		'**',
-		'*.rake'
-).to_s
-
-# include tasks from metasplioit_data_models, such as `rake yard`.
-# metasploit-framework specific yard options are in .yardopts
-Dir.glob(metasploit_data_models_task_glob) do |path|
-	load path
-end
 
 if print_without
 	puts "Bundle currently installed " \

armitage

@@ -1,4 +1,10 @@
 # Please only use postgresql bound to a TCP port.
+# Only postgresql is supportable for metasploit-framework
+# these days. (No SQLite, no MySQL).
+#
+# To set up a metasploit database, follow the directions hosted at:
+# https://fedoraproject.org/wiki/Metasploit_Postgres_Setup (Works on
+# essentially any Linux distro, not just Fedora)
 development: &pgsql
   adapter: postgresql
   database: metasploit_framework_development
@@ -9,6 +15,12 @@ development: &pgsql
   pool: 5
   timeout: 5
 
+# You will often want to seperate your databases between dev
+# mode and prod mode. Absent a production db, though, defaulting
+# to dev is pretty sensible for many developer-users.
+production: &production
+  <<: *pgsql
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.