faraday 1.4.1 → 2.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +197 -3
- data/LICENSE.md +1 -1
- data/README.md +34 -20
- data/Rakefile +3 -1
- data/examples/client_spec.rb +67 -13
- data/examples/client_test.rb +80 -15
- data/lib/faraday/adapter/test.rb +117 -52
- data/lib/faraday/adapter.rb +5 -14
- data/lib/faraday/connection.rb +70 -130
- data/lib/faraday/encoders/nested_params_encoder.rb +14 -7
- data/lib/faraday/error.rb +20 -11
- data/lib/faraday/logging/formatter.rb +28 -15
- data/lib/faraday/middleware.rb +3 -1
- data/lib/faraday/middleware_registry.rb +17 -63
- data/lib/faraday/options/connection_options.rb +7 -6
- data/lib/faraday/options/env.rb +85 -62
- data/lib/faraday/options/proxy_options.rb +11 -3
- data/lib/faraday/options/request_options.rb +7 -6
- data/lib/faraday/options/ssl_options.rb +56 -45
- data/lib/faraday/options.rb +7 -6
- data/lib/faraday/rack_builder.rb +23 -21
- data/lib/faraday/request/authorization.rb +37 -38
- data/lib/faraday/request/instrumentation.rb +5 -1
- data/lib/faraday/request/json.rb +70 -0
- data/lib/faraday/request/url_encoded.rb +5 -1
- data/lib/faraday/request.rb +20 -37
- data/lib/faraday/response/json.rb +73 -0
- data/lib/faraday/response/logger.rb +8 -4
- data/lib/faraday/response/raise_error.rb +33 -6
- data/lib/faraday/response.rb +10 -20
- data/lib/faraday/utils/headers.rb +7 -2
- data/lib/faraday/utils.rb +11 -7
- data/lib/faraday/version.rb +1 -1
- data/lib/faraday.rb +10 -31
- data/spec/faraday/adapter/test_spec.rb +182 -0
- data/spec/faraday/connection_spec.rb +177 -90
- data/spec/faraday/error_spec.rb +31 -6
- data/spec/faraday/middleware_registry_spec.rb +31 -0
- data/spec/faraday/middleware_spec.rb +18 -0
- data/spec/faraday/options/env_spec.rb +8 -2
- data/spec/faraday/options/options_spec.rb +1 -1
- data/spec/faraday/options/proxy_options_spec.rb +15 -0
- data/spec/faraday/params_encoders/nested_spec.rb +8 -0
- data/spec/faraday/rack_builder_spec.rb +26 -54
- data/spec/faraday/request/authorization_spec.rb +54 -24
- data/spec/faraday/request/instrumentation_spec.rb +5 -7
- data/spec/faraday/request/json_spec.rb +199 -0
- data/spec/faraday/request/url_encoded_spec.rb +12 -2
- data/spec/faraday/request_spec.rb +5 -15
- data/spec/faraday/response/json_spec.rb +189 -0
- data/spec/faraday/response/logger_spec.rb +38 -0
- data/spec/faraday/response/raise_error_spec.rb +47 -5
- data/spec/faraday/response_spec.rb +3 -1
- data/spec/faraday/utils/headers_spec.rb +22 -4
- data/spec/faraday/utils_spec.rb +63 -1
- data/spec/faraday_spec.rb +8 -4
- data/spec/spec_helper.rb +6 -5
- data/spec/support/fake_safe_buffer.rb +1 -1
- data/spec/support/helper_methods.rb +0 -37
- data/spec/support/shared_examples/adapter.rb +2 -2
- data/spec/support/shared_examples/request_method.rb +22 -21
- metadata +14 -94
- data/lib/faraday/adapter/em_http.rb +0 -289
- 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 -153
- data/lib/faraday/adapter/httpclient.rb +0 -152
- data/lib/faraday/adapter/patron.rb +0 -132
- data/lib/faraday/adapter/rack.rb +0 -75
- data/lib/faraday/adapter/typhoeus.rb +0 -15
- data/lib/faraday/autoload.rb +0 -92
- data/lib/faraday/dependency_loader.rb +0 -37
- data/lib/faraday/file_part.rb +0 -128
- data/lib/faraday/param_part.rb +0 -53
- data/lib/faraday/request/basic_authentication.rb +0 -20
- data/lib/faraday/request/multipart.rb +0 -106
- data/lib/faraday/request/retry.rb +0 -239
- data/lib/faraday/request/token_authentication.rb +0 -20
- data/spec/faraday/adapter/em_http_spec.rb +0 -47
- data/spec/faraday/adapter/em_synchrony_spec.rb +0 -16
- data/spec/faraday/adapter/excon_spec.rb +0 -49
- data/spec/faraday/adapter/httpclient_spec.rb +0 -73
- data/spec/faraday/adapter/net_http_spec.rb +0 -64
- data/spec/faraday/adapter/patron_spec.rb +0 -18
- data/spec/faraday/adapter/rack_spec.rb +0 -8
- data/spec/faraday/adapter/typhoeus_spec.rb +0 -7
- data/spec/faraday/composite_read_io_spec.rb +0 -80
- data/spec/faraday/request/multipart_spec.rb +0 -302
- data/spec/faraday/request/retry_spec.rb +0 -242
- data/spec/faraday/response/middleware_spec.rb +0 -68
- data/spec/support/webmock_rack_app.rb +0 -68
@@ -79,7 +79,7 @@ shared_examples 'a request method' do |http_method|
|
|
79
79
|
|
80
80
|
on_feature :request_body_on_query_methods do
|
81
81
|
it 'sends request body' do
|
82
|
-
request_stub.with(
|
82
|
+
request_stub.with({ body: 'test' })
|
83
83
|
res = if query_or_body == :body
|
84
84
|
conn.public_send(http_method, '/', 'test')
|
85
85
|
else
|
@@ -93,7 +93,7 @@ shared_examples 'a request method' do |http_method|
|
|
93
93
|
|
94
94
|
it 'sends url encoded parameters' do
|
95
95
|
payload = { name: 'zack' }
|
96
|
-
request_stub.with(
|
96
|
+
request_stub.with({ query_or_body => payload })
|
97
97
|
res = conn.public_send(http_method, '/', payload)
|
98
98
|
if query_or_body == :query
|
99
99
|
expect(res.env.request_body).to be_nil
|
@@ -104,7 +104,7 @@ shared_examples 'a request method' do |http_method|
|
|
104
104
|
|
105
105
|
it 'sends url encoded nested parameters' do
|
106
106
|
payload = { name: { first: 'zack' } }
|
107
|
-
request_stub.with(
|
107
|
+
request_stub.with({ query_or_body => payload })
|
108
108
|
conn.public_send(http_method, '/', payload)
|
109
109
|
end
|
110
110
|
|
@@ -126,19 +126,6 @@ shared_examples 'a request method' do |http_method|
|
|
126
126
|
expect { conn.public_send(http_method, '/') }.to raise_error(exc)
|
127
127
|
end
|
128
128
|
|
129
|
-
# Can't send files on get, head and delete methods
|
130
|
-
if method_with_body?(http_method)
|
131
|
-
it 'sends files' do
|
132
|
-
payload = { uploaded_file: multipart_file }
|
133
|
-
request_stub.with(headers: { 'Content-Type' => %r{\Amultipart/form-data} }) do |request|
|
134
|
-
# WebMock does not support matching body for multipart/form-data requests yet :(
|
135
|
-
# https://github.com/bblimke/webmock/issues/623
|
136
|
-
request.body.include?('RubyMultipartPost')
|
137
|
-
end
|
138
|
-
conn.public_send(http_method, '/', payload)
|
139
|
-
end
|
140
|
-
end
|
141
|
-
|
142
129
|
on_feature :reason_phrase_parse do
|
143
130
|
it 'parses the reason phrase' do
|
144
131
|
request_stub.to_return(status: [200, 'OK'])
|
@@ -166,12 +153,19 @@ shared_examples 'a request method' do |http_method|
|
|
166
153
|
let(:streamed) { [] }
|
167
154
|
|
168
155
|
context 'when response is empty' do
|
169
|
-
it do
|
156
|
+
it 'handles streaming' do
|
157
|
+
env = nil
|
170
158
|
conn.public_send(http_method, '/') do |req|
|
171
|
-
req.options.on_data = proc
|
159
|
+
req.options.on_data = proc do |chunk, size, block_env|
|
160
|
+
streamed << [chunk, size]
|
161
|
+
env ||= block_env
|
162
|
+
end
|
172
163
|
end
|
173
164
|
|
174
165
|
expect(streamed).to eq([['', 0]])
|
166
|
+
# TODO: enable this after updating all existing adapters to the new streaming API
|
167
|
+
# expect(env).to be_a(Faraday::Env)
|
168
|
+
# expect(env.status).to eq(200)
|
175
169
|
end
|
176
170
|
end
|
177
171
|
|
@@ -179,12 +173,19 @@ shared_examples 'a request method' do |http_method|
|
|
179
173
|
before { request_stub.to_return(body: big_string) }
|
180
174
|
|
181
175
|
it 'handles streaming' do
|
176
|
+
env = nil
|
182
177
|
response = conn.public_send(http_method, '/') do |req|
|
183
|
-
req.options.on_data = proc
|
178
|
+
req.options.on_data = proc do |chunk, size, block_env|
|
179
|
+
streamed << [chunk, size]
|
180
|
+
env ||= block_env
|
181
|
+
end
|
184
182
|
end
|
185
183
|
|
186
184
|
expect(response.body).to eq('')
|
187
185
|
check_streaming_response(streamed, chunk_size: 16 * 1024)
|
186
|
+
# TODO: enable this after updating all existing adapters to the new streaming API
|
187
|
+
# expect(env).to be_a(Faraday::Env)
|
188
|
+
# expect(env.status).to eq(200)
|
188
189
|
end
|
189
190
|
end
|
190
191
|
end
|
@@ -199,11 +200,11 @@ shared_examples 'a request method' do |http_method|
|
|
199
200
|
@payload2 = { b: '2' }
|
200
201
|
|
201
202
|
request_stub
|
202
|
-
.with(
|
203
|
+
.with({ query_or_body => @payload1 })
|
203
204
|
.to_return(body: @payload1.to_json)
|
204
205
|
|
205
206
|
stub_request(http_method, remote)
|
206
|
-
.with(
|
207
|
+
.with({ query_or_body => @payload2 })
|
207
208
|
.to_return(body: @payload2.to_json)
|
208
209
|
|
209
210
|
conn.in_parallel do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faraday
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- "@technoweenie"
|
@@ -10,84 +10,28 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date:
|
13
|
+
date: 2024-01-09 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
|
-
- !ruby/object:Gem::Dependency
|
16
|
-
name: faraday-excon
|
17
|
-
requirement: !ruby/object:Gem::Requirement
|
18
|
-
requirements:
|
19
|
-
- - "~>"
|
20
|
-
- !ruby/object:Gem::Version
|
21
|
-
version: '1.1'
|
22
|
-
type: :runtime
|
23
|
-
prerelease: false
|
24
|
-
version_requirements: !ruby/object:Gem::Requirement
|
25
|
-
requirements:
|
26
|
-
- - "~>"
|
27
|
-
- !ruby/object:Gem::Version
|
28
|
-
version: '1.1'
|
29
15
|
- !ruby/object:Gem::Dependency
|
30
16
|
name: faraday-net_http
|
31
|
-
requirement: !ruby/object:Gem::Requirement
|
32
|
-
requirements:
|
33
|
-
- - "~>"
|
34
|
-
- !ruby/object:Gem::Version
|
35
|
-
version: '1.0'
|
36
|
-
type: :runtime
|
37
|
-
prerelease: false
|
38
|
-
version_requirements: !ruby/object:Gem::Requirement
|
39
|
-
requirements:
|
40
|
-
- - "~>"
|
41
|
-
- !ruby/object:Gem::Version
|
42
|
-
version: '1.0'
|
43
|
-
- !ruby/object:Gem::Dependency
|
44
|
-
name: faraday-net_http_persistent
|
45
|
-
requirement: !ruby/object:Gem::Requirement
|
46
|
-
requirements:
|
47
|
-
- - "~>"
|
48
|
-
- !ruby/object:Gem::Version
|
49
|
-
version: '1.1'
|
50
|
-
type: :runtime
|
51
|
-
prerelease: false
|
52
|
-
version_requirements: !ruby/object:Gem::Requirement
|
53
|
-
requirements:
|
54
|
-
- - "~>"
|
55
|
-
- !ruby/object:Gem::Version
|
56
|
-
version: '1.1'
|
57
|
-
- !ruby/object:Gem::Dependency
|
58
|
-
name: multipart-post
|
59
17
|
requirement: !ruby/object:Gem::Requirement
|
60
18
|
requirements:
|
61
19
|
- - ">="
|
62
20
|
- !ruby/object:Gem::Version
|
63
|
-
version: '
|
21
|
+
version: '2.0'
|
64
22
|
- - "<"
|
65
23
|
- !ruby/object:Gem::Version
|
66
|
-
version: '3'
|
24
|
+
version: '3.2'
|
67
25
|
type: :runtime
|
68
26
|
prerelease: false
|
69
27
|
version_requirements: !ruby/object:Gem::Requirement
|
70
28
|
requirements:
|
71
29
|
- - ">="
|
72
30
|
- !ruby/object:Gem::Version
|
73
|
-
version: '
|
31
|
+
version: '2.0'
|
74
32
|
- - "<"
|
75
33
|
- !ruby/object:Gem::Version
|
76
|
-
version: '3'
|
77
|
-
- !ruby/object:Gem::Dependency
|
78
|
-
name: ruby2_keywords
|
79
|
-
requirement: !ruby/object:Gem::Requirement
|
80
|
-
requirements:
|
81
|
-
- - ">="
|
82
|
-
- !ruby/object:Gem::Version
|
83
|
-
version: 0.0.4
|
84
|
-
type: :runtime
|
85
|
-
prerelease: false
|
86
|
-
version_requirements: !ruby/object:Gem::Requirement
|
87
|
-
requirements:
|
88
|
-
- - ">="
|
89
|
-
- !ruby/object:Gem::Version
|
90
|
-
version: 0.0.4
|
34
|
+
version: '3.2'
|
91
35
|
description:
|
92
36
|
email: technoweenie@gmail.com
|
93
37
|
executables: []
|
@@ -102,23 +46,12 @@ files:
|
|
102
46
|
- examples/client_test.rb
|
103
47
|
- lib/faraday.rb
|
104
48
|
- lib/faraday/adapter.rb
|
105
|
-
- lib/faraday/adapter/em_http.rb
|
106
|
-
- lib/faraday/adapter/em_http_ssl_patch.rb
|
107
|
-
- lib/faraday/adapter/em_synchrony.rb
|
108
|
-
- lib/faraday/adapter/em_synchrony/parallel_manager.rb
|
109
|
-
- lib/faraday/adapter/httpclient.rb
|
110
|
-
- lib/faraday/adapter/patron.rb
|
111
|
-
- lib/faraday/adapter/rack.rb
|
112
49
|
- lib/faraday/adapter/test.rb
|
113
|
-
- lib/faraday/adapter/typhoeus.rb
|
114
50
|
- lib/faraday/adapter_registry.rb
|
115
|
-
- lib/faraday/autoload.rb
|
116
51
|
- lib/faraday/connection.rb
|
117
|
-
- lib/faraday/dependency_loader.rb
|
118
52
|
- lib/faraday/encoders/flat_params_encoder.rb
|
119
53
|
- lib/faraday/encoders/nested_params_encoder.rb
|
120
54
|
- lib/faraday/error.rb
|
121
|
-
- lib/faraday/file_part.rb
|
122
55
|
- lib/faraday/logging/formatter.rb
|
123
56
|
- lib/faraday/methods.rb
|
124
57
|
- lib/faraday/middleware.rb
|
@@ -129,18 +62,15 @@ files:
|
|
129
62
|
- lib/faraday/options/proxy_options.rb
|
130
63
|
- lib/faraday/options/request_options.rb
|
131
64
|
- lib/faraday/options/ssl_options.rb
|
132
|
-
- lib/faraday/param_part.rb
|
133
65
|
- lib/faraday/parameters.rb
|
134
66
|
- lib/faraday/rack_builder.rb
|
135
67
|
- lib/faraday/request.rb
|
136
68
|
- lib/faraday/request/authorization.rb
|
137
|
-
- lib/faraday/request/basic_authentication.rb
|
138
69
|
- lib/faraday/request/instrumentation.rb
|
139
|
-
- lib/faraday/request/
|
140
|
-
- lib/faraday/request/retry.rb
|
141
|
-
- lib/faraday/request/token_authentication.rb
|
70
|
+
- lib/faraday/request/json.rb
|
142
71
|
- lib/faraday/request/url_encoded.rb
|
143
72
|
- lib/faraday/response.rb
|
73
|
+
- lib/faraday/response/json.rb
|
144
74
|
- lib/faraday/response/logger.rb
|
145
75
|
- lib/faraday/response/raise_error.rb
|
146
76
|
- lib/faraday/utils.rb
|
@@ -148,20 +78,12 @@ files:
|
|
148
78
|
- lib/faraday/utils/params_hash.rb
|
149
79
|
- lib/faraday/version.rb
|
150
80
|
- spec/external_adapters/faraday_specs_setup.rb
|
151
|
-
- spec/faraday/adapter/em_http_spec.rb
|
152
|
-
- spec/faraday/adapter/em_synchrony_spec.rb
|
153
|
-
- spec/faraday/adapter/excon_spec.rb
|
154
|
-
- spec/faraday/adapter/httpclient_spec.rb
|
155
|
-
- spec/faraday/adapter/net_http_spec.rb
|
156
|
-
- spec/faraday/adapter/patron_spec.rb
|
157
|
-
- spec/faraday/adapter/rack_spec.rb
|
158
81
|
- spec/faraday/adapter/test_spec.rb
|
159
|
-
- spec/faraday/adapter/typhoeus_spec.rb
|
160
82
|
- spec/faraday/adapter_registry_spec.rb
|
161
83
|
- spec/faraday/adapter_spec.rb
|
162
|
-
- spec/faraday/composite_read_io_spec.rb
|
163
84
|
- spec/faraday/connection_spec.rb
|
164
85
|
- spec/faraday/error_spec.rb
|
86
|
+
- spec/faraday/middleware_registry_spec.rb
|
165
87
|
- spec/faraday/middleware_spec.rb
|
166
88
|
- spec/faraday/options/env_spec.rb
|
167
89
|
- spec/faraday/options/options_spec.rb
|
@@ -172,12 +94,11 @@ files:
|
|
172
94
|
- spec/faraday/rack_builder_spec.rb
|
173
95
|
- spec/faraday/request/authorization_spec.rb
|
174
96
|
- spec/faraday/request/instrumentation_spec.rb
|
175
|
-
- spec/faraday/request/
|
176
|
-
- spec/faraday/request/retry_spec.rb
|
97
|
+
- spec/faraday/request/json_spec.rb
|
177
98
|
- spec/faraday/request/url_encoded_spec.rb
|
178
99
|
- spec/faraday/request_spec.rb
|
100
|
+
- spec/faraday/response/json_spec.rb
|
179
101
|
- spec/faraday/response/logger_spec.rb
|
180
|
-
- spec/faraday/response/middleware_spec.rb
|
181
102
|
- spec/faraday/response/raise_error_spec.rb
|
182
103
|
- spec/faraday/response_spec.rb
|
183
104
|
- spec/faraday/utils/headers_spec.rb
|
@@ -191,13 +112,12 @@ files:
|
|
191
112
|
- spec/support/shared_examples/params_encoder.rb
|
192
113
|
- spec/support/shared_examples/request_method.rb
|
193
114
|
- spec/support/streaming_response_checker.rb
|
194
|
-
- spec/support/webmock_rack_app.rb
|
195
115
|
homepage: https://lostisland.github.io/faraday
|
196
116
|
licenses:
|
197
117
|
- MIT
|
198
118
|
metadata:
|
199
119
|
homepage_uri: https://lostisland.github.io/faraday
|
200
|
-
changelog_uri: https://github.com/lostisland/faraday/releases/tag/
|
120
|
+
changelog_uri: https://github.com/lostisland/faraday/releases/tag/v2.9.0
|
201
121
|
source_code_uri: https://github.com/lostisland/faraday
|
202
122
|
bug_tracker_uri: https://github.com/lostisland/faraday/issues
|
203
123
|
post_install_message:
|
@@ -209,14 +129,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
209
129
|
requirements:
|
210
130
|
- - ">="
|
211
131
|
- !ruby/object:Gem::Version
|
212
|
-
version: '
|
132
|
+
version: '3.0'
|
213
133
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
214
134
|
requirements:
|
215
135
|
- - ">="
|
216
136
|
- !ruby/object:Gem::Version
|
217
137
|
version: '0'
|
218
138
|
requirements: []
|
219
|
-
rubygems_version: 3.
|
139
|
+
rubygems_version: 3.5.3
|
220
140
|
signing_key:
|
221
141
|
specification_version: 4
|
222
142
|
summary: HTTP/REST API client library.
|
@@ -1,289 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Adapter
|
5
|
-
# EventMachine adapter. This adapter is useful for either asynchronous
|
6
|
-
# requests when in an EM reactor loop, or for making parallel requests in
|
7
|
-
# synchronous code.
|
8
|
-
class EMHttp < Faraday::Adapter
|
9
|
-
# Options is a module containing helpers to convert the Faraday env object
|
10
|
-
# into options hashes for EMHTTP method calls.
|
11
|
-
module Options
|
12
|
-
# @return [Hash]
|
13
|
-
def connection_config(env)
|
14
|
-
options = {}
|
15
|
-
configure_proxy(options, env)
|
16
|
-
configure_timeout(options, env)
|
17
|
-
configure_socket(options, env)
|
18
|
-
configure_ssl(options, env)
|
19
|
-
options
|
20
|
-
end
|
21
|
-
|
22
|
-
def request_config(env)
|
23
|
-
options = {
|
24
|
-
body: read_body(env),
|
25
|
-
head: env[:request_headers]
|
26
|
-
# keepalive: true,
|
27
|
-
# file: 'path/to/file', # stream data off disk
|
28
|
-
}
|
29
|
-
configure_compression(options, env)
|
30
|
-
options
|
31
|
-
end
|
32
|
-
|
33
|
-
def read_body(env)
|
34
|
-
body = env[:body]
|
35
|
-
body.respond_to?(:read) ? body.read : body
|
36
|
-
end
|
37
|
-
|
38
|
-
# Reads out proxy settings from env into options
|
39
|
-
def configure_proxy(options, env)
|
40
|
-
proxy = request_options(env)[:proxy]
|
41
|
-
return unless proxy
|
42
|
-
|
43
|
-
options[:proxy] = {
|
44
|
-
host: proxy[:uri].host,
|
45
|
-
port: proxy[:uri].port,
|
46
|
-
authorization: [proxy[:user], proxy[:password]]
|
47
|
-
}
|
48
|
-
end
|
49
|
-
|
50
|
-
# Reads out host and port settings from env into options
|
51
|
-
def configure_socket(options, env)
|
52
|
-
bind = request_options(env)[:bind]
|
53
|
-
return unless bind
|
54
|
-
|
55
|
-
options[:bind] = {
|
56
|
-
host: bind[:host],
|
57
|
-
port: bind[:port]
|
58
|
-
}
|
59
|
-
end
|
60
|
-
|
61
|
-
# Reads out SSL certificate settings from env into options
|
62
|
-
def configure_ssl(options, env)
|
63
|
-
return unless env[:url].scheme == 'https' && env[:ssl]
|
64
|
-
|
65
|
-
options[:ssl] = {
|
66
|
-
cert_chain_file: env[:ssl][:ca_file],
|
67
|
-
verify_peer: env[:ssl].fetch(:verify, true)
|
68
|
-
}
|
69
|
-
end
|
70
|
-
|
71
|
-
# Reads out timeout settings from env into options
|
72
|
-
def configure_timeout(options, env)
|
73
|
-
req = request_options(env)
|
74
|
-
options[:inactivity_timeout] = request_timeout(:read, req)
|
75
|
-
options[:connect_timeout] = request_timeout(:open, req)
|
76
|
-
end
|
77
|
-
|
78
|
-
# Reads out compression header settings from env into options
|
79
|
-
def configure_compression(options, env)
|
80
|
-
return unless (env[:method] == :get) &&
|
81
|
-
!options[:head].key?('accept-encoding')
|
82
|
-
|
83
|
-
options[:head]['accept-encoding'] = 'gzip, compressed'
|
84
|
-
end
|
85
|
-
|
86
|
-
def request_options(env)
|
87
|
-
env[:request]
|
88
|
-
end
|
89
|
-
end
|
90
|
-
|
91
|
-
include Options
|
92
|
-
|
93
|
-
dependency do
|
94
|
-
require 'em-http'
|
95
|
-
|
96
|
-
begin
|
97
|
-
require 'openssl'
|
98
|
-
rescue LoadError
|
99
|
-
warn 'Warning: no such file to load -- openssl. ' \
|
100
|
-
'Make sure it is installed if you want HTTPS support'
|
101
|
-
else
|
102
|
-
require 'em-http/version'
|
103
|
-
if EventMachine::HttpRequest::VERSION < '1.1.6'
|
104
|
-
require 'faraday/adapter/em_http_ssl_patch'
|
105
|
-
end
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
self.supports_parallel = true
|
110
|
-
|
111
|
-
# @return [Manager]
|
112
|
-
def self.setup_parallel_manager(_options = nil)
|
113
|
-
Manager.new
|
114
|
-
end
|
115
|
-
|
116
|
-
def call(env)
|
117
|
-
super
|
118
|
-
perform_request env
|
119
|
-
@app.call env
|
120
|
-
end
|
121
|
-
|
122
|
-
def perform_request(env)
|
123
|
-
if parallel?(env)
|
124
|
-
manager = env[:parallel_manager]
|
125
|
-
manager.add do
|
126
|
-
perform_single_request(env)
|
127
|
-
.callback { env[:response].finish(env) }
|
128
|
-
end
|
129
|
-
elsif EventMachine.reactor_running?
|
130
|
-
# EM is running: instruct upstream that this is an async request
|
131
|
-
env[:parallel_manager] = true
|
132
|
-
perform_single_request(env)
|
133
|
-
.callback { env[:response].finish(env) }
|
134
|
-
.errback do
|
135
|
-
# TODO: no way to communicate the error in async mode
|
136
|
-
raise NotImplementedError
|
137
|
-
end
|
138
|
-
else
|
139
|
-
error = nil
|
140
|
-
# start EM, block until request is completed
|
141
|
-
EventMachine.run do
|
142
|
-
perform_single_request(env)
|
143
|
-
.callback { EventMachine.stop }
|
144
|
-
.errback do |client|
|
145
|
-
error = error_message(client)
|
146
|
-
EventMachine.stop
|
147
|
-
end
|
148
|
-
end
|
149
|
-
raise_error(error) if error
|
150
|
-
end
|
151
|
-
rescue EventMachine::Connectify::CONNECTError => e
|
152
|
-
if e.message.include?('Proxy Authentication Required')
|
153
|
-
raise Faraday::ConnectionFailed,
|
154
|
-
%(407 "Proxy Authentication Required ")
|
155
|
-
end
|
156
|
-
|
157
|
-
raise Faraday::ConnectionFailed, e
|
158
|
-
rescue StandardError => e
|
159
|
-
if defined?(::OpenSSL::SSL::SSLError) && \
|
160
|
-
e.is_a?(::OpenSSL::SSL::SSLError)
|
161
|
-
raise Faraday::SSLError, e
|
162
|
-
end
|
163
|
-
|
164
|
-
raise
|
165
|
-
end
|
166
|
-
|
167
|
-
# TODO: reuse the connection to support pipelining
|
168
|
-
def perform_single_request(env)
|
169
|
-
req = create_request(env)
|
170
|
-
req = req.setup_request(env[:method], request_config(env))
|
171
|
-
req.callback do |client|
|
172
|
-
if env[:request].stream_response?
|
173
|
-
warn "Streaming downloads for #{self.class.name} " \
|
174
|
-
'are not yet implemented.'
|
175
|
-
env[:request].on_data.call(
|
176
|
-
client.response,
|
177
|
-
client.response.bytesize
|
178
|
-
)
|
179
|
-
end
|
180
|
-
status = client.response_header.status
|
181
|
-
reason = client.response_header.http_reason
|
182
|
-
save_response(env, status, client.response, nil, reason) do |headers|
|
183
|
-
client.response_header.each do |name, value|
|
184
|
-
headers[name.to_sym] = value
|
185
|
-
end
|
186
|
-
end
|
187
|
-
end
|
188
|
-
end
|
189
|
-
|
190
|
-
def create_request(env)
|
191
|
-
EventMachine::HttpRequest.new(
|
192
|
-
env[:url], connection_config(env).merge(@connection_options)
|
193
|
-
)
|
194
|
-
end
|
195
|
-
|
196
|
-
def error_message(client)
|
197
|
-
client.error || 'request failed'
|
198
|
-
end
|
199
|
-
|
200
|
-
def raise_error(msg)
|
201
|
-
error_class = Faraday::ClientError
|
202
|
-
if timeout_message?(msg)
|
203
|
-
error_class = Faraday::TimeoutError
|
204
|
-
msg = 'request timed out'
|
205
|
-
elsif msg == Errno::ECONNREFUSED
|
206
|
-
error_class = Faraday::ConnectionFailed
|
207
|
-
msg = 'connection refused'
|
208
|
-
elsif msg == 'connection closed by server'
|
209
|
-
error_class = Faraday::ConnectionFailed
|
210
|
-
end
|
211
|
-
raise error_class, msg
|
212
|
-
end
|
213
|
-
|
214
|
-
def timeout_message?(msg)
|
215
|
-
msg == Errno::ETIMEDOUT ||
|
216
|
-
(msg.is_a?(String) && msg.include?('timeout error'))
|
217
|
-
end
|
218
|
-
|
219
|
-
# @return [Boolean]
|
220
|
-
def parallel?(env)
|
221
|
-
!!env[:parallel_manager]
|
222
|
-
end
|
223
|
-
|
224
|
-
# This parallel manager is designed to start an EventMachine loop
|
225
|
-
# and block until all registered requests have been completed.
|
226
|
-
class Manager
|
227
|
-
# @see reset
|
228
|
-
def initialize
|
229
|
-
reset
|
230
|
-
end
|
231
|
-
|
232
|
-
# Re-initializes instance variables
|
233
|
-
def reset
|
234
|
-
@registered_procs = []
|
235
|
-
@num_registered = 0
|
236
|
-
@num_succeeded = 0
|
237
|
-
@errors = []
|
238
|
-
@running = false
|
239
|
-
end
|
240
|
-
|
241
|
-
# @return [Boolean]
|
242
|
-
def running?
|
243
|
-
@running
|
244
|
-
end
|
245
|
-
|
246
|
-
def add(&block)
|
247
|
-
if running?
|
248
|
-
perform_request(&block)
|
249
|
-
else
|
250
|
-
@registered_procs << block
|
251
|
-
end
|
252
|
-
@num_registered += 1
|
253
|
-
end
|
254
|
-
|
255
|
-
def run
|
256
|
-
if @num_registered.positive?
|
257
|
-
@running = true
|
258
|
-
EventMachine.run do
|
259
|
-
@registered_procs.each do |proc|
|
260
|
-
perform_request(&proc)
|
261
|
-
end
|
262
|
-
end
|
263
|
-
unless @errors.empty?
|
264
|
-
raise Faraday::ClientError, @errors.first || 'connection failed'
|
265
|
-
end
|
266
|
-
end
|
267
|
-
ensure
|
268
|
-
reset
|
269
|
-
end
|
270
|
-
|
271
|
-
def perform_request
|
272
|
-
client = yield
|
273
|
-
client.callback do
|
274
|
-
@num_succeeded += 1
|
275
|
-
check_finished
|
276
|
-
end
|
277
|
-
client.errback do
|
278
|
-
@errors << client.error
|
279
|
-
check_finished
|
280
|
-
end
|
281
|
-
end
|
282
|
-
|
283
|
-
def check_finished
|
284
|
-
EventMachine.stop if @num_succeeded + @errors.size == @num_registered
|
285
|
-
end
|
286
|
-
end
|
287
|
-
end
|
288
|
-
end
|
289
|
-
end
|
@@ -1,62 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'openssl'
|
4
|
-
require 'em-http'
|
5
|
-
|
6
|
-
# EventMachine patch to make SSL work.
|
7
|
-
module EmHttpSslPatch
|
8
|
-
def ssl_verify_peer(cert_string)
|
9
|
-
begin
|
10
|
-
@last_seen_cert = OpenSSL::X509::Certificate.new(cert_string)
|
11
|
-
rescue OpenSSL::X509::CertificateError
|
12
|
-
return false
|
13
|
-
end
|
14
|
-
|
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
|
-
end
|
25
|
-
true
|
26
|
-
end
|
27
|
-
|
28
|
-
def ssl_handshake_completed
|
29
|
-
return true unless verify_peer?
|
30
|
-
|
31
|
-
unless verified_cert_identity?
|
32
|
-
raise OpenSSL::SSL::SSLError,
|
33
|
-
%(host "#{host}" does not match the server certificate)
|
34
|
-
end
|
35
|
-
|
36
|
-
true
|
37
|
-
end
|
38
|
-
|
39
|
-
def verify_peer?
|
40
|
-
parent.connopts.tls[:verify_peer]
|
41
|
-
end
|
42
|
-
|
43
|
-
def verified_cert_identity?
|
44
|
-
OpenSSL::SSL.verify_certificate_identity(@last_seen_cert, host)
|
45
|
-
end
|
46
|
-
|
47
|
-
def host
|
48
|
-
parent.uri.host
|
49
|
-
end
|
50
|
-
|
51
|
-
def certificate_store
|
52
|
-
@certificate_store ||= begin
|
53
|
-
store = OpenSSL::X509::Store.new
|
54
|
-
store.set_default_paths
|
55
|
-
ca_file = parent.connopts.tls[:cert_chain_file]
|
56
|
-
store.add_file(ca_file) if ca_file
|
57
|
-
store
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
|
62
|
-
EventMachine::HttpStubConnection.include(EmHttpSslPatch)
|