From 64f3e68310d41432ad7a35255ef554e98415b6c3 Mon Sep 17 00:00:00 2001
From: m-1-k-3 <github@s3cur1ty.de>
Date: Thu, 4 Apr 2013 13:01:18 +0200
Subject: [PATCH] is_dlink and some more feedback included

---
 .../dlink_dir_300b_600b_815_http_login.rb     | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/auxiliary/scanner/http/dlink_dir_300b_600b_815_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_300b_600b_815_http_login.rb
index b3e8241b40..4916f7b373 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_300b_600b_815_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_300b_600b_815_http_login.rb
@@ -54,11 +54,31 @@ class Metasploit3 < Msf::Auxiliary
 		"#{proto}://#{rhost}:#{rport}#{@uri.to_s}"
 	end
 
+	def is_dlink?
+		response = send_request_cgi({
+			'uri' => @uri,
+			'method' => 'GET'
+			})
+
+		if response and response.headers['Server'] and response.headers['Server'] =~ /Linux,\ HTTP\/1.1,\ DIR-.*Ver\ .*/
+			return true
+		else
+			return false
+		end
+	end 
+
 	def run_host(ip)
 
 		@uri = "/session.cgi"
 
-		print_status("Attempting to login to #{target_url}")
+		if is_dlink?
+			vprint_good("#{target_url} - DLink device detected")
+		else
+			vprint_error("#{target_url} - Dlink device doesn't detected")
+			return
+		end
+
+		print_status("#{target_url} - Attempting to login") 
 
 		each_user_pass { |user, pass|
 			do_login(user, pass)
@@ -106,7 +126,6 @@ class Metasploit3 < Msf::Auxiliary
 				}
 			})
 			return if response.nil?
-			return if (response.headers['Server'].nil? or response.headers['Server'] !~ /Linux,\ HTTP\/1.1,\ DIR-.*Ver\ .*/)
 			return if (response.code == 404)
 
 			return response
@@ -117,6 +136,7 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	def determine_result(response)
+		return :abort if response.nil?
 		return :abort unless response.kind_of? Rex::Proto::Http::Response
 		return :abort unless response.code
 		if response.body =~ /\<RESULT\>SUCCESS\<\/RESULT\>/