cleanup, deprecated

Author: Michael Messner

modules/exploits/linux/http/dlink_upnp_exec_echo.rb renamed to modules/exploits/linux/http/dlink_upnp_exec_noauth.rb

@@ -55,15 +55,22 @@ def initialize(info = {})
         ],
       'DefaultTarget'    => 0
       ))
+
       deregister_options('CMDSTAGER::DECODER', 'CMDSTAGER::FLAVOR')
+
+    register_options(
+      [
+        Opt::RPORT(49152)       #port of UPnP SOAP webinterface
+      ], self.class)
+
   end
 
   def check
     begin
       res = send_request_cgi({
         'uri' => '/InternetGatewayDevice.xml'
       })
-      if res && [200, 301, 302].include?(res.code) && res.body.to_s =~ /<modelNumber>DIR-645<\/modelNumber>/
+      if res && [200, 301, 302].include?(res.code) && res.body.to_s =~ /<modelNumber>DIR-/
         return Exploit::CheckCode::Detected
       end
     rescue ::Rex::ConnectionError
@@ -74,10 +81,10 @@ def check
   end
 
   def exploit
-    print_status("#{peer} - Trying to access the vulnerable URL...")
+    print_status("#{peer} - Trying to access the device ...")
 
     unless check == Exploit::CheckCode::Detected
-      fail_with(Failure::Unknown, "#{peer} - Failed to access the vulnerable URL")
+      fail_with(Failure::Unknown, "#{peer} - Failed to access the vulnerable device")
     end
 
     print_status("#{peer} - Exploiting...")

modules/exploits/linux/http/dlink_upnp_exec_noauth_telnetd.rb

@@ -4,12 +4,17 @@
 ##
 
 require 'msf/core'
+require 'msf/core/module/deprecated'
 
 class Metasploit3 < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::FileDropper
+  include Msf::Module::Deprecated
+
+  DEPRECATION_DATE = Date.new(2014, 8, 8)
+  DEPRECATION_REPLACEMENT = 'modules/exploits/linux/http/dlink_upnp_exec_noauth.rb'
 
   def initialize(info = {})
     super(update_info(info,