more cleanups

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

data/msfcrawler/basic.rb

@@ -1,3 +1,16 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+# $Revision$
+
 require 'rubygems'
 require 'pathname'
 require 'hpricot'
@@ -6,28 +19,28 @@
 class CrawlerSimple < BaseParser
 
 	def parse(request,result)
-		
+
 		if !result['Content-Type'].include? "text/html"
 			return
 		end
-		
+
 		doc = Hpricot(result.body.to_s)
 		doc.search('a').each do |link|
-		
+
 		hr = link.attributes['href']
-		
-		if hr and !hr.match(/^(\#|javascript\:)/) 
+
+		if hr and !hr.match(/^(\#|javascript\:)/)
 			begin
-				hreq = urltohash('GET',hr,request['uri'],nil)				
-				
+				hreq = urltohash('GET',hr,request['uri'],nil)
+
 				insertnewpath(hreq)
-					
+
 			rescue URI::InvalidURIError
 				#puts "Parse error"
 				#puts "Error: #{link[0]}"
 			end
 		end
 		end
-	end 
+	end
 end
 

data/msfcrawler/flash.rb

@@ -1,8 +1,20 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+# $Revision$
+
 require 'rubygems'
 require 'pathname'
 require 'uri'
 
-
 $flarebinary = "/home/et/Downloads/flare"
 $flareoutdir = "/home/et/Downloads/"
 
@@ -13,52 +25,52 @@ def parse(request,result)
 		rexp = ['loadMovieNum\(\'(.*?)\'',
 			'loadMovie\(\'(.*?)\'',
 			'getURL\(\'(.*?)\''
-			]		
+			]
+
 
-
 		if !result['Content-Type'].include? "application/x-shockwave-flash"
 			return
 		end
-		
+
 		outswf = File.join($flareoutdir,request['uri'].gsub(/\//,'_'))
-		
-		puts "Downloading SWF file to: #{outswf}" 
-		
-		ffile = File.new(outswf, "wb")    
+
+		puts "Downloading SWF file to: #{outswf}"
+
+		ffile = File.new(outswf, "wb")
 		ffile.puts(result.body)
-		ffile.close		
+		ffile.close
 
 		system("#{$flarebinary} #{outswf}")
-		
+
 		outflr = outswf.gsub('.swf','.flr')
-		
+
 		if File.exists?(outflr)
-			puts "Decompiled SWF file to: #{outflr}" 	
+			puts "Decompiled SWF file to: #{outflr}"
 		else
 			puts "Error: Decompilation failed."
 			return
 		end
-		
+
 		File.open(outflr, "r") do |infile|
 			while (line = infile.gets)
 
-			rexp.each do |r|						
-				links = line.to_s.scan(Regexp.new(r,true)) #" 
-				links.each do |link| 
-				
+			rexp.each do |r|
+				links = line.to_s.scan(Regexp.new(r,true)) #"
+				links.each do |link|
+
 					begin
 						hreq = urltohash('GET',link[0],request['uri'],nil)
 
 						insertnewpath(hreq)
-					
+
 					rescue URI::InvalidURIError
 						#puts "Parse error"
 						#puts "Error: #{link[0]}"
 					end
-				end	
+				end
 			end
 			end
-		end										
-	end 
+		end
+	end
 end
 

data/msfcrawler/forms.rb

@@ -1,3 +1,16 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+# $Revision$
+
 require 'rubygems'
 require 'pathname'
 require 'hpricot'
@@ -6,11 +19,11 @@
 class CrawlerForms < BaseParser
 
 	def parse(request,result)
-		
+
 		if !result['Content-Type'].include? "text/html"
 			return
 		end
-		
+
 		hr = ''
 		m = ''
 
@@ -21,44 +34,44 @@ def parse(request,result)
 			fname = f.attributes['name']
 			if fname.empty?
 				fname = "NONE"
-			end  
+			end
 
 			m = "GET"
 			if !f.attributes['method'].empty?
 				m = f.attributes['method'].upcase
 			end
-			
-			#puts "Parsing form name: #{fname} (#{m})"		
-			
+
+			#puts "Parsing form name: #{fname} (#{m})"
+
 			htmlform = Hpricot(f.inner_html)
-			
+
 			arrdata = []
-			
+
 			htmlform.search('input').each do |p|
 				#puts p.attributes['name']
 				#puts p.attributes['type']
 				#puts p.attributes['value']
-				
-				#raw_request has uri_encoding disabled as it encodes '='. 
-				arrdata << (p.attributes['name'] + "=" + Rex::Text.uri_encode(p.attributes['value']))				
+
+				#raw_request has uri_encoding disabled as it encodes '='.
+				arrdata << (p.attributes['name'] + "=" + Rex::Text.uri_encode(p.attributes['value']))
 			end
-			
+
 			data = arrdata.join("&").to_s
-	
-		
+
+
 			begin
 				hreq = urltohash(m,hr,request['uri'],data)
-				
+
 				hreq['ctype'] = 'application/x-www-form-urlencoded'
-					
+
 				insertnewpath(hreq)
-			
-					
+
+
 			rescue URI::InvalidURIError
 				#puts "Parse error"
 				#puts "Error: #{link[0]}"
 			end
-		end			
-	end 
+		end
+	end
 end
 

data/msfcrawler/objects.rb

@@ -1,3 +1,16 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+# $Revision$
+
 require 'rubygems'
 require 'pathname'
 require 'hpricot'
@@ -6,11 +19,11 @@
 class CrawlerObjects < BaseParser
 
 	def parse(request,result)
-		
+
 		if !result['Content-Type'].include? "text/html"
 			return
 		end
-		
+
 		hr = ''
 		m = ''
 
@@ -21,15 +34,15 @@ def parse(request,result)
 
 			begin
 				hreq = urltohash('GET',s,request['uri'],nil)
-				
+
 				insertnewpath(hreq)
-			
-					
+
+
 			rescue URI::InvalidURIError
 				#puts "Parse error"
 				#puts "Error: #{link[0]}"
 			end
-		end			
-	end 
+		end
+	end
 end
 

data/msfcrawler/scripts.rb

@@ -1,3 +1,16 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+# $Revision$
+
 require 'rubygems'
 require 'pathname'
 require 'hpricot'
@@ -6,11 +19,11 @@
 class CrawlerScripts < BaseParser
 
 	def parse(request,result)
-		
+
 		if !result['Content-Type'].include? "text/html"
 			return
 		end
-		
+
 		hr = ''
 		m = ''
 
@@ -20,16 +33,16 @@ def parse(request,result)
 			s = obj['src']
 
 			begin
-				hreq = urltohash('GET',s,request['uri'],nil)				
-				
+				hreq = urltohash('GET',s,request['uri'],nil)
+
 				insertnewpath(hreq)
-			
-					
+
+
 			rescue URI::InvalidURIError
 				#puts "Parse error"
 				#puts "Error: #{link[0]}"
 			end
-		end			
-	end 
+		end
+	end
 end
 

documentation/samples/framework/dump_module_info.rb

@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 #
+# $Id$
+#
 # This sample demonstrates how a module's information can be easily serialized
 # to a readable format.
 #
+# $Revision$
+#
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
 

documentation/samples/framework/encode_file.rb

@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 #
+# $Id$
+#
 # This sample demonstrates how a file can be encoded using a framework
 # encoder.
 #
+# $Revision$
+#
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
 

documentation/samples/framework/enumerate_modules.rb

@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 #
+# $Id$
+#
 # This sample demonstrates enumerating all of the modules in the framework and
 # displays their module type and reference name.
 #
+# $Revision$
+#
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))