Update java meterpreter and payload references to use metasploit-payloads

Author: Brent Cook

lib/msf/core/payload/java.rb

@@ -17,9 +17,7 @@ module Msf::Payload::Java
   def generate_stage
     stage = ''
     @stage_class_files.each do |path|
-      fd = File.open(File.join( Msf::Config.data_directory, "java", path ), "rb")
-      data = fd.read(fd.stat.size)
-      fd.close
+      data = MetasploitPayloads.read("java", path)
       stage << ([data.length].pack("N") + data)
     end
     stage << [0].pack("N")
@@ -36,8 +34,8 @@ def generate
 
   #
   # Used by stagers to create a jar file as a {Rex::Zip::Jar}.  Stagers
-  # define a list of class files in @class_files which are pulled from
-  # {Msf::Config.data_directory}.  The configuration file is created by
+  # define a list of class files in @class_files which are pulled from the
+  # MetasploitPayloads gem. The configuration file is created by
   # the payload's #config method.
   #
   # @option opts :main_class [String] the name of the Main-Class
@@ -58,7 +56,7 @@ def generate_jar(opts={})
     jar = Rex::Zip::Jar.new
     jar.add_sub("metasploit") if opts[:random]
     jar.add_file("metasploit.dat", config)
-    jar.add_files(paths, File.join(Msf::Config.data_directory, "java"))
+    jar.add_files(paths, MetasploitPayloads.path('java'))
     jar.build_manifest(:main_class => main_class)
 
     jar
@@ -103,7 +101,7 @@ def generate_war(opts={})
     zip.add_file('WEB-INF/', '')
     zip.add_file('WEB-INF/web.xml', web_xml)
     zip.add_file("WEB-INF/classes/", "")
-    zip.add_files(paths, File.join(Msf::Config.data_directory, "java"), "WEB-INF/classes/")
+    zip.add_files(paths, MetasploitPayloads.path('java'), 'WEB-INF/classes/')
     zip.add_file("WEB-INF/classes/metasploit.dat", config)
 
     zip

lib/msf/util/exe.rb

@@ -1139,7 +1139,7 @@ def self.to_jar(exe, opts = {})
     paths = [
       [ "metasploit", "Payload.class" ],
     ]
-    zip.add_files(paths, File.join(Msf::Config.data_directory, "java"))
+    zip.add_files(paths, MetasploitPayloads.path('java'))
     zip.build_manifest :main_class => "metasploit.Payload"
     config = "Spawn=#{spawn}\r\nExecutable=#{exe_name}\r\n"
     zip.add_file("metasploit.dat", config)

modules/exploits/multi/http/axis2_deployer.rb

@@ -98,7 +98,7 @@ def upload_exec(session,rpath)
 
       # We need this class as a wrapper to run in a thread.  For some reason
       # the Payload class is giving illegal access exceptions without it.
-      path = File.join(Msf::Config.data_directory, "java", "metasploit", "PayloadServlet.class")
+      path = MetasploitPayloads.path("java", "metasploit", "PayloadServlet.class")
       fd = File.open(path, "rb")
       servlet = fd.read(fd.stat.size)
       fd.close

modules/exploits/multi/misc/java_jmx_server.rb

@@ -80,7 +80,7 @@ def on_request_uri(cli, request)
         ["metasploit", "JMXPayloadMBean.class"],
         ["metasploit", "JMXPayload.class"],
       ]
-      jar.add_files(paths, [ Msf::Config.data_directory, "java" ])
+      jar.add_files(paths, MetasploitPayloads.path('java'))
 
       send_response(cli, jar.pack,
         {

modules/exploits/multi/misc/java_rmi_server.rb

@@ -179,7 +179,7 @@ def on_request_uri(cli, request)
         [ "metasploit", "RMILoader.class" ],
         [ "metasploit", "RMIPayload.class" ],
       ]
-      jar.add_files(paths, [ Msf::Config.data_directory, "java" ])
+      jar.add_files(paths, MetasploitPayloads.path('java'))
 
       send_response(cli, jar.pack,
       {

modules/payloads/singles/java/shell_reverse_tcp.rb

@@ -53,10 +53,8 @@ def generate_jar(opts={})
           jar.add_file(full, '')
         end
       end
-      fd = File.open(File.join( Msf::Config.data_directory, "java", path ), "rb")
-      data = fd.read(fd.stat.size)
+      data = MetasploitPayloads.read('java', path)
       jar.add_file(path.join("/"), data)
-      fd.close
     end
     jar.build_manifest(:main_class => "metasploit.Payload")
     jar.add_file("metasploit.dat", config)

modules/payloads/stages/java/meterpreter.rb

@@ -54,8 +54,7 @@ def initialize(info = {})
   # used as the final stage; calls super to get the intermediate stager.
   #
   def generate_stage
-    file = File.join(Msf::Config.data_directory, "meterpreter", "meterpreter.jar")
-    met = File.open(file, "rb") {|f| f.read(f.stat.size) }
+    met = MetasploitPayloads.read('meterpreter', 'meterpreter.jar')
 
     # All of the dendencies to create a jar loader, followed by the length
     # of the jar and the jar itself.