finish move of php / python meterpreters to metasploit-payloads

Gemfile.lock

@@ -9,7 +9,7 @@ PATH
       json
       metasploit-concern (= 1.0.0)
       metasploit-model (= 1.0.0)
-      metasploit-payloads (= 1.0.9)
+      metasploit-payloads (= 1.0.10)
       msgpack
       nokogiri
       packetfu (= 1.1.9)
@@ -123,7 +123,7 @@ GEM
       activemodel (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
-    metasploit-payloads (1.0.9)
+    metasploit-payloads (1.0.10)
     metasploit_data_models (1.2.5)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)

metasploit-framework.gemspec

@@ -61,7 +61,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model', '1.0.0'
   # Needed for Meterpreter
-  spec.add_runtime_dependency 'metasploit-payloads', '1.0.9'
+  spec.add_runtime_dependency 'metasploit-payloads', '1.0.10'
   # Needed by msfgui and other rpc components
   spec.add_runtime_dependency 'msgpack'
   # Needed by anemone crawler

modules/payloads/singles/php/meterpreter_reverse_tcp.rb

@@ -31,10 +31,7 @@ module Metasploit4
   end
 
   def generate
-    file = File.join(Msf::Config.data_directory, "meterpreter", "meterpreter.php")
-    met = File.open(file, "rb") {|f|
-      f.read(f.stat.size)
-    }
+    met = MetasploitPayloads.read('meterpreter', 'meterpreter.php')
 
     met.gsub!("127.0.0.1", datastore['LHOST']) if datastore['LHOST']
     met.gsub!("4444", datastore['LPORT'].to_s) if datastore['LPORT']

modules/payloads/stages/php/meterpreter.rb

@@ -25,11 +25,7 @@ module Metasploit4
   end
 
   def generate_stage(opts={})
-    file = File.join(Msf::Config.data_directory, "meterpreter", "meterpreter.php")
-
-    met = File.open(file, "rb") { |f|
-      f.read(f.stat.size)
-    }
+    met = MetasploitPayloads.read('meterpreter', 'meterpreter.php')
 
     uuid = opts[:uuid] || generate_payload_uuid
     bytes = uuid.to_raw.chars.map { |c| '\x%.2x' % c.ord }.join('')

modules/payloads/stages/python/meterpreter.rb

@@ -27,11 +27,7 @@ module Metasploit3
   end
 
   def generate_stage(opts={})
-    file = ::File.join(Msf::Config.data_directory, 'meterpreter', 'meterpreter.py')
-
-    met = ::File.open(file, 'rb') {|f|
-      f.read(f.stat.size)
-    }
+    met = MetasploitPayloads.read('meterpreter', 'meterpreter.py')
 
     if datastore['PythonMeterpreterDebug']
       met = met.sub("DEBUGGING = False", "DEBUGGING = True")