Revert the revert of rapid7#3446

This reverts commit 9b35b0e.

This should not land on master until the Metasploit Pro folks (@trosen-r7
and friends) get their Meterpreter path specifications working the
same way as Framework's does.

Author: Tod Beardsley

.gitignore

@@ -15,8 +15,6 @@ Gemfile.local.lock
 config/database.yml
 # simplecov coverage data
 coverage
-data/meterpreter/ext_server_pivot.x86.dll
-data/meterpreter/ext_server_pivot.x64.dll
 doc/
 external/source/meterpreter/java/bin
 external/source/meterpreter/java/build
@@ -53,3 +51,34 @@ tags
 # ignore release/debug folders for exploits
 external/source/exploits/**/Debug
 external/source/exploits/**/Release
+
+# Avoid checking in Meterpreter binaries. These are supplied upstream by
+# the meterpreter_bins gem.
+data/meterpreter/elevator.x64.dll
+data/meterpreter/elevator.x86.dll
+data/meterpreter/ext_server_espia.x64.dll
+data/meterpreter/ext_server_espia.x86.dll
+data/meterpreter/ext_server_extapi.x64.dll
+data/meterpreter/ext_server_extapi.x86.dll
+data/meterpreter/ext_server_incognito.x64.dll
+data/meterpreter/ext_server_incognito.x86.dll
+data/meterpreter/ext_server_kiwi.x64.dll
+data/meterpreter/ext_server_kiwi.x86.dll
+data/meterpreter/ext_server_lanattacks.x64.dll
+data/meterpreter/ext_server_lanattacks.x86.dll
+data/meterpreter/ext_server_mimikatz.x64.dll
+data/meterpreter/ext_server_mimikatz.x86.dll
+data/meterpreter/ext_server_priv.x64.dll
+data/meterpreter/ext_server_priv.x86.dll
+data/meterpreter/ext_server_stdapi.x64.dll
+data/meterpreter/ext_server_stdapi.x86.dll
+data/meterpreter/metsrv.x64.dll
+data/meterpreter/metsrv.x86.dll
+data/meterpreter/screenshot.x64.dll
+data/meterpreter/screenshot.x86.dll
+
+# Avoid checking in Meterpreter libs that are built from
+# private source. If you're interested in this functionality,
+# check out Metasploit Pro: http://metasploit.com/download
+data/meterpreter/ext_server_pivot.x86.dll
+data/meterpreter/ext_server_pivot.x64.dll

Gemfile

@@ -6,6 +6,8 @@ gem 'activesupport', '>= 3.0.0', '< 4.0.0'
 gem 'bcrypt'
 # Needed for some admin modules (scrutinizer_add_user.rb)
 gem 'json'
+# Needed for Meterpreter on Windows, soon others.
+gem 'meterpreter_bins', '0.0.6'
 # Needed by msfgui and other rpc components
 gem 'msgpack'
 # Needed by anemone crawler

Gemfile.lock

@@ -26,6 +26,7 @@ GEM
       activerecord (>= 3.2.13)
       activesupport
       pg
+    meterpreter_bins (0.0.6)
     mini_portile (0.5.1)
     msgpack (0.5.5)
     multi_json (1.0.4)
@@ -70,6 +71,7 @@ DEPENDENCIES
   fivemat (= 1.2.1)
   json
   metasploit_data_models (~> 0.17.0)
+  meterpreter_bins (= 0.0.6)
   msgpack
   network_interface (~> 0.0.1)
   nokogiri