logstash-mixin-http_client 6.0.1 → 7.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 3e6d37a37ce80b8e4ca87da4e6fa0df6a8d9a529
4
- data.tar.gz: 058f541533769dbb8990c8858786bb13f7f3e284
2
+ SHA256:
3
+ metadata.gz: 967d2306be29d709b80a1e2483e09c7eb06acdbc5079af3090ef265427377b33
4
+ data.tar.gz: 6d358bd6a4b819a14cd669af4d14ea3f130b2802bec6872e6ef03f27b8c5e186
5
5
  SHA512:
6
- metadata.gz: 443d6408adf513f63e569cac2315c1a7ea69121f05e6bee5c927903cfbe9bc11098965f5499340141b443c3a997c58b0eb24a14cc485198fd55cc18fc5db26e5
7
- data.tar.gz: 119fc60fe0cf6a49c49db00d3df7191acf94edef454193a733d77a045b609c9a600a4c8350a492cccac9de1eb17640964a80786b3c1392c33cb77c3f8a8cfc88
6
+ metadata.gz: a0ad4d31a8e1a72d38686466b141ff16c22b24821d8c9dc9d8a0df6d2745d05b7a4e644a26b869c4c6bacac4d73e27aaa2fa065dcbbd67d1bbda2b35153e08cf
7
+ data.tar.gz: b3bf2076187e018a00b19c0c2ec9eb770ae241879fc798aad60ec8b6bb02f79ce508aa23f9ff5c29ba03280288cd2cc3d5e002a87aebda51f680d2f322fe6880
data/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 7.2.0
2
+ - Feat: add `ssl_supported_protocols` option [#40](https://github.com/logstash-plugins/logstash-mixin-http_client/pull/40)
3
+
4
+ ## 7.1.0
5
+ - Feat: add `ssl_verification_mode` [#39](https://github.com/logstash-plugins/logstash-mixin-http_client/pull/39)
6
+
7
+ ## 7.0.0
8
+ - Removed obsolete `ssl_certificate_verify` option
9
+
1
10
  ## 6.0.1
2
11
  - Fix some documentation issues
3
12
 
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
2
1
 
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
6
5
 
7
- http://www.apache.org/licenses/LICENSE-2.0
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8
7
 
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright 2020 Elastic and contributors
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/README.md CHANGED
@@ -1,10 +1,10 @@
1
1
  # Easily Add an HTTP Client to your Logstash Plugin!
2
2
 
3
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-mixin-http_client.svg)](https://travis-ci.org/logstash-plugins/logstash-mixin-http_client)
3
+ [![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-mixin-http_client.svg)](https://travis-ci.com/logstash-plugins/logstash-mixin-http_client)
4
4
 
5
5
  HTTP clients have a lot of configurable options (proxies, certificates, headers, etc.), and specifying all of these with proper validation for a logstash plugin can be irritating. We built this plugin while building our [HTTP Poller Input](https://github.com/logstash-plugins/logstash-input-http_poller). If you need to build a plugin that works primarily based around HTTP this mixin makes it easy and consistent! It is based on [Manticore](https://github.com/cheald/manticore) a lightning quick, fully featured JRuby HTTP client based on Apache Commons HTTP Client.`
6
6
 
7
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-mixin-http_client.svg)](https://travis-ci.org/logstash-plugins/logstash-mixin-http_client)
7
+ [![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-mixin-http_client.svg)](https://travis-ci.com/logstash-plugins/logstash-mixin-http_client)
8
8
 
9
9
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
10
10
 
@@ -52,8 +52,6 @@ module LogStash::PluginMixins::HttpClient
52
52
  # See https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html#setValidateAfterInactivity(int)[these docs for more info]
53
53
  config :validate_after_inactivity, :validate => :number, :default => 200
54
54
 
55
- config :ssl_certificate_validation, :obsolete => "This option is obsolete as it never worked correctly."
56
-
57
55
  # If you need to use a custom X.509 CA (.pem certs) specify the path to that here
58
56
  config :cacert, :validate => :path
59
57
 
@@ -72,6 +70,15 @@ module LogStash::PluginMixins::HttpClient
72
70
  # Specify the keystore type here. One of `JKS` or `PKCS12`. Default is `JKS`
73
71
  config :keystore_type, :validate => :string, :default => "JKS"
74
72
 
73
+ # Naming aligned with the Elastic stack.
74
+ # full: verifies that the provided certificate is signed by a trusted authority (CA) and also verifies that the
75
+ # server’s hostname (or IP address) matches the names identified within the certificate
76
+ # none: no verification of the server’s certificate
77
+ config :ssl_verification_mode, :validate => ['full', 'none'], :default => 'full'
78
+
79
+ # NOTE: the default setting [] uses Java SSL engine defaults.
80
+ config :ssl_supported_protocols, :validate => ['TLSv1.1', 'TLSv1.2', 'TLSv1.3'], :default => [], :list => true
81
+
75
82
  # If you need to use a custom truststore (`.jks`) specify that here. This does not work with .pem certs!
76
83
  config :truststore, :validate => :path
77
84
 
@@ -172,6 +179,21 @@ module LogStash::PluginMixins::HttpClient
172
179
  raise InvalidHTTPConfigError, "You must specify both client_cert and client_key for an HTTP client, or neither!"
173
180
  end
174
181
 
182
+ case @ssl_verification_mode
183
+ when 'full'
184
+ # NOTE: would make sense to have :browser here but historically we've used the (:strict) default
185
+ #
186
+ # supporting `ssl_verification_mode => strict` the same way ES does might require upstream Manticore
187
+ # changes -> as in ES/Beats setting `strict` means: "if the SAN is empty return an error"
188
+ c[:ssl][:verify] = :strict # :default
189
+ when 'none'
190
+ c[:ssl][:verify] = :disable
191
+ end
192
+
193
+ if @ssl_supported_protocols && @ssl_supported_protocols.any?
194
+ c[:ssl][:protocols] = @ssl_supported_protocols
195
+ end
196
+
175
197
  c
176
198
  end
177
199
 
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-mixin-http_client'
3
- s.version = '6.0.1'
3
+ s.version = '7.2.0'
4
4
  s.licenses = ['Apache License (2.0)']
5
5
  s.summary = "AWS mixins to provide a unified interface for Amazon Webservice"
6
6
  s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
  # Gem dependencies
19
19
  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
20
20
  s.add_runtime_dependency 'logstash-codec-plain'
21
- s.add_runtime_dependency 'manticore', '>= 0.5.2', '< 1.0.0'
21
+ s.add_runtime_dependency 'manticore', '>= 0.8.0', '< 1.0.0'
22
22
 
23
23
  s.add_development_dependency 'logstash-devutils'
24
24
  s.add_development_dependency 'stud'
@@ -85,7 +85,7 @@ describe LogStash::PluginMixins::HttpClient do
85
85
  end
86
86
  end
87
87
 
88
- describe "http auth" do
88
+ describe "http auth" do
89
89
  subject { Dummy.new(client_config).send(:client_config)[:auth] }
90
90
 
91
91
  let(:user) { "myuser" }
@@ -113,7 +113,7 @@ describe "http auth" do
113
113
  end
114
114
 
115
115
  context "with a user but no password specified" do
116
- let(:client_config) { c = super; c.delete("password"); c }
116
+ let(:client_config) { c = super(); c.delete("password"); c }
117
117
 
118
118
  it "should raise a configuration error" do
119
119
  expect { subject }.to raise_error(::LogStash::ConfigurationError)
@@ -185,4 +185,70 @@ describe "http auth" do
185
185
  include_examples("raising a configuration error")
186
186
  end
187
187
  end
188
+
189
+ describe "with verify mode" do
190
+ let(:file) { Stud::Temporary.file }
191
+ let(:path) { file.path }
192
+ after { File.unlink(path)}
193
+
194
+ context "default" do
195
+ let(:conf) { basic_config }
196
+
197
+ it "sets manticore verify to :strict" do
198
+ expect( Dummy.new(conf).client_config[:ssl] ).to include :verify => :strict
199
+ end
200
+ end
201
+
202
+ context "'full'" do
203
+ let(:conf) { basic_config.merge("ssl_verification_mode" => 'full') }
204
+
205
+ it "sets manticore verify to :strict" do
206
+ expect( Dummy.new(conf).client_config[:ssl] ).to include :verify => :strict
207
+ end
208
+ end
209
+
210
+ context "'none'" do
211
+ let(:conf) { basic_config.merge("ssl_verification_mode" => 'none') }
212
+
213
+ it "sets manticore verify to :disable" do
214
+ expect( Dummy.new(conf).client_config[:ssl] ).to include :verify => :disable
215
+ end
216
+ end
217
+
218
+ end
219
+
220
+ describe "with supported protocols" do
221
+ context "default" do
222
+ let(:conf) { basic_config }
223
+
224
+ it "does not set manticore protocols option" do
225
+ expect( Dummy.new(conf).client_config[:ssl] ).to_not include :protocols
226
+ end
227
+ end
228
+
229
+ context "empty" do
230
+ let(:conf) { basic_config.merge("ssl_supported_protocols" => []) }
231
+
232
+ it "does not set manticore protocols option" do
233
+ expect( Dummy.new(conf).client_config[:ssl] ).to_not include :protocols
234
+ end
235
+ end
236
+
237
+ context "'TLSv1.3'" do
238
+ let(:conf) { basic_config.merge("ssl_supported_protocols" => ['TLSv1.3']) }
239
+
240
+ it "sets manticore protocols option" do
241
+ expect( Dummy.new(conf).client_config[:ssl] ).to include :protocols => ['TLSv1.3']
242
+ end
243
+ end
244
+
245
+ context "'TLSv1.2' and 'TLSv1.3'" do
246
+ let(:conf) { basic_config.merge("ssl_supported_protocols" => ['TLSv1.3', 'TLSv1.2']) }
247
+
248
+ it "sets manticore protocols option" do
249
+ expect( Dummy.new(conf).client_config[:ssl] ).to include :protocols => ['TLSv1.3', 'TLSv1.2']
250
+ end
251
+ end
252
+
253
+ end
188
254
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-mixin-http_client
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.1
4
+ version: 7.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-16 00:00:00.000000000 Z
11
+ date: 2022-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  requirements:
50
50
  - - ">="
51
51
  - !ruby/object:Gem::Version
52
- version: 0.5.2
52
+ version: 0.8.0
53
53
  - - "<"
54
54
  - !ruby/object:Gem::Version
55
55
  version: 1.0.0
@@ -60,7 +60,7 @@ dependencies:
60
60
  requirements:
61
61
  - - ">="
62
62
  - !ruby/object:Gem::Version
63
- version: 0.5.2
63
+ version: 0.8.0
64
64
  - - "<"
65
65
  - !ruby/object:Gem::Version
66
66
  version: 1.0.0
@@ -92,7 +92,9 @@ dependencies:
92
92
  - - ">="
93
93
  - !ruby/object:Gem::Version
94
94
  version: '0'
95
- description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
95
+ description: This gem is a Logstash plugin required to be installed on top of the
96
+ Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
97
+ gem is not a stand-alone program
96
98
  email: info@elastic.co
97
99
  executables: []
98
100
  extensions: []
@@ -125,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
125
127
  - !ruby/object:Gem::Version
126
128
  version: '0'
127
129
  requirements: []
128
- rubyforge_project:
129
- rubygems_version: 2.4.8
130
+ rubygems_version: 3.1.6
130
131
  signing_key:
131
132
  specification_version: 4
132
133
  summary: AWS mixins to provide a unified interface for Amazon Webservice