cleanup options

lib/rex/proto/http/client.rb

@@ -129,23 +129,12 @@ class Client
 	#
 	# @return [ClientRequest]
 	def request_raw(opts={})
-		opts['agent']   ||= config['agent']
-		opts['data']    ||= ''
-		opts['uri']     ||= '/'
-		opts['cookie']  ||= config['cookie']
-		opts['encode']  ||= false
-		opts['headers'] ||= config['headers'] || {}
-		opts['vhost']   ||= config['vhost']
-		opts['method']  ||= 'GET'
-		opts['proto']   ||= 'HTTP'
-		opts['query']   ||= ''
-
+		opts = self.config.merge(opts)
+		
+		opts['ssl']         = self.ssl
 		opts['cgi']         = false
 		opts['port']        = self.port
-		opts['basic_auth']  = opts['basic_auth'] || config['basic_auth'] || ''
-		opts['raw_headers'] = opts['raw_headers'] || config['raw_headers'] || ''
-		opts['version']     = opts['version']     || config['version'] || '1.1'
-
+		
 		req = ClientRequest.new(opts)
 	end
 
@@ -162,33 +151,13 @@ class Client
 	#
 	# @return [ClientRequest]
 	def request_cgi(opts={})
-		opts['agent']       ||= config['agent']
-		opts['basic_auth']  ||= config['basic_auth']  || ''
-		opts['cookie']      ||= config['cookie']
+		opts = self.config.merge(opts)
+		
 		opts['ctype']       ||= 'application/x-www-form-urlencoded'
-		opts['data']        ||= ''
-		opts['encode']      ||= false
-		opts['headers']     ||= config['headers'] || {}
-		opts['method']      ||= 'GET'
-		opts['proto']       ||= 'HTTP'
-		opts['query']       ||= ''
-		opts['raw_headers'] ||= config['raw_headers'] || ''
-		opts['uri']         ||= '/'
-		opts['vars_get']    ||= {}
-		opts['vars_post']   ||= {}
-		opts['version']     ||= config['version']     || '1.1'
-		opts['vhost']       ||= config['vhost']
-
 		opts['ssl']         = self.ssl
 		opts['cgi']         = true
 		opts['port']        = self.port
 
-		if opts['encode_params'] == true or opts['encode_params'].nil?
-			opts['encode_params'] = true
-		else
-			opts['encode_params'] = false
-		end
-
 		req = ClientRequest.new(opts)
 	end
 

lib/rex/proto/http/client_request.rb

@@ -27,6 +27,7 @@ class ClientRequest
 		'path_info'              => '',
 		'port'                   => 80,
 		'proto'                  => 'HTTP',
+		'query'                  => '',
 		'ssl'                    => false,
 		'uri'                    => '/',
 		'vars_get'               => {},
@@ -38,7 +39,7 @@ class ClientRequest
 		# Evasion options
 		#
 		'encode_params'          => true,
-		'encode'                 => true,
+		'encode'                 => false,
 		'uri_encode_mode'        => 'hex-normal', # hex-all, hex-random, u-normal, u-random, u-all
 		'uri_encode_count'       => 1,       # integer
 		'uri_full_url'           => false,   # bool