logstash-input-tcp 6.0.4-java → 6.0.9-java

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
2
  SHA256:
3
- metadata.gz: 111b9d45b87f5cd47ca57f08c6888c6707e497a3ac684cd979e753c7bca0a36f
4
- data.tar.gz: eb7fbb4e8f20b1ecebe0a0e6b0c6faa02a6658c2e84ff5499ebb874e696deaee
3
+ metadata.gz: f6eb6cc7c3c5b381a2e6d3fe88da5dec75f5ef618b13e808f225e5c79f014a07
4
+ data.tar.gz: 2a7da79f758677e26f23b0de499c352fa34a5cfb311e716fef60e70aadb8a101
5
5
  SHA512:
6
- metadata.gz: b1a9c7eb8a2cdfe98282aea08a466b4909f766ffb983a36ef7c614725e230ff627d8eff56f35e5bcbfdbc7379e58e2424a7faf10d0a444c79d2579c6a59cda90
7
- data.tar.gz: ad6dda462743631fbbc51121bce2cf7c7fd1897553e2fb804af52b8c1cdd52625616c7802c19e2052b7c804c5c41cb7d2dfcc86c9a9894981fd241afa0d7cc7b
6
+ metadata.gz: e3e2f304718febde6c77bfedba571a23b5c54d84c2e8c8c892876d2e20033f3a38fa146f1c27d3678ab1c8beeb22eb8210594b5ea51b77396ac40606ffcd398f
7
+ data.tar.gz: 7d544239e0fadb492d5b2306aee74529fd97767eb30defa70d6adb68443f1803f0c65832c070710df4be0a1f4341f1f2a1750fa94acb36516bcb201ac6982ef4
data/CHANGELOG.md CHANGED
@@ -1,3 +1,23 @@
1
+ ## 6.0.9
2
+ - [DOC] Reorder options alphabetically [#171](https://github.com/logstash-plugins/logstash-input-tcp/pull/171)
3
+
4
+ ## 6.0.8
5
+ - [DOC] better description for `tcp_keep_alive` option [#169](https://github.com/logstash-plugins/logstash-input-tcp/pull/169)
6
+
7
+ ## 6.0.7
8
+ - Fix: reduce error logging (to info level) on connection resets [#168](https://github.com/logstash-plugins/logstash-input-tcp/pull/168)
9
+ - Refactor: only patch Socket classes once (on first input)
10
+ - Refactor: use a proper log4j logger (in Java to avoid surprises when unwrapping `LogStash::Logging::Logger`)
11
+
12
+ ## 6.0.6
13
+ - Updated Netty dependencies. Additionally, this release removes the dependency on `tcnative` +
14
+ `boringssl`, using JVM supplied ciphers instead. This may result in fewer ciphers being available if the JCE
15
+ unlimited strength jurisdiction policy is not installed. (This policy is installed by default on versions of the
16
+ JDK from u161 onwards)[#157](https://github.com/logstash-plugins/logstash-input-tcp/pull/157)
17
+
18
+ ## 6.0.5
19
+ - Fix potential startup crash that could occur when multiple instances of this plugin were started simultaneously [#155](https://github.com/logstash-plugins/logstash-input-tcp/pull/155)
20
+
1
21
  ## 6.0.4
2
22
  - Refactor: scope java_import to avoid polluting [#152](https://github.com/logstash-plugins/logstash-input-tcp/pull/152)
3
23
 
data/Gemfile CHANGED
@@ -9,7 +9,3 @@ if Dir.exist?(logstash_path) && use_logstash_source
9
9
  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
10
10
  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
11
11
  end
12
-
13
- if RUBY_VERSION == "1.9.3"
14
- gem 'rake', '12.2.1'
15
- end
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012-2018 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,6 +1,6 @@
1
1
  # Logstash Plugin
2
2
 
3
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-tcp.svg)](https://travis-ci.org/logstash-plugins/logstash-input-tcp)
3
+ [![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-tcp.svg)](https://travis-ci.com/logstash-plugins/logstash-input-tcp)
4
4
 
5
5
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
6
6
 
data/docs/index.asciidoc CHANGED
@@ -78,6 +78,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
78
78
  [cols="<,<,<",options="header",]
79
79
  |=======================================================================
80
80
  |Setting |Input type|Required
81
+ | <<plugins-{type}s-{plugin}-dns_reverse_lookup_enabled>> |<<boolean,boolean>>|No
81
82
  | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
82
83
  | <<plugins-{type}s-{plugin}-mode>> |<<string,string>>, one of `["server", "client"]`|No
83
84
  | <<plugins-{type}s-{plugin}-port>> |<<number,number>>|Yes
@@ -90,7 +91,6 @@ This plugin supports the following configuration options plus the <<plugins-{typ
90
91
  | <<plugins-{type}s-{plugin}-ssl_key_passphrase>> |<<password,password>>|No
91
92
  | <<plugins-{type}s-{plugin}-ssl_verify>> |<<boolean,boolean>>|No
92
93
  | <<plugins-{type}s-{plugin}-tcp_keep_alive>> |<<boolean,boolean>>|No
93
- | <<plugins-{type}s-{plugin}-dns_reverse_lookup_enabled>> |<<boolean,boolean>>|No
94
94
  |=======================================================================
95
95
 
96
96
  Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -98,6 +98,16 @@ input plugins.
98
98
 
99
99
  &nbsp;
100
100
 
101
+ [id="plugins-{type}s-{plugin}-dns_reverse_lookup_enabled"]
102
+ ===== `dns_reverse_lookup_enabled`
103
+
104
+ * Value type is <<boolean,boolean>>
105
+ * Default value is `true`
106
+
107
+ It is possible to avoid DNS reverse-lookups by disabling this setting. If disabled,
108
+ the address metadata that is added to events will contain the source address as-specified
109
+ at the TCP layer and IPs will not be resolved to hostnames.
110
+
101
111
  [id="plugins-{type}s-{plugin}-host"]
102
112
  ===== `host`
103
113
 
@@ -202,17 +212,9 @@ For input, sets the field `sslsubject` to that of the client certificate.
202
212
  * Value type is <<boolean,boolean>>
203
213
  * Default value is `false`
204
214
 
205
- Instruct the socket to use TCP keep alives. Uses OS defaults for keep alive settings.
206
-
207
- [id="plugins-{type}s-{plugin}-dns_reverse_lookup_enabled"]
208
- ===== `dns_reverse_lookup_enabled`
209
-
210
- * Value type is <<boolean,boolean>>
211
- * Default value is `true`
212
-
213
- It is possible to avoid DNS reverse-lookups by disabling this setting. If disabled,
214
- the address metadata that is added to events will contain the source address as-specified
215
- at the TCP layer and IPs will not be resolved to hostnames.
215
+ Instruct the socket to use TCP keep alive. If it's `true` then the underlying socket
216
+ will use the OS defaults settings for keep alive. If it's `false` it doesn't configure any
217
+ keep alive setting for the underlying socket.
216
218
 
217
219
 
218
220
  [id="plugins-{type}s-{plugin}-common-options"]
@@ -0,0 +1,30 @@
1
+ :plugin: tcp-test
2
+ :type: input
3
+ :default_codec: line
4
+
5
+ ///////////////////////////////////////////
6
+ START - GENERATED VARIABLES, DO NOT EDIT!
7
+ ///////////////////////////////////////////
8
+ :version: %VERSION%
9
+ :release_date: %RELEASE_DATE%
10
+ :changelog_url: %CHANGELOG_URL%
11
+ :include_path: ../../../../logstash/docs/include
12
+ ///////////////////////////////////////////
13
+ END - GENERATED VARIABLES, DO NOT EDIT!
14
+ ///////////////////////////////////////////
15
+
16
+ [id="plugins-{type}s-{plugin}"]
17
+
18
+ === Tcp-test input plugin
19
+
20
+ include::{include_path}/plugin_header.asciidoc[]
21
+
22
+ ==== Description
23
+
24
+ This is only a test.
25
+
26
+
27
+ [id="plugins-{type}s-{plugin}-common-options"]
28
+ include::{include_path}/{type}.asciidoc[]
29
+
30
+ :default_codec!:
@@ -119,12 +119,21 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
119
119
  PROXY_PORT_FIELD = "proxy_port".freeze
120
120
  SSLSUBJECT_FIELD = "sslsubject".freeze
121
121
 
122
+ # Monkey patch TCPSocket and SSLSocket to include socket peer
123
+ # @private
124
+ def self.patch_socket_peer!
125
+ unless TCPSocket < ::LogStash::Util::SocketPeer
126
+ TCPSocket.send :include, ::LogStash::Util::SocketPeer
127
+ end
128
+ unless OpenSSL::SSL::SSLSocket < ::LogStash::Util::SocketPeer
129
+ OpenSSL::SSL::SSLSocket.send :include, ::LogStash::Util::SocketPeer
130
+ end
131
+ end
132
+
122
133
  def initialize(*args)
123
134
  super(*args)
124
135
 
125
- # monkey patch TCPSocket and SSLSocket to include socket peer
126
- TCPSocket.module_eval{include ::LogStash::Util::SocketPeer}
127
- OpenSSL::SSL::SSLSocket.module_eval{include ::LogStash::Util::SocketPeer}
136
+ self.class.patch_socket_peer!
128
137
 
129
138
  # threadsafe socket bookkeeping
130
139
  @server_socket = nil
@@ -141,15 +150,15 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
141
150
  if server?
142
151
  ssl_context = get_ssl_context(SslOptions)
143
152
 
144
- @loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive,
145
- ssl_context, @logger.to_java(org.apache.logging.log4j.Logger))
153
+
154
+ @loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive, ssl_context)
146
155
  end
147
156
  end
148
157
 
149
158
  def run(output_queue)
150
159
  @output_queue = output_queue
151
160
  if server?
152
- @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => "#{@ssl_enable}")
161
+ @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => @ssl_enable)
153
162
  @loop.run
154
163
  else
155
164
  run_client()
@@ -242,12 +251,10 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
242
251
  rescue Errno::ECONNRESET
243
252
  @logger.debug? && @logger.debug("Connection reset by peer", :client => peer)
244
253
  rescue OpenSSL::SSL::SSLError => e
245
- # Fixes issue #23
246
- @logger.error("SSL Error", :exception => e, :backtrace => e.backtrace)
247
- socket.close rescue nil
254
+ @logger.error("SSL error", :client => peer, :message => e.message, :exception => e.class, :backtrace => e.backtrace)
248
255
  rescue => e
249
256
  # if plugin is stopping, don't bother logging it as an error
250
- !stop? && @logger.error("An error occurred. Closing connection", :client => peer, :exception => e, :backtrace => e.backtrace)
257
+ !stop? && @logger.error("An error occurred, closing connection", :client => peer, :message => e.message, :exception => e.class, :backtrace => e.backtrace)
251
258
  ensure
252
259
  # catch all rescue nil on close to discard any close errors or invalid socket
253
260
  socket.close rescue nil
@@ -283,7 +290,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
283
290
  @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
284
291
  end
285
292
  rescue => e
286
- @logger.error("Could not inititalize SSL context", :exception => e, :backtrace => e.backtrace)
293
+ @logger.error("Could not inititalize SSL context", :message => e.message, :exception => e.class, :backtrace => e.backtrace)
287
294
  raise e
288
295
  end
289
296
 
@@ -1,4 +1,5 @@
1
1
  require 'openssl'
2
+ require "logstash/util/loggable"
2
3
 
3
4
  # Simulate a normal SslOptions builder:
4
5
  #
@@ -12,10 +13,12 @@ require 'openssl'
12
13
  # .set_ssl_certificate_authorities(@ssl_certificate_authorities.to_java(:string))
13
14
  # .build.toSslContext()
14
15
  class SslOptions
16
+ include LogStash::Util::Loggable
15
17
 
16
18
  java_import 'io.netty.handler.ssl.ClientAuth'
17
19
  java_import 'io.netty.handler.ssl.SslContextBuilder'
18
20
  java_import 'java.security.cert.X509Certificate'
21
+ java_import 'javax.crypto.Cipher'
19
22
  java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
20
23
  java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
21
24
  java_import 'org.bouncycastle.openssl.PEMKeyPair'
@@ -70,6 +73,8 @@ class SslOptions
70
73
  def toSslContext
71
74
  return nil unless @ssl_enabled
72
75
 
76
+ # Check key strength
77
+ logger.warn("JCE Unlimited Strength Jurisdiction Policy not installed - max key length is 128 bits") unless Cipher.getMaxAllowedKeyLength("AES") > 128
73
78
  # create certificate object
74
79
  cf = java.security.cert.CertificateFactory.getInstance("X.509")
75
80
  cert_chain = []
@@ -38,8 +38,8 @@ class DecoderImpl
38
38
  pp_info = pp_hdr.split(/\s/)
39
39
  # PROXY proto clientip proxyip clientport proxyport
40
40
  if pp_info[0] != "PROXY"
41
- @tcp.logger.error("invalid proxy protocol header label", :hdr => pp_hdr)
42
- raise IOError
41
+ @tcp.logger.error("Invalid proxy protocol header label", :header => pp_hdr)
42
+ raise IOError.new("Invalid proxy protocol header label #{pp_hdr.inspect}")
43
43
  else
44
44
  @proxy_address = pp_info[3]
45
45
  @proxy_port = pp_info[5]
@@ -341,8 +341,7 @@ describe LogStash::Inputs::Tcp do
341
341
  "port" => port,
342
342
  "ssl_enable" => true,
343
343
  "ssl_cert" => certificate_file.path,
344
- "ssl_key" => key_file.path,
345
- "ssl_extra_chain_certs" => certificate_file.path
344
+ "ssl_key" => key_file.path
346
345
  }
347
346
  end
348
347
 
@@ -368,7 +367,6 @@ describe LogStash::Inputs::Tcp do
368
367
  File.unlink(certificate_file.path)
369
368
  File.unlink(key_file.path)
370
369
  end
371
-
372
370
  end
373
371
 
374
372
  context "with pkcs#8 keys" do
data/version CHANGED
@@ -1 +1 @@
1
- 6.0.4
1
+ 6.0.9
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-tcp
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.4
4
+ version: 6.0.9
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-16 00:00:00.000000000 Z
11
+ date: 2021-03-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
171
171
  - NOTICE.TXT
172
172
  - README.md
173
173
  - docs/index.asciidoc
174
+ - docs/testfile.asciidoc
174
175
  - lib/logstash-input-tcp_jars.rb
175
176
  - lib/logstash/inputs/tcp.rb
176
177
  - lib/logstash/inputs/tcp/compat_ssl_options.rb
@@ -178,7 +179,7 @@ files:
178
179
  - logstash-input-tcp.gemspec
179
180
  - spec/inputs/tcp_spec.rb
180
181
  - spec/spec_helper.rb
181
- - vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.4/logstash-input-tcp-6.0.4.jar
182
+ - vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.9/logstash-input-tcp-6.0.9.jar
182
183
  - version
183
184
  homepage: http://www.elastic.co/guide/en/logstash/current/index.html
184
185
  licenses: