librex 0.0.65 → 0.0.66

data/lib/rex/machscan.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module MachScan
@@ -6,4 +7,4 @@ module MachScan
 end
 end
 
-require 'rex/machscan/scanner'
+require 'rex/machscan/scanner'

data/lib/rex/machscan/scanner.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module MachScan

data/lib/rex/mime.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module MIME
 
@@ -6,4 +7,4 @@ require 'rex/mime/part'
 require 'rex/mime/message'
 
 end
-end
+end

data/lib/rex/mime/header.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module MIME
 class Header

data/lib/rex/mime/message.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module MIME
 class Message
@@ -88,7 +89,9 @@ class Message
 			part.header.set("Content-Disposition", content_disposition)
 		end
 
-		part.header.set("Content-Type", content_type)
+		if (content_type)
+			part.header.set("Content-Type", content_type)
+		end
 
 		if (transfer_encoding)
 			part.header.set("Content-Transfer-Encoding", transfer_encoding)

data/lib/rex/mime/part.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module MIME
 class Part
@@ -17,4 +18,4 @@ class Part
 
 end
 end
-end
+end

data/lib/rex/nop/opty2.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/arch/x86'
 require 'rex/nop/opty2_tables'
 
@@ -105,4 +106,4 @@ class Opty2
 end
 
 end
-end
+end

data/lib/rex/nop/opty2.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -20,4 +21,4 @@ class Rex::Nop::Opty2::UnitTest < Test::Unit::TestCase
 		}
 	end
 
-end
+end

data/lib/rex/nop/opty2_tables.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Nop
 

data/lib/rex/ole.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: ole.rb 11444 2010-12-29 17:07:46Z jduck $
-# Version: $Revision: 11444 $
+# $Id: ole.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/clsid.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: clsid.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: clsid.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/difat.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: difat.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: difat.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/directory.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: directory.rb 9287 2010-05-12 05:33:35Z jduck $
-# Version: $Revision: 9287 $
+# $Id: directory.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/direntry.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: direntry.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: direntry.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/fat.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: fat.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: fat.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/header.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: header.rb 10394 2010-09-20 08:06:27Z jduck $
-# Version: $Revision: 10394 $
+# $Id: header.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/minifat.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: minifat.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: minifat.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/propset.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: propset.rb 12196 2011-04-01 00:51:33Z egypt $
-# Version: $Revision: 12196 $
+# $Id: propset.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##
@@ -113,7 +114,7 @@ class PropertySetStream
 			@os_platform
 		].pack('vvvv')
 		buf << @clsid.pack
-		buf << [@propsets.length].pack('V')			
+		buf << [@propsets.length].pack('V')
 
 		# Pack all the PropertySet children
 		data = []

data/lib/rex/ole/samples/create_ole.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 msfbase = __FILE__
 while File.symlink?(msfbase)

data/lib/rex/ole/samples/dir.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 msfbase = __FILE__
 while File.symlink?(msfbase)

data/lib/rex/ole/samples/dump_stream.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 msfbase = __FILE__
 while File.symlink?(msfbase)

data/lib/rex/ole/samples/ole_info.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 msfbase = __FILE__
 while File.symlink?(msfbase)

data/lib/rex/ole/storage.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: storage.rb 10394 2010-09-20 08:06:27Z jduck $
-# Version: $Revision: 10394 $
+# $Id: storage.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/stream.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: stream.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: stream.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/substorage.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: substorage.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: substorage.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/ole/util.rb

@@ -1,6 +1,7 @@
+# -*- coding: binary -*-
 ##
-# $Id: util.rb 8457 2010-02-11 18:36:38Z jduck $
-# Version: $Revision: 8457 $
+# $Id: util.rb 15548 2012-06-29 06:08:20Z rapid7 $
+# Version: $Revision: 15548 $
 ##
 
 ##

data/lib/rex/parser/acunetix_nokogiri.rb

@@ -1,19 +1,20 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),"nokogiri_doc_mixin")
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
 require 'rex'
 require 'uri'
 
 module Rex
 	module Parser
 
-		# If Nokogiri is available, define the Acunetix document class. 
+		# If Nokogiri is available, define the Acunetix document class.
 		load_nokogiri && class AcunetixDocument < Nokogiri::XML::SAX::Document
 
 		include NokogiriDocMixin
 
 		# The resolver prefers your local /etc/hosts (or windows equiv), but will
-		# fall back to regular DNS. It retains a cache for the import to avoid 
+		# fall back to regular DNS. It retains a cache for the import to avoid
 		# spamming your network with DNS requests.
-		attr_reader :resolv_cache 
+		attr_reader :resolv_cache
 
 		# If name resolution of the host fails out completely, you will not be
 		# able to import that Scan task. Other scan tasks in the same report
@@ -48,8 +49,8 @@ module Rex
 		def end_element(name=nil)
 			block = @block
 			case name
-			when "Scan" 
-				# Clears most of the @state out, we're done with this web site. 
+			when "Scan"
+				# Clears most of the @state out, we're done with this web site.
 				@state.delete_if {|k| k != :current_tag}
 			when "Name"
 				@state[:has_text] = false
@@ -58,7 +59,7 @@ module Rex
 				@text = nil
 			when "StartURL" # Populates @state[:starturl_uri], we use this a lot
 				@state[:has_text] = false
-				collect_host 
+				collect_host
 				collect_service
 				@text = nil
 				handle_parse_warnings &block
@@ -138,7 +139,7 @@ module Rex
 			return if @text.strip.empty?
 			uri = URI.parse(@text) rescue nil
 			return unless uri
-			@state[:starturl_uri] = uri 
+			@state[:starturl_uri] = uri
 			@report_data[:ports] ||= []
 			@report_data[:ports] << @state[:starturl_port]
 		end
@@ -169,7 +170,7 @@ module Rex
 		def record_variable(attrs)
 			return unless in_tag("Inputs")
 			return unless @state[:fullurl].kind_of? URI
-			method = attr_hash(attrs)["Type"] 
+			method = attr_hash(attrs)["Type"]
 			return unless method
 			return if method.strip.empty?
 			@state[:form_variables] ||= []
@@ -246,7 +247,7 @@ module Rex
 		end
 
 		# XXX Rex::Proto::Http::Packet seems broken for
-		# actually parsing requests and responses, but all I 
+		# actually parsing requests and responses, but all I
 		# need are the headers anyway
 		def parse_request(request)
 			headers = Rex::Proto::Http::Packet::Header.new
@@ -262,8 +263,8 @@ module Rex
 			headers = Rex::Proto::Http::Packet::Header.new
 			headers.from_s response.dup # It's destructive.
 			return unless headers.cmd_string
-			http,code,msg = headers.cmd_string.split(/\s+/) 
-			return unless code 
+			http,code,msg = headers.cmd_string.split(/\s+/)
+			return unless code
 			return unless code.to_i.to_s == code
 			parsed = {}
 			parsed[:code] = code

data/lib/rex/parser/apple_backup_manifestdb.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 #
 # This is a Ruby port of the Python manifest parsing code posted to:
 # 	http://stackoverflow.com/questions/3085153/how-to-parse-the-manifest-mbdb-file-in-an-ios-4-0-itunes-backup/3130860#3130860
@@ -12,8 +13,8 @@ class AppleBackupManifestDB
 	attr_accessor :mbdb, :mbdx
 	attr_accessor :mbdb_data, :mbdx_data
 	attr_accessor :mbdb_offset, :mbdx_offset
-	
-	def initialize(mbdb_data, mbdx_data)	
+
+	def initialize(mbdb_data, mbdx_data)
 		self.entries = {}
 		self.entry_offsets = {}
 		self.mbdb_data = mbdb_data
@@ -21,18 +22,18 @@ class AppleBackupManifestDB
 		parse_mbdb
 		parse_mbdx
 	end
-	
+
 	def self.from_files(mbdb_file, mbdx_file)
 		mbdb_data = ""
 		::File.open(mbdb_file, "rb") {|fd| mbdb_data = fd.read(fd.stat.size) }
 		mbdx_data = ""
 		::File.open(mbdx_file, "rb") {|fd| mbdx_data = fd.read(fd.stat.size) }
-		
+
 		self.new(mbdb_data, mbdx_data)
 	end
-	
+
 	def parse_mbdb
-		raise ArgumentError, "Not valid MBDB data" if self.mbdb_data[0,4] != "mbdb"	
+		raise ArgumentError, "Not valid MBDB data" if self.mbdb_data[0,4] != "mbdb"
 		self.mbdb_offset = 4
 		self.mbdb_offset = self.mbdb_offset + 2 # Maps to \x05 \x00 (unknown)
 
@@ -40,19 +41,19 @@ class AppleBackupManifestDB
 			info = {}
 			info[:start_offset] = self.mbdb_offset
 			info[:domain]       = mbdb_read_string
-			info[:filename]     = mbdb_read_string			
-			info[:linktarget]   = mbdb_read_string			
+			info[:filename]     = mbdb_read_string
+			info[:linktarget]   = mbdb_read_string
 			info[:datahash]     = mbdb_read_string
 			info[:unknown1]     = mbdb_read_string
 			info[:mode]         = mbdb_read_int(2)
-			info[:unknown2]     = mbdb_read_int(4)			
-			info[:unknown3]     = mbdb_read_int(4)				
-			info[:uid]          = mbdb_read_int(4)				
-			info[:gid]          = mbdb_read_int(4)				
+			info[:unknown2]     = mbdb_read_int(4)
+			info[:unknown3]     = mbdb_read_int(4)
+			info[:uid]          = mbdb_read_int(4)
+			info[:gid]          = mbdb_read_int(4)
 			info[:mtime]        = Time.at(mbdb_read_int(4))
 			info[:atime]        = Time.at(mbdb_read_int(4))
 			info[:ctime]        = Time.at(mbdb_read_int(4))
-			info[:length]       = mbdb_read_int(8)	
+			info[:length]       = mbdb_read_int(8)
 			info[:flag]         = mbdb_read_int(1)
 			property_count      = mbdb_read_int(1)
 			info[:properties]   = {}
@@ -65,7 +66,7 @@ class AppleBackupManifestDB
 		end
 		self.mbdb_data = ""
 	end
-    	
+
 	def parse_mbdx
 		raise ArgumentError, "Not a valid MBDX file" if self.mbdx_data[0,4] != "mbdx"
 
@@ -86,7 +87,7 @@ class AppleBackupManifestDB
 		end
 		self.mbdx_data = ""
 	end
-	
+
 	def mbdb_read_string
 		raise RuntimeError, "Corrupted MBDB file" if self.mbdb_offset > self.mbdb_data.length
 		len = self.mbdb_data[self.mbdb_offset, 2].unpack("n")[0]
@@ -96,16 +97,16 @@ class AppleBackupManifestDB
 		self.mbdb_offset += len
 		return val
 	end
-	
+
 	def mbdb_read_int(size)
 		val = 0
 		size.downto(1) do |i|
 			val = (val << 8) + self.mbdb_data[self.mbdb_offset, 1].unpack("C")[0]
 			self.mbdb_offset += 1
 		end
- 		val
+		val
 	end
-	
+
 	def mbdx_read_string
 		raise RuntimeError, "Corrupted MBDX file" if self.mbdx_offset > self.mbdx_data.length
 		len = self.mbdx_data[self.mbdx_offset, 2].unpack("n")[0]
@@ -115,7 +116,7 @@ class AppleBackupManifestDB
 		self.mbdx_offset += len
 		return val
 	end
-	
+
 	def mbdx_read_int(size)
 		val = 0
 		size.downto(1) do |i|