Merge branch 'FireFart-msftidy_1'

Author: sinn3r

modules/auxiliary/scanner/upnp/ssdp_msearch.rb

@@ -71,7 +71,7 @@ def scanner_postscan(batch)
 					:name  => 'upnp',
 					:info  => res[:info][:location].to_s
 				) if datastore['REPORT_LOCATION']
- 			end
+			end
 		end
 	end
 

modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb

@@ -34,8 +34,8 @@ def initialize(info = {})
 				[
 					['CVE', '2008-5499'],
 					['OSVDB', '50796'],
-					['URL', 'http://www.adobe.com/support/security/bulletins/apsb08-24.html'],
-					['URL', 'http://www.securityfocus.com/bid/32896/exploit']
+					['BID', '32896'],
+					['URL', 'http://www.adobe.com/support/security/bulletins/apsb08-24.html']
 				],
 			'DefaultOptions' =>
 				{

modules/exploits/multi/svn/svnserve_date.rb

@@ -32,8 +32,7 @@ def initialize(info = {})
 					['CVE', '2004-0397'],
 					['OSVDB', '6301'],
 					['BID',	'10386'],
-					['URL',   'http://lists.netsys.com/pipermail/full-disclosure/2004-May/021737.html'],
-					['MIL',   '68'],
+					['URL',   'http://lists.netsys.com/pipermail/full-disclosure/2004-May/021737.html']
 				],
 			'Payload'        =>
 				{

modules/exploits/windows/browser/ms05_054_onload.rb

@@ -39,7 +39,7 @@ def initialize(info = {})
 					['MSB', 'MS05-054'],
 					['CVE', '2005-1790'],
 					['OSVDB', '17094'],
-					['URL', 'http://www.securityfocus.com/bid/13799/info'],
+					['BID', '13799'],
 					['URL', 'http://www.cvedetails.com/cve/CVE-2005-1790'],
 				],
 			'DefaultOptions' =>

modules/exploits/windows/ftp/easyftp_cwd_fixret.rb

@@ -36,12 +36,12 @@ def initialize(info = {})
 			'References'     =>
 				[
 					[ 'OSVDB', '62134' ],
+					[ 'BID', '38262' ],
 					[ 'URL', 'http://paulmakowski.wordpress.com/2010/02/28/increasing-payload-size-w-return-address-overwrite/' ],
 					[ 'URL', 'http://paulmakowski.wordpress.com/2010/04/19/metasploit-plugin-for-easyftp-server-exploit' ],
 					[ 'URL', 'http://seclists.org/bugtraq/2010/Feb/202' ],
 					[ 'URL', 'http://code.google.com/p/easyftpsvr/'],
-					[ 'URL', 'https://tegosecurity.com/etc/return_overwrite/RCE_easy_ftp_server_1.7.0.2.zip' ],
-					[ 'URL', 'http://www.securityfocus.com/bid/38262/exploit']
+					[ 'URL', 'https://tegosecurity.com/etc/return_overwrite/RCE_easy_ftp_server_1.7.0.2.zip' ]
 				],
 			'Privileged'     => false,
 			'Payload'        =>

modules/post/windows/gather/credentials/filezilla_server.rb

@@ -206,7 +206,7 @@ def get_filezilla_creds(paths)
 				:target_port => config['admin_port']
 			)
 		end
-		
+
 		p = store_loot("filezilla.server.creds", "text/csv", session, credentials.to_csv,
 			"filezilla_server_credentials.csv", "FileZilla FTP Server Credentials")
 

modules/post/windows/gather/smart_hashdump.rb

@@ -285,7 +285,7 @@ def read_hashdump
 		host,port = session.session_host, session.session_port
 		collected_hashes = ""
 		tries = 1
-		
+
 		begin
 
 			print_status("\tObtaining the boot key...")
@@ -330,7 +330,7 @@ def read_hashdump
 
 		rescue ::Interrupt
 			raise $!
-		rescue ::Rex::Post::Meterpreter::RequestError => e		
+		rescue ::Rex::Post::Meterpreter::RequestError => e
 			# Sometimes we get this invalid handle race condition.
 			# So let's retry a couple of times before giving up.
 			# See bug #6815
@@ -343,7 +343,7 @@ def read_hashdump
 				print_error("Meterpreter Exception: #{e.class} #{e}")
 				print_error("This script requires the use of a SYSTEM user context (hint: migrate into service process)")
 			end
-			
+
 		rescue ::Exception => e
 			print_error("Error: #{e.class} #{e} #{e.backtrace}")
 		end

modules/post/windows/manage/migrate.rb

@@ -39,7 +39,7 @@ def run
 		print_status("Current server process: #{server.name} (#{server.pid})")
 
 		target_pid = nil
-		
+
 		if datastore['SPAWN']
 			print_status("Spawning notepad.exe process to migrate to")
 			target_pid = create_temp_proc