cleans & DRYs exploit/exe & util/exe & msfpayload

Author: kernelsmith

lib/msf/core/exploit/exe.rb

@@ -42,9 +42,7 @@ def get_custom_exe(path=nil)
     path ||= datastore['EXE::Custom']
     print_status("Using custom payload #{path}, RHOST and RPORT settings will be ignored!")
     datastore['DisablePayloadHandler'] = true
-    file = ::File.open(path,'rb')
-    exe = file.read(file.stat.size)
-    file.close
+    ::File.open(path,'rb') {|f| exe = f.read(f.stat.size)}
     exe
   end
 
@@ -58,16 +56,13 @@ def generate_payload_exe(opts = {})
     pl ||= payload.encoded
 
     # Fall back to x86...
-    if not opts[:arch] or opts[:arch].length < 1
-      opts[:arch] = [ ARCH_X86 ]
-    end
+    opts[:arch] = [ARCH_X86] if !opts[:arch] || opts[:arch].length < 1
+
     # Ensure we have an array
-    if not opts[:arch].kind_of? Array
-      opts[:arch] = [ opts[:arch] ]
-    end
+    opts[:arch] = [opts[:arch]] unless opts[:arch].kind_of? Array
 
     # Transform the PlatformList
-    if (opts[:platform].kind_of? Msf::Module::PlatformList)
+    if opts[:platform].kind_of? Msf::Module::PlatformList
       opts[:platform] = opts[:platform].platforms
     end
 
@@ -89,7 +84,7 @@ def generate_payload_exe_service(opts = {})
     #Ensure opts[:arch] is an array
     opts[:arch] = [opts[:arch]] unless opts[:arch].kind_of? Array
 
-    if opts[:arch] and (opts[:arch].index(ARCH_X64) or opts[:arch].index(ARCH_X86_64))
+    if opts[:arch] && (opts[:arch].index(ARCH_X64) or opts[:arch].index(ARCH_X86_64))
       exe = Msf::Util::EXE.to_win64pe_service(framework, pl, opts)
     else
       exe = Msf::Util::EXE.to_win32pe_service(framework, pl, opts)
@@ -112,12 +107,12 @@ def generate_payload_dll(opts = {})
     opts[:arch] = [opts[:arch]] unless opts[:arch].kind_of? Array
 
     # NOTE: Only x86_64 linux is supported here.
-    if (plat.index(Msf::Module::Platform::Linux))
-      if opts[:arch] and (opts[:arch].index(ARCH_X64) or opts[:arch].index(ARCH_X86_64))
+    if plat.index(Msf::Module::Platform::Linux)
+      if opts[:arch] && (opts[:arch].index(ARCH_X64) || opts[:arch].index(ARCH_X86_64))
         dll = Msf::Util::EXE.to_linux_x64_elf_dll(framework, pl,opts)
       end
-    elsif (plat.index(Msf::Module::Platform::Windows))
-      if opts[:arch] and (opts[:arch].index(ARCH_X64) or opts[:arch].index(ARCH_X86_64))
+    elsif plat.index(Msf::Module::Platform::Windows)
+      if opts[:arch] && (opts[:arch].index(ARCH_X64) || opts[:arch].index(ARCH_X86_64))
         dll = Msf::Util::EXE.to_win64pe_dll(framework, pl, opts)
       else
         dll = Msf::Util::EXE.to_win32pe_dll(framework, pl, opts)
@@ -140,9 +135,7 @@ def generate_payload_msi(opts = {})
         :uac => datastore['MSI::UAC']
     })
 
-    msi = Msf::Util::EXE.to_exe_msi(framework, exe, opts)
-
-    return msi
+    Msf::Util::EXE.to_exe_msi(framework, exe, opts)
   end
 
 protected