faraday 1.0.0 → 1.10.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +104 -0
- data/LICENSE.md +1 -1
- data/README.md +4 -6
- data/examples/client_spec.rb +35 -3
- data/examples/client_test.rb +41 -2
- data/lib/faraday/adapter/test.rb +59 -43
- data/lib/faraday/adapter/typhoeus.rb +1 -1
- data/lib/faraday/adapter.rb +2 -12
- data/lib/faraday/adapter_registry.rb +3 -1
- data/lib/faraday/autoload.rb +2 -10
- data/lib/faraday/connection.rb +37 -9
- data/lib/faraday/dependency_loader.rb +3 -1
- data/lib/faraday/deprecate.rb +110 -0
- data/lib/faraday/encoders/flat_params_encoder.rb +9 -2
- data/lib/faraday/encoders/nested_params_encoder.rb +7 -2
- data/lib/faraday/error.rb +20 -6
- data/lib/faraday/methods.rb +6 -0
- data/lib/faraday/middleware.rb +14 -4
- data/lib/faraday/options/proxy_options.rb +4 -0
- data/lib/faraday/options.rb +4 -8
- data/lib/faraday/rack_builder.rb +13 -12
- data/lib/faraday/request/authorization.rb +17 -8
- data/lib/faraday/request/json.rb +55 -0
- data/lib/faraday/request/url_encoded.rb +3 -1
- data/lib/faraday/request.rb +19 -11
- data/lib/faraday/response/json.rb +54 -0
- data/lib/faraday/response/logger.rb +2 -4
- data/lib/faraday/response/raise_error.rb +12 -1
- data/lib/faraday/response.rb +7 -8
- data/lib/faraday/utils/headers.rb +2 -2
- data/lib/faraday/utils.rb +11 -3
- data/lib/faraday/version.rb +5 -0
- data/lib/faraday.rb +67 -40
- data/spec/faraday/adapter/em_http_spec.rb +39 -37
- data/spec/faraday/adapter/em_synchrony_spec.rb +11 -9
- data/spec/faraday/adapter/patron_spec.rb +1 -1
- data/spec/faraday/adapter/test_spec.rb +377 -0
- data/spec/faraday/connection_spec.rb +45 -0
- data/spec/faraday/deprecate_spec.rb +147 -0
- data/spec/faraday/error_spec.rb +15 -0
- data/spec/faraday/middleware_spec.rb +32 -6
- data/spec/faraday/options/proxy_options_spec.rb +7 -0
- data/spec/faraday/params_encoders/flat_spec.rb +8 -0
- data/spec/faraday/params_encoders/nested_spec.rb +8 -0
- data/spec/faraday/rack_builder_spec.rb +150 -1
- data/spec/faraday/request/authorization_spec.rb +10 -2
- data/spec/faraday/request/json_spec.rb +111 -0
- data/spec/faraday/request/url_encoded_spec.rb +13 -0
- data/spec/faraday/request_spec.rb +16 -5
- data/spec/faraday/response/json_spec.rb +119 -0
- data/spec/faraday/response/middleware_spec.rb +16 -0
- data/spec/faraday/response/raise_error_spec.rb +63 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/support/shared_examples/adapter.rb +2 -1
- data/spec/support/shared_examples/request_method.rb +39 -11
- metadata +157 -31
- data/UPGRADING.md +0 -55
- data/lib/faraday/adapter/em_http.rb +0 -285
- data/lib/faraday/adapter/em_http_ssl_patch.rb +0 -62
- data/lib/faraday/adapter/em_synchrony/parallel_manager.rb +0 -69
- data/lib/faraday/adapter/em_synchrony.rb +0 -150
- data/lib/faraday/adapter/excon.rb +0 -124
- data/lib/faraday/adapter/httpclient.rb +0 -151
- data/lib/faraday/adapter/net_http.rb +0 -209
- data/lib/faraday/adapter/net_http_persistent.rb +0 -91
- data/lib/faraday/adapter/patron.rb +0 -132
- data/lib/faraday/adapter/rack.rb +0 -75
- data/lib/faraday/file_part.rb +0 -128
- data/lib/faraday/param_part.rb +0 -53
- data/lib/faraday/request/multipart.rb +0 -99
- data/lib/faraday/request/retry.rb +0 -239
- data/spec/faraday/adapter/net_http_persistent_spec.rb +0 -57
- data/spec/faraday/request/multipart_spec.rb +0 -274
- data/spec/faraday/request/retry_spec.rb +0 -242
@@ -1,151 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Adapter
|
5
|
-
# HTTPClient adapter.
|
6
|
-
class HTTPClient < Faraday::Adapter
|
7
|
-
dependency 'httpclient'
|
8
|
-
|
9
|
-
def build_connection(env)
|
10
|
-
@client ||= ::HTTPClient.new.tap do |cli|
|
11
|
-
# enable compression
|
12
|
-
cli.transparent_gzip_decompression = true
|
13
|
-
end
|
14
|
-
|
15
|
-
if (req = env[:request])
|
16
|
-
if (proxy = req[:proxy])
|
17
|
-
configure_proxy @client, proxy
|
18
|
-
end
|
19
|
-
|
20
|
-
if (bind = req[:bind])
|
21
|
-
configure_socket @client, bind
|
22
|
-
end
|
23
|
-
|
24
|
-
configure_timeouts @client, req
|
25
|
-
end
|
26
|
-
|
27
|
-
if env[:url].scheme == 'https' && (ssl = env[:ssl])
|
28
|
-
configure_ssl @client, ssl
|
29
|
-
end
|
30
|
-
|
31
|
-
configure_client @client
|
32
|
-
|
33
|
-
@client
|
34
|
-
end
|
35
|
-
|
36
|
-
def call(env)
|
37
|
-
super
|
38
|
-
|
39
|
-
# TODO: Don't stream yet.
|
40
|
-
# https://github.com/nahi/httpclient/pull/90
|
41
|
-
env[:body] = env[:body].read if env[:body].respond_to? :read
|
42
|
-
|
43
|
-
connection(env) do |http|
|
44
|
-
resp = http.request env[:method], env[:url],
|
45
|
-
body: env[:body],
|
46
|
-
header: env[:request_headers]
|
47
|
-
|
48
|
-
if (req = env[:request]).stream_response?
|
49
|
-
warn "Streaming downloads for #{self.class.name} " \
|
50
|
-
'are not yet implemented.'
|
51
|
-
req.on_data.call(resp.body, resp.body.bytesize)
|
52
|
-
end
|
53
|
-
save_response env, resp.status, resp.body, resp.headers, resp.reason
|
54
|
-
|
55
|
-
@app.call env
|
56
|
-
end
|
57
|
-
rescue ::HTTPClient::TimeoutError, Errno::ETIMEDOUT
|
58
|
-
raise Faraday::TimeoutError, $ERROR_INFO
|
59
|
-
rescue ::HTTPClient::BadResponseError => e
|
60
|
-
if e.message.include?('status 407')
|
61
|
-
raise Faraday::ConnectionFailed,
|
62
|
-
%(407 "Proxy Authentication Required ")
|
63
|
-
end
|
64
|
-
|
65
|
-
raise Faraday::ClientError, $ERROR_INFO
|
66
|
-
rescue Errno::EADDRNOTAVAIL, Errno::ECONNREFUSED, IOError, SocketError
|
67
|
-
raise Faraday::ConnectionFailed, $ERROR_INFO
|
68
|
-
rescue StandardError => e
|
69
|
-
if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
|
70
|
-
raise Faraday::SSLError, e
|
71
|
-
end
|
72
|
-
|
73
|
-
raise
|
74
|
-
end
|
75
|
-
|
76
|
-
# @param bind [Hash]
|
77
|
-
def configure_socket(client, bind)
|
78
|
-
client.socket_local.host = bind[:host]
|
79
|
-
client.socket_local.port = bind[:port]
|
80
|
-
end
|
81
|
-
|
82
|
-
# Configure proxy URI and any user credentials.
|
83
|
-
#
|
84
|
-
# @param proxy [Hash]
|
85
|
-
def configure_proxy(client, proxy)
|
86
|
-
client.proxy = proxy[:uri]
|
87
|
-
return unless proxy[:user] && proxy[:password]
|
88
|
-
|
89
|
-
client.set_proxy_auth(proxy[:user], proxy[:password])
|
90
|
-
end
|
91
|
-
|
92
|
-
# @param ssl [Hash]
|
93
|
-
def configure_ssl(client, ssl)
|
94
|
-
ssl_config = client.ssl_config
|
95
|
-
ssl_config.verify_mode = ssl_verify_mode(ssl)
|
96
|
-
ssl_config.cert_store = ssl_cert_store(ssl)
|
97
|
-
|
98
|
-
ssl_config.add_trust_ca ssl[:ca_file] if ssl[:ca_file]
|
99
|
-
ssl_config.add_trust_ca ssl[:ca_path] if ssl[:ca_path]
|
100
|
-
ssl_config.client_cert = ssl[:client_cert] if ssl[:client_cert]
|
101
|
-
ssl_config.client_key = ssl[:client_key] if ssl[:client_key]
|
102
|
-
ssl_config.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
|
103
|
-
end
|
104
|
-
|
105
|
-
# @param req [Hash]
|
106
|
-
def configure_timeouts(client, req)
|
107
|
-
if (sec = request_timeout(:open, req))
|
108
|
-
client.connect_timeout = sec
|
109
|
-
end
|
110
|
-
|
111
|
-
if (sec = request_timeout(:write, req))
|
112
|
-
client.send_timeout = sec
|
113
|
-
end
|
114
|
-
|
115
|
-
return unless (sec = request_timeout(:read, req))
|
116
|
-
|
117
|
-
client.receive_timeout = sec
|
118
|
-
end
|
119
|
-
|
120
|
-
def configure_client(client)
|
121
|
-
@config_block&.call(client)
|
122
|
-
end
|
123
|
-
|
124
|
-
# @param ssl [Hash]
|
125
|
-
# @return [OpenSSL::X509::Store]
|
126
|
-
def ssl_cert_store(ssl)
|
127
|
-
return ssl[:cert_store] if ssl[:cert_store]
|
128
|
-
|
129
|
-
# Memoize the cert store so that the same one is passed to
|
130
|
-
# HTTPClient each time, to avoid resyncing SSL sessions when
|
131
|
-
# it's changed
|
132
|
-
@ssl_cert_store ||= begin
|
133
|
-
# Use the default cert store by default, i.e. system ca certs
|
134
|
-
OpenSSL::X509::Store.new.tap(&:set_default_paths)
|
135
|
-
end
|
136
|
-
end
|
137
|
-
|
138
|
-
# @param ssl [Hash]
|
139
|
-
def ssl_verify_mode(ssl)
|
140
|
-
ssl[:verify_mode] || begin
|
141
|
-
if ssl.fetch(:verify, true)
|
142
|
-
OpenSSL::SSL::VERIFY_PEER |
|
143
|
-
OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
|
144
|
-
else
|
145
|
-
OpenSSL::SSL::VERIFY_NONE
|
146
|
-
end
|
147
|
-
end
|
148
|
-
end
|
149
|
-
end
|
150
|
-
end
|
151
|
-
end
|
@@ -1,209 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
begin
|
4
|
-
require 'net/https'
|
5
|
-
rescue LoadError
|
6
|
-
warn 'Warning: no such file to load -- net/https. ' \
|
7
|
-
'Make sure openssl is installed if you want ssl support'
|
8
|
-
require 'net/http'
|
9
|
-
end
|
10
|
-
require 'zlib'
|
11
|
-
|
12
|
-
module Faraday
|
13
|
-
class Adapter
|
14
|
-
# Net::HTTP adapter.
|
15
|
-
class NetHttp < Faraday::Adapter
|
16
|
-
exceptions = [
|
17
|
-
IOError,
|
18
|
-
Errno::EADDRNOTAVAIL,
|
19
|
-
Errno::ECONNABORTED,
|
20
|
-
Errno::ECONNREFUSED,
|
21
|
-
Errno::ECONNRESET,
|
22
|
-
Errno::EHOSTUNREACH,
|
23
|
-
Errno::EINVAL,
|
24
|
-
Errno::ENETUNREACH,
|
25
|
-
Errno::EPIPE,
|
26
|
-
Net::HTTPBadResponse,
|
27
|
-
Net::HTTPHeaderSyntaxError,
|
28
|
-
Net::ProtocolError,
|
29
|
-
SocketError,
|
30
|
-
Zlib::GzipFile::Error
|
31
|
-
]
|
32
|
-
|
33
|
-
exceptions << OpenSSL::SSL::SSLError if defined?(OpenSSL)
|
34
|
-
exceptions << Net::OpenTimeout if defined?(Net::OpenTimeout)
|
35
|
-
|
36
|
-
NET_HTTP_EXCEPTIONS = exceptions.freeze
|
37
|
-
|
38
|
-
def initialize(app = nil, opts = {}, &block)
|
39
|
-
@ssl_cert_store = nil
|
40
|
-
super(app, opts, &block)
|
41
|
-
end
|
42
|
-
|
43
|
-
def build_connection(env)
|
44
|
-
net_http_connection(env).tap do |http|
|
45
|
-
if http.respond_to?(:use_ssl=)
|
46
|
-
http.use_ssl = env[:url].scheme == 'https'
|
47
|
-
end
|
48
|
-
configure_ssl(http, env[:ssl])
|
49
|
-
configure_request(http, env[:request])
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
def net_http_connection(env)
|
54
|
-
klass = if (proxy = env[:request][:proxy])
|
55
|
-
Net::HTTP::Proxy(proxy[:uri].hostname, proxy[:uri].port,
|
56
|
-
proxy[:user], proxy[:password])
|
57
|
-
else
|
58
|
-
Net::HTTP
|
59
|
-
end
|
60
|
-
port = env[:url].port || (env[:url].scheme == 'https' ? 443 : 80)
|
61
|
-
klass.new(env[:url].hostname, port)
|
62
|
-
end
|
63
|
-
|
64
|
-
def call(env)
|
65
|
-
super
|
66
|
-
http_response = connection(env) do |http|
|
67
|
-
begin
|
68
|
-
perform_request(http, env)
|
69
|
-
rescue *NET_HTTP_EXCEPTIONS => e
|
70
|
-
if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
|
71
|
-
raise Faraday::SSLError, e
|
72
|
-
end
|
73
|
-
|
74
|
-
raise Faraday::ConnectionFailed, e
|
75
|
-
end
|
76
|
-
end
|
77
|
-
|
78
|
-
save_response(env, http_response.code.to_i,
|
79
|
-
http_response.body || +'', nil,
|
80
|
-
http_response.message) do |response_headers|
|
81
|
-
http_response.each_header do |key, value|
|
82
|
-
response_headers[key] = value
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
@app.call env
|
87
|
-
rescue Timeout::Error, Errno::ETIMEDOUT => e
|
88
|
-
raise Faraday::TimeoutError, e
|
89
|
-
end
|
90
|
-
|
91
|
-
private
|
92
|
-
|
93
|
-
def create_request(env)
|
94
|
-
request = Net::HTTPGenericRequest.new \
|
95
|
-
env[:method].to_s.upcase, # request method
|
96
|
-
!!env[:body], # is there request body
|
97
|
-
env[:method] != :head, # is there response body
|
98
|
-
env[:url].request_uri, # request uri path
|
99
|
-
env[:request_headers] # request headers
|
100
|
-
|
101
|
-
if env[:body].respond_to?(:read)
|
102
|
-
request.body_stream = env[:body]
|
103
|
-
else
|
104
|
-
request.body = env[:body]
|
105
|
-
end
|
106
|
-
request
|
107
|
-
end
|
108
|
-
|
109
|
-
def perform_request(http, env)
|
110
|
-
if env[:request].stream_response?
|
111
|
-
size = 0
|
112
|
-
yielded = false
|
113
|
-
http_response = request_with_wrapped_block(http, env) do |chunk|
|
114
|
-
if chunk.bytesize.positive? || size.positive?
|
115
|
-
yielded = true
|
116
|
-
size += chunk.bytesize
|
117
|
-
env[:request].on_data.call(chunk, size)
|
118
|
-
end
|
119
|
-
end
|
120
|
-
env[:request].on_data.call(+'', 0) unless yielded
|
121
|
-
# Net::HTTP returns something,
|
122
|
-
# but it's not meaningful according to the docs.
|
123
|
-
http_response.body = nil
|
124
|
-
http_response
|
125
|
-
else
|
126
|
-
request_with_wrapped_block(http, env)
|
127
|
-
end
|
128
|
-
end
|
129
|
-
|
130
|
-
def request_with_wrapped_block(http, env, &block)
|
131
|
-
if (env[:method] == :get) && !env[:body]
|
132
|
-
# prefer `get` to `request` because the former handles gzip (ruby 1.9)
|
133
|
-
request_via_get_method(http, env, &block)
|
134
|
-
else
|
135
|
-
request_via_request_method(http, env, &block)
|
136
|
-
end
|
137
|
-
end
|
138
|
-
|
139
|
-
def request_via_get_method(http, env, &block)
|
140
|
-
http.get env[:url].request_uri, env[:request_headers], &block
|
141
|
-
end
|
142
|
-
|
143
|
-
def request_via_request_method(http, env, &block)
|
144
|
-
if block_given?
|
145
|
-
http.request create_request(env) do |response|
|
146
|
-
response.read_body(&block)
|
147
|
-
end
|
148
|
-
else
|
149
|
-
http.request create_request(env)
|
150
|
-
end
|
151
|
-
end
|
152
|
-
|
153
|
-
def configure_ssl(http, ssl)
|
154
|
-
return unless ssl
|
155
|
-
|
156
|
-
http.verify_mode = ssl_verify_mode(ssl)
|
157
|
-
http.cert_store = ssl_cert_store(ssl)
|
158
|
-
|
159
|
-
http.cert = ssl[:client_cert] if ssl[:client_cert]
|
160
|
-
http.key = ssl[:client_key] if ssl[:client_key]
|
161
|
-
http.ca_file = ssl[:ca_file] if ssl[:ca_file]
|
162
|
-
http.ca_path = ssl[:ca_path] if ssl[:ca_path]
|
163
|
-
http.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
|
164
|
-
http.ssl_version = ssl[:version] if ssl[:version]
|
165
|
-
http.min_version = ssl[:min_version] if ssl[:min_version]
|
166
|
-
http.max_version = ssl[:max_version] if ssl[:max_version]
|
167
|
-
end
|
168
|
-
|
169
|
-
def configure_request(http, req)
|
170
|
-
if (sec = request_timeout(:read, req))
|
171
|
-
http.read_timeout = sec
|
172
|
-
end
|
173
|
-
|
174
|
-
if (sec = http.respond_to?(:write_timeout=) &&
|
175
|
-
request_timeout(:write, req))
|
176
|
-
http.write_timeout = sec
|
177
|
-
end
|
178
|
-
|
179
|
-
if (sec = request_timeout(:open, req))
|
180
|
-
http.open_timeout = sec
|
181
|
-
end
|
182
|
-
|
183
|
-
# Only set if Net::Http supports it, since Ruby 2.5.
|
184
|
-
http.max_retries = 0 if http.respond_to?(:max_retries=)
|
185
|
-
|
186
|
-
@config_block&.call(http)
|
187
|
-
end
|
188
|
-
|
189
|
-
def ssl_cert_store(ssl)
|
190
|
-
return ssl[:cert_store] if ssl[:cert_store]
|
191
|
-
|
192
|
-
@ssl_cert_store ||= begin
|
193
|
-
# Use the default cert store by default, i.e. system ca certs
|
194
|
-
OpenSSL::X509::Store.new.tap(&:set_default_paths)
|
195
|
-
end
|
196
|
-
end
|
197
|
-
|
198
|
-
def ssl_verify_mode(ssl)
|
199
|
-
ssl[:verify_mode] || begin
|
200
|
-
if ssl.fetch(:verify, true)
|
201
|
-
OpenSSL::SSL::VERIFY_PEER
|
202
|
-
else
|
203
|
-
OpenSSL::SSL::VERIFY_NONE
|
204
|
-
end
|
205
|
-
end
|
206
|
-
end
|
207
|
-
end
|
208
|
-
end
|
209
|
-
end
|
@@ -1,91 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Adapter
|
5
|
-
# Net::HTTP::Persistent adapter.
|
6
|
-
class NetHttpPersistent < NetHttp
|
7
|
-
dependency 'net/http/persistent'
|
8
|
-
|
9
|
-
private
|
10
|
-
|
11
|
-
def net_http_connection(env)
|
12
|
-
@cached_connection ||=
|
13
|
-
if Net::HTTP::Persistent.instance_method(:initialize)
|
14
|
-
.parameters.first == %i[key name]
|
15
|
-
options = { name: 'Faraday' }
|
16
|
-
if @connection_options.key?(:pool_size)
|
17
|
-
options[:pool_size] = @connection_options[:pool_size]
|
18
|
-
end
|
19
|
-
Net::HTTP::Persistent.new(**options)
|
20
|
-
else
|
21
|
-
Net::HTTP::Persistent.new('Faraday')
|
22
|
-
end
|
23
|
-
|
24
|
-
proxy_uri = proxy_uri(env)
|
25
|
-
if @cached_connection.proxy_uri != proxy_uri
|
26
|
-
@cached_connection.proxy = proxy_uri
|
27
|
-
end
|
28
|
-
@cached_connection
|
29
|
-
end
|
30
|
-
|
31
|
-
def proxy_uri(env)
|
32
|
-
proxy_uri = nil
|
33
|
-
if (proxy = env[:request][:proxy])
|
34
|
-
proxy_uri = if proxy[:uri].is_a?(::URI::HTTP)
|
35
|
-
proxy[:uri].dup
|
36
|
-
else
|
37
|
-
::URI.parse(proxy[:uri].to_s)
|
38
|
-
end
|
39
|
-
proxy_uri.user = proxy_uri.password = nil
|
40
|
-
# awful patch for net-http-persistent 2.8
|
41
|
-
# not unescaping user/password
|
42
|
-
if proxy[:user]
|
43
|
-
(class << proxy_uri; self; end).class_eval do
|
44
|
-
define_method(:user) { proxy[:user] }
|
45
|
-
define_method(:password) { proxy[:password] }
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
proxy_uri
|
50
|
-
end
|
51
|
-
|
52
|
-
def perform_request(http, env)
|
53
|
-
http.request env[:url], create_request(env)
|
54
|
-
rescue Errno::ETIMEDOUT => e
|
55
|
-
raise Faraday::TimeoutError, e
|
56
|
-
rescue Net::HTTP::Persistent::Error => e
|
57
|
-
raise Faraday::TimeoutError, e if e.message.include? 'Timeout'
|
58
|
-
|
59
|
-
if e.message.include? 'connection refused'
|
60
|
-
raise Faraday::ConnectionFailed, e
|
61
|
-
end
|
62
|
-
|
63
|
-
raise
|
64
|
-
end
|
65
|
-
|
66
|
-
SSL_CONFIGURATIONS = {
|
67
|
-
certificate: :client_cert,
|
68
|
-
private_key: :client_key,
|
69
|
-
ca_file: :ca_file,
|
70
|
-
ssl_version: :version,
|
71
|
-
min_version: :min_version,
|
72
|
-
max_version: :max_version
|
73
|
-
}.freeze
|
74
|
-
|
75
|
-
def configure_ssl(http, ssl)
|
76
|
-
return unless ssl
|
77
|
-
|
78
|
-
http_set(http, :verify_mode, ssl_verify_mode(ssl))
|
79
|
-
http_set(http, :cert_store, ssl_cert_store(ssl))
|
80
|
-
|
81
|
-
SSL_CONFIGURATIONS
|
82
|
-
.select { |_, key| ssl[key] }
|
83
|
-
.each { |target, key| http_set(http, target, ssl[key]) }
|
84
|
-
end
|
85
|
-
|
86
|
-
def http_set(http, attr, value)
|
87
|
-
http.send("#{attr}=", value) if http.send(attr) != value
|
88
|
-
end
|
89
|
-
end
|
90
|
-
end
|
91
|
-
end
|
@@ -1,132 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Adapter
|
5
|
-
# Patron adapter.
|
6
|
-
class Patron < Faraday::Adapter
|
7
|
-
dependency 'patron'
|
8
|
-
|
9
|
-
def build_connection(env)
|
10
|
-
session = ::Patron::Session.new
|
11
|
-
@config_block&.call(session)
|
12
|
-
if (env[:url].scheme == 'https') && env[:ssl]
|
13
|
-
configure_ssl(session, env[:ssl])
|
14
|
-
end
|
15
|
-
|
16
|
-
if (req = env[:request])
|
17
|
-
configure_timeouts(session, req)
|
18
|
-
configure_proxy(session, req[:proxy])
|
19
|
-
end
|
20
|
-
|
21
|
-
session
|
22
|
-
end
|
23
|
-
|
24
|
-
def call(env)
|
25
|
-
super
|
26
|
-
# TODO: support streaming requests
|
27
|
-
env[:body] = env[:body].read if env[:body].respond_to? :read
|
28
|
-
|
29
|
-
response = connection(env) do |session|
|
30
|
-
begin
|
31
|
-
data = env[:body] ? env[:body].to_s : nil
|
32
|
-
session.request(env[:method], env[:url].to_s,
|
33
|
-
env[:request_headers], data: data)
|
34
|
-
rescue Errno::ECONNREFUSED, ::Patron::ConnectionFailed
|
35
|
-
raise Faraday::ConnectionFailed, $ERROR_INFO
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
if (req = env[:request]).stream_response?
|
40
|
-
warn "Streaming downloads for #{self.class.name} " \
|
41
|
-
'are not yet implemented.'
|
42
|
-
req.on_data.call(response.body, response.body.bytesize)
|
43
|
-
end
|
44
|
-
# Remove the "HTTP/1.1 200", leaving just the reason phrase
|
45
|
-
reason_phrase = response.status_line.gsub(/^.* \d{3} /, '')
|
46
|
-
|
47
|
-
save_response(env, response.status, response.body,
|
48
|
-
response.headers, reason_phrase)
|
49
|
-
|
50
|
-
@app.call env
|
51
|
-
rescue ::Patron::TimeoutError => e
|
52
|
-
if connection_timed_out_message?(e.message)
|
53
|
-
raise Faraday::ConnectionFailed, e
|
54
|
-
end
|
55
|
-
|
56
|
-
raise Faraday::TimeoutError, e
|
57
|
-
rescue ::Patron::Error => e
|
58
|
-
if e.message.include?('code 407')
|
59
|
-
raise Faraday::ConnectionFailed,
|
60
|
-
%(407 "Proxy Authentication Required ")
|
61
|
-
end
|
62
|
-
|
63
|
-
raise Faraday::ConnectionFailed, e
|
64
|
-
end
|
65
|
-
|
66
|
-
if loaded? && defined?(::Patron::Request::VALID_ACTIONS)
|
67
|
-
# HAX: helps but doesn't work completely
|
68
|
-
# https://github.com/toland/patron/issues/34
|
69
|
-
::Patron::Request::VALID_ACTIONS.tap do |actions|
|
70
|
-
if actions[0].is_a?(Symbol)
|
71
|
-
actions << :patch unless actions.include? :patch
|
72
|
-
actions << :options unless actions.include? :options
|
73
|
-
else
|
74
|
-
# Patron 0.4.20 and up
|
75
|
-
actions << 'PATCH' unless actions.include? 'PATCH'
|
76
|
-
actions << 'OPTIONS' unless actions.include? 'OPTIONS'
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
def configure_ssl(session, ssl)
|
82
|
-
if ssl.fetch(:verify, true)
|
83
|
-
session.cacert = ssl[:ca_file]
|
84
|
-
else
|
85
|
-
session.insecure = true
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
|
-
def configure_timeouts(session, req)
|
90
|
-
return unless req
|
91
|
-
|
92
|
-
if (sec = request_timeout(:read, req))
|
93
|
-
session.timeout = sec
|
94
|
-
end
|
95
|
-
|
96
|
-
return unless (sec = request_timeout(:open, req))
|
97
|
-
|
98
|
-
session.connect_timeout = sec
|
99
|
-
end
|
100
|
-
|
101
|
-
def configure_proxy(session, proxy)
|
102
|
-
return unless proxy
|
103
|
-
|
104
|
-
proxy_uri = proxy[:uri].dup
|
105
|
-
proxy_uri.user = proxy[:user] &&
|
106
|
-
Utils.escape(proxy[:user]).gsub('+', '%20')
|
107
|
-
proxy_uri.password = proxy[:password] &&
|
108
|
-
Utils.escape(proxy[:password]).gsub('+', '%20')
|
109
|
-
session.proxy = proxy_uri.to_s
|
110
|
-
end
|
111
|
-
|
112
|
-
private
|
113
|
-
|
114
|
-
CURL_TIMEOUT_MESSAGES = [
|
115
|
-
'Connection time-out',
|
116
|
-
'Connection timed out',
|
117
|
-
'Timed out before name resolve',
|
118
|
-
'server connect has timed out',
|
119
|
-
'Resolving timed out',
|
120
|
-
'name lookup timed out',
|
121
|
-
'timed out before SSL',
|
122
|
-
'connect() timed out'
|
123
|
-
].freeze
|
124
|
-
|
125
|
-
def connection_timed_out_message?(message)
|
126
|
-
CURL_TIMEOUT_MESSAGES.any? do |curl_message|
|
127
|
-
message.include?(curl_message)
|
128
|
-
end
|
129
|
-
end
|
130
|
-
end
|
131
|
-
end
|
132
|
-
end
|
data/lib/faraday/adapter/rack.rb
DELETED
@@ -1,75 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Adapter
|
5
|
-
# Sends requests to a Rack app.
|
6
|
-
#
|
7
|
-
# @example
|
8
|
-
#
|
9
|
-
# class MyRackApp
|
10
|
-
# def call(env)
|
11
|
-
# [200, {'Content-Type' => 'text/html'}, ["hello world"]]
|
12
|
-
# end
|
13
|
-
# end
|
14
|
-
#
|
15
|
-
# Faraday.new do |conn|
|
16
|
-
# conn.adapter :rack, MyRackApp.new
|
17
|
-
# end
|
18
|
-
class Rack < Faraday::Adapter
|
19
|
-
dependency 'rack/test'
|
20
|
-
|
21
|
-
# not prefixed with "HTTP_"
|
22
|
-
SPECIAL_HEADERS = %w[CONTENT_LENGTH CONTENT_TYPE].freeze
|
23
|
-
|
24
|
-
def initialize(faraday_app, rack_app)
|
25
|
-
super(faraday_app)
|
26
|
-
mock_session = ::Rack::MockSession.new(rack_app)
|
27
|
-
@session = ::Rack::Test::Session.new(mock_session)
|
28
|
-
end
|
29
|
-
|
30
|
-
def call(env)
|
31
|
-
super
|
32
|
-
rack_env = build_rack_env(env)
|
33
|
-
|
34
|
-
env[:request_headers]&.each do |name, value|
|
35
|
-
name = name.upcase.tr('-', '_')
|
36
|
-
name = "HTTP_#{name}" unless SPECIAL_HEADERS.include? name
|
37
|
-
rack_env[name] = value
|
38
|
-
end
|
39
|
-
|
40
|
-
timeout = request_timeout(:open, env[:request])
|
41
|
-
timeout ||= request_timeout(:read, env[:request])
|
42
|
-
response = if timeout
|
43
|
-
Timer.timeout(timeout, Faraday::TimeoutError) do
|
44
|
-
execute_request(env, rack_env)
|
45
|
-
end
|
46
|
-
else
|
47
|
-
execute_request(env, rack_env)
|
48
|
-
end
|
49
|
-
|
50
|
-
if (req = env[:request]).stream_response?
|
51
|
-
warn "Streaming downloads for #{self.class.name} " \
|
52
|
-
'are not yet implemented.'
|
53
|
-
req.on_data.call(response.body, response.body.bytesize)
|
54
|
-
end
|
55
|
-
|
56
|
-
save_response(env, response.status, response.body, response.headers)
|
57
|
-
@app.call env
|
58
|
-
end
|
59
|
-
|
60
|
-
private
|
61
|
-
|
62
|
-
def execute_request(env, rack_env)
|
63
|
-
@session.request(env[:url].to_s, rack_env)
|
64
|
-
end
|
65
|
-
|
66
|
-
def build_rack_env(env)
|
67
|
-
{
|
68
|
-
method: env[:method],
|
69
|
-
input: env[:body].respond_to?(:read) ? env[:body].read : env[:body],
|
70
|
-
'rack.url_scheme' => env[:url].scheme
|
71
|
-
}
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
|
-
end
|