Land rapid7#1934 - Fix UltraISO Exploit File Creation

Author: wchen-r7

lib/msf/core/exploit/fileformat.rb

@@ -30,8 +30,8 @@ def file_format_filename
 		datastore['FILENAME']
 	end
 
-	def file_create(data)
-		fname = file_format_filename
+	def file_create(data, filename = nil)
+		fname = filename || file_format_filename
 		ltype = "exploit.fileformat.#{self.shortname}"
 		full_path = store_local(ltype, nil, data, fname)
 		print_good "#{fname} stored at #{full_path}"

modules/exploits/windows/fileformat/ultraiso_ccd.rb

@@ -206,14 +206,7 @@ def exploit
 		sploit << idx_line
 
 		file_create(sploit)
-
-		# create the empty IMG file
-		imgfn = datastore['FILENAME'].dup
-		imgfn.gsub!(/\.ccd$/, '.img')
-		out = imgfn
-		File.new(out,"wb").close
-		print_status("Created empty output file #{out}")
-
+		file_create('', datastore['FILENAME'].gsub(/\.ccd$/, '.img'))
 	end
 
 end

modules/exploits/windows/fileformat/ultraiso_cue.rb

@@ -111,13 +111,8 @@ def exploit
 
 		print_status("Creating '#{datastore['FILENAME']}' using target '#{target.name}' ...")
 		file_create(cue_data)
+		file_create('', datastore['FILENAME'].gsub(/\.cue$/, '.bin'))
 
-		# create the empty BIN file
-		binfn = datastore['FILENAME'].dup
-		binfn.gsub!(/\.cue$/, '.bin')
-		out =  binfn
-		File.new(out,"wb").close
-		print_status("Created empty output file #{out}")
 
 	end