faraday 0.17.3 → 1.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +156 -8
- data/LICENSE.md +1 -1
- data/README.md +16 -358
- data/Rakefile +1 -7
- data/examples/client_spec.rb +65 -0
- data/examples/client_test.rb +79 -0
- data/lib/faraday.rb +120 -189
- data/lib/faraday/adapter.rb +77 -22
- data/lib/faraday/adapter/em_http.rb +148 -102
- data/lib/faraday/adapter/em_http_ssl_patch.rb +24 -18
- data/lib/faraday/adapter/em_synchrony.rb +110 -63
- data/lib/faraday/adapter/em_synchrony/parallel_manager.rb +18 -15
- data/lib/faraday/adapter/httpclient.rb +83 -59
- data/lib/faraday/adapter/patron.rb +80 -43
- data/lib/faraday/adapter/rack.rb +30 -13
- data/lib/faraday/adapter/test.rb +86 -53
- data/lib/faraday/adapter/typhoeus.rb +4 -1
- data/lib/faraday/adapter_registry.rb +30 -0
- data/lib/faraday/autoload.rb +44 -36
- data/lib/faraday/connection.rb +313 -182
- data/lib/faraday/dependency_loader.rb +37 -0
- data/lib/faraday/encoders/flat_params_encoder.rb +105 -0
- data/lib/faraday/encoders/nested_params_encoder.rb +176 -0
- data/lib/faraday/error.rb +29 -35
- data/lib/faraday/file_part.rb +128 -0
- data/lib/faraday/logging/formatter.rb +105 -0
- data/lib/faraday/methods.rb +6 -0
- data/lib/faraday/middleware.rb +19 -25
- data/lib/faraday/middleware_registry.rb +129 -0
- data/lib/faraday/options.rb +36 -191
- data/lib/faraday/options/connection_options.rb +22 -0
- data/lib/faraday/options/env.rb +181 -0
- data/lib/faraday/options/proxy_options.rb +28 -0
- data/lib/faraday/options/request_options.rb +22 -0
- data/lib/faraday/options/ssl_options.rb +59 -0
- data/lib/faraday/param_part.rb +53 -0
- data/lib/faraday/parameters.rb +4 -197
- data/lib/faraday/rack_builder.rb +76 -64
- data/lib/faraday/request.rb +86 -44
- data/lib/faraday/request/authorization.rb +44 -30
- data/lib/faraday/request/basic_authentication.rb +14 -7
- data/lib/faraday/request/instrumentation.rb +45 -27
- data/lib/faraday/request/multipart.rb +86 -48
- data/lib/faraday/request/retry.rb +197 -171
- data/lib/faraday/request/token_authentication.rb +15 -10
- data/lib/faraday/request/url_encoded.rb +43 -23
- data/lib/faraday/response.rb +24 -20
- data/lib/faraday/response/logger.rb +22 -69
- data/lib/faraday/response/raise_error.rb +49 -18
- data/lib/faraday/utils.rb +38 -247
- data/lib/faraday/utils/headers.rb +139 -0
- data/lib/faraday/utils/params_hash.rb +61 -0
- data/lib/faraday/version.rb +5 -0
- data/spec/external_adapters/faraday_specs_setup.rb +14 -0
- data/spec/faraday/adapter/em_http_spec.rb +47 -0
- data/spec/faraday/adapter/em_synchrony_spec.rb +16 -0
- data/spec/faraday/adapter/excon_spec.rb +49 -0
- data/spec/faraday/adapter/httpclient_spec.rb +73 -0
- data/spec/faraday/adapter/net_http_spec.rb +64 -0
- data/spec/faraday/adapter/patron_spec.rb +18 -0
- data/spec/faraday/adapter/rack_spec.rb +8 -0
- data/spec/faraday/adapter/test_spec.rb +260 -0
- data/spec/faraday/adapter/typhoeus_spec.rb +7 -0
- data/spec/faraday/adapter_registry_spec.rb +28 -0
- data/spec/faraday/adapter_spec.rb +55 -0
- data/spec/faraday/composite_read_io_spec.rb +80 -0
- data/spec/faraday/connection_spec.rb +721 -0
- data/spec/faraday/error_spec.rb +12 -54
- data/spec/faraday/middleware_spec.rb +52 -0
- data/spec/faraday/options/env_spec.rb +70 -0
- data/spec/faraday/options/options_spec.rb +297 -0
- data/spec/faraday/options/proxy_options_spec.rb +37 -0
- data/spec/faraday/options/request_options_spec.rb +19 -0
- data/spec/faraday/params_encoders/flat_spec.rb +42 -0
- data/spec/faraday/params_encoders/nested_spec.rb +142 -0
- data/spec/faraday/rack_builder_spec.rb +345 -0
- data/spec/faraday/request/authorization_spec.rb +88 -0
- data/spec/faraday/request/instrumentation_spec.rb +76 -0
- data/spec/faraday/request/multipart_spec.rb +302 -0
- data/spec/faraday/request/retry_spec.rb +242 -0
- data/spec/faraday/request/url_encoded_spec.rb +83 -0
- data/spec/faraday/request_spec.rb +120 -0
- data/spec/faraday/response/logger_spec.rb +220 -0
- data/spec/faraday/response/middleware_spec.rb +68 -0
- data/spec/faraday/response/raise_error_spec.rb +78 -15
- data/spec/faraday/response_spec.rb +75 -0
- data/spec/faraday/utils/headers_spec.rb +82 -0
- data/spec/faraday/utils_spec.rb +56 -0
- data/spec/faraday_spec.rb +37 -0
- data/spec/spec_helper.rb +63 -36
- data/spec/support/disabling_stub.rb +14 -0
- data/spec/support/fake_safe_buffer.rb +15 -0
- data/spec/support/helper_methods.rb +133 -0
- data/spec/support/shared_examples/adapter.rb +105 -0
- data/spec/support/shared_examples/params_encoder.rb +18 -0
- data/spec/support/shared_examples/request_method.rb +262 -0
- data/spec/support/streaming_response_checker.rb +35 -0
- data/spec/support/webmock_rack_app.rb +68 -0
- metadata +124 -41
- data/lib/faraday/adapter/excon.rb +0 -82
- data/lib/faraday/adapter/net_http.rb +0 -152
- data/lib/faraday/adapter/net_http_persistent.rb +0 -68
- data/lib/faraday/deprecate.rb +0 -107
- data/lib/faraday/upload_io.rb +0 -67
- data/spec/faraday/deprecate_spec.rb +0 -69
- data/test/adapters/default_test.rb +0 -14
- data/test/adapters/em_http_test.rb +0 -30
- data/test/adapters/em_synchrony_test.rb +0 -32
- data/test/adapters/excon_test.rb +0 -30
- data/test/adapters/httpclient_test.rb +0 -34
- data/test/adapters/integration.rb +0 -263
- data/test/adapters/logger_test.rb +0 -136
- data/test/adapters/net_http_persistent_test.rb +0 -114
- data/test/adapters/net_http_test.rb +0 -79
- data/test/adapters/patron_test.rb +0 -40
- data/test/adapters/rack_test.rb +0 -38
- data/test/adapters/test_middleware_test.rb +0 -157
- data/test/adapters/typhoeus_test.rb +0 -38
- data/test/authentication_middleware_test.rb +0 -65
- data/test/composite_read_io_test.rb +0 -109
- data/test/connection_test.rb +0 -738
- data/test/env_test.rb +0 -268
- data/test/helper.rb +0 -75
- data/test/live_server.rb +0 -67
- data/test/middleware/instrumentation_test.rb +0 -88
- data/test/middleware/retry_test.rb +0 -282
- data/test/middleware_stack_test.rb +0 -260
- data/test/multibyte.txt +0 -1
- data/test/options_test.rb +0 -333
- data/test/parameters_test.rb +0 -157
- data/test/request_middleware_test.rb +0 -126
- data/test/response_middleware_test.rb +0 -72
- data/test/strawberry.rb +0 -2
- data/test/utils_test.rb +0 -98
@@ -1,43 +1,49 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'openssl'
|
2
4
|
require 'em-http'
|
3
5
|
|
6
|
+
# EventMachine patch to make SSL work.
|
4
7
|
module EmHttpSslPatch
|
5
8
|
def ssl_verify_peer(cert_string)
|
6
|
-
cert = nil
|
7
9
|
begin
|
8
|
-
|
10
|
+
@last_seen_cert = OpenSSL::X509::Certificate.new(cert_string)
|
9
11
|
rescue OpenSSL::X509::CertificateError
|
10
12
|
return false
|
11
13
|
end
|
12
14
|
|
13
|
-
@last_seen_cert
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
else
|
23
|
-
raise OpenSSL::SSL::SSLError.new(%(unable to verify the server certificate for "#{host}"))
|
15
|
+
unless certificate_store.verify(@last_seen_cert)
|
16
|
+
raise OpenSSL::SSL::SSLError,
|
17
|
+
%(unable to verify the server certificate for "#{host}")
|
18
|
+
end
|
19
|
+
|
20
|
+
begin
|
21
|
+
certificate_store.add_cert(@last_seen_cert)
|
22
|
+
rescue OpenSSL::X509::StoreError => e
|
23
|
+
raise e unless e.message == 'cert already in hash table'
|
24
24
|
end
|
25
|
+
true
|
25
26
|
end
|
26
27
|
|
27
28
|
def ssl_handshake_completed
|
28
29
|
return true unless verify_peer?
|
29
30
|
|
30
|
-
unless
|
31
|
-
raise OpenSSL::SSL::SSLError
|
32
|
-
|
33
|
-
true
|
31
|
+
unless verified_cert_identity?
|
32
|
+
raise OpenSSL::SSL::SSLError,
|
33
|
+
%(host "#{host}" does not match the server certificate)
|
34
34
|
end
|
35
|
+
|
36
|
+
true
|
35
37
|
end
|
36
38
|
|
37
39
|
def verify_peer?
|
38
40
|
parent.connopts.tls[:verify_peer]
|
39
41
|
end
|
40
42
|
|
43
|
+
def verified_cert_identity?
|
44
|
+
OpenSSL::SSL.verify_certificate_identity(@last_seen_cert, host)
|
45
|
+
end
|
46
|
+
|
41
47
|
def host
|
42
48
|
parent.uri.host
|
43
49
|
end
|
@@ -53,4 +59,4 @@ module EmHttpSslPatch
|
|
53
59
|
end
|
54
60
|
end
|
55
61
|
|
56
|
-
EventMachine::HttpStubConnection.
|
62
|
+
EventMachine::HttpStubConnection.include(EmHttpSslPatch)
|
@@ -1,7 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'uri'
|
2
4
|
|
3
5
|
module Faraday
|
4
6
|
class Adapter
|
7
|
+
# EventMachine Synchrony adapter.
|
5
8
|
class EMSynchrony < Faraday::Adapter
|
6
9
|
include EMHttp::Options
|
7
10
|
|
@@ -9,11 +12,28 @@ module Faraday
|
|
9
12
|
require 'em-synchrony/em-http'
|
10
13
|
require 'em-synchrony/em-multi'
|
11
14
|
require 'fiber'
|
15
|
+
|
16
|
+
require 'faraday/adapter/em_synchrony/parallel_manager'
|
17
|
+
|
18
|
+
if Faraday::Adapter::EMSynchrony.loaded?
|
19
|
+
begin
|
20
|
+
require 'openssl'
|
21
|
+
rescue LoadError
|
22
|
+
warn 'Warning: no such file to load -- openssl. ' \
|
23
|
+
'Make sure it is installed if you want HTTPS support'
|
24
|
+
else
|
25
|
+
require 'em-http/version'
|
26
|
+
if EventMachine::HttpRequest::VERSION < '1.1.6'
|
27
|
+
require 'faraday/adapter/em_http_ssl_patch'
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
12
31
|
end
|
13
32
|
|
14
33
|
self.supports_parallel = true
|
15
34
|
|
16
|
-
|
35
|
+
# @return [ParallelManager]
|
36
|
+
def self.setup_parallel_manager(_options = nil)
|
17
37
|
ParallelManager.new
|
18
38
|
end
|
19
39
|
|
@@ -23,84 +43,111 @@ module Faraday
|
|
23
43
|
|
24
44
|
http_method = env[:method].to_s.downcase.to_sym
|
25
45
|
|
26
|
-
# Queue requests for parallel execution.
|
27
46
|
if env[:parallel_manager]
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
47
|
+
# Queue requests for parallel execution.
|
48
|
+
execute_parallel_request(env, request, http_method)
|
49
|
+
else
|
50
|
+
# Execute single request.
|
51
|
+
execute_single_request(env, request, http_method)
|
52
|
+
end
|
34
53
|
|
35
|
-
|
36
|
-
|
37
|
-
|
54
|
+
@app.call env
|
55
|
+
rescue Errno::ECONNREFUSED
|
56
|
+
raise Faraday::ConnectionFailed, $ERROR_INFO
|
57
|
+
rescue EventMachine::Connectify::CONNECTError => e
|
58
|
+
if e.message.include?('Proxy Authentication Required')
|
59
|
+
raise Faraday::ConnectionFailed,
|
60
|
+
%(407 "Proxy Authentication Required")
|
61
|
+
end
|
38
62
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
63
|
+
raise Faraday::ConnectionFailed, e
|
64
|
+
rescue Errno::ETIMEDOUT => e
|
65
|
+
raise Faraday::TimeoutError, e
|
66
|
+
rescue RuntimeError => e
|
67
|
+
if e.message == 'connection closed by server'
|
68
|
+
raise Faraday::ConnectionFailed, e
|
69
|
+
end
|
70
|
+
|
71
|
+
raise Faraday::TimeoutError, e if e.message.include?('timeout error')
|
72
|
+
|
73
|
+
raise
|
74
|
+
rescue StandardError => e
|
75
|
+
if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
|
76
|
+
raise Faraday::SSLError, e
|
77
|
+
end
|
78
|
+
|
79
|
+
raise
|
80
|
+
end
|
81
|
+
|
82
|
+
def create_request(env)
|
83
|
+
EventMachine::HttpRequest.new(
|
84
|
+
Utils::URI(env[:url].to_s),
|
85
|
+
connection_config(env).merge(@connection_options)
|
86
|
+
)
|
87
|
+
end
|
88
|
+
|
89
|
+
private
|
54
90
|
|
55
|
-
|
91
|
+
def execute_parallel_request(env, request, http_method)
|
92
|
+
env[:parallel_manager].add(request, http_method,
|
93
|
+
request_config(env)) do |resp|
|
94
|
+
if (req = env[:request]).stream_response?
|
95
|
+
warn "Streaming downloads for #{self.class.name} " \
|
96
|
+
'are not yet implemented.'
|
97
|
+
req.on_data.call(resp.response, resp.response.bytesize)
|
98
|
+
end
|
56
99
|
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
client.response_header.each do |name, value|
|
100
|
+
save_response(env, resp.response_header.status,
|
101
|
+
resp.response) do |resp_headers|
|
102
|
+
resp.response_header.each do |name, value|
|
61
103
|
resp_headers[name.to_sym] = value
|
62
104
|
end
|
63
105
|
end
|
106
|
+
|
107
|
+
# Finalize the response object with values from `env`.
|
108
|
+
env[:response].finish(env)
|
64
109
|
end
|
110
|
+
end
|
65
111
|
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
112
|
+
def execute_single_request(env, request, http_method)
|
113
|
+
block = -> { request.send(http_method, request_config(env)) }
|
114
|
+
client = call_block(block)
|
115
|
+
|
116
|
+
raise client.error if client&.error
|
117
|
+
|
118
|
+
if env[:request].stream_response?
|
119
|
+
warn "Streaming downloads for #{self.class.name} " \
|
120
|
+
'are not yet implemented.'
|
121
|
+
env[:request].on_data.call(
|
122
|
+
client.response,
|
123
|
+
client.response.bytesize
|
124
|
+
)
|
74
125
|
end
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
raise
|
126
|
+
status = client.response_header.status
|
127
|
+
reason = client.response_header.http_reason
|
128
|
+
save_response(env, status, client.response, nil, reason) do |headers|
|
129
|
+
client.response_header.each do |name, value|
|
130
|
+
headers[name.to_sym] = value
|
131
|
+
end
|
82
132
|
end
|
83
|
-
|
84
|
-
|
85
|
-
|
133
|
+
end
|
134
|
+
|
135
|
+
def call_block(block)
|
136
|
+
client = nil
|
137
|
+
|
138
|
+
if EM.reactor_running?
|
139
|
+
client = block.call
|
86
140
|
else
|
87
|
-
|
141
|
+
EM.run do
|
142
|
+
Fiber.new do
|
143
|
+
client = block.call
|
144
|
+
EM.stop
|
145
|
+
end.resume
|
146
|
+
end
|
88
147
|
end
|
89
|
-
end
|
90
148
|
|
91
|
-
|
92
|
-
EventMachine::HttpRequest.new(Utils::URI(env[:url].to_s), connection_config(env).merge(@connection_options))
|
149
|
+
client
|
93
150
|
end
|
94
151
|
end
|
95
152
|
end
|
96
153
|
end
|
97
|
-
|
98
|
-
require 'faraday/adapter/em_synchrony/parallel_manager'
|
99
|
-
|
100
|
-
begin
|
101
|
-
require 'openssl'
|
102
|
-
rescue LoadError
|
103
|
-
warn "Warning: no such file to load -- openssl. Make sure it is installed if you want HTTPS support"
|
104
|
-
else
|
105
|
-
require 'faraday/adapter/em_http_ssl_patch'
|
106
|
-
end if Faraday::Adapter::EMSynchrony.loaded?
|
@@ -1,16 +1,21 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Faraday
|
2
4
|
class Adapter
|
3
5
|
class EMSynchrony < Faraday::Adapter
|
6
|
+
# A parallel manager for EMSynchrony.
|
4
7
|
class ParallelManager
|
5
|
-
|
6
|
-
#
|
7
|
-
#
|
8
|
+
# Add requests to queue.
|
9
|
+
#
|
10
|
+
# @param request [EM::HttpRequest]
|
11
|
+
# @param method [Symbol, String] HTTP method
|
12
|
+
# @param args [Array] the rest of the positional arguments
|
8
13
|
def add(request, method, *args, &block)
|
9
14
|
queue << {
|
10
|
-
:
|
11
|
-
:
|
12
|
-
:
|
13
|
-
:
|
15
|
+
request: request,
|
16
|
+
method: method,
|
17
|
+
args: args,
|
18
|
+
block: block
|
14
19
|
}
|
15
20
|
end
|
16
21
|
|
@@ -19,19 +24,18 @@ module Faraday
|
|
19
24
|
def run
|
20
25
|
result = nil
|
21
26
|
if !EM.reactor_running?
|
22
|
-
EM.run
|
27
|
+
EM.run do
|
23
28
|
Fiber.new do
|
24
29
|
result = perform
|
25
30
|
EM.stop
|
26
31
|
end.resume
|
27
|
-
|
32
|
+
end
|
28
33
|
else
|
29
34
|
result = perform
|
30
35
|
end
|
31
36
|
result
|
32
37
|
end
|
33
38
|
|
34
|
-
|
35
39
|
private
|
36
40
|
|
37
41
|
# The request queue.
|
@@ -59,8 +63,7 @@ module Faraday
|
|
59
63
|
# Block fiber until all requests have returned.
|
60
64
|
multi.perform
|
61
65
|
end
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
end # Faraday
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -1,78 +1,97 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Faraday
|
2
4
|
class Adapter
|
5
|
+
# HTTPClient adapter.
|
3
6
|
class HTTPClient < Faraday::Adapter
|
4
7
|
dependency 'httpclient'
|
5
8
|
|
6
|
-
def
|
7
|
-
@client ||= ::HTTPClient.new
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
super
|
12
|
-
|
13
|
-
# enable compression
|
14
|
-
client.transparent_gzip_decompression = true
|
9
|
+
def build_connection(env)
|
10
|
+
@client ||= ::HTTPClient.new.tap do |cli|
|
11
|
+
# enable compression
|
12
|
+
cli.transparent_gzip_decompression = true
|
13
|
+
end
|
15
14
|
|
16
|
-
if req = env[:request]
|
17
|
-
if proxy = req[:proxy]
|
18
|
-
configure_proxy proxy
|
15
|
+
if (req = env[:request])
|
16
|
+
if (proxy = req[:proxy])
|
17
|
+
configure_proxy @client, proxy
|
19
18
|
end
|
20
19
|
|
21
|
-
if bind = req[:bind]
|
22
|
-
configure_socket bind
|
20
|
+
if (bind = req[:bind])
|
21
|
+
configure_socket @client, bind
|
23
22
|
end
|
24
23
|
|
25
|
-
configure_timeouts req
|
24
|
+
configure_timeouts @client, req
|
26
25
|
end
|
27
26
|
|
28
|
-
if env[:url].scheme == 'https' && ssl = env[:ssl]
|
29
|
-
configure_ssl ssl
|
27
|
+
if env[:url].scheme == 'https' && (ssl = env[:ssl])
|
28
|
+
configure_ssl @client, ssl
|
30
29
|
end
|
31
30
|
|
32
|
-
configure_client
|
31
|
+
configure_client @client
|
32
|
+
|
33
|
+
@client
|
34
|
+
end
|
33
35
|
|
34
|
-
|
36
|
+
def call(env)
|
37
|
+
super
|
38
|
+
|
39
|
+
# TODO: Don't stream yet.
|
35
40
|
# https://github.com/nahi/httpclient/pull/90
|
36
41
|
env[:body] = env[:body].read if env[:body].respond_to? :read
|
37
42
|
|
38
|
-
|
39
|
-
:
|
40
|
-
|
43
|
+
connection(env) do |http|
|
44
|
+
resp = http.request env[:method], env[:url],
|
45
|
+
body: env[:body],
|
46
|
+
header: env[:request_headers]
|
41
47
|
|
42
|
-
|
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
|
43
54
|
|
44
|
-
|
55
|
+
@app.call env
|
56
|
+
end
|
45
57
|
rescue ::HTTPClient::TimeoutError, Errno::ETIMEDOUT
|
46
|
-
raise Faraday::TimeoutError,
|
47
|
-
rescue ::HTTPClient::BadResponseError =>
|
48
|
-
if
|
49
|
-
raise Faraday::ConnectionFailed,
|
50
|
-
|
51
|
-
raise Faraday::ClientError, $!
|
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 ")
|
52
63
|
end
|
53
|
-
|
54
|
-
raise Faraday::
|
55
|
-
rescue
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
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::SSL::SSLError) && \
|
70
|
+
e.is_a?(::OpenSSL::SSL::SSLError)
|
71
|
+
raise Faraday::SSLError, e
|
60
72
|
end
|
73
|
+
|
74
|
+
raise
|
61
75
|
end
|
62
76
|
|
63
|
-
|
77
|
+
# @param bind [Hash]
|
78
|
+
def configure_socket(client, bind)
|
64
79
|
client.socket_local.host = bind[:host]
|
65
80
|
client.socket_local.port = bind[:port]
|
66
81
|
end
|
67
82
|
|
68
|
-
|
83
|
+
# Configure proxy URI and any user credentials.
|
84
|
+
#
|
85
|
+
# @param proxy [Hash]
|
86
|
+
def configure_proxy(client, proxy)
|
69
87
|
client.proxy = proxy[:uri]
|
70
|
-
|
71
|
-
|
72
|
-
|
88
|
+
return unless proxy[:user] && proxy[:password]
|
89
|
+
|
90
|
+
client.set_proxy_auth(proxy[:user], proxy[:password])
|
73
91
|
end
|
74
92
|
|
75
|
-
|
93
|
+
# @param ssl [Hash]
|
94
|
+
def configure_ssl(client, ssl)
|
76
95
|
ssl_config = client.ssl_config
|
77
96
|
ssl_config.verify_mode = ssl_verify_mode(ssl)
|
78
97
|
ssl_config.cert_store = ssl_cert_store(ssl)
|
@@ -84,40 +103,45 @@ module Faraday
|
|
84
103
|
ssl_config.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
|
85
104
|
end
|
86
105
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
client.
|
91
|
-
client.send_timeout = req[:timeout]
|
106
|
+
# @param req [Hash]
|
107
|
+
def configure_timeouts(client, req)
|
108
|
+
if (sec = request_timeout(:open, req))
|
109
|
+
client.connect_timeout = sec
|
92
110
|
end
|
93
111
|
|
94
|
-
if req
|
95
|
-
client.
|
96
|
-
client.send_timeout = req[:open_timeout]
|
112
|
+
if (sec = request_timeout(:write, req))
|
113
|
+
client.send_timeout = sec
|
97
114
|
end
|
115
|
+
|
116
|
+
return unless (sec = request_timeout(:read, req))
|
117
|
+
|
118
|
+
client.receive_timeout = sec
|
98
119
|
end
|
99
120
|
|
100
|
-
def configure_client
|
101
|
-
@config_block
|
121
|
+
def configure_client(client)
|
122
|
+
@config_block&.call(client)
|
102
123
|
end
|
103
124
|
|
125
|
+
# @param ssl [Hash]
|
126
|
+
# @return [OpenSSL::X509::Store]
|
104
127
|
def ssl_cert_store(ssl)
|
105
128
|
return ssl[:cert_store] if ssl[:cert_store]
|
129
|
+
|
106
130
|
# Memoize the cert store so that the same one is passed to
|
107
|
-
# HTTPClient each time, to avoid resyncing SSL
|
131
|
+
# HTTPClient each time, to avoid resyncing SSL sessions when
|
108
132
|
# it's changed
|
109
|
-
@
|
133
|
+
@ssl_cert_store ||= begin
|
110
134
|
# Use the default cert store by default, i.e. system ca certs
|
111
|
-
|
112
|
-
cert_store.set_default_paths
|
113
|
-
cert_store
|
135
|
+
OpenSSL::X509::Store.new.tap(&:set_default_paths)
|
114
136
|
end
|
115
137
|
end
|
116
138
|
|
139
|
+
# @param ssl [Hash]
|
117
140
|
def ssl_verify_mode(ssl)
|
118
141
|
ssl[:verify_mode] || begin
|
119
142
|
if ssl.fetch(:verify, true)
|
120
|
-
OpenSSL::SSL::VERIFY_PEER |
|
143
|
+
OpenSSL::SSL::VERIFY_PEER |
|
144
|
+
OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
|
121
145
|
else
|
122
146
|
OpenSSL::SSL::VERIFY_NONE
|
123
147
|
end
|