API change for the HTML mixin, the send_response method is no longer overloaded, instead exploits must call send_response_html to enable HTML evasion. The old method caused problems when a exploit needed HTML and non-HTML response capabilities

git-svn-id: file:///home/svn/framework3/trunk@4173 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/exploit/http.rb

@@ -492,7 +492,7 @@ protected
     # Transmits a html response to the supplied client
     #
     # HTML evasions are implemented here.
-    def send_response(cli, body, headers = {})
+    def send_response_html(cli, body, headers = {})
 		if datastore['HTML::base64'] != 'none'
 			case datastore['HTML::base64']
 				when 'plain'

modules/exploits/multi/browser/firefox_queryinterface.rb

@@ -7,7 +7,7 @@ class Exploits::Multi::Browser::Firefox_QueryInterface < Msf::Exploit::Remote
 	#
 	# This module acts as an HTTP server
 	#
-	include Exploit::Remote::HttpServer
+	include Exploit::Remote::HttpServer::HTML
 
 	def initialize(info = {})
 		super(update_info(info,
@@ -67,7 +67,7 @@ class Exploits::Multi::Browser::Firefox_QueryInterface < Msf::Exploit::Remote
 		return if ((p = regenerate_payload(cli)) == nil)
 
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
-		send_response(cli, generate_html(p), { 'Content-Type' => 'text/html' })
+		send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html' })
 		handler(cli)
 	end
 	

modules/exploits/multi/browser/mozilla_compareto.rb

@@ -7,7 +7,7 @@ class Exploits::Multi::Browser::Mozilla_CompareTo < Msf::Exploit::Remote
 	#
 	# This module acts as an HTTP server
 	#
-	include Exploit::Remote::HttpServer
+	include Exploit::Remote::HttpServer::HTML
 
 	def initialize(info = {})
 		super(update_info(info,
@@ -62,7 +62,7 @@ class Exploits::Multi::Browser::Mozilla_CompareTo < Msf::Exploit::Remote
 		return if ((p = regenerate_payload(cli)) == nil)
 
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
-		send_response(cli, generate_html(p), { 'Content-Type' => 'text/html' })
+		send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html' })
 		handler(cli)
 	end
 	

modules/exploits/multi/browser/mozilla_navigatorjava.rb

@@ -7,7 +7,7 @@ class Exploits::Multi::Browser::Mozilla_NavigatorJava < Msf::Exploit::Remote
 	#
 	# This module acts as an HTTP server
 	#
-	include Exploit::Remote::HttpServer
+	include Exploit::Remote::HttpServer::HTML
 
 	def initialize(info = {})
 		super(update_info(info,
@@ -87,7 +87,7 @@ class Exploits::Multi::Browser::Mozilla_NavigatorJava < Msf::Exploit::Remote
 		return if ((p = regenerate_payload(cli)) == nil)
 
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
-		send_response(cli, generate_html(p), { 'Content-Type' => 'text/html' })
+		send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html' })
 		handler(cli)
 	end
 	

modules/exploits/private/ms06_051_unexceptfilter.rb

@@ -183,7 +183,7 @@ class Exploits::Private::IeUnexpFilt < Msf::Exploit::Remote
 			</script></html>";
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/aim_goaway.rb

@@ -80,7 +80,7 @@ class Exploits::Windows::Browser::AimGoaway < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/mcafee_mcsubmgr_vsprintf.rb

@@ -102,7 +102,7 @@ class Exploits::Windows::Browser::McAfeeMcSubMgrVsprintf < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/mirc_irc_url.rb

@@ -64,7 +64,7 @@ class Exploits::Windows::Browser::Mirc_Irc_Url < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/ms03_020_ie_objecttype.rb

@@ -93,7 +93,7 @@ class Exploits::Windows::Browser::MS03_020_Ie_ObjectType < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/ms06_001_wmf_setabortproc.rb

@@ -7,7 +7,7 @@ class Exploits::Windows::Browser::MS06_001_WMF_SETABORTPROC < Msf::Exploit::Remo
 	#
 	# This module acts as an HTTP server
 	#
-	include Exploit::Remote::HttpServer
+	include Exploit::Remote::HttpServer::HTML
 
 	def initialize(info = {})
 		super(update_info(info,
@@ -79,7 +79,7 @@ class Exploits::Windows::Browser::MS06_001_WMF_SETABORTPROC < Msf::Exploit::Remo
 				get_resource + '/' + 
 				Rex::Text.rand_text_alphanumeric(rand(80)+16) + 
 				".#{ext}'><body>One second please...</body></html>"
-			send_response(cli, html)
+			send_response_html(cli, html)
 			return
 		end
 

modules/exploits/windows/browser/ms06_055_vml_method.rb

@@ -131,7 +131,7 @@ class Exploits::Windows::Browser::MS06_055_VML_Overflow < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/webview_setslice.rb

@@ -122,7 +122,7 @@ class Exploits::Windows::Browser::WebView_SetSlice < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end

modules/exploits/windows/browser/winamp_playlist_unc.rb

@@ -7,7 +7,7 @@ class Exploits::Windows::Browser::WinAmp_Playlist_UNC < Msf::Exploit::Remote
 	#
 	# This module acts as an HTTP server
 	#
-	include Exploit::Remote::HttpServer
+	include Exploit::Remote::HttpServer::HTML
 
 	def initialize(info = {})
 		super(update_info(info,
@@ -84,7 +84,7 @@ class Exploits::Windows::Browser::WinAmp_Playlist_UNC < Msf::Exploit::Remote
 				Rex::Text.rand_text_alphanumeric(rand(80)+16) + 
 				".pls'</script>" +
 				"One second please...</body></html>"
-			send_response(cli, html)
+			send_response_html(cli, html)
 			return
 		end
 

modules/exploits/windows/browser/xmplay_asx.rb

@@ -66,7 +66,7 @@ class Exploits::Windows::Browser::Xmplay_Asx < Msf::Exploit::Remote
 		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
 
 		# Transmit the response to the client
-		send_response(cli, content)
+		send_response_html(cli, content)
 	end
 
 end