librex 0.0.65 → 0.0.66

data/lib/rex/proto/http/client.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 

data/lib/rex/proto/http/handler.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module Http
@@ -43,4 +44,4 @@ end
 
 end
 end
-end
+end

data/lib/rex/proto/http/handler/erb.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'erb'
 include ERB::Util
 
@@ -54,10 +55,10 @@ class Handler::Erb < Handler
 
 			# Calculate the actual file path on disk.
 			file_path = root_path + resource
-		
+
 			# Serialize the contents of the file
 			data = ''
-			
+
 			File.open(file_path, 'rb') { |f|
 				data = f.read
 			}
@@ -88,11 +89,11 @@ class Handler::Erb < Handler
 				"<h1>Internal Server Error</h1>" +
 				"The server encountered an error:<br/><br/> <b>" + html_escape($!) + "</b><br/><br/>" +
 				"Stack trace:<br/><br/>" +
-				$@.map { |e| html_escape(e.to_s) }.join("<br/>") + 
+				$@.map { |e| html_escape(e.to_s) }.join("<br/>") +
 				"</body></html>"
 		end
 
-		# Send the response to the 
+		# Send the response to the
 		if (cli and resp)
 			cli.send_response(resp)
 		end

data/lib/rex/proto/http/handler/erb.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', '..'))
 
@@ -18,4 +19,4 @@ class Rex::Proto::Http::Handler::Erb::UnitTest < Test::Unit::TestCase
 		assert_equal("foo 4\n", r.body)
 	end
 
-end
+end

data/lib/rex/proto/http/handler/proc.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'erb'
 
 module Rex

data/lib/rex/proto/http/handler/proc.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', '..'))
 
@@ -21,4 +22,4 @@ class Rex::Proto::Http::Handler::Proc::UnitTest < Test::Unit::TestCase
 		assert_equal(1, cool)
 	end
 
-end
+end

data/lib/rex/proto/http/header.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/http'
 
 module Rex
@@ -47,7 +48,7 @@ class Packet::Header < Hash
 
 		# Extract each header value pair
 		header.split(/\r\n/mn).each { |str|
-			if (md = str.match(/^(.+?): (.+?)$/))
+			if (md = str.match(/^(.+?)\s*:\s*(.+?)\s*$/))
 				if (self[md[1]])
 					self[md[1]] << ", " + md[2]
 				else
@@ -152,7 +153,7 @@ class Packet::Header < Hash
 		end
 		list.each(&block)
 	end
-	
+
 	#
 	# The raw command string associated with the header which will vary between
 	# requests and responses.
@@ -170,4 +171,3 @@ end
 end
 end
 end
-

data/lib/rex/proto/http/header.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -43,4 +44,4 @@ class Rex::Proto::Http::Packet::Header::UnitTest < Test::Unit::TestCase
 		h.from_s("POST /foo HTTP/1.0")
 		assert_equal("POST /foo HTTP/1.0\r\n", h.cmd_string, 'just cmd_string')
 	end
-end
+end

data/lib/rex/proto/http/packet.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/http'
 
 module Rex

data/lib/rex/proto/http/packet.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -24,7 +25,7 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
 	end
 
 	def test_pipeline
-		req_normalized = 
+		req_normalized =
 			"GET / HTTP/1.0\r\n" +
 			"Foo: Bar\r\n" +
 			"Content-Length: 10\r\n" +
@@ -32,13 +33,13 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
 			"Super body"
 
 		req = req_normalized + req_normalized
-	   
+
 		req_base = req.dup
 		req_fold = req.gsub(/:/,  ':' + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t") + "\r\n" + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t"))
 		req_nocr = req.gsub(/\r\n/, "\n")
 		req_junk = req + "junk"
 
-		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr, 'extra junk' => req_junk }.each_pair { |name, test| 
+		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr, 'extra junk' => req_junk }.each_pair { |name, test|
 			h = Klass.new
 			h.auto_cl = false
 			assert_equal(Klass::ParseCode::Completed, h.parse(test), "parse #{name}")
@@ -52,7 +53,7 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
 
 
 	def test_chunked
-		req_start = 
+		req_start =
 			"GET / HTTP/1.0\r\n" +
 			"Transfer-Encoding: chunked\r\n" +
 			"Foo: Bar\r\n" +
@@ -61,13 +62,13 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
 		req_normalized = req_start + "Super body"
 
 		req = req_start + "1\r\nS\r\n1\r\nu\r\n1\r\np\r\n1\r\ne\r\n1\r\nr\r\n1\r\n \r\n1\r\nb\r\n1\r\no\r\n1\r\nd\r\n1\r\ny\r\n0\r\n\r\n"
-		
+
 		req_base = req.dup
 		req_fold = req.gsub(/:/,  ':' + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t") + "\r\n" + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t"))
 		req_nocr = req.gsub(/\r\n/, "\n")
 		req_junk = req + "junk"
 
-		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr, 'extra junk' => req_junk }.each_pair { |name, test| 
+		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr, 'extra junk' => req_junk }.each_pair { |name, test|
 			h = Klass.new
 			h.auto_cl = false
 			assert_equal(Klass::ParseCode::Completed, h.parse(test), "parse #{name}")
@@ -80,19 +81,19 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
 	end
 
 	def test_content_length
-		req = 
+		req =
 			"GET / HTTP/1.0\r\n" +
 			"Foo: Bar\r\n" +
 			"Content-Length: 10\r\n" +
 			"\r\n" +
 			"Super body"
-		
+
 		req_base = req.dup
 		req_fold = req.gsub(/:/,  ':' + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t") + "\r\n" + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t"))
 		req_nocr = req.gsub(/\r\n/, "\n")
 		req_junk = req + "junk"
 
-		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr, 'extra junk' => req_junk }.each_pair { |name, test| 
+		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr, 'extra junk' => req_junk }.each_pair { |name, test|
 			h = Klass.new
 			h.auto_cl = false
 			assert_equal(Klass::ParseCode::Completed, h.parse(test), "parse #{name}")
@@ -103,20 +104,20 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
 			assert_equal("Super body", h.body, "body #{name}")
 		}
 	end
-		
+
 	def test_parse_connection_close
-		req = 
+		req =
 			"GET / HTTP/1.0\r\n" +
 			"Foo: Bar\r\n" +
 			"Connection: close\r\n" +
 			"\r\n" +
 			"Super body"
-		
+
 		req_base = req.dup
 		req_fold = req.gsub(/:/,  ':' + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t") + "\r\n" + Rex::Text.rand_base(rand(10) + 1,'',"\s","\t"))
 		req_nocr = req.gsub(/\r\n/, "\n")
 
-		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr }.each_pair { |name, test| 
+		{ 'base' => req_base, 'fold' => req_fold, 'no cr' => req_nocr }.each_pair { |name, test|
 			h = Klass.new
 			h.auto_cl = false
 			assert_equal(Klass::ParseCode::Completed, h.parse(test), "parse #{name}")
@@ -162,4 +163,4 @@ class Rex::Proto::Http::Packet::UnitTest < Test::Unit::TestCase
         assert_equal("GET / HTTP/1.0\r\n", h.headers.cmd_string, 'cmd string')
     end
 
-end
+end

data/lib/rex/proto/http/request.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'uri'
 require 'rex/proto/http'
 
@@ -19,7 +20,7 @@ class Request < Packet
 	# Some individual request types.
 	#
 	##
-	
+
 	#
 	# HTTP GET request class wrapper.
 	#
@@ -102,7 +103,7 @@ class Request < Packet
 
 	# normalize out multiple slashes, directory traversal, and self referrential directories
 	def normalize!(str)
-		i = 0 
+		i = 0
 		while (str.gsub!(/(\/\.\/|\/\w+\/\.\.\/|\/\/)/,'/')); i += 1; end
 		i
 	end
@@ -110,7 +111,7 @@ class Request < Packet
 	# Puts a URI back together based on the URI parts
 	def uri
 		str = self.uri_parts['Resource'].dup || '/'
-		
+
 		# /././././
 		if self.junk_self_referring_directories
 			str.gsub!(/\//) {
@@ -125,7 +126,7 @@ class Request < Packet
 		end
 
 		# /RAND/../RAND../
-		if self.junk_directories 
+		if self.junk_directories
 			str.gsub!(/\//) {
 				dirs = ''
 				(rand(5)+5).times {
@@ -144,7 +145,7 @@ class Request < Packet
 			}
 			str.sub!(/^[\/]+/, '/') # only one beginning slash!
 		end
-		
+
 		# /%20HTTP/1.0%0d%0a/../../
 		# which decodes to "/ HTTP/1.0\r\n"
 		if self.junk_end_of_uri
@@ -158,7 +159,7 @@ class Request < Packet
 				str << '?' + param_string
 			end
 		end
-		str	
+		str
 	end
 
 	def param_string
@@ -175,11 +176,11 @@ class Request < Packet
     				params.push(Rex::Text.uri_encode(param, self.uri_encode_mode) + '=' + Rex::Text.uri_encode(subvalue, self.uri_encode_mode))
 				}
 			else
-    			if !value.nil?
-    				params.push(Rex::Text.uri_encode(param, self.uri_encode_mode) + '=' + Rex::Text.uri_encode(value, self.uri_encode_mode))
-    			else 
-    				params.push(Rex::Text.uri_encode(param, self.uri_encode_mode))
-    			end
+				if !value.nil?
+					params.push(Rex::Text.uri_encode(param, self.uri_encode_mode) + '=' + Rex::Text.uri_encode(value, self.uri_encode_mode))
+				else
+					params.push(Rex::Text.uri_encode(param, self.uri_encode_mode))
+				end
 			end
 		}
 
@@ -197,7 +198,7 @@ class Request < Packet
 		self.raw_uri = str
 		update_uri_parts
 	end
- 
+
 	# Returns a request packet
 	def to_s
 		str = ''
@@ -217,7 +218,7 @@ class Request < Packet
 		if str.length > 0
 			return str
 		end
-		
+
 		if PostRequests.include?(self.method)
 			return param_string
 		end
@@ -291,28 +292,28 @@ class Request < Packet
 
 	# add junk directories
 	attr_accessor :junk_directories
-	
-	# add junk slashes 
+
+	# add junk slashes
 	attr_accessor :junk_slashes
-   
+
 	# add junk self referring directories (aka  /././././)
 	attr_accessor :junk_self_referring_directories
 
 	# add junk params
 	attr_accessor :junk_params
-	
+
 	# add junk pipeline requests
 	attr_accessor :junk_pipeline
 
 	# add junk start of params
 	attr_accessor :junk_param_start
-	
+
 	# add junk end of URI
 	attr_accessor :junk_end_of_uri
-	
-	# encoding uri 
+
+	# encoding uri
 	attr_accessor :uri_encode_mode
-		
+
 
 protected
 
@@ -326,7 +327,7 @@ protected
 		str.split(/[;&]/).each { |vv|
 			var = vv
 			val = ''
-			
+
 			if (md = vv.match(/(.+?)=(.*)/))
 				var = md[1]
 				val = md[2]

data/lib/rex/proto/http/request.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -211,4 +212,4 @@ class Rex::Proto::Http::Request::UnitTest < Test::Unit::TestCase
 		h.uri = '/foo/..////./././asdf/././//../bar.html'
 		assert_equal('/bar.html', h.uri, 'normalize on set')
 	end
-end
+end

data/lib/rex/proto/http/response.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/http'
 
 module Rex
@@ -15,7 +16,7 @@ class Response < Packet
 	#
 	# Builtin response class wrappers.
 	#
-	## 
+	##
 
 	#
 	# HTTP 200/OK response class wrapper.
@@ -77,10 +78,10 @@ class Response < Packet
 	#
 	# Used to store a copy of the original request
 	#
-	attr_accessor :request 
-	
-	
-	attr_accessor :code 
+	attr_accessor :request
+
+
+	attr_accessor :code
 	attr_accessor :message
 	attr_accessor :proto
 end

data/lib/rex/proto/http/response.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -17,7 +18,7 @@ class Rex::Proto::Http::Response::UnitTest < Test::Unit::TestCase
 			"HTTP/1.1 200 OK\r\n" +
 			"Content-Length: 14\r\n" +
 			"Content-Encoding: deflate\r\n\r\n" +
-			"x\234\313\310T\310\315\317\005\000\a\225\002;", 
+			"x\234\313\310T\310\315\317\005\000\a\225\002;",
 			h.to_s, 'deflate'
 			)
 	end
@@ -34,7 +35,7 @@ class Rex::Proto::Http::Response::UnitTest < Test::Unit::TestCase
 
 		assert_equal(
 			"HTTP/1.1 200 OK\r\n" +
-			"Content-Length: 26\r\n"+			
+			"Content-Length: 26\r\n"+
 			"Content-Encoding: gzip\r\n\r\n",
 			http_header, 'http headers'
 			)
@@ -64,7 +65,7 @@ class Rex::Proto::Http::Response::UnitTest < Test::Unit::TestCase
 		assert_equal(
 			"HTTP/1.1 200 OK\r\n" +
 			"Content-Length: 6\r\n" +
-			"Foo: Fishing\r\n" +			
+			"Foo: Fishing\r\n" +
 			"Chicken: 47\r\n\r\nhi mom", h.to_s, 'to_s w/ body')
 	end
 
@@ -84,7 +85,7 @@ class Rex::Proto::Http::Response::UnitTest < Test::Unit::TestCase
 			"Foo: Fishing\r\n" +
 			"Chicken: 47\r\n\r\n0\r\n\r\n", h.to_s, 'chunked w/o body'
 			)
-		
+
 		srand(0)
 		h.body = Rex::Text.rand_text_alphanumeric(100)
 		assert_equal(
@@ -103,10 +104,10 @@ class Rex::Proto::Http::Response::UnitTest < Test::Unit::TestCase
 			"Transfer-Encoding: chunked\r\n" +
 			"Foo: Fishing\r\n" +
 			"Chicken: 47\r\n\r\n" +
-			"1\r\nh\r\n1\r\ni\r\n1\r\n \r\n1\r\nm\r\n1\r\no\r\n1\r\nm\r\n0\r\n\r\n", 
+			"1\r\nh\r\n1\r\ni\r\n1\r\n \r\n1\r\nm\r\n1\r\no\r\n1\r\nm\r\n0\r\n\r\n",
 			h.to_s, '1 byte chunks'
 			)
-		
+
 		h.chunk_min_size = 2
 		assert_equal(
 			"HTTP/1.1 200 OK\r\n" +