2005-07-24 20:53:54 +00:00
|
|
|
require 'rex/socket'
|
|
|
|
require 'rex/proto/http'
|
2006-12-19 07:11:55 +00:00
|
|
|
require 'rex/text'
|
2005-07-24 20:53:54 +00:00
|
|
|
|
|
|
|
module Rex
|
|
|
|
module Proto
|
|
|
|
module Http
|
|
|
|
|
|
|
|
###
|
|
|
|
#
|
|
|
|
# Acts as a client to an HTTP server, sending requests and receiving
|
2006-12-19 07:11:55 +00:00
|
|
|
# responses.
|
2005-07-24 20:53:54 +00:00
|
|
|
#
|
|
|
|
###
|
|
|
|
class Client
|
|
|
|
|
2005-12-08 05:55:44 +00:00
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
# Creates a new client instance
|
2005-12-08 05:55:44 +00:00
|
|
|
#
|
2007-09-24 04:44:44 +00:00
|
|
|
def initialize(host, port = 80, context = {}, ssl = nil, proxies = nil)
|
2005-07-24 20:53:54 +00:00
|
|
|
self.hostname = host
|
|
|
|
self.port = port.to_i
|
2006-01-17 04:35:44 +00:00
|
|
|
self.context = context
|
2006-01-20 18:59:24 +00:00
|
|
|
self.ssl = ssl
|
2007-09-24 04:44:44 +00:00
|
|
|
self.proxies = proxies
|
2006-12-19 07:11:55 +00:00
|
|
|
self.config = {
|
|
|
|
'read_max_data' => (1024*1024*1),
|
|
|
|
'vhost' => self.hostname,
|
|
|
|
'version' => '1.1',
|
|
|
|
'agent' => "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
|
2007-02-18 22:35:07 +00:00
|
|
|
#
|
|
|
|
# Evasion options
|
|
|
|
#
|
|
|
|
'uri_encode_mode' => 'hex-normal', # hex-all, hex-random, u-normal, u-random, u-all
|
2007-05-06 22:33:21 +00:00
|
|
|
'uri_encode_count' => 1, # integer
|
2007-02-18 22:35:07 +00:00
|
|
|
'uri_full_url' => false, # bool
|
|
|
|
'pad_method_uri_count' => 1, # integer
|
|
|
|
'pad_uri_version_count' => 1, # integer
|
|
|
|
'pad_method_uri_type' => 'space', # space, tab, apache
|
|
|
|
'pad_uri_version_type' => 'space', # space, tab, apache
|
|
|
|
'method_random_valid' => false, # bool
|
|
|
|
'method_random_invalid' => false, # bool
|
|
|
|
'method_random_case' => false, # bool
|
|
|
|
'version_random_valid' => false, # bool
|
|
|
|
'version_random_invalid' => false, # bool
|
|
|
|
'version_random_case' => false, # bool
|
|
|
|
'uri_dir_self_reference' => false, # bool
|
|
|
|
'uri_dir_fake_relative' => false, # bool
|
|
|
|
'uri_use_backslashes' => false, # bool
|
|
|
|
'pad_fake_headers' => false, # bool
|
|
|
|
'pad_fake_headers_count' => 16, # integer
|
2007-03-08 14:08:41 +00:00
|
|
|
'pad_get_params' => false, # bool
|
|
|
|
'pad_get_params_count' => 8, # integer
|
|
|
|
'pad_post_params' => false, # bool
|
2007-03-10 05:58:14 +00:00
|
|
|
'pad_post_params_count' => 8, # integer
|
|
|
|
'uri_fake_end' => false, # bool
|
|
|
|
'uri_fake_params_start' => false, # bool
|
2007-04-26 21:08:22 +00:00
|
|
|
'header_folding' => false, # bool
|
|
|
|
'chunked_size' => 0 # integer
|
2005-09-15 23:37:38 +00:00
|
|
|
}
|
2007-03-17 20:10:57 +00:00
|
|
|
|
|
|
|
# This is not used right now...
|
|
|
|
self.config_types = {
|
|
|
|
'uri_encode_mode' => ['hex-normal', 'hex-all', 'hex-random', 'u-normal', 'u-random', 'u-all'],
|
2007-05-04 15:17:25 +00:00
|
|
|
'uri_encode_count' => 'integer',
|
2007-03-17 20:10:57 +00:00
|
|
|
'uri_full_url' => 'bool',
|
|
|
|
'pad_method_uri_count' => 'integer',
|
|
|
|
'pad_uri_version_count' => 'integer',
|
|
|
|
'pad_method_uri_type' => ['space', 'tab', 'apache'],
|
|
|
|
'pad_uri_version_type' => ['space', 'tab', 'apache'],
|
|
|
|
'method_random_valid' => 'bool',
|
|
|
|
'method_random_invalid' => 'bool',
|
|
|
|
'method_random_case' => 'bool',
|
|
|
|
'version_random_valid' => 'bool',
|
|
|
|
'version_random_invalid' => 'bool',
|
|
|
|
'version_random_case' => 'bool',
|
|
|
|
'uri_dir_self_reference' => 'bool',
|
|
|
|
'uri_dir_fake_relative' => 'bool',
|
|
|
|
'uri_use_backslashes' => 'bool',
|
|
|
|
'pad_fake_headers' => 'bool',
|
|
|
|
'pad_fake_headers_count' => 'integer',
|
|
|
|
'pad_get_params' => 'bool',
|
|
|
|
'pad_get_params_count' => 'integer',
|
|
|
|
'pad_post_params' => 'bool',
|
|
|
|
'pad_post_params_count' => 'integer',
|
|
|
|
'uri_fake_end' => 'bool',
|
|
|
|
'uri_fake_params_start' => 'bool',
|
2007-04-26 21:08:22 +00:00
|
|
|
'header_folding' => 'bool',
|
|
|
|
'chunked_size' => 'integer'
|
2007-03-17 20:10:57 +00:00
|
|
|
}
|
2005-09-15 23:37:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
# Set configuration options
|
2005-09-15 23:37:38 +00:00
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
def set_config(opts = {})
|
|
|
|
opts.each_pair do |var,val|
|
2007-02-18 22:35:07 +00:00
|
|
|
self.config[var]=val
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
2005-09-15 23:37:38 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
# Create an arbitrary HTTP request
|
|
|
|
#
|
|
|
|
def request_raw(opts={})
|
|
|
|
c_enc = opts['encode'] || false
|
|
|
|
c_uri = opts['uri'] || '/'
|
2006-12-28 23:42:54 +00:00
|
|
|
c_body = opts['data'] || ''
|
2006-12-19 07:11:55 +00:00
|
|
|
c_meth = opts['method'] || 'GET'
|
2006-12-28 23:42:54 +00:00
|
|
|
c_prot = opts['proto'] || 'HTTP'
|
2006-12-19 07:11:55 +00:00
|
|
|
c_vers = opts['version'] || config['version'] || '1.1'
|
|
|
|
c_qs = opts['query']
|
|
|
|
c_ag = opts['agent'] || config['agent']
|
|
|
|
c_cook = opts['cookie'] || config['cookie']
|
|
|
|
c_host = opts['vhost'] || config['vhost']
|
2007-03-11 16:28:13 +00:00
|
|
|
c_head = opts['headers'] || config['headers'] || {}
|
|
|
|
c_rawh = opts['raw_headers']|| config['raw_headers'] || ''
|
2006-12-19 07:11:55 +00:00
|
|
|
c_conn = opts['connection']
|
2007-04-23 22:48:22 +00:00
|
|
|
c_auth = opts['basic_auth'] || config['basic_auth'] || ''
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
uri = set_uri(c_uri)
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req = ''
|
|
|
|
req += set_method(c_meth)
|
|
|
|
req += set_method_uri_spacer()
|
|
|
|
req += set_uri_prepend()
|
|
|
|
req += (c_enc ? set_encode_uri(uri) : uri)
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
if (c_qs)
|
|
|
|
req += '?'
|
|
|
|
req += (c_enc ? set_encode_qs(c_qs) : c_qs)
|
2005-09-15 23:37:38 +00:00
|
|
|
end
|
2006-12-19 07:11:55 +00:00
|
|
|
|
|
|
|
req += set_uri_append()
|
|
|
|
req += set_uri_version_spacer()
|
2006-12-28 23:42:54 +00:00
|
|
|
req += set_version(c_prot, c_vers)
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_host_header(c_host)
|
|
|
|
req += set_agent_header(c_ag)
|
2007-04-23 22:48:22 +00:00
|
|
|
|
|
|
|
if (c_auth.length > 0)
|
|
|
|
req += set_basic_auth_header(c_auth)
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_cookie_header(c_cook)
|
|
|
|
req += set_connection_header(c_conn)
|
2007-03-11 16:28:13 +00:00
|
|
|
req += set_extra_headers(c_head)
|
|
|
|
req += set_raw_headers(c_rawh)
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_body(c_body)
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# Create a CGI compatible request
|
|
|
|
#
|
|
|
|
def request_cgi(opts={})
|
|
|
|
c_enc = opts['encode'] || false
|
2006-12-28 23:42:54 +00:00
|
|
|
c_cgi = opts['uri'] || '/'
|
|
|
|
c_body = opts['data'] || ''
|
2006-12-19 07:11:55 +00:00
|
|
|
c_meth = opts['method'] || 'GET'
|
2006-12-28 23:42:54 +00:00
|
|
|
c_prot = opts['proto'] || 'HTTP'
|
2006-12-19 07:11:55 +00:00
|
|
|
c_vers = opts['version'] || config['version'] || '1.1'
|
|
|
|
c_qs = opts['query'] || ''
|
|
|
|
c_varg = opts['vars_get'] || {}
|
|
|
|
c_varp = opts['vars_post'] || {}
|
|
|
|
c_head = opts['headers'] || config['headers'] || {}
|
2007-03-11 16:28:13 +00:00
|
|
|
c_rawh = opts['raw_headers']|| config['raw_headers'] || ''
|
2006-12-19 07:11:55 +00:00
|
|
|
c_type = opts['ctype'] || 'application/x-www-form-urlencoded'
|
|
|
|
c_ag = opts['agent'] || config['agent']
|
|
|
|
c_cook = opts['cookie'] || config['cookie']
|
|
|
|
c_host = opts['vhost'] || config['vhost']
|
|
|
|
c_conn = opts['connection']
|
2007-04-23 22:48:22 +00:00
|
|
|
c_path = opts['path_info']
|
|
|
|
c_auth = opts['basic_auth'] || config['basic_auth'] || ''
|
2007-04-26 21:08:22 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
uri = set_cgi(c_cgi)
|
|
|
|
qstr = c_qs
|
|
|
|
pstr = c_body
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2007-03-08 14:08:41 +00:00
|
|
|
if (config['pad_get_params'])
|
|
|
|
1.upto(config['pad_get_params_count'].to_i) do |i|
|
|
|
|
qstr << '&' if qstr.length > 0
|
|
|
|
qstr << set_encode_uri(Rex::Text.rand_text_alphanumeric(rand(32)+1))
|
|
|
|
qstr << '='
|
|
|
|
qstr << set_encode_uri(Rex::Text.rand_text_alphanumeric(rand(32)+1))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
c_varg.each_pair do |var,val|
|
|
|
|
qstr << '&' if qstr.length > 0
|
|
|
|
qstr << set_encode_uri(var)
|
|
|
|
qstr << '='
|
|
|
|
qstr << set_encode_uri(val)
|
2005-09-15 23:37:38 +00:00
|
|
|
end
|
2006-10-11 08:31:54 +00:00
|
|
|
|
2007-03-08 14:08:41 +00:00
|
|
|
if (config['pad_post_params'])
|
|
|
|
1.upto(config['pad_post_params_count'].to_i) do |i|
|
|
|
|
pstr << '&' if qstr.length > 0
|
|
|
|
pstr << set_encode_uri(Rex::Text.rand_text_alphanumeric(rand(32)+1))
|
|
|
|
pstr << '='
|
|
|
|
pstr << set_encode_uri(Rex::Text.rand_text_alphanumeric(rand(32)+1))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
c_varp.each_pair do |var,val|
|
|
|
|
pstr << '&' if pstr.length > 0
|
|
|
|
pstr << set_encode_uri(var)
|
|
|
|
pstr << '='
|
|
|
|
pstr << set_encode_uri(val)
|
2006-10-11 08:31:54 +00:00
|
|
|
end
|
2007-01-30 04:48:35 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req = ''
|
|
|
|
req += set_method(c_meth)
|
|
|
|
req += set_method_uri_spacer()
|
|
|
|
req += set_uri_prepend()
|
|
|
|
req += set_encode_uri(uri)
|
|
|
|
|
|
|
|
if (qstr.length > 0)
|
|
|
|
req += '?'
|
|
|
|
req += qstr
|
2005-09-15 23:37:38 +00:00
|
|
|
end
|
2006-12-19 07:11:55 +00:00
|
|
|
|
|
|
|
req += set_path_info(c_path)
|
|
|
|
req += set_uri_append()
|
|
|
|
req += set_uri_version_spacer()
|
2006-12-28 23:42:54 +00:00
|
|
|
req += set_version(c_prot, c_vers)
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_host_header(c_host)
|
|
|
|
req += set_agent_header(c_ag)
|
2007-04-23 22:48:22 +00:00
|
|
|
|
|
|
|
if (c_auth.length > 0)
|
|
|
|
req += set_basic_auth_header(c_auth)
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_cookie_header(c_cook)
|
|
|
|
req += set_connection_header(c_conn)
|
|
|
|
req += set_extra_headers(c_head)
|
2007-04-26 21:08:22 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_content_type_header(c_type)
|
|
|
|
req += set_content_len_header(pstr.length)
|
2007-04-26 21:08:22 +00:00
|
|
|
req += set_chunked_header()
|
2007-03-11 16:28:13 +00:00
|
|
|
req += set_raw_headers(c_rawh)
|
2006-12-19 07:11:55 +00:00
|
|
|
req += set_body(pstr)
|
2007-03-08 14:08:41 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
req
|
|
|
|
end
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2005-07-24 20:53:54 +00:00
|
|
|
#
|
|
|
|
# Connects to the remote server if possible.
|
|
|
|
#
|
|
|
|
def connect
|
|
|
|
# If we already have a connection and we aren't pipelining, close it.
|
* add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers. ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below). NOTE: If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is A=%3d
* add URI junk self referring directory support, eg: /././foo.html
git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
|
|
|
if (self.conn)
|
|
|
|
if !pipelining?
|
|
|
|
close
|
|
|
|
else
|
|
|
|
return self.conn
|
|
|
|
end
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
self.conn = Rex::Socket::Tcp.create(
|
|
|
|
'PeerHost' => self.hostname,
|
|
|
|
'PeerPort' => self.port.to_i,
|
|
|
|
'LocalHost' => self.local_host,
|
2006-01-17 04:35:44 +00:00
|
|
|
'LocalPort' => self.local_port,
|
2006-01-20 18:59:24 +00:00
|
|
|
'Context' => self.context,
|
2007-09-24 04:44:44 +00:00
|
|
|
'SSL' => self.ssl,
|
|
|
|
'Proxies' => self.proxies
|
2006-01-17 04:35:44 +00:00
|
|
|
)
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Closes the connection to the remote server.
|
|
|
|
#
|
|
|
|
def close
|
2005-09-22 03:24:32 +00:00
|
|
|
if (self.conn)
|
|
|
|
self.conn.shutdown
|
|
|
|
self.conn.close
|
|
|
|
end
|
|
|
|
|
2005-07-24 20:53:54 +00:00
|
|
|
self.conn = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
# Transmit a HTTP request and receive the response
|
2005-07-24 20:53:54 +00:00
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
def send_recv(req, t = -1)
|
|
|
|
send_request(req)
|
|
|
|
read_response(t)
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
# Send a HTTP request to the server
|
|
|
|
# TODO:
|
|
|
|
# * Handle junk pipeline requests
|
|
|
|
def send_request(req)
|
2005-07-24 20:53:54 +00:00
|
|
|
# Connect to the server
|
|
|
|
connect
|
|
|
|
|
* add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers. ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below). NOTE: If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is A=%3d
* add URI junk self referring directory support, eg: /././foo.html
git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
|
|
|
# build the request
|
|
|
|
req_string = req.to_s
|
|
|
|
|
2005-07-24 20:53:54 +00:00
|
|
|
# Send it on over
|
2007-04-22 07:50:07 +00:00
|
|
|
ret = conn.put(req_string)
|
2006-12-19 07:11:55 +00:00
|
|
|
|
|
|
|
ret
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Read a response from the server
|
|
|
|
#
|
|
|
|
def read_response(t = -1)
|
2007-02-22 07:33:00 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
resp = Response.new
|
|
|
|
resp.max_data = config['read_max_data']
|
2005-07-24 20:53:54 +00:00
|
|
|
|
|
|
|
# Tell the remote side if we aren't pipelining
|
2008-09-24 04:41:51 +00:00
|
|
|
#conn.shutdown(::Socket::SHUT_WR) if (!pipelining?)
|
2005-07-24 20:53:54 +00:00
|
|
|
|
|
|
|
# Wait at most t seconds for the full response to be read in. We only
|
|
|
|
# do this if t was specified as a negative value indicating an infinite
|
|
|
|
# wait cycle. If t were specified as nil it would indicate that no
|
|
|
|
# response parsing is required.
|
|
|
|
timeout((t < 0) ? nil : t) {
|
|
|
|
# Now, read in the response until we're good to go.
|
|
|
|
begin
|
* add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers. ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below). NOTE: If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is A=%3d
* add URI junk self referring directory support, eg: /././foo.html
git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
|
|
|
if self.junk_pipeline
|
|
|
|
i = 0
|
|
|
|
self.junk_pipeline.times {
|
|
|
|
i += 1
|
|
|
|
rv = nil
|
|
|
|
|
|
|
|
while rv != Packet::ParseCode::Completed
|
|
|
|
if (rv == Packet::ParseCode::Error)
|
|
|
|
raise RuntimeError, resp.error, caller
|
|
|
|
end
|
|
|
|
|
|
|
|
if resp.bufq.length > 0
|
|
|
|
rv = resp.parse('')
|
|
|
|
else
|
|
|
|
rv = resp.parse(conn.get)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
if resp['Connection'] == 'close'
|
|
|
|
raise RuntimeError, "junk pipelined request ##{i} caused the server to close the connection", caller
|
|
|
|
end
|
|
|
|
|
|
|
|
buf = resp.bufq
|
|
|
|
resp.reset
|
|
|
|
resp.bufq = buf
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
rv = nil
|
|
|
|
if resp.bufq.length > 0
|
|
|
|
rv = resp.parse('')
|
|
|
|
end
|
|
|
|
|
|
|
|
if rv != Packet::ParseCode::Completed
|
|
|
|
# Keep running until we finish parsing or EOF is reached
|
|
|
|
while ((rv = resp.parse(conn.get)) != Packet::ParseCode::Completed)
|
|
|
|
# Parsing error? Raise an exception, our job is done.
|
|
|
|
if (rv == Packet::ParseCode::Error)
|
|
|
|
raise RuntimeError, resp.error, caller
|
|
|
|
end
|
2007-05-03 20:01:29 +00:00
|
|
|
select(nil, nil, nil, 0.10)
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
rescue EOFError
|
2007-11-29 06:57:14 +00:00
|
|
|
return nil
|
2008-09-24 04:41:51 +00:00
|
|
|
rescue ::TimeoutError, ::Timeout::Error
|
|
|
|
#$stdout.puts("timeout\n")
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
} if (t)
|
|
|
|
|
|
|
|
# Close our side if we aren't pipelining
|
2008-09-24 04:41:51 +00:00
|
|
|
#close if (!pipelining?)
|
2005-07-24 20:53:54 +00:00
|
|
|
|
* add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers. ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below). NOTE: If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is A=%3d
* add URI junk self referring directory support, eg: /././foo.html
git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
|
|
|
# if the server said stop pipelining, we listen...
|
|
|
|
if resp['Connection'] == 'close'
|
2008-09-24 04:41:51 +00:00
|
|
|
#close
|
* add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers. ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below). NOTE: If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is A=%3d
* add URI junk self referring directory support, eg: /././foo.html
git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
|
|
|
end
|
|
|
|
|
2005-09-15 23:37:38 +00:00
|
|
|
# XXX - How should we handle this?
|
|
|
|
if (not resp.completed?)
|
|
|
|
# raise RuntimeError, resp.error, caller
|
|
|
|
end
|
|
|
|
|
|
|
|
# Always return the Response object back to the client
|
|
|
|
return resp
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
2005-11-15 05:22:13 +00:00
|
|
|
# Cleans up any outstanding connections and other resources.
|
2005-07-24 20:53:54 +00:00
|
|
|
#
|
|
|
|
def stop
|
|
|
|
close
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Returns whether or not the conn is valid.
|
|
|
|
#
|
|
|
|
def conn?
|
|
|
|
conn != nil
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
2005-11-15 05:22:13 +00:00
|
|
|
# Whether or not connections should be pipelined.
|
2005-07-24 20:53:54 +00:00
|
|
|
#
|
|
|
|
def pipelining?
|
|
|
|
pipeline
|
|
|
|
end
|
2006-12-19 07:11:55 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Return the encoded URI
|
|
|
|
# ['none','hex-normal', 'hex-all', 'u-normal', 'u-all']
|
2007-02-18 22:35:07 +00:00
|
|
|
def set_encode_uri(uri)
|
2007-05-04 15:17:25 +00:00
|
|
|
a = uri
|
|
|
|
self.config['uri_encode_count'].times {
|
|
|
|
a = Rex::Text.uri_encode(a, self.config['uri_encode_mode'])
|
|
|
|
}
|
|
|
|
return a
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the encoded query string
|
|
|
|
#
|
|
|
|
def set_encode_qs(qs)
|
2007-05-04 15:17:25 +00:00
|
|
|
a = qs
|
|
|
|
self.config['uri_encode_count'].times {
|
|
|
|
a = Rex::Text.uri_encode(a, self.config['uri_encode_mode'])
|
|
|
|
}
|
|
|
|
return a
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the uri
|
|
|
|
#
|
|
|
|
def set_uri(uri)
|
2007-02-18 22:35:07 +00:00
|
|
|
|
|
|
|
if (self.config['uri_dir_self_reference'])
|
|
|
|
uri.gsub!('/', '/./')
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['uri_dir_fake_relative'])
|
|
|
|
buf = ""
|
|
|
|
uri.split('/').each do |part|
|
|
|
|
cnt = rand(8)+2
|
|
|
|
1.upto(cnt) { |idx|
|
|
|
|
buf += "/" + Rex::Text.rand_text_alphanumeric(rand(32)+1)
|
|
|
|
}
|
|
|
|
buf += ("/.." * cnt)
|
|
|
|
buf += "/" + part
|
|
|
|
end
|
|
|
|
uri = buf
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
if (self.config['uri_full_url'])
|
|
|
|
url = self.ssl ? "https" : "http"
|
|
|
|
url += self.config['vhost']
|
|
|
|
url += (self.port == 80) ? "" : ":#{self.port}"
|
|
|
|
url += uri
|
|
|
|
url
|
|
|
|
else
|
|
|
|
uri
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the cgi
|
2007-02-18 22:35:07 +00:00
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
def set_cgi(uri)
|
2007-02-18 22:35:07 +00:00
|
|
|
|
|
|
|
if (self.config['uri_dir_self_reference'])
|
|
|
|
uri.gsub!('/', '/./')
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['uri_dir_fake_relative'])
|
|
|
|
buf = ""
|
|
|
|
uri.split('/').each do |part|
|
|
|
|
cnt = rand(8)+2
|
|
|
|
1.upto(cnt) { |idx|
|
|
|
|
buf += "/" + Rex::Text.rand_text_alphanumeric(rand(32)+1)
|
|
|
|
}
|
|
|
|
buf += ("/.." * cnt)
|
|
|
|
buf += "/" + part
|
|
|
|
end
|
|
|
|
uri = buf
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
url = uri
|
|
|
|
|
|
|
|
if (self.config['uri_full_url'])
|
|
|
|
url = self.ssl ? "https" : "http"
|
|
|
|
url += self.config['vhost']
|
|
|
|
url += (self.port == 80) ? "" : ":#{self.port}"
|
|
|
|
url += uri
|
|
|
|
end
|
|
|
|
|
|
|
|
url
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP method string
|
|
|
|
#
|
|
|
|
def set_method(method)
|
2007-02-18 22:35:07 +00:00
|
|
|
ret = method
|
|
|
|
|
|
|
|
if (self.config['method_random_valid'])
|
|
|
|
ret = ['GET', 'POST', 'HEAD'][rand(3)]
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['method_random_invalid'])
|
|
|
|
ret = Rex::Text.rand_text_alpha(rand(20)+1)
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['method_random_case'])
|
2007-03-08 14:08:41 +00:00
|
|
|
ret = Rex::Text.to_rand_case(ret)
|
2007-02-18 22:35:07 +00:00
|
|
|
end
|
|
|
|
|
2007-02-22 07:33:00 +00:00
|
|
|
ret
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP version string
|
|
|
|
#
|
2006-12-28 23:42:54 +00:00
|
|
|
def set_version(protocol, version)
|
2007-02-18 22:35:07 +00:00
|
|
|
ret = protocol + "/" + version
|
|
|
|
|
|
|
|
if (self.config['version_random_valid'])
|
|
|
|
ret = protocol + "/" + ['1.0', '1.1'][rand(2)]
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['version_random_invalid'])
|
|
|
|
ret = Rex::Text.rand_text_alphanumeric(rand(20)+1)
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['version_random_case'])
|
2007-03-08 14:08:41 +00:00
|
|
|
ret = Rex::Text.to_rand_case(ret)
|
2007-02-18 22:35:07 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
ret += "\r\n"
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP seperator and body string
|
|
|
|
#
|
|
|
|
def set_body(data)
|
2007-04-26 21:08:22 +00:00
|
|
|
return "\r\n" + data if self.config['chunked_size'] == 0
|
|
|
|
str = data.dup
|
|
|
|
chunked = ''
|
|
|
|
while str.size > 0
|
|
|
|
chunk = str.slice!(0,rand(self.config['chunked_size']) + 1)
|
|
|
|
chunked += sprintf("%x", chunk.size) + "\r\n" + chunk + "\r\n"
|
|
|
|
end
|
|
|
|
"\r\n" + chunked + "0\r\n\r\n"
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP path info
|
|
|
|
# TODO:
|
|
|
|
# * Encode path information
|
|
|
|
def set_path_info(path)
|
|
|
|
path ? path : ''
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the spacing between the method and uri
|
|
|
|
#
|
|
|
|
def set_method_uri_spacer
|
2007-03-08 14:08:41 +00:00
|
|
|
len = self.config['pad_method_uri_count'].to_i
|
2007-02-18 22:35:07 +00:00
|
|
|
set = " "
|
|
|
|
buf = ""
|
|
|
|
|
|
|
|
case self.config['pad_method_uri_type']
|
|
|
|
when 'tab'
|
|
|
|
set = "\t"
|
|
|
|
when 'apache'
|
|
|
|
set = "\t \x0b\x0c\x0d"
|
|
|
|
end
|
|
|
|
|
|
|
|
while(buf.length < len)
|
|
|
|
buf << set[ rand(set.length) ]
|
|
|
|
end
|
|
|
|
|
|
|
|
return buf
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the spacing between the uri and the version
|
|
|
|
#
|
|
|
|
def set_uri_version_spacer
|
2007-03-08 14:08:41 +00:00
|
|
|
len = self.config['pad_uri_version_count'].to_i
|
2007-02-18 22:35:07 +00:00
|
|
|
set = " "
|
|
|
|
buf = ""
|
|
|
|
|
|
|
|
case self.config['pad_uri_version_type']
|
|
|
|
when 'tab'
|
|
|
|
set = "\t"
|
|
|
|
when 'apache'
|
|
|
|
set = "\t \x0b\x0c\x0d"
|
|
|
|
end
|
|
|
|
|
|
|
|
while(buf.length < len)
|
|
|
|
buf << set[ rand(set.length) ]
|
|
|
|
end
|
|
|
|
|
|
|
|
return buf
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the padding to place before the uri
|
|
|
|
#
|
|
|
|
def set_uri_prepend
|
2007-03-10 05:58:14 +00:00
|
|
|
prefix = ""
|
|
|
|
|
|
|
|
if (self.config['uri_fake_params_start'])
|
|
|
|
prefix << '/%3fa=b/../'
|
|
|
|
end
|
|
|
|
|
|
|
|
if (self.config['uri_fake_end'])
|
|
|
|
prefix << '/%20HTTP/1.0/../../'
|
|
|
|
end
|
|
|
|
|
|
|
|
prefix
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the padding to place before the uri
|
|
|
|
#
|
|
|
|
def set_uri_append
|
|
|
|
# TODO:
|
|
|
|
# * Support different padding types
|
|
|
|
""
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP Host header
|
|
|
|
#
|
|
|
|
def set_host_header(host)
|
|
|
|
return "" if self.config['uri_full_url']
|
|
|
|
host ||= self.config['vhost']
|
|
|
|
set_formatted_header("Host", host)
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP agent header
|
|
|
|
#
|
|
|
|
def set_agent_header(agent)
|
|
|
|
agent ? set_formatted_header("User-Agent", agent) : ""
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP cookie header
|
|
|
|
#
|
|
|
|
def set_cookie_header(cookie)
|
|
|
|
cookie ? set_formatted_header("Cookie", cookie) : ""
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the HTTP connection header
|
|
|
|
#
|
|
|
|
def set_connection_header(conn)
|
|
|
|
conn ? set_formatted_header("Connection", conn) : ""
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the content type header
|
|
|
|
#
|
|
|
|
def set_content_type_header(ctype)
|
|
|
|
set_formatted_header("Content-Type", ctype)
|
|
|
|
end
|
|
|
|
|
|
|
|
#
|
|
|
|
# Return the content length header
|
|
|
|
def set_content_len_header(clen)
|
2007-04-26 21:08:22 +00:00
|
|
|
return "" if self.config['chunked_size'] > 0
|
2006-12-19 07:11:55 +00:00
|
|
|
set_formatted_header("Content-Length", clen)
|
|
|
|
end
|
2007-04-23 22:48:22 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Return the Authorization basic-auth header
|
|
|
|
#
|
|
|
|
def set_basic_auth_header(auth)
|
|
|
|
auth ? set_formatted_header("Authorization", "Basic " + Rex::Text.encode_base64(auth)) : ""
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
#
|
|
|
|
# Return a string of formatted extra headers
|
2007-03-11 16:28:13 +00:00
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
def set_extra_headers(headers)
|
|
|
|
buf = ''
|
|
|
|
|
2007-02-18 22:35:07 +00:00
|
|
|
if (self.config['pad_fake_headers'])
|
2007-03-08 14:08:41 +00:00
|
|
|
1.upto(self.config['pad_fake_headers_count'].to_i) do |i|
|
2007-02-18 22:35:07 +00:00
|
|
|
buf += set_formatted_header(
|
|
|
|
Rex::Text.rand_text_alphanumeric(rand(32)+1),
|
|
|
|
Rex::Text.rand_text_alphanumeric(rand(32)+1)
|
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
headers.each_pair do |var,val|
|
|
|
|
buf += set_formatted_header(var, val)
|
|
|
|
end
|
|
|
|
|
|
|
|
buf
|
|
|
|
end
|
2007-04-26 21:08:22 +00:00
|
|
|
|
|
|
|
def set_chunked_header()
|
|
|
|
return "" if self.config['chunked_size'] == 0
|
|
|
|
set_formatted_header('Transfer-Encoding', 'chunked')
|
|
|
|
end
|
|
|
|
|
2007-03-11 16:28:13 +00:00
|
|
|
#
|
|
|
|
# Return a string of raw header data
|
|
|
|
#
|
|
|
|
def set_raw_headers(data)
|
|
|
|
data
|
|
|
|
end
|
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
#
|
|
|
|
# Return a formatted header string
|
2007-03-10 05:58:14 +00:00
|
|
|
#
|
2006-12-19 07:11:55 +00:00
|
|
|
def set_formatted_header(var, val)
|
2007-03-10 05:58:14 +00:00
|
|
|
if (self.config['header_folding'])
|
|
|
|
"#{var}:\r\n\t#{val}\r\n"
|
|
|
|
else
|
|
|
|
"#{var}: #{val}\r\n"
|
|
|
|
end
|
2006-12-19 07:11:55 +00:00
|
|
|
end
|
|
|
|
|
2005-07-24 20:53:54 +00:00
|
|
|
|
2006-12-19 07:11:55 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The client request configuration
|
|
|
|
#
|
|
|
|
attr_accessor :config
|
2005-11-15 05:22:13 +00:00
|
|
|
#
|
2007-03-17 20:10:57 +00:00
|
|
|
# The client request configuration classes
|
|
|
|
#
|
|
|
|
attr_accessor :config_types
|
|
|
|
#
|
2005-11-15 05:22:13 +00:00
|
|
|
# Whether or not pipelining is in use.
|
|
|
|
#
|
2005-07-24 20:53:54 +00:00
|
|
|
attr_accessor :pipeline
|
2005-11-15 05:22:13 +00:00
|
|
|
#
|
|
|
|
# The local host of the client.
|
|
|
|
#
|
2005-07-24 20:53:54 +00:00
|
|
|
attr_accessor :local_host
|
2005-11-15 05:22:13 +00:00
|
|
|
#
|
|
|
|
# The local port of the client.
|
|
|
|
#
|
2005-07-24 20:53:54 +00:00
|
|
|
attr_accessor :local_port
|
2005-11-15 05:22:13 +00:00
|
|
|
#
|
|
|
|
# The underlying connection.
|
|
|
|
#
|
2005-09-22 03:24:32 +00:00
|
|
|
attr_accessor :conn
|
2006-01-17 04:35:44 +00:00
|
|
|
#
|
|
|
|
# The calling context to pass to the socket
|
|
|
|
#
|
|
|
|
attr_accessor :context
|
2007-09-24 04:44:44 +00:00
|
|
|
#
|
|
|
|
# The proxy list
|
|
|
|
#
|
|
|
|
attr_accessor :proxies
|
|
|
|
|
* add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers. ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below). NOTE: If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is A=%3d
* add URI junk self referring directory support, eg: /././foo.html
git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
|
|
|
|
|
|
|
# When parsing the request, thunk off the first response from the server, since junk
|
|
|
|
attr_accessor :junk_pipeline
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2005-07-24 20:53:54 +00:00
|
|
|
protected
|
|
|
|
|
2006-01-27 05:33:08 +00:00
|
|
|
# https
|
2006-01-20 18:59:24 +00:00
|
|
|
attr_accessor :ssl
|
|
|
|
|
2005-11-15 05:22:13 +00:00
|
|
|
attr_accessor :hostname, :port # :nodoc:
|
2006-12-19 07:11:55 +00:00
|
|
|
|
2005-09-15 23:37:38 +00:00
|
|
|
|
2005-07-24 20:53:54 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
2008-10-19 21:03:39 +00:00
|
|
|
end
|