Skip to content

Commit 6d089e4

Browse files
laka3000childish-sambino
authored and
childish-sambino
committed
fix: handle building the HTTP client proxy URI without authentication (#445)
* Fix http client proxy URI without authentication * Add back missing 'proxy_prot' instance variable
1 parent 51212ae commit 6d089e4

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

lib/twilio-ruby/http/http_client.rb

+3-7
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ class Client
1111
def initialize(proxy_prot = nil, proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil,
1212
ssl_ca_file = nil, timeout: nil)
1313
@proxy_prot = proxy_prot
14-
@proxy_addr = proxy_addr
15-
@proxy_port = proxy_port
16-
@proxy_user = proxy_user
17-
@proxy_pass = proxy_pass
14+
@proxy_path = "#{proxy_addr}:#{proxy_port}" if proxy_addr && proxy_port
15+
@proxy_auth = "#{proxy_user}:#{proxy_pass}@" if proxy_pass && proxy_user
1816
@ssl_ca_file = ssl_ca_file
1917
@timeout = timeout
2018
@adapter = Faraday.default_adapter
@@ -27,9 +25,7 @@ def _request(request)
2725
f.adapter @adapter
2826
f.headers = request.headers
2927
f.basic_auth(request.auth[0], request.auth[1])
30-
if @proxy_addr
31-
f.proxy = "#{@proxy_prot}://#{@proxy_user}:#{@proxy_pass}@#{@proxy_addr}:#{@proxy_port}"
32-
end
28+
f.proxy = "#{@proxy_prot}://#{@proxy_auth}#{@proxy_path}" if @proxy_prot && @proxy_path
3329
f.options.open_timeout = request.timeout || @timeout
3430
f.options.timeout = request.timeout || @timeout
3531
end

0 commit comments

Comments
 (0)