sharpetronics/httpx
1
0
Fork 0
mirror of https://github.com/HoneyryderChuck/httpx.git synced 2025-09-01 00:00:35 -04:00
Code Issues Projects Releases Wiki Activity

socks: allow for them to call the on_error callback routine and fail early when experiencing proxy-specific errors

Browse Source
This commit is contained in:
HoneyryderChuck 2018-06-29 17:24:23 +01:00
parent 8b5eb7c477
commit 0284b0478e
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/httpx/plugins/proxy/socks4.rb
View File

@ -30,11 +30,7 @@ module HTTPX
transition(:connected)
throw(:called)
else
response = ErrorResponse.new(Error.new("socks error: #{status}"), @options)
until @pending.empty?
req, _ = @pending.shift
emit(:response, req, response)
end
on_socks_error("socks error: #{status}")
end
end
@ -56,6 +52,15 @@ module HTTPX
log(level: 1, label: "SOCKS4: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" } unless nextstate == :open
super
end
private
def on_socks_error(message)
ex = Error.new(message)
ex.set_backtrace(caller)
on_error(ex)
throw(:called)
end
end
Parameters.register("socks4", Socks4ProxyChannel)
Parameters.register("socks4a", Socks4ProxyChannel)

20
lib/httpx/plugins/proxy/socks5.rb
View File

@ -45,7 +45,7 @@ module HTTPX
transition(:authenticating)
return
when NONE
on_error_response("no supported authorization methods")
on_socks_error("no supported authorization methods")
else
transition(:negotiating)
end
@ -53,11 +53,11 @@ module HTTPX
version, status = packet.unpack("CC")
check_version(version)
return transition(:negotiating) if status == SUCCESS
on_error_response("socks authentication error: #{status}")
on_socks_error("socks authentication error: #{status}")
when :negotiating
version, reply, = packet.unpack("CC")
check_version(version)
return on_error_response("socks5 negotiation error: #{reply}") unless reply == SUCCESS
on_socks_error("socks5 negotiation error: #{reply}") unless reply == SUCCESS
req, _ = @pending.first
request_uri = req.uri
@io = ProxySSL.new(@io, request_uri, @options) if request_uri.scheme == "https"
@ -91,17 +91,17 @@ module HTTPX
end
def check_version(version)
raise Error, "invalid SOCKS version (#{version})" if version != 5
on_socks_error("invalid SOCKS version (#{version})") if version != 5
end
def on_error_response(error)
response = ErrorResponse.new(Error.new(error), @options)
until @pending.empty?
req, _ = @pending.shift
emit(:response, req, response)
end
def on_socks_error(message)
ex = Error.new(message)
ex.set_backtrace(caller)
on_error(ex)
throw(:called)
end
end
Parameters.register("socks5", Socks5ProxyChannel)
class SocksParser